diff --git a/eng/emitter-package-lock.json b/eng/emitter-package-lock.json index e25757735f9d..954be2479c5a 100644 --- a/eng/emitter-package-lock.json +++ b/eng/emitter-package-lock.json @@ -5,18 +5,18 @@ "packages": { "": { "dependencies": { - "@azure-tools/typespec-java": "0.19.1" + "@azure-tools/typespec-java": "/mnt/vss/_work/1/s/autorest.java/typespec-extension/azure-tools-typespec-java-0.19.2.tgz" }, "devDependencies": { "@azure-tools/typespec-autorest": "0.45.0", "@azure-tools/typespec-azure-core": "0.45.0", "@azure-tools/typespec-azure-resource-manager": "0.45.0", "@azure-tools/typespec-azure-rulesets": "0.45.0", - "@azure-tools/typespec-client-generator-core": "0.45.1", - "@typespec/compiler": "0.59.0", - "@typespec/http": "0.59.0", + "@azure-tools/typespec-client-generator-core": "0.45.4", + "@typespec/compiler": "0.59.1", + "@typespec/http": "0.59.1", "@typespec/openapi": "0.59.0", - "@typespec/rest": "0.59.0", + "@typespec/rest": "0.59.1", "@typespec/versioning": "0.59.0", "@typespec/xml": "0.59.0" } @@ -140,9 +140,9 @@ } }, "node_modules/@azure-tools/typespec-client-generator-core": { - "version": "0.45.1", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.45.1.tgz", - "integrity": "sha512-C68pONnONncKlYjlU7JyxxS57NCLancPfoq0eDcaeXUcjFL34kkLKTE3VK0V6aBKBerAB5qOicsO9X81acFFCw==", + "version": "0.45.4", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.45.4.tgz", + "integrity": "sha512-QJygwMqhEtBi2tPYs/HAfs0QTowXAwp6QpP/Vd2pHnJAncTV1BN17n/9LLAlMu2CnLimqvTuIN+FfliM28AX9w==", "license": "MIT", "dependencies": { "change-case": "~5.4.4", @@ -161,9 +161,9 @@ } }, "node_modules/@azure-tools/typespec-java": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-java/-/typespec-java-0.19.1.tgz", - "integrity": "sha512-xOe0/MSdB7RtzQU8cVCyozLzev7/KkKEugd5rHv6JKD++sh1YNsLzoRlPfRhT8JZk4trzwZrwIGjXd3WSGF9HQ==", + "version": "0.19.2", + "resolved": "file:../../autorest.java/typespec-extension/azure-tools-typespec-java-0.19.2.tgz", + "integrity": "sha512-OwIUJvrwW957fhQPth+EbbpbeYIlBSC1hS9hie5h6DWkkcETI/7xGO5Mx1Nx/tTjKEdYQVFFjnx3ENF8IpP6iQ==", "license": "MIT", "dependencies": { "@autorest/codemodel": "~4.20.0", @@ -178,7 +178,7 @@ "@azure-tools/typespec-azure-core": ">=0.45.0 <1.0.0", "@azure-tools/typespec-azure-resource-manager": ">=0.45.0 <1.0.0", "@azure-tools/typespec-azure-rulesets": ">=0.45.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.45.1 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.45.4 <1.0.0", "@typespec/compiler": ">=0.59.0 <1.0.0", "@typespec/http": ">=0.59.0 <1.0.0", "@typespec/openapi": ">=0.59.0 <1.0.0", @@ -272,9 +272,9 @@ } }, "node_modules/@typespec/compiler": { - "version": "0.59.0", - "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.59.0.tgz", - "integrity": "sha512-fqh2TeAWQyt70f7NkfwOvoQMqHAfGzIfvcUi+XW55+ms6opiqNXBIT822Jr+T4fNo1PgsnbKC34n6SSIMxnOqw==", + "version": "0.59.1", + "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.59.1.tgz", + "integrity": "sha512-O2ljgr6YoFaIH6a8lWc90/czdv4B2X6N9wz4WsnQnVvgO0Tj0s+3xkvp4Tv59RKMhT0f3fK6dL8oEGO32FYk1A==", "license": "MIT", "dependencies": { "@babel/code-frame": "~7.24.7", @@ -301,9 +301,9 @@ } }, "node_modules/@typespec/http": { - "version": "0.59.0", - "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.59.0.tgz", - "integrity": "sha512-P8kJBHmkqYHhojO97Tnj8FH+UInWzGBl2I9Z6ZX6sVUVW9/87hoovgCcVmvU1xMUD/xvKzX3m70fbRXhkocsGQ==", + "version": "0.59.1", + "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.59.1.tgz", + "integrity": "sha512-Ai8oCAO+Bw1HMSZ9gOI5Od4fNn/ul4HrVtTB01xFuLK6FQj854pxhzao8ylPnr7gIRQ327FV12/QfXR87yCiYQ==", "license": "MIT", "engines": { "node": ">=18.0.0" @@ -326,16 +326,16 @@ } }, "node_modules/@typespec/rest": { - "version": "0.59.0", - "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.59.0.tgz", - "integrity": "sha512-wGrmjRDUMgMn9fqusRhu36hC2GOvirz5O01VSrmAEOH6k1L2GX0Mq70gOdZa4kkkWyHYDKb7GdjfaLe8v+OH6w==", + "version": "0.59.1", + "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.59.1.tgz", + "integrity": "sha512-uKU431jBYL2tVQWG5THA75+OtXDa1e8cMAafYK/JJRRiVRd8D/Epd8fp07dzlB8tFGrhCaGlekRMqFPFrHh2/A==", "license": "MIT", "engines": { "node": ">=18.0.0" }, "peerDependencies": { "@typespec/compiler": "~0.59.0", - "@typespec/http": "~0.59.0" + "@typespec/http": "~0.59.1" } }, "node_modules/@typespec/versioning": { diff --git a/eng/emitter-package.json b/eng/emitter-package.json index f0a0cc9d7492..9b93d54b564f 100644 --- a/eng/emitter-package.json +++ b/eng/emitter-package.json @@ -1,19 +1,19 @@ { "main": "dist/src/index.js", "dependencies": { - "@azure-tools/typespec-java": "0.19.1" + "@azure-tools/typespec-java": "/mnt/vss/_work/1/s/autorest.java/typespec-extension/azure-tools-typespec-java-0.19.2.tgz" }, "devDependencies": { "@azure-tools/typespec-autorest": "0.45.0", "@azure-tools/typespec-azure-core": "0.45.0", "@azure-tools/typespec-azure-resource-manager": "0.45.0", "@azure-tools/typespec-azure-rulesets": "0.45.0", - "@azure-tools/typespec-client-generator-core": "0.45.1", - "@typespec/compiler": "0.59.0", - "@typespec/http": "0.59.0", + "@azure-tools/typespec-client-generator-core": "0.45.4", + "@typespec/compiler": "0.59.1", + "@typespec/http": "0.59.1", "@typespec/openapi": "0.59.0", - "@typespec/rest": "0.59.0", + "@typespec/rest": "0.59.1", "@typespec/versioning": "0.59.0", "@typespec/xml": "0.59.0" } -} +} \ No newline at end of file diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/BestWorkerMode.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/BestWorkerMode.java index f022b87ee4a3..faef81c16399 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/BestWorkerMode.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/BestWorkerMode.java @@ -19,12 +19,6 @@ @Fluent public final class BestWorkerMode extends DistributionMode { - /* - * The type discriminator describing a sub-type of DistributionMode. - */ - @Generated - private DistributionModeKind kind = DistributionModeKind.BEST_WORKER; - /* * Define a scoring rule to use, when calculating a score to determine the best worker. If not set, will use a * default scoring formula that uses the number of job labels that the worker labels match, as well as the number of @@ -51,17 +45,7 @@ public final class BestWorkerMode extends DistributionMode { */ @Generated public BestWorkerMode() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of DistributionMode. - * - * @return the kind value. - */ - @Generated - @Override - public DistributionModeKind getKind() { - return this.kind; + this.kind = DistributionModeKind.BEST_WORKER; } /** @@ -232,17 +216,8 @@ public static BestWorkerMode fromJson(JsonReader jsonReader) throws IOException while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("minConcurrentOffers".equals(fieldName)) { - JsonMergePatchHelper.getDistributionModeAccessor() - .setMinConcurrentOffers(deserializedBestWorkerMode, reader.getNullable(JsonReader::getInt)); - } else if ("maxConcurrentOffers".equals(fieldName)) { - JsonMergePatchHelper.getDistributionModeAccessor() - .setMaxConcurrentOffers(deserializedBestWorkerMode, reader.getNullable(JsonReader::getInt)); - } else if ("bypassSelectors".equals(fieldName)) { - JsonMergePatchHelper.getDistributionModeAccessor() - .setBypassSelectors(deserializedBestWorkerMode, reader.getNullable(JsonReader::getBoolean)); - } else if ("kind".equals(fieldName)) { - deserializedBestWorkerMode.kind = DistributionModeKind.fromString(reader.getString()); + if (DistributionMode.fromJsonShared(reader, fieldName, deserializedBestWorkerMode)) { + continue; } else if ("scoringRule".equals(fieldName)) { deserializedBestWorkerMode.scoringRule = RouterRule.fromJson(reader); } else if ("scoringRuleOptions".equals(fieldName)) { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/CancelExceptionAction.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/CancelExceptionAction.java index 65238c916c96..107e2df99f93 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/CancelExceptionAction.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/CancelExceptionAction.java @@ -19,12 +19,6 @@ @Fluent public final class CancelExceptionAction extends ExceptionAction { - /* - * The type discriminator describing a sub-type of ExceptionAction. - */ - @Generated - private ExceptionActionKind kind = ExceptionActionKind.CANCEL; - /* * A note that will be appended to a job's notes collection with the current timestamp. */ @@ -48,17 +42,7 @@ public final class CancelExceptionAction extends ExceptionAction { */ @Generated public CancelExceptionAction() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of ExceptionAction. - * - * @return the kind value. - */ - @Generated - @Override - public ExceptionActionKind getKind() { - return this.kind; + this.kind = ExceptionActionKind.CANCEL; } /** @@ -181,11 +165,8 @@ public static CancelExceptionAction fromJson(JsonReader jsonReader) throws IOExc while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("id".equals(fieldName)) { - JsonMergePatchHelper.getExceptionActionAccessor() - .setId(deserializedCancelExceptionAction, reader.getString()); - } else if ("kind".equals(fieldName)) { - deserializedCancelExceptionAction.kind = ExceptionActionKind.fromString(reader.getString()); + if (ExceptionAction.fromJsonShared(reader, fieldName, deserializedCancelExceptionAction)) { + continue; } else if ("note".equals(fieldName)) { deserializedCancelExceptionAction.note = reader.getString(); } else if ("dispositionCode".equals(fieldName)) { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalQueueSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalQueueSelectorAttachment.java index e0f2fd53f5c4..a082b38a02fb 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalQueueSelectorAttachment.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalQueueSelectorAttachment.java @@ -20,12 +20,6 @@ @Fluent public final class ConditionalQueueSelectorAttachment extends QueueSelectorAttachment { - /* - * The type discriminator describing a sub-type of QueueSelectorAttachment. - */ - @Generated - private QueueSelectorAttachmentKind kind = QueueSelectorAttachmentKind.CONDITIONAL; - /* * The condition that must be true for the queue selectors to be attached. */ @@ -49,17 +43,7 @@ public final class ConditionalQueueSelectorAttachment extends QueueSelectorAttac */ @Generated public ConditionalQueueSelectorAttachment() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of QueueSelectorAttachment. - * - * @return the kind value. - */ - @Generated - @Override - public QueueSelectorAttachmentKind getKind() { - return this.kind; + this.kind = QueueSelectorAttachmentKind.CONDITIONAL; } /** @@ -168,9 +152,9 @@ public static ConditionalQueueSelectorAttachment fromJson(JsonReader jsonReader) while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedConditionalQueueSelectorAttachment.kind - = QueueSelectorAttachmentKind.fromString(reader.getString()); + if (QueueSelectorAttachment.fromJsonShared(reader, fieldName, + deserializedConditionalQueueSelectorAttachment)) { + continue; } else if ("condition".equals(fieldName)) { deserializedConditionalQueueSelectorAttachment.condition = RouterRule.fromJson(reader); } else if ("queueSelectors".equals(fieldName)) { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalWorkerSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalWorkerSelectorAttachment.java index 1a08d0f37147..67342e4958df 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalWorkerSelectorAttachment.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalWorkerSelectorAttachment.java @@ -20,12 +20,6 @@ @Fluent public final class ConditionalWorkerSelectorAttachment extends WorkerSelectorAttachment { - /* - * The type discriminator describing a sub-type of WorkerSelectorAttachment. - */ - @Generated - private WorkerSelectorAttachmentKind kind = WorkerSelectorAttachmentKind.CONDITIONAL; - /* * The condition that must be true for the worker selectors to be attached. */ @@ -49,17 +43,7 @@ public final class ConditionalWorkerSelectorAttachment extends WorkerSelectorAtt */ @Generated public ConditionalWorkerSelectorAttachment() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of WorkerSelectorAttachment. - * - * @return the kind value. - */ - @Generated - @Override - public WorkerSelectorAttachmentKind getKind() { - return this.kind; + this.kind = WorkerSelectorAttachmentKind.CONDITIONAL; } /** @@ -168,9 +152,9 @@ public static ConditionalWorkerSelectorAttachment fromJson(JsonReader jsonReader while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedConditionalWorkerSelectorAttachment.kind - = WorkerSelectorAttachmentKind.fromString(reader.getString()); + if (WorkerSelectorAttachment.fromJsonShared(reader, fieldName, + deserializedConditionalWorkerSelectorAttachment)) { + continue; } else if ("condition".equals(fieldName)) { deserializedConditionalWorkerSelectorAttachment.condition = RouterRule.fromJson(reader); } else if ("workerSelectors".equals(fieldName)) { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DirectMapRouterRule.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DirectMapRouterRule.java index 81a8a01f64ee..d18c9cce81b5 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DirectMapRouterRule.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DirectMapRouterRule.java @@ -34,12 +34,6 @@ public RouterRuleKind getKind() { return RouterRuleKind.DIRECT_MAP; } - /* - * The type discriminator describing a sub-type of RouterRule - */ - @Generated - private RouterRuleKind kind = RouterRuleKind.DIRECT_MAP; - /** * Stores updated model property, the value is property name, not serialized name. */ @@ -83,8 +77,8 @@ public static DirectMapRouterRule fromJson(JsonReader jsonReader) throws IOExcep while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedDirectMapRouterRule.kind = RouterRuleKind.fromString(reader.getString()); + if (RouterRule.fromJsonShared(reader, fieldName, deserializedDirectMapRouterRule)) { + continue; } else { reader.skipChildren(); } diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DistributionMode.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DistributionMode.java index dad03add39db..a0080cb2b633 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DistributionMode.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DistributionMode.java @@ -24,7 +24,7 @@ public class DistributionMode implements JsonSerializable { * The type discriminator describing a sub-type of DistributionMode. */ @Generated - private DistributionModeKind kind = DistributionModeKind.fromString("DistributionMode"); + DistributionModeKind kind; /* * Governs the minimum desired number of active concurrent offers a job can have. @@ -51,6 +51,7 @@ public class DistributionMode implements JsonSerializable { */ @Generated public DistributionMode() { + this.kind = DistributionModeKind.fromString("DistributionMode"); } /** @@ -276,19 +277,30 @@ static DistributionMode fromJsonKnownDiscriminator(JsonReader jsonReader) throws while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedDistributionMode.kind = DistributionModeKind.fromString(reader.getString()); - } else if ("minConcurrentOffers".equals(fieldName)) { - deserializedDistributionMode.minConcurrentOffers = reader.getNullable(JsonReader::getInt); - } else if ("maxConcurrentOffers".equals(fieldName)) { - deserializedDistributionMode.maxConcurrentOffers = reader.getNullable(JsonReader::getInt); - } else if ("bypassSelectors".equals(fieldName)) { - deserializedDistributionMode.bypassSelectors = reader.getNullable(JsonReader::getBoolean); - } else { + if (!DistributionMode.fromJsonShared(reader, fieldName, deserializedDistributionMode)) { reader.skipChildren(); } } return deserializedDistributionMode; }); } + + @Generated + static boolean fromJsonShared(JsonReader reader, String fieldName, DistributionMode deserializedDistributionMode) + throws IOException { + if ("kind".equals(fieldName)) { + deserializedDistributionMode.kind = DistributionModeKind.fromString(reader.getString()); + return true; + } else if ("minConcurrentOffers".equals(fieldName)) { + deserializedDistributionMode.minConcurrentOffers = reader.getNullable(JsonReader::getInt); + return true; + } else if ("maxConcurrentOffers".equals(fieldName)) { + deserializedDistributionMode.maxConcurrentOffers = reader.getNullable(JsonReader::getInt); + return true; + } else if ("bypassSelectors".equals(fieldName)) { + deserializedDistributionMode.bypassSelectors = reader.getNullable(JsonReader::getBoolean); + return true; + } + return false; + } } diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionAction.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionAction.java index 55a247ee53d6..4b8617f4b229 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionAction.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionAction.java @@ -24,7 +24,7 @@ public class ExceptionAction implements JsonSerializable { * The type discriminator describing a sub-type of ExceptionAction. */ @Generated - private ExceptionActionKind kind = ExceptionActionKind.fromString("ExceptionAction"); + ExceptionActionKind kind; /* * Unique Id of the exception action. @@ -72,6 +72,7 @@ public void setId(ExceptionAction model, String id) { */ @Generated public ExceptionAction() { + this.kind = ExceptionActionKind.fromString("ExceptionAction"); } /** @@ -183,15 +184,24 @@ static ExceptionAction fromJsonKnownDiscriminator(JsonReader jsonReader) throws while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedExceptionAction.kind = ExceptionActionKind.fromString(reader.getString()); - } else if ("id".equals(fieldName)) { - deserializedExceptionAction.id = reader.getString(); - } else { + if (!ExceptionAction.fromJsonShared(reader, fieldName, deserializedExceptionAction)) { reader.skipChildren(); } } return deserializedExceptionAction; }); } + + @Generated + static boolean fromJsonShared(JsonReader reader, String fieldName, ExceptionAction deserializedExceptionAction) + throws IOException { + if ("kind".equals(fieldName)) { + deserializedExceptionAction.kind = ExceptionActionKind.fromString(reader.getString()); + return true; + } else if ("id".equals(fieldName)) { + deserializedExceptionAction.id = reader.getString(); + return true; + } + return false; + } } diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionTrigger.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionTrigger.java index 6dcd23451e30..dd988fb5191f 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionTrigger.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionTrigger.java @@ -24,7 +24,7 @@ public class ExceptionTrigger implements JsonSerializable { * The type discriminator describing a sub-type of ExceptionTrigger. */ @Generated - private ExceptionTriggerKind kind = ExceptionTriggerKind.fromString("ExceptionTrigger"); + ExceptionTriggerKind kind; /** * Stores updated model property, the value is property name, not serialized name. @@ -62,6 +62,7 @@ public boolean isJsonMergePatch(ExceptionTrigger model) { */ @Generated public ExceptionTrigger() { + this.kind = ExceptionTriggerKind.fromString("ExceptionTrigger"); } /** @@ -140,13 +141,21 @@ static ExceptionTrigger fromJsonKnownDiscriminator(JsonReader jsonReader) throws while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedExceptionTrigger.kind = ExceptionTriggerKind.fromString(reader.getString()); - } else { + if (!ExceptionTrigger.fromJsonShared(reader, fieldName, deserializedExceptionTrigger)) { reader.skipChildren(); } } return deserializedExceptionTrigger; }); } + + @Generated + static boolean fromJsonShared(JsonReader reader, String fieldName, ExceptionTrigger deserializedExceptionTrigger) + throws IOException { + if ("kind".equals(fieldName)) { + deserializedExceptionTrigger.kind = ExceptionTriggerKind.fromString(reader.getString()); + return true; + } + return false; + } } diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExpressionRouterRule.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExpressionRouterRule.java index aa46b0e9280b..8c977cc7d8c4 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExpressionRouterRule.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExpressionRouterRule.java @@ -19,12 +19,6 @@ @Fluent public final class ExpressionRouterRule extends RouterRule { - /* - * The type discriminator describing a sub-type of RouterRule - */ - @Generated - private RouterRuleKind kind = RouterRuleKind.EXPRESSION; - /* * The expression language to compile to and execute. */ @@ -48,17 +42,7 @@ public final class ExpressionRouterRule extends RouterRule { */ @Generated public ExpressionRouterRule() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of RouterRule. - * - * @return the kind value. - */ - @Generated - @Override - public RouterRuleKind getKind() { - return this.kind; + this.kind = RouterRuleKind.EXPRESSION; } /** @@ -161,8 +145,8 @@ public static ExpressionRouterRule fromJson(JsonReader jsonReader) throws IOExce while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedExpressionRouterRule.kind = RouterRuleKind.fromString(reader.getString()); + if (RouterRule.fromJsonShared(reader, fieldName, deserializedExpressionRouterRule)) { + continue; } else if ("language".equals(fieldName)) { deserializedExpressionRouterRule.language = ExpressionRouterRuleLanguage.fromString(reader.getString()); diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/FunctionRouterRule.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/FunctionRouterRule.java index f2fb240b75a4..d39a115bb1ad 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/FunctionRouterRule.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/FunctionRouterRule.java @@ -19,12 +19,6 @@ @Fluent public final class FunctionRouterRule extends RouterRule { - /* - * The type discriminator describing a sub-type of RouterRule - */ - @Generated - private RouterRuleKind kind = RouterRuleKind.FUNCTION; - /* * URL for Azure Function. */ @@ -48,17 +42,7 @@ public final class FunctionRouterRule extends RouterRule { */ @Generated public FunctionRouterRule() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of RouterRule. - * - * @return the kind value. - */ - @Generated - @Override - public RouterRuleKind getKind() { - return this.kind; + this.kind = RouterRuleKind.FUNCTION; } /** @@ -165,8 +149,8 @@ public static FunctionRouterRule fromJson(JsonReader jsonReader) throws IOExcept while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedFunctionRouterRule.kind = RouterRuleKind.fromString(reader.getString()); + if (RouterRule.fromJsonShared(reader, fieldName, deserializedFunctionRouterRule)) { + continue; } else if ("functionUri".equals(fieldName)) { deserializedFunctionRouterRule.functionUri = reader.getString(); } else if ("credential".equals(fieldName)) { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/JobMatchingMode.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/JobMatchingMode.java index 19f13b2e1504..226748237aef 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/JobMatchingMode.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/JobMatchingMode.java @@ -28,7 +28,7 @@ public class JobMatchingMode implements JsonSerializable { * The type discriminator describing a sub-type of JobMatchingMode. */ @Generated - private JobMatchingModeKind kind = JobMatchingModeKind.fromString("JobMatchingMode"); + JobMatchingModeKind kind; /** * Stores updated model property, the value is property name, not serialized name. @@ -65,6 +65,7 @@ public boolean isJsonMergePatch(JobMatchingMode model) { */ @Generated public JobMatchingMode() { + this.kind = JobMatchingModeKind.fromString("JobMatchingMode"); } /** @@ -145,13 +146,21 @@ static JobMatchingMode fromJsonKnownDiscriminator(JsonReader jsonReader) throws while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedJobMatchingMode.kind = JobMatchingModeKind.fromString(reader.getString()); - } else { + if (!JobMatchingMode.fromJsonShared(reader, fieldName, deserializedJobMatchingMode)) { reader.skipChildren(); } } return deserializedJobMatchingMode; }); } + + @Generated + static boolean fromJsonShared(JsonReader reader, String fieldName, JobMatchingMode deserializedJobMatchingMode) + throws IOException { + if ("kind".equals(fieldName)) { + deserializedJobMatchingMode.kind = JobMatchingModeKind.fromString(reader.getString()); + return true; + } + return false; + } } diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/LongestIdleMode.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/LongestIdleMode.java index db5a92d9c32d..3d6043376ea2 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/LongestIdleMode.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/LongestIdleMode.java @@ -19,12 +19,6 @@ @Fluent public final class LongestIdleMode extends DistributionMode { - /* - * The type discriminator describing a sub-type of DistributionMode. - */ - @Generated - private DistributionModeKind kind = DistributionModeKind.LONGEST_IDLE; - /** * Stores updated model property, the value is property name, not serialized name. */ @@ -36,17 +30,7 @@ public final class LongestIdleMode extends DistributionMode { */ @Generated public LongestIdleMode() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of DistributionMode. - * - * @return the kind value. - */ - @Generated - @Override - public DistributionModeKind getKind() { - return this.kind; + this.kind = DistributionModeKind.LONGEST_IDLE; } /** @@ -143,17 +127,8 @@ public static LongestIdleMode fromJson(JsonReader jsonReader) throws IOException while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("minConcurrentOffers".equals(fieldName)) { - JsonMergePatchHelper.getDistributionModeAccessor() - .setMinConcurrentOffers(deserializedLongestIdleMode, reader.getNullable(JsonReader::getInt)); - } else if ("maxConcurrentOffers".equals(fieldName)) { - JsonMergePatchHelper.getDistributionModeAccessor() - .setMaxConcurrentOffers(deserializedLongestIdleMode, reader.getNullable(JsonReader::getInt)); - } else if ("bypassSelectors".equals(fieldName)) { - JsonMergePatchHelper.getDistributionModeAccessor() - .setBypassSelectors(deserializedLongestIdleMode, reader.getNullable(JsonReader::getBoolean)); - } else if ("kind".equals(fieldName)) { - deserializedLongestIdleMode.kind = DistributionModeKind.fromString(reader.getString()); + if (DistributionMode.fromJsonShared(reader, fieldName, deserializedLongestIdleMode)) { + continue; } else { reader.skipChildren(); } diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ManualReclassifyExceptionAction.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ManualReclassifyExceptionAction.java index 52eb37ede1db..f61d74ed592c 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ManualReclassifyExceptionAction.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ManualReclassifyExceptionAction.java @@ -20,12 +20,6 @@ @Fluent public final class ManualReclassifyExceptionAction extends ExceptionAction { - /* - * The type discriminator describing a sub-type of ExceptionAction. - */ - @Generated - private ExceptionActionKind kind = ExceptionActionKind.MANUAL_RECLASSIFY; - /* * Updated QueueId. */ @@ -55,17 +49,7 @@ public final class ManualReclassifyExceptionAction extends ExceptionAction { */ @Generated public ManualReclassifyExceptionAction() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of ExceptionAction. - * - * @return the kind value. - */ - @Generated - @Override - public ExceptionActionKind getKind() { - return this.kind; + this.kind = ExceptionActionKind.MANUAL_RECLASSIFY; } /** @@ -220,12 +204,8 @@ public static ManualReclassifyExceptionAction fromJson(JsonReader jsonReader) th while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("id".equals(fieldName)) { - JsonMergePatchHelper.getExceptionActionAccessor() - .setId(deserializedManualReclassifyExceptionAction, reader.getString()); - } else if ("kind".equals(fieldName)) { - deserializedManualReclassifyExceptionAction.kind - = ExceptionActionKind.fromString(reader.getString()); + if (ExceptionAction.fromJsonShared(reader, fieldName, deserializedManualReclassifyExceptionAction)) { + continue; } else if ("queueId".equals(fieldName)) { deserializedManualReclassifyExceptionAction.queueId = reader.getString(); } else if ("priority".equals(fieldName)) { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughQueueSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughQueueSelectorAttachment.java index fbd3c60429f6..41b3fd2b5790 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughQueueSelectorAttachment.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughQueueSelectorAttachment.java @@ -19,12 +19,6 @@ @Fluent public final class PassThroughQueueSelectorAttachment extends QueueSelectorAttachment { - /* - * The type discriminator describing a sub-type of QueueSelectorAttachment. - */ - @Generated - private QueueSelectorAttachmentKind kind = QueueSelectorAttachmentKind.PASS_THROUGH; - /* * The label key to query against. */ @@ -48,17 +42,7 @@ public final class PassThroughQueueSelectorAttachment extends QueueSelectorAttac */ @Generated public PassThroughQueueSelectorAttachment() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of QueueSelectorAttachment. - * - * @return the kind value. - */ - @Generated - @Override - public QueueSelectorAttachmentKind getKind() { - return this.kind; + this.kind = QueueSelectorAttachmentKind.PASS_THROUGH; } /** @@ -164,9 +148,9 @@ public static PassThroughQueueSelectorAttachment fromJson(JsonReader jsonReader) while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedPassThroughQueueSelectorAttachment.kind - = QueueSelectorAttachmentKind.fromString(reader.getString()); + if (QueueSelectorAttachment.fromJsonShared(reader, fieldName, + deserializedPassThroughQueueSelectorAttachment)) { + continue; } else if ("key".equals(fieldName)) { deserializedPassThroughQueueSelectorAttachment.key = reader.getString(); } else if ("labelOperator".equals(fieldName)) { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughWorkerSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughWorkerSelectorAttachment.java index 3c20bdff21f8..9fae66368ac8 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughWorkerSelectorAttachment.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughWorkerSelectorAttachment.java @@ -21,12 +21,6 @@ @Fluent public final class PassThroughWorkerSelectorAttachment extends WorkerSelectorAttachment { - /* - * The type discriminator describing a sub-type of WorkerSelectorAttachment. - */ - @Generated - private WorkerSelectorAttachmentKind kind = WorkerSelectorAttachmentKind.PASS_THROUGH; - /* * The label key to query against. */ @@ -50,17 +44,7 @@ public final class PassThroughWorkerSelectorAttachment extends WorkerSelectorAtt */ @Generated public PassThroughWorkerSelectorAttachment() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of WorkerSelectorAttachment. - * - * @return the kind value. - */ - @Generated - @Override - public WorkerSelectorAttachmentKind getKind() { - return this.kind; + this.kind = WorkerSelectorAttachmentKind.PASS_THROUGH; } /** @@ -175,9 +159,9 @@ public static PassThroughWorkerSelectorAttachment fromJson(JsonReader jsonReader while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedPassThroughWorkerSelectorAttachment.kind - = WorkerSelectorAttachmentKind.fromString(reader.getString()); + if (WorkerSelectorAttachment.fromJsonShared(reader, fieldName, + deserializedPassThroughWorkerSelectorAttachment)) { + continue; } else if ("key".equals(fieldName)) { deserializedPassThroughWorkerSelectorAttachment.key = reader.getString(); } else if ("labelOperator".equals(fieldName)) { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueAndMatchMode.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueAndMatchMode.java index a9bf9188098d..9afb8182ab6d 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueAndMatchMode.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueAndMatchMode.java @@ -19,12 +19,6 @@ @Immutable public final class QueueAndMatchMode extends JobMatchingMode { - /* - * The type discriminator describing a sub-type of JobMatchingMode. - */ - @Generated - private JobMatchingModeKind kind = JobMatchingModeKind.QUEUE_AND_MATCH; - /** * Stores updated model property, the value is property name, not serialized name. */ @@ -36,17 +30,7 @@ public final class QueueAndMatchMode extends JobMatchingMode { */ @Generated public QueueAndMatchMode() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of JobMatchingMode. - * - * @return the kind value. - */ - @Generated - @Override - public JobMatchingModeKind getKind() { - return this.kind; + this.kind = JobMatchingModeKind.QUEUE_AND_MATCH; } /** @@ -86,8 +70,8 @@ public static QueueAndMatchMode fromJson(JsonReader jsonReader) throws IOExcepti while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedQueueAndMatchMode.kind = JobMatchingModeKind.fromString(reader.getString()); + if (JobMatchingMode.fromJsonShared(reader, fieldName, deserializedQueueAndMatchMode)) { + continue; } else { reader.skipChildren(); } diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueLengthExceptionTrigger.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueLengthExceptionTrigger.java index 709017d22df1..b737131dfdfc 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueLengthExceptionTrigger.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueLengthExceptionTrigger.java @@ -19,12 +19,6 @@ @Fluent public final class QueueLengthExceptionTrigger extends ExceptionTrigger { - /* - * The type discriminator describing a sub-type of ExceptionTrigger. - */ - @Generated - private ExceptionTriggerKind kind = ExceptionTriggerKind.QUEUE_LENGTH; - /* * Threshold of number of jobs ahead in the queue to for this trigger to fire. */ @@ -42,17 +36,7 @@ public final class QueueLengthExceptionTrigger extends ExceptionTrigger { */ @Generated public QueueLengthExceptionTrigger() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of ExceptionTrigger. - * - * @return the kind value. - */ - @Generated - @Override - public ExceptionTriggerKind getKind() { - return this.kind; + this.kind = ExceptionTriggerKind.QUEUE_LENGTH; } /** @@ -120,8 +104,8 @@ public static QueueLengthExceptionTrigger fromJson(JsonReader jsonReader) throws while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedQueueLengthExceptionTrigger.kind = ExceptionTriggerKind.fromString(reader.getString()); + if (ExceptionTrigger.fromJsonShared(reader, fieldName, deserializedQueueLengthExceptionTrigger)) { + continue; } else if ("threshold".equals(fieldName)) { deserializedQueueLengthExceptionTrigger.threshold = reader.getInt(); } else { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueSelectorAttachment.java index 84c278adec7b..aec2d77ce0d1 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueSelectorAttachment.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueSelectorAttachment.java @@ -24,7 +24,7 @@ public class QueueSelectorAttachment implements JsonSerializable { * The type discriminator describing a sub-type of RouterRule */ @Generated - private RouterRuleKind kind = RouterRuleKind.fromString("RouterRule"); + RouterRuleKind kind; /** * Stores updated model property, the value is property name, not serialized name. @@ -66,6 +66,7 @@ public boolean isJsonMergePatch(RouterRule model) { */ @Generated public RouterRule() { + this.kind = RouterRuleKind.fromString("RouterRule"); } /** @@ -150,13 +151,21 @@ static RouterRule fromJsonKnownDiscriminator(JsonReader jsonReader) throws IOExc while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedRouterRule.kind = RouterRuleKind.fromString(reader.getString()); - } else { + if (!RouterRule.fromJsonShared(reader, fieldName, deserializedRouterRule)) { reader.skipChildren(); } } return deserializedRouterRule; }); } + + @Generated + static boolean fromJsonShared(JsonReader reader, String fieldName, RouterRule deserializedRouterRule) + throws IOException { + if ("kind".equals(fieldName)) { + deserializedRouterRule.kind = RouterRuleKind.fromString(reader.getString()); + return true; + } + return false; + } } diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineQueueSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineQueueSelectorAttachment.java index 3b5d1b971121..1fd9e0a5d95d 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineQueueSelectorAttachment.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineQueueSelectorAttachment.java @@ -19,12 +19,6 @@ @Fluent public final class RuleEngineQueueSelectorAttachment extends QueueSelectorAttachment { - /* - * The type discriminator describing a sub-type of QueueSelectorAttachment. - */ - @Generated - private QueueSelectorAttachmentKind kind = QueueSelectorAttachmentKind.RULE_ENGINE; - /* * A RouterRule that resolves a collection of queue selectors to attach. */ @@ -42,17 +36,7 @@ public final class RuleEngineQueueSelectorAttachment extends QueueSelectorAttach */ @Generated public RuleEngineQueueSelectorAttachment() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of QueueSelectorAttachment. - * - * @return the kind value. - */ - @Generated - @Override - public QueueSelectorAttachmentKind getKind() { - return this.kind; + this.kind = QueueSelectorAttachmentKind.RULE_ENGINE; } /** @@ -127,9 +111,9 @@ public static RuleEngineQueueSelectorAttachment fromJson(JsonReader jsonReader) while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedRuleEngineQueueSelectorAttachment.kind - = QueueSelectorAttachmentKind.fromString(reader.getString()); + if (QueueSelectorAttachment.fromJsonShared(reader, fieldName, + deserializedRuleEngineQueueSelectorAttachment)) { + continue; } else if ("rule".equals(fieldName)) { deserializedRuleEngineQueueSelectorAttachment.rule = RouterRule.fromJson(reader); } else { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineWorkerSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineWorkerSelectorAttachment.java index 537b66b1a520..fa958f1611d1 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineWorkerSelectorAttachment.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineWorkerSelectorAttachment.java @@ -19,12 +19,6 @@ @Fluent public final class RuleEngineWorkerSelectorAttachment extends WorkerSelectorAttachment { - /* - * The type discriminator describing a sub-type of WorkerSelectorAttachment. - */ - @Generated - private WorkerSelectorAttachmentKind kind = WorkerSelectorAttachmentKind.RULE_ENGINE; - /* * A RouterRule that resolves a collection of worker selectors to attach. */ @@ -42,17 +36,7 @@ public final class RuleEngineWorkerSelectorAttachment extends WorkerSelectorAtta */ @Generated public RuleEngineWorkerSelectorAttachment() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of WorkerSelectorAttachment. - * - * @return the kind value. - */ - @Generated - @Override - public WorkerSelectorAttachmentKind getKind() { - return this.kind; + this.kind = WorkerSelectorAttachmentKind.RULE_ENGINE; } /** @@ -127,9 +111,9 @@ public static RuleEngineWorkerSelectorAttachment fromJson(JsonReader jsonReader) while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedRuleEngineWorkerSelectorAttachment.kind - = WorkerSelectorAttachmentKind.fromString(reader.getString()); + if (WorkerSelectorAttachment.fromJsonShared(reader, fieldName, + deserializedRuleEngineWorkerSelectorAttachment)) { + continue; } else if ("rule".equals(fieldName)) { deserializedRuleEngineWorkerSelectorAttachment.rule = RouterRule.fromJson(reader); } else { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ScheduleAndSuspendMode.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ScheduleAndSuspendMode.java index 27eb384a530e..ebdfb2df420d 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ScheduleAndSuspendMode.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ScheduleAndSuspendMode.java @@ -23,12 +23,6 @@ @Fluent public final class ScheduleAndSuspendMode extends JobMatchingMode { - /* - * The type discriminator describing a sub-type of JobMatchingMode. - */ - @Generated - private JobMatchingModeKind kind = JobMatchingModeKind.SCHEDULE_AND_SUSPEND; - /* * Requested schedule time. */ @@ -46,17 +40,7 @@ public final class ScheduleAndSuspendMode extends JobMatchingMode { */ @Generated public ScheduleAndSuspendMode() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of JobMatchingMode. - * - * @return the kind value. - */ - @Generated - @Override - public JobMatchingModeKind getKind() { - return this.kind; + this.kind = JobMatchingModeKind.SCHEDULE_AND_SUSPEND; } /** @@ -130,8 +114,8 @@ public static ScheduleAndSuspendMode fromJson(JsonReader jsonReader) throws IOEx while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedScheduleAndSuspendMode.kind = JobMatchingModeKind.fromString(reader.getString()); + if (JobMatchingMode.fromJsonShared(reader, fieldName, deserializedScheduleAndSuspendMode)) { + continue; } else if ("scheduleAt".equals(fieldName)) { deserializedScheduleAndSuspendMode.scheduleAt = reader .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticQueueSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticQueueSelectorAttachment.java index 6288b663c5b8..0e449b067fcd 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticQueueSelectorAttachment.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticQueueSelectorAttachment.java @@ -19,12 +19,6 @@ @Fluent public final class StaticQueueSelectorAttachment extends QueueSelectorAttachment { - /* - * The type discriminator describing a sub-type of QueueSelectorAttachment. - */ - @Generated - private QueueSelectorAttachmentKind kind = QueueSelectorAttachmentKind.STATIC; - /* * The queue selector to attach. */ @@ -42,17 +36,7 @@ public final class StaticQueueSelectorAttachment extends QueueSelectorAttachment */ @Generated public StaticQueueSelectorAttachment() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of QueueSelectorAttachment. - * - * @return the kind value. - */ - @Generated - @Override - public QueueSelectorAttachmentKind getKind() { - return this.kind; + this.kind = QueueSelectorAttachmentKind.STATIC; } /** @@ -129,9 +113,9 @@ public static StaticQueueSelectorAttachment fromJson(JsonReader jsonReader) thro while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedStaticQueueSelectorAttachment.kind - = QueueSelectorAttachmentKind.fromString(reader.getString()); + if (QueueSelectorAttachment.fromJsonShared(reader, fieldName, + deserializedStaticQueueSelectorAttachment)) { + continue; } else if ("queueSelector".equals(fieldName)) { deserializedStaticQueueSelectorAttachment.queueSelector = RouterQueueSelector.fromJson(reader); } else { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticRouterRule.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticRouterRule.java index 3619a87fdc4f..e2d98fc88331 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticRouterRule.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticRouterRule.java @@ -19,12 +19,6 @@ @Fluent public final class StaticRouterRule extends RouterRule { - /* - * The type discriminator describing a sub-type of RouterRule - */ - @Generated - private RouterRuleKind kind = RouterRuleKind.STATIC; - /* * The static value this rule always returns. Values must be primitive values - number, string, boolean. */ @@ -42,17 +36,7 @@ public final class StaticRouterRule extends RouterRule { */ @Generated public StaticRouterRule() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of RouterRule. - * - * @return the kind value. - */ - @Generated - @Override - public RouterRuleKind getKind() { - return this.kind; + this.kind = RouterRuleKind.STATIC; } /** @@ -111,8 +95,8 @@ public static StaticRouterRule fromJson(JsonReader jsonReader) throws IOExceptio while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedStaticRouterRule.kind = RouterRuleKind.fromString(reader.getString()); + if (RouterRule.fromJsonShared(reader, fieldName, deserializedStaticRouterRule)) { + continue; } else if ("value".equals(fieldName)) { deserializedStaticRouterRule.value = RouterValue.fromJson(reader); } else { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticWorkerSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticWorkerSelectorAttachment.java index a61a74acef80..e1325fed9ef0 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticWorkerSelectorAttachment.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticWorkerSelectorAttachment.java @@ -19,12 +19,6 @@ @Fluent public final class StaticWorkerSelectorAttachment extends WorkerSelectorAttachment { - /* - * The type discriminator describing a sub-type of WorkerSelectorAttachment. - */ - @Generated - private WorkerSelectorAttachmentKind kind = WorkerSelectorAttachmentKind.STATIC; - /* * The worker selector to attach. */ @@ -42,17 +36,7 @@ public final class StaticWorkerSelectorAttachment extends WorkerSelectorAttachme */ @Generated public StaticWorkerSelectorAttachment() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of WorkerSelectorAttachment. - * - * @return the kind value. - */ - @Generated - @Override - public WorkerSelectorAttachmentKind getKind() { - return this.kind; + this.kind = WorkerSelectorAttachmentKind.STATIC; } /** @@ -129,9 +113,9 @@ public static StaticWorkerSelectorAttachment fromJson(JsonReader jsonReader) thr while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedStaticWorkerSelectorAttachment.kind - = WorkerSelectorAttachmentKind.fromString(reader.getString()); + if (WorkerSelectorAttachment.fromJsonShared(reader, fieldName, + deserializedStaticWorkerSelectorAttachment)) { + continue; } else if ("workerSelector".equals(fieldName)) { deserializedStaticWorkerSelectorAttachment.workerSelector = RouterWorkerSelector.fromJson(reader); } else { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/SuspendMode.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/SuspendMode.java index 22e002ff2ab4..8f17a126f32e 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/SuspendMode.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/SuspendMode.java @@ -19,12 +19,6 @@ @Immutable public final class SuspendMode extends JobMatchingMode { - /* - * The type discriminator describing a sub-type of JobMatchingMode. - */ - @Generated - private JobMatchingModeKind kind = JobMatchingModeKind.SUSPEND; - /** * Stores updated model property, the value is property name, not serialized name. */ @@ -36,17 +30,7 @@ public final class SuspendMode extends JobMatchingMode { */ @Generated public SuspendMode() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of JobMatchingMode. - * - * @return the kind value. - */ - @Generated - @Override - public JobMatchingModeKind getKind() { - return this.kind; + this.kind = JobMatchingModeKind.SUSPEND; } /** @@ -86,8 +70,8 @@ public static SuspendMode fromJson(JsonReader jsonReader) throws IOException { while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedSuspendMode.kind = JobMatchingModeKind.fromString(reader.getString()); + if (JobMatchingMode.fromJsonShared(reader, fieldName, deserializedSuspendMode)) { + continue; } else { reader.skipChildren(); } diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WaitTimeExceptionTrigger.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WaitTimeExceptionTrigger.java index b4a9cf060c6f..4dc5ae546132 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WaitTimeExceptionTrigger.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WaitTimeExceptionTrigger.java @@ -21,12 +21,6 @@ @Fluent public final class WaitTimeExceptionTrigger extends ExceptionTrigger { - /* - * The type discriminator describing a sub-type of ExceptionTrigger. - */ - @Generated - private ExceptionTriggerKind kind = ExceptionTriggerKind.WAIT_TIME; - /* * Threshold for wait time for this trigger. */ @@ -44,17 +38,7 @@ public final class WaitTimeExceptionTrigger extends ExceptionTrigger { */ @Generated public WaitTimeExceptionTrigger() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of ExceptionTrigger. - * - * @return the kind value. - */ - @Generated - @Override - public ExceptionTriggerKind getKind() { - return this.kind; + this.kind = ExceptionTriggerKind.WAIT_TIME; } /** @@ -98,8 +82,8 @@ public static WaitTimeExceptionTrigger fromJson(JsonReader jsonReader) throws IO while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedWaitTimeExceptionTrigger.kind = ExceptionTriggerKind.fromString(reader.getString()); + if (ExceptionTrigger.fromJsonShared(reader, fieldName, deserializedWaitTimeExceptionTrigger)) { + continue; } else if ("thresholdSeconds".equals(fieldName)) { deserializedWaitTimeExceptionTrigger.thresholdSeconds = CustomizationHelper.deserializeDurationFromSeconds(reader); diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WebhookRouterRule.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WebhookRouterRule.java index f6db6174813a..fef5459c5660 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WebhookRouterRule.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WebhookRouterRule.java @@ -19,12 +19,6 @@ @Fluent public final class WebhookRouterRule extends RouterRule { - /* - * The type discriminator describing a sub-type of RouterRule - */ - @Generated - private RouterRuleKind kind = RouterRuleKind.WEBHOOK; - /* * Uri for Authorization Server. */ @@ -55,17 +49,7 @@ public final class WebhookRouterRule extends RouterRule { */ @Generated public WebhookRouterRule() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of RouterRule. - * - * @return the kind value. - */ - @Generated - @Override - public RouterRuleKind getKind() { - return this.kind; + this.kind = RouterRuleKind.WEBHOOK; } /** @@ -204,8 +188,8 @@ public static WebhookRouterRule fromJson(JsonReader jsonReader) throws IOExcepti while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedWebhookRouterRule.kind = RouterRuleKind.fromString(reader.getString()); + if (RouterRule.fromJsonShared(reader, fieldName, deserializedWebhookRouterRule)) { + continue; } else if ("authorizationServerUri".equals(fieldName)) { deserializedWebhookRouterRule.authorizationServerUri = reader.getString(); } else if ("clientCredential".equals(fieldName)) { diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationQueueSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationQueueSelectorAttachment.java index ab1a9f576464..73c01a539a70 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationQueueSelectorAttachment.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationQueueSelectorAttachment.java @@ -20,12 +20,6 @@ @Fluent public final class WeightedAllocationQueueSelectorAttachment extends QueueSelectorAttachment { - /* - * The type discriminator describing a sub-type of QueueSelectorAttachment. - */ - @Generated - private QueueSelectorAttachmentKind kind = QueueSelectorAttachmentKind.WEIGHTED_ALLOCATION; - /* * A collection of percentage based weighted allocations. */ @@ -43,17 +37,7 @@ public final class WeightedAllocationQueueSelectorAttachment extends QueueSelect */ @Generated public WeightedAllocationQueueSelectorAttachment() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of QueueSelectorAttachment. - * - * @return the kind value. - */ - @Generated - @Override - public QueueSelectorAttachmentKind getKind() { - return this.kind; + this.kind = QueueSelectorAttachmentKind.WEIGHTED_ALLOCATION; } /** @@ -127,9 +111,9 @@ public static WeightedAllocationQueueSelectorAttachment fromJson(JsonReader json while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedWeightedAllocationQueueSelectorAttachment.kind - = QueueSelectorAttachmentKind.fromString(reader.getString()); + if (QueueSelectorAttachment.fromJsonShared(reader, fieldName, + deserializedWeightedAllocationQueueSelectorAttachment)) { + continue; } else if ("allocations".equals(fieldName)) { List allocations = reader.readArray(reader1 -> QueueWeightedAllocation.fromJson(reader1)); diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationWorkerSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationWorkerSelectorAttachment.java index 94654094bfb6..e64ba649d8c9 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationWorkerSelectorAttachment.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationWorkerSelectorAttachment.java @@ -20,12 +20,6 @@ @Fluent public final class WeightedAllocationWorkerSelectorAttachment extends WorkerSelectorAttachment { - /* - * The type discriminator describing a sub-type of WorkerSelectorAttachment. - */ - @Generated - private WorkerSelectorAttachmentKind kind = WorkerSelectorAttachmentKind.WEIGHTED_ALLOCATION; - /* * A collection of percentage based weighted allocations. */ @@ -43,17 +37,7 @@ public final class WeightedAllocationWorkerSelectorAttachment extends WorkerSele */ @Generated public WeightedAllocationWorkerSelectorAttachment() { - } - - /** - * Get the kind property: The type discriminator describing a sub-type of WorkerSelectorAttachment. - * - * @return the kind value. - */ - @Generated - @Override - public WorkerSelectorAttachmentKind getKind() { - return this.kind; + this.kind = WorkerSelectorAttachmentKind.WEIGHTED_ALLOCATION; } /** @@ -127,9 +111,9 @@ public static WeightedAllocationWorkerSelectorAttachment fromJson(JsonReader jso while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedWeightedAllocationWorkerSelectorAttachment.kind - = WorkerSelectorAttachmentKind.fromString(reader.getString()); + if (WorkerSelectorAttachment.fromJsonShared(reader, fieldName, + deserializedWeightedAllocationWorkerSelectorAttachment)) { + continue; } else if ("allocations".equals(fieldName)) { List allocations = reader.readArray(reader1 -> WorkerWeightedAllocation.fromJson(reader1)); diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WorkerSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WorkerSelectorAttachment.java index d6caf79c9ac5..3a33ab1ba234 100644 --- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WorkerSelectorAttachment.java +++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WorkerSelectorAttachment.java @@ -24,7 +24,7 @@ public class WorkerSelectorAttachment implements JsonSerializable to, String mediaUrl) { super(channelRegistrationId, to); this.mediaUrl = mediaUrl; - } - - /** - * Get the kind property: The type discriminator describing a notification type. - * - * @return the kind value. - */ - @Generated - @Override - public CommunicationMessageKind getKind() { - return this.kind; + this.kind = CommunicationMessageKind.IMAGE; } /** @@ -99,10 +83,8 @@ public String getMediaUrl() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("channelRegistrationId", getChannelRegistrationId()); - jsonWriter.writeArrayField("to", getTo(), (writer, element) -> writer.writeString(element)); + toJsonShared(jsonWriter); jsonWriter.writeStringField("mediaUri", this.mediaUrl); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); jsonWriter.writeStringField("content", this.content); return jsonWriter.writeEndObject(); } diff --git a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateDocument.java b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateDocument.java index 82096b7568c4..502f3e2eb3bc 100644 --- a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateDocument.java +++ b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateDocument.java @@ -16,12 +16,6 @@ @Fluent public final class MessageTemplateDocument extends MessageTemplateValue { - /* - * The type discriminator describing a template parameter type. - */ - @Generated - private MessageTemplateValueKind kind = MessageTemplateValueKind.DOCUMENT; - /* * The (public) URL of the media. */ @@ -50,17 +44,7 @@ public final class MessageTemplateDocument extends MessageTemplateValue { public MessageTemplateDocument(String refValue, String url) { super(refValue); this.url = url; - } - - /** - * Get the kind property: The type discriminator describing a template parameter type. - * - * @return the kind value. - */ - @Generated - @Override - public MessageTemplateValueKind getKind() { - return this.kind; + this.kind = MessageTemplateValueKind.DOCUMENT; } /** @@ -124,9 +108,8 @@ public MessageTemplateDocument setFileName(String fileName) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getRefValue()); + toJsonShared(jsonWriter); jsonWriter.writeStringField("url", this.url); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); jsonWriter.writeStringField("caption", this.caption); jsonWriter.writeStringField("fileName", this.fileName); return jsonWriter.writeEndObject(); diff --git a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateImage.java b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateImage.java index 8a1baa1273d9..6150979b462d 100644 --- a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateImage.java +++ b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateImage.java @@ -16,12 +16,6 @@ @Fluent public final class MessageTemplateImage extends MessageTemplateValue { - /* - * The type discriminator describing a template parameter type. - */ - @Generated - private MessageTemplateValueKind kind = MessageTemplateValueKind.IMAGE; - /* * The (public) URL of the media. */ @@ -50,17 +44,7 @@ public final class MessageTemplateImage extends MessageTemplateValue { public MessageTemplateImage(String refValue, String url) { super(refValue); this.url = url; - } - - /** - * Get the kind property: The type discriminator describing a template parameter type. - * - * @return the kind value. - */ - @Generated - @Override - public MessageTemplateValueKind getKind() { - return this.kind; + this.kind = MessageTemplateValueKind.IMAGE; } /** @@ -124,9 +108,8 @@ public MessageTemplateImage setFileName(String fileName) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getRefValue()); + toJsonShared(jsonWriter); jsonWriter.writeStringField("url", this.url); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); jsonWriter.writeStringField("caption", this.caption); jsonWriter.writeStringField("fileName", this.fileName); return jsonWriter.writeEndObject(); diff --git a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateLocation.java b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateLocation.java index 442ad75b4c00..1474d35e69e4 100644 --- a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateLocation.java +++ b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateLocation.java @@ -17,12 +17,6 @@ @Fluent public final class MessageTemplateLocation extends MessageTemplateValue { - /* - * The type discriminator describing a template parameter type. - */ - @Generated - private MessageTemplateValueKind kind = MessageTemplateValueKind.LOCATION; - /* * The [Optional] name of the location. */ @@ -59,17 +53,7 @@ private MessageTemplateLocation(String refValue, double latitude, double longitu super(refValue); this.latitude = latitude; this.longitude = longitude; - } - - /** - * Get the kind property: The type discriminator describing a template parameter type. - * - * @return the kind value. - */ - @Generated - @Override - public MessageTemplateValueKind getKind() { - return this.kind; + this.kind = MessageTemplateValueKind.LOCATION; } /** @@ -123,10 +107,9 @@ public MessageTemplateLocation setAddress(String address) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getRefValue()); + toJsonShared(jsonWriter); jsonWriter.writeDoubleField("latitude", this.latitude); jsonWriter.writeDoubleField("longitude", this.longitude); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); jsonWriter.writeStringField("locationName", this.locationName); jsonWriter.writeStringField("address", this.address); return jsonWriter.writeEndObject(); diff --git a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateQuickAction.java b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateQuickAction.java index 1fe4f046c640..b5103bfc2be6 100644 --- a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateQuickAction.java +++ b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateQuickAction.java @@ -16,12 +16,6 @@ @Fluent public final class MessageTemplateQuickAction extends MessageTemplateValue { - /* - * The type discriminator describing a template parameter type. - */ - @Generated - private MessageTemplateValueKind kind = MessageTemplateValueKind.QUICK_ACTION; - /* * The [Optional] quick action text */ @@ -42,17 +36,7 @@ public final class MessageTemplateQuickAction extends MessageTemplateValue { @Generated public MessageTemplateQuickAction(String refValue) { super(refValue); - } - - /** - * Get the kind property: The type discriminator describing a template parameter type. - * - * @return the kind value. - */ - @Generated - @Override - public MessageTemplateValueKind getKind() { - return this.kind; + this.kind = MessageTemplateValueKind.QUICK_ACTION; } /** @@ -106,8 +90,7 @@ public MessageTemplateQuickAction setPayload(String payload) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getRefValue()); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); + toJsonShared(jsonWriter); jsonWriter.writeStringField("text", this.text); jsonWriter.writeStringField("payload", this.payload); return jsonWriter.writeEndObject(); diff --git a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateText.java b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateText.java index d8d2b393274e..f89e8e02c022 100644 --- a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateText.java +++ b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateText.java @@ -16,12 +16,6 @@ @Immutable public final class MessageTemplateText extends MessageTemplateValue { - /* - * The type discriminator describing a template parameter type. - */ - @Generated - private MessageTemplateValueKind kind = MessageTemplateValueKind.TEXT; - /* * The text value. */ @@ -38,17 +32,7 @@ public final class MessageTemplateText extends MessageTemplateValue { public MessageTemplateText(String refValue, String text) { super(refValue); this.text = text; - } - - /** - * Get the kind property: The type discriminator describing a template parameter type. - * - * @return the kind value. - */ - @Generated - @Override - public MessageTemplateValueKind getKind() { - return this.kind; + this.kind = MessageTemplateValueKind.TEXT; } /** @@ -68,9 +52,8 @@ public String getText() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getRefValue()); + toJsonShared(jsonWriter); jsonWriter.writeStringField("text", this.text); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); return jsonWriter.writeEndObject(); } diff --git a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateValue.java b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateValue.java index bec3dda77c2c..4a4bf0a69d63 100644 --- a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateValue.java +++ b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/MessageTemplateValue.java @@ -21,7 +21,7 @@ public class MessageTemplateValue implements JsonSerializable to) { this.channelRegistrationId = channelRegistrationId; this.to = to; + this.kind = CommunicationMessageKind.fromString("NotificationContent"); } /** @@ -85,9 +86,7 @@ public List getTo() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("channelRegistrationId", this.channelRegistrationId); - jsonWriter.writeArrayField("to", this.to, (writer, element) -> writer.writeString(element)); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); + toJsonShared(jsonWriter); return jsonWriter.writeEndObject(); } @@ -155,4 +154,10 @@ static NotificationContent fromJsonKnownDiscriminator(JsonReader jsonReader) thr return deserializedNotificationContent; }); } + + void toJsonShared(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStringField("channelRegistrationId", this.channelRegistrationId); + jsonWriter.writeArrayField("to", this.to, (writer, element) -> writer.writeString(element)); + jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); + } } diff --git a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/TemplateNotificationContent.java b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/TemplateNotificationContent.java index 3f76dd37b238..c6e52455c15b 100644 --- a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/TemplateNotificationContent.java +++ b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/TemplateNotificationContent.java @@ -17,12 +17,6 @@ @Immutable public final class TemplateNotificationContent extends NotificationContent { - /* - * The type discriminator describing a notification type. - */ - @Generated - private CommunicationMessageKind kind = CommunicationMessageKind.TEMPLATE; - /* * The template object used to create templates. */ @@ -40,17 +34,7 @@ public final class TemplateNotificationContent extends NotificationContent { public TemplateNotificationContent(String channelRegistrationId, List to, MessageTemplate template) { super(channelRegistrationId, to); this.template = template; - } - - /** - * Get the kind property: The type discriminator describing a notification type. - * - * @return the kind value. - */ - @Generated - @Override - public CommunicationMessageKind getKind() { - return this.kind; + this.kind = CommunicationMessageKind.TEMPLATE; } /** @@ -70,10 +54,8 @@ public MessageTemplate getTemplate() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("channelRegistrationId", getChannelRegistrationId()); - jsonWriter.writeArrayField("to", getTo(), (writer, element) -> writer.writeString(element)); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("template", this.template); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); return jsonWriter.writeEndObject(); } diff --git a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/TextNotificationContent.java b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/TextNotificationContent.java index 59ad2ed12bb5..53ea6f4df41e 100644 --- a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/TextNotificationContent.java +++ b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/models/TextNotificationContent.java @@ -17,12 +17,6 @@ @Immutable public final class TextNotificationContent extends NotificationContent { - /* - * The type discriminator describing a notification type. - */ - @Generated - private CommunicationMessageKind kind = CommunicationMessageKind.TEXT; - /* * Message content. */ @@ -40,17 +34,7 @@ public final class TextNotificationContent extends NotificationContent { public TextNotificationContent(String channelRegistrationId, List to, String content) { super(channelRegistrationId, to); this.content = content; - } - - /** - * Get the kind property: The type discriminator describing a notification type. - * - * @return the kind value. - */ - @Generated - @Override - public CommunicationMessageKind getKind() { - return this.kind; + this.kind = CommunicationMessageKind.TEXT; } /** @@ -70,10 +54,8 @@ public String getContent() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("channelRegistrationId", getChannelRegistrationId()); - jsonWriter.writeArrayField("to", getTo(), (writer, element) -> writer.writeString(element)); + toJsonShared(jsonWriter); jsonWriter.writeStringField("content", this.content); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); return jsonWriter.writeEndObject(); } diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsCreateOrUpdateSamples.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsCreateOrUpdateSamples.java index 5cc7997ac6f0..480b844cb2d1 100644 --- a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsCreateOrUpdateSamples.java +++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsCreateOrUpdateSamples.java @@ -111,8 +111,7 @@ */ public final class FleetsCreateOrUpdateSamples { /* - * x-ms-original-file: - * specification/azurefleet/AzureFleet.Management/examples/2024-05-01-preview/Fleets_CreateOrUpdate.json + * x-ms-original-file: 2024-05-01-preview/Fleets_CreateOrUpdate.json */ /** * Sample code: Fleets_CreateOrUpdate. @@ -386,8 +385,7 @@ public static void fleetsCreateOrUpdate(com.azure.resourcemanager.computefleet.C } /* - * x-ms-original-file: - * specification/azurefleet/AzureFleet.Management/examples/2024-05-01-preview/Fleets_CreateOrUpdate_MinimumSet.json + * x-ms-original-file: 2024-05-01-preview/Fleets_CreateOrUpdate_MinimumSet.json */ /** * Sample code: Fleets_CreateOrUpdate_MinimumSet. diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsDeleteSamples.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsDeleteSamples.java index 933a8b9c3795..6fafbb1d706d 100644 --- a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsDeleteSamples.java +++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsDeleteSamples.java @@ -9,7 +9,7 @@ */ public final class FleetsDeleteSamples { /* - * x-ms-original-file: specification/azurefleet/AzureFleet.Management/examples/2024-05-01-preview/Fleets_Delete.json + * x-ms-original-file: 2024-05-01-preview/Fleets_Delete.json */ /** * Sample code: Fleets_Delete. diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsGetByResourceGroupSamples.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsGetByResourceGroupSamples.java index 69915346ac3a..d645e29c5a20 100644 --- a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsGetByResourceGroupSamples.java +++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsGetByResourceGroupSamples.java @@ -9,7 +9,7 @@ */ public final class FleetsGetByResourceGroupSamples { /* - * x-ms-original-file: specification/azurefleet/AzureFleet.Management/examples/2024-05-01-preview/Fleets_Get.json + * x-ms-original-file: 2024-05-01-preview/Fleets_Get.json */ /** * Sample code: Fleets_Get. diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsListByResourceGroupSamples.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsListByResourceGroupSamples.java index 417a0c81271e..edfb33bf2b24 100644 --- a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsListByResourceGroupSamples.java +++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsListByResourceGroupSamples.java @@ -9,8 +9,7 @@ */ public final class FleetsListByResourceGroupSamples { /* - * x-ms-original-file: - * specification/azurefleet/AzureFleet.Management/examples/2024-05-01-preview/Fleets_ListByResourceGroup.json + * x-ms-original-file: 2024-05-01-preview/Fleets_ListByResourceGroup.json */ /** * Sample code: Fleets_ListByResourceGroup. diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsListSamples.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsListSamples.java index 63dc47bfea17..9e7ddd8749f9 100644 --- a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsListSamples.java +++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsListSamples.java @@ -9,8 +9,7 @@ */ public final class FleetsListSamples { /* - * x-ms-original-file: - * specification/azurefleet/AzureFleet.Management/examples/2024-05-01-preview/Fleets_ListBySubscription.json + * x-ms-original-file: 2024-05-01-preview/Fleets_ListBySubscription.json */ /** * Sample code: Fleets_ListBySubscription. diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsListVirtualMachineScaleSetsSamples.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsListVirtualMachineScaleSetsSamples.java index b2f80b6ad7ca..14218d6e02a4 100644 --- a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsListVirtualMachineScaleSetsSamples.java +++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsListVirtualMachineScaleSetsSamples.java @@ -9,9 +9,7 @@ */ public final class FleetsListVirtualMachineScaleSetsSamples { /* - * x-ms-original-file: - * specification/azurefleet/AzureFleet.Management/examples/2024-05-01-preview/Fleets_ListVirtualMachineScaleSets. - * json + * x-ms-original-file: 2024-05-01-preview/Fleets_ListVirtualMachineScaleSets.json */ /** * Sample code: Fleets_ListVirtualMachineScaleSets. diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsUpdateSamples.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsUpdateSamples.java index 1960781ad7a9..b0cd467b1cbd 100644 --- a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsUpdateSamples.java +++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/FleetsUpdateSamples.java @@ -111,7 +111,7 @@ */ public final class FleetsUpdateSamples { /* - * x-ms-original-file: specification/azurefleet/AzureFleet.Management/examples/2024-05-01-preview/Fleets_Update.json + * x-ms-original-file: 2024-05-01-preview/Fleets_Update.json */ /** * Sample code: Fleets_Update. diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/OperationsListSamples.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/OperationsListSamples.java index 63c542ab746d..1c0dcc08ed48 100644 --- a/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/OperationsListSamples.java +++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/samples/java/com/azure/resourcemanager/computefleet/generated/OperationsListSamples.java @@ -9,8 +9,7 @@ */ public final class OperationsListSamples { /* - * x-ms-original-file: - * specification/azurefleet/AzureFleet.Management/examples/2024-05-01-preview/Operations_List.json + * x-ms-original-file: 2024-05-01-preview/Operations_List.json */ /** * Sample code: Operations_List. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesCreateOrReplaceSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesCreateOrReplaceSamples.java index 77398626708b..ae836ae79380 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesCreateOrReplaceSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesCreateOrReplaceSamples.java @@ -16,9 +16,7 @@ */ public final class AssetEndpointProfilesCreateOrReplaceSamples { /* - * x-ms-original-file: - * specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/Create_AssetEndpointProfile. - * json + * x-ms-original-file: 2023-11-01-preview/Create_AssetEndpointProfile.json */ /** * Sample code: Create_AssetEndpointProfile. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesDeleteSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesDeleteSamples.java index 90c788455641..4e2336722606 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesDeleteSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesDeleteSamples.java @@ -9,9 +9,7 @@ */ public final class AssetEndpointProfilesDeleteSamples { /* - * x-ms-original-file: - * specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/Delete_AssetEndpointProfile. - * json + * x-ms-original-file: 2023-11-01-preview/Delete_AssetEndpointProfile.json */ /** * Sample code: Delete_AssetEndpointProfile. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesGetByResourceGroupSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesGetByResourceGroupSamples.java index 601d78676bed..d368f892688f 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesGetByResourceGroupSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesGetByResourceGroupSamples.java @@ -9,8 +9,7 @@ */ public final class AssetEndpointProfilesGetByResourceGroupSamples { /* - * x-ms-original-file: - * specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/Get_AssetEndpointProfile.json + * x-ms-original-file: 2023-11-01-preview/Get_AssetEndpointProfile.json */ /** * Sample code: Get_AssetEndpointProfile. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesListByResourceGroupSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesListByResourceGroupSamples.java index 688027d9d5a7..ff0ea59c900e 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesListByResourceGroupSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesListByResourceGroupSamples.java @@ -9,8 +9,7 @@ */ public final class AssetEndpointProfilesListByResourceGroupSamples { /* - * x-ms-original-file: specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/ - * List_AssetEndpointProfiles_ResourceGroup.json + * x-ms-original-file: 2023-11-01-preview/List_AssetEndpointProfiles_ResourceGroup.json */ /** * Sample code: List_AssetEndpointProfiles_ResourceGroup. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesListSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesListSamples.java index 1e064296691a..bdc3cd5b2a28 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesListSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesListSamples.java @@ -9,8 +9,7 @@ */ public final class AssetEndpointProfilesListSamples { /* - * x-ms-original-file: specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/ - * List_AssetEndpointProfiles_Subscription.json + * x-ms-original-file: 2023-11-01-preview/List_AssetEndpointProfiles_Subscription.json */ /** * Sample code: List_AssetEndpointProfiles_Subscription. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesUpdateSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesUpdateSamples.java index a3fa582f9ebb..b17f50f89b86 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesUpdateSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetEndpointProfilesUpdateSamples.java @@ -12,9 +12,7 @@ */ public final class AssetEndpointProfilesUpdateSamples { /* - * x-ms-original-file: - * specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/Update_AssetEndpointProfile. - * json + * x-ms-original-file: 2023-11-01-preview/Update_AssetEndpointProfile.json */ /** * Sample code: Update_AssetEndpointProfile. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsCreateOrReplaceSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsCreateOrReplaceSamples.java index f306fa1f8910..79bcdfa6364c 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsCreateOrReplaceSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsCreateOrReplaceSamples.java @@ -19,8 +19,7 @@ */ public final class AssetsCreateOrReplaceSamples { /* - * x-ms-original-file: specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/ - * Create_Asset_Without_ExternalAssetId.json + * x-ms-original-file: 2023-11-01-preview/Create_Asset_Without_ExternalAssetId.json */ /** * Sample code: Create_Asset_Without_ExternalAssetId. @@ -77,8 +76,7 @@ public final class AssetsCreateOrReplaceSamples { } /* - * x-ms-original-file: specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/ - * Create_Asset_With_ExternalAssetId.json + * x-ms-original-file: 2023-11-01-preview/Create_Asset_With_ExternalAssetId.json */ /** * Sample code: Create_Asset_With_ExternalAssetId. @@ -136,8 +134,7 @@ public final class AssetsCreateOrReplaceSamples { } /* - * x-ms-original-file: specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/ - * Create_Asset_Without_DisplayName.json + * x-ms-original-file: 2023-11-01-preview/Create_Asset_Without_DisplayName.json */ /** * Sample code: Create_Asset_Without_DisplayName. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsDeleteSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsDeleteSamples.java index be516b095a08..70cfaccb1bf7 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsDeleteSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsDeleteSamples.java @@ -9,8 +9,7 @@ */ public final class AssetsDeleteSamples { /* - * x-ms-original-file: - * specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/Delete_Asset.json + * x-ms-original-file: 2023-11-01-preview/Delete_Asset.json */ /** * Sample code: Delete_Asset. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsGetByResourceGroupSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsGetByResourceGroupSamples.java index 288f85b812bf..c731ac32bf41 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsGetByResourceGroupSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsGetByResourceGroupSamples.java @@ -9,8 +9,7 @@ */ public final class AssetsGetByResourceGroupSamples { /* - * x-ms-original-file: - * specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/Get_Asset_With_SyncStatus.json + * x-ms-original-file: 2023-11-01-preview/Get_Asset_With_SyncStatus.json */ /** * Sample code: Get_Asset_With_SyncStatus. @@ -23,8 +22,7 @@ public static void getAssetWithSyncStatus(com.azure.resourcemanager.deviceregist } /* - * x-ms-original-file: - * specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/Get_Asset.json + * x-ms-original-file: 2023-11-01-preview/Get_Asset.json */ /** * Sample code: Get_Asset. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsListByResourceGroupSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsListByResourceGroupSamples.java index c96ce2cdd5fb..8b174d5e66b8 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsListByResourceGroupSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsListByResourceGroupSamples.java @@ -9,8 +9,7 @@ */ public final class AssetsListByResourceGroupSamples { /* - * x-ms-original-file: - * specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/List_Assets_ResourceGroup.json + * x-ms-original-file: 2023-11-01-preview/List_Assets_ResourceGroup.json */ /** * Sample code: List_Assets_ResourceGroup. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsListSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsListSamples.java index b694ca7870e0..7dd988b7f8db 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsListSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsListSamples.java @@ -9,8 +9,7 @@ */ public final class AssetsListSamples { /* - * x-ms-original-file: - * specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/List_Assets_Subscription.json + * x-ms-original-file: 2023-11-01-preview/List_Assets_Subscription.json */ /** * Sample code: List_Assets_Subscription. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsUpdateSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsUpdateSamples.java index 09cce367cf07..91a129302397 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsUpdateSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/AssetsUpdateSamples.java @@ -12,8 +12,7 @@ */ public final class AssetsUpdateSamples { /* - * x-ms-original-file: - * specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/Update_Asset.json + * x-ms-original-file: 2023-11-01-preview/Update_Asset.json */ /** * Sample code: Update_Asset. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/OperationStatusGetSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/OperationStatusGetSamples.java index 73ee5c051c21..c1cb56d59147 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/OperationStatusGetSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/OperationStatusGetSamples.java @@ -9,8 +9,7 @@ */ public final class OperationStatusGetSamples { /* - * x-ms-original-file: - * specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/Get_OperationStatus.json + * x-ms-original-file: 2023-11-01-preview/Get_OperationStatus.json */ /** * Sample code: Get_OperationStatus. diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/OperationsListSamples.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/OperationsListSamples.java index 71af364785ff..6bbe4acb0d33 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/OperationsListSamples.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/samples/java/com/azure/resourcemanager/deviceregistry/generated/OperationsListSamples.java @@ -9,8 +9,7 @@ */ public final class OperationsListSamples { /* - * x-ms-original-file: - * specification/deviceregistry/DeviceRegistry.Management/examples/2023-11-01-preview/List_Operations.json + * x-ms-original-file: 2023-11-01-preview/List_Operations.json */ /** * Sample code: List_Operations. diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/AgentProfile.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/AgentProfile.java index bf35a1539cc6..7eacaabdf8ca 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/AgentProfile.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/AgentProfile.java @@ -19,7 +19,7 @@ public class AgentProfile implements JsonSerializable { /* * Discriminator property for AgentProfile. */ - private String kind = "AgentProfile"; + String kind; /* * Defines pool buffer/stand-by agents. @@ -35,6 +35,7 @@ public class AgentProfile implements JsonSerializable { * Creates an instance of AgentProfile class. */ public AgentProfile() { + this.kind = "AgentProfile"; } /** @@ -106,10 +107,14 @@ public void validate() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + toJsonShared(jsonWriter); + return jsonWriter.writeEndObject(); + } + + void toJsonShared(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("kind", this.kind); jsonWriter.writeJsonField("resourcePredictions", this.resourcePredictions); jsonWriter.writeJsonField("resourcePredictionsProfile", this.resourcePredictionsProfile); - return jsonWriter.writeEndObject(); } /** @@ -154,13 +159,7 @@ static AgentProfile fromJsonKnownDiscriminator(JsonReader jsonReader) throws IOE String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedAgentProfile.kind = reader.getString(); - } else if ("resourcePredictions".equals(fieldName)) { - deserializedAgentProfile.resourcePredictions = ResourcePredictions.fromJson(reader); - } else if ("resourcePredictionsProfile".equals(fieldName)) { - deserializedAgentProfile.resourcePredictionsProfile = ResourcePredictionsProfile.fromJson(reader); - } else { + if (!AgentProfile.fromJsonShared(reader, fieldName, deserializedAgentProfile)) { reader.skipChildren(); } } @@ -168,4 +167,19 @@ static AgentProfile fromJsonKnownDiscriminator(JsonReader jsonReader) throws IOE return deserializedAgentProfile; }); } + + static boolean fromJsonShared(JsonReader reader, String fieldName, AgentProfile deserializedAgentProfile) + throws IOException { + if ("kind".equals(fieldName)) { + deserializedAgentProfile.kind = reader.getString(); + return true; + } else if ("resourcePredictions".equals(fieldName)) { + deserializedAgentProfile.resourcePredictions = ResourcePredictions.fromJson(reader); + return true; + } else if ("resourcePredictionsProfile".equals(fieldName)) { + deserializedAgentProfile.resourcePredictionsProfile = ResourcePredictionsProfile.fromJson(reader); + return true; + } + return false; + } } diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/AutomaticResourcePredictionsProfile.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/AutomaticResourcePredictionsProfile.java index 38d99c836022..e25a94d44c64 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/AutomaticResourcePredictionsProfile.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/AutomaticResourcePredictionsProfile.java @@ -15,11 +15,6 @@ */ @Fluent public final class AutomaticResourcePredictionsProfile extends ResourcePredictionsProfile { - /* - * Determines how the stand-by scheme should be provided. - */ - private ResourcePredictionsProfileType kind = ResourcePredictionsProfileType.AUTOMATIC; - /* * Determines the balance between cost and performance. */ @@ -29,16 +24,7 @@ public final class AutomaticResourcePredictionsProfile extends ResourcePredictio * Creates an instance of AutomaticResourcePredictionsProfile class. */ public AutomaticResourcePredictionsProfile() { - } - - /** - * Get the kind property: Determines how the stand-by scheme should be provided. - * - * @return the kind value. - */ - @Override - public ResourcePredictionsProfileType kind() { - return this.kind; + this.kind = ResourcePredictionsProfileType.AUTOMATIC; } /** @@ -76,7 +62,7 @@ public void validate() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); + toJsonShared(jsonWriter); jsonWriter.writeStringField("predictionPreference", this.predictionPreference == null ? null : this.predictionPreference.toString()); return jsonWriter.writeEndObject(); @@ -98,9 +84,9 @@ public static AutomaticResourcePredictionsProfile fromJson(JsonReader jsonReader String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedAutomaticResourcePredictionsProfile.kind - = ResourcePredictionsProfileType.fromString(reader.getString()); + if (ResourcePredictionsProfile.fromJsonShared(reader, fieldName, + deserializedAutomaticResourcePredictionsProfile)) { + continue; } else if ("predictionPreference".equals(fieldName)) { deserializedAutomaticResourcePredictionsProfile.predictionPreference = PredictionPreference.fromString(reader.getString()); diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/AzureDevOpsOrganizationProfile.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/AzureDevOpsOrganizationProfile.java index 59b926621f48..c1bd0277238f 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/AzureDevOpsOrganizationProfile.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/AzureDevOpsOrganizationProfile.java @@ -17,11 +17,6 @@ */ @Fluent public final class AzureDevOpsOrganizationProfile extends OrganizationProfile { - /* - * Discriminator property for OrganizationProfile. - */ - private String kind = "AzureDevOps"; - /* * The list of Azure DevOps organizations the pool should be present in. */ @@ -36,16 +31,7 @@ public final class AzureDevOpsOrganizationProfile extends OrganizationProfile { * Creates an instance of AzureDevOpsOrganizationProfile class. */ public AzureDevOpsOrganizationProfile() { - } - - /** - * Get the kind property: Discriminator property for OrganizationProfile. - * - * @return the kind value. - */ - @Override - public String kind() { - return this.kind; + this.kind = "AzureDevOps"; } /** @@ -117,8 +103,8 @@ public void validate() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + toJsonShared(jsonWriter); jsonWriter.writeArrayField("organizations", this.organizations, (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("kind", this.kind); jsonWriter.writeJsonField("permissionProfile", this.permissionProfile); return jsonWriter.writeEndObject(); } @@ -140,11 +126,11 @@ public static AzureDevOpsOrganizationProfile fromJson(JsonReader jsonReader) thr String fieldName = reader.getFieldName(); reader.nextToken(); - if ("organizations".equals(fieldName)) { + if (OrganizationProfile.fromJsonShared(reader, fieldName, deserializedAzureDevOpsOrganizationProfile)) { + continue; + } else if ("organizations".equals(fieldName)) { List organizations = reader.readArray(reader1 -> Organization.fromJson(reader1)); deserializedAzureDevOpsOrganizationProfile.organizations = organizations; - } else if ("kind".equals(fieldName)) { - deserializedAzureDevOpsOrganizationProfile.kind = reader.getString(); } else if ("permissionProfile".equals(fieldName)) { deserializedAzureDevOpsOrganizationProfile.permissionProfile = AzureDevOpsPermissionProfile.fromJson(reader); diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/FabricProfile.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/FabricProfile.java index 15e10d25df9b..90ec1dc86f7c 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/FabricProfile.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/FabricProfile.java @@ -19,12 +19,13 @@ public class FabricProfile implements JsonSerializable { /* * Discriminator property for FabricProfile. */ - private String kind = "FabricProfile"; + String kind; /** * Creates an instance of FabricProfile class. */ public FabricProfile() { + this.kind = "FabricProfile"; } /** @@ -50,10 +51,14 @@ public void validate() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("kind", this.kind); + toJsonShared(jsonWriter); return jsonWriter.writeEndObject(); } + void toJsonShared(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStringField("kind", this.kind); + } + /** * Reads an instance of FabricProfile from the JsonReader. * @@ -94,9 +99,7 @@ static FabricProfile fromJsonKnownDiscriminator(JsonReader jsonReader) throws IO String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedFabricProfile.kind = reader.getString(); - } else { + if (!FabricProfile.fromJsonShared(reader, fieldName, deserializedFabricProfile)) { reader.skipChildren(); } } @@ -104,4 +107,13 @@ static FabricProfile fromJsonKnownDiscriminator(JsonReader jsonReader) throws IO return deserializedFabricProfile; }); } + + static boolean fromJsonShared(JsonReader reader, String fieldName, FabricProfile deserializedFabricProfile) + throws IOException { + if ("kind".equals(fieldName)) { + deserializedFabricProfile.kind = reader.getString(); + return true; + } + return false; + } } diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/GitHubOrganizationProfile.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/GitHubOrganizationProfile.java index 3dba8f20e272..f7b31354b171 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/GitHubOrganizationProfile.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/GitHubOrganizationProfile.java @@ -17,11 +17,6 @@ */ @Fluent public final class GitHubOrganizationProfile extends OrganizationProfile { - /* - * Discriminator property for OrganizationProfile. - */ - private String kind = "GitHub"; - /* * The list of GitHub organizations/repositories the pool should be present in. */ @@ -31,16 +26,7 @@ public final class GitHubOrganizationProfile extends OrganizationProfile { * Creates an instance of GitHubOrganizationProfile class. */ public GitHubOrganizationProfile() { - } - - /** - * Get the kind property: Discriminator property for OrganizationProfile. - * - * @return the kind value. - */ - @Override - public String kind() { - return this.kind; + this.kind = "GitHub"; } /** @@ -87,8 +73,8 @@ public void validate() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + toJsonShared(jsonWriter); jsonWriter.writeArrayField("organizations", this.organizations, (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } @@ -108,12 +94,12 @@ public static GitHubOrganizationProfile fromJson(JsonReader jsonReader) throws I String fieldName = reader.getFieldName(); reader.nextToken(); - if ("organizations".equals(fieldName)) { + if (OrganizationProfile.fromJsonShared(reader, fieldName, deserializedGitHubOrganizationProfile)) { + continue; + } else if ("organizations".equals(fieldName)) { List organizations = reader.readArray(reader1 -> GitHubOrganization.fromJson(reader1)); deserializedGitHubOrganizationProfile.organizations = organizations; - } else if ("kind".equals(fieldName)) { - deserializedGitHubOrganizationProfile.kind = reader.getString(); } else { reader.skipChildren(); } diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/ManualResourcePredictionsProfile.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/ManualResourcePredictionsProfile.java index cb47ecc2a139..14d322088ac3 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/ManualResourcePredictionsProfile.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/ManualResourcePredictionsProfile.java @@ -15,25 +15,11 @@ */ @Immutable public final class ManualResourcePredictionsProfile extends ResourcePredictionsProfile { - /* - * Determines how the stand-by scheme should be provided. - */ - private ResourcePredictionsProfileType kind = ResourcePredictionsProfileType.MANUAL; - /** * Creates an instance of ManualResourcePredictionsProfile class. */ public ManualResourcePredictionsProfile() { - } - - /** - * Get the kind property: Determines how the stand-by scheme should be provided. - * - * @return the kind value. - */ - @Override - public ResourcePredictionsProfileType kind() { - return this.kind; + this.kind = ResourcePredictionsProfileType.MANUAL; } /** @@ -51,7 +37,7 @@ public void validate() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); + toJsonShared(jsonWriter); return jsonWriter.writeEndObject(); } @@ -71,9 +57,9 @@ public static ManualResourcePredictionsProfile fromJson(JsonReader jsonReader) t String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedManualResourcePredictionsProfile.kind - = ResourcePredictionsProfileType.fromString(reader.getString()); + if (ResourcePredictionsProfile.fromJsonShared(reader, fieldName, + deserializedManualResourcePredictionsProfile)) { + continue; } else { reader.skipChildren(); } diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/OrganizationProfile.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/OrganizationProfile.java index fb5628ee4dca..112053535ca5 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/OrganizationProfile.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/models/OrganizationProfile.java @@ -19,12 +19,13 @@ public class OrganizationProfile implements JsonSerializable writer.writeJson(element)); - jsonWriter.writeStringField("kind", this.kind); jsonWriter.writeJsonField("osProfile", this.osProfile); jsonWriter.writeJsonField("storageProfile", this.storageProfile); jsonWriter.writeJsonField("networkProfile", this.networkProfile); @@ -226,13 +212,13 @@ public static VmssFabricProfile fromJson(JsonReader jsonReader) throws IOExcepti String fieldName = reader.getFieldName(); reader.nextToken(); - if ("sku".equals(fieldName)) { + if (FabricProfile.fromJsonShared(reader, fieldName, deserializedVmssFabricProfile)) { + continue; + } else if ("sku".equals(fieldName)) { deserializedVmssFabricProfile.sku = DevOpsAzureSku.fromJson(reader); } else if ("images".equals(fieldName)) { List images = reader.readArray(reader1 -> PoolImage.fromJson(reader1)); deserializedVmssFabricProfile.images = images; - } else if ("kind".equals(fieldName)) { - deserializedVmssFabricProfile.kind = reader.getString(); } else if ("osProfile".equals(fieldName)) { deserializedVmssFabricProfile.osProfile = OsProfile.fromJson(reader); } else if ("storageProfile".equals(fieldName)) { diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/ImageVersionsListByImageSamples.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/ImageVersionsListByImageSamples.java index e5a17d00c052..170ce5f97baf 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/ImageVersionsListByImageSamples.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/ImageVersionsListByImageSamples.java @@ -9,9 +9,7 @@ */ public final class ImageVersionsListByImageSamples { /* - * x-ms-original-file: - * specification/devopsinfrastructure/Microsoft.DevOpsInfrastructure.Management/examples/2024-04-04-preview/ - * ImageVersions_ListByImage.json + * x-ms-original-file: 2024-04-04-preview/ImageVersions_ListByImage.json */ /** * Sample code: ImageVersions_ListByImage. diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/OperationsListSamples.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/OperationsListSamples.java index ca2bb1b307a5..82587082798d 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/OperationsListSamples.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/OperationsListSamples.java @@ -9,9 +9,7 @@ */ public final class OperationsListSamples { /* - * x-ms-original-file: - * specification/devopsinfrastructure/Microsoft.DevOpsInfrastructure.Management/examples/2024-04-04-preview/ - * ListOperations.json + * x-ms-original-file: 2024-04-04-preview/ListOperations.json */ /** * Sample code: Operations_List. diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsCreateOrUpdateSamples.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsCreateOrUpdateSamples.java index 59cf68211aa3..277b55ce27c3 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsCreateOrUpdateSamples.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsCreateOrUpdateSamples.java @@ -19,9 +19,7 @@ */ public final class PoolsCreateOrUpdateSamples { /* - * x-ms-original-file: - * specification/devopsinfrastructure/Microsoft.DevOpsInfrastructure.Management/examples/2024-04-04-preview/ - * CreateOrUpdatePool.json + * x-ms-original-file: 2024-04-04-preview/CreateOrUpdatePool.json */ /** * Sample code: Pools_CreateOrUpdate. diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsDeleteSamples.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsDeleteSamples.java index 933f4107aa95..bc8cdb746928 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsDeleteSamples.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsDeleteSamples.java @@ -9,9 +9,7 @@ */ public final class PoolsDeleteSamples { /* - * x-ms-original-file: - * specification/devopsinfrastructure/Microsoft.DevOpsInfrastructure.Management/examples/2024-04-04-preview/ - * DeletePool.json + * x-ms-original-file: 2024-04-04-preview/DeletePool.json */ /** * Sample code: Pools_Delete. diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsGetByResourceGroupSamples.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsGetByResourceGroupSamples.java index d1d5fd3a4b9e..f9905363435a 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsGetByResourceGroupSamples.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsGetByResourceGroupSamples.java @@ -9,9 +9,7 @@ */ public final class PoolsGetByResourceGroupSamples { /* - * x-ms-original-file: - * specification/devopsinfrastructure/Microsoft.DevOpsInfrastructure.Management/examples/2024-04-04-preview/GetPool. - * json + * x-ms-original-file: 2024-04-04-preview/GetPool.json */ /** * Sample code: Pools_Get. diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsListByResourceGroupSamples.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsListByResourceGroupSamples.java index e7d052b64414..9768f9af3872 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsListByResourceGroupSamples.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsListByResourceGroupSamples.java @@ -9,9 +9,7 @@ */ public final class PoolsListByResourceGroupSamples { /* - * x-ms-original-file: - * specification/devopsinfrastructure/Microsoft.DevOpsInfrastructure.Management/examples/2024-04-04-preview/ - * ListPoolsBySubscriptionAndResourceGroup.json + * x-ms-original-file: 2024-04-04-preview/ListPoolsBySubscriptionAndResourceGroup.json */ /** * Sample code: Pools_ListByResourceGroup. diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsListSamples.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsListSamples.java index 4248d324c140..995dc3691024 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsListSamples.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsListSamples.java @@ -9,9 +9,7 @@ */ public final class PoolsListSamples { /* - * x-ms-original-file: - * specification/devopsinfrastructure/Microsoft.DevOpsInfrastructure.Management/examples/2024-04-04-preview/ - * ListPoolsBySubscription.json + * x-ms-original-file: 2024-04-04-preview/ListPoolsBySubscription.json */ /** * Sample code: Pools_ListBySubscription. diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsUpdateSamples.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsUpdateSamples.java index 60f1780a46a9..3057edf444d4 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsUpdateSamples.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/PoolsUpdateSamples.java @@ -11,9 +11,7 @@ */ public final class PoolsUpdateSamples { /* - * x-ms-original-file: - * specification/devopsinfrastructure/Microsoft.DevOpsInfrastructure.Management/examples/2024-04-04-preview/ - * UpdatePool.json + * x-ms-original-file: 2024-04-04-preview/UpdatePool.json */ /** * Sample code: Pools_Update. diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/ResourceDetailsListByPoolSamples.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/ResourceDetailsListByPoolSamples.java index 314e782e426e..60bb303aabd4 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/ResourceDetailsListByPoolSamples.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/ResourceDetailsListByPoolSamples.java @@ -9,9 +9,7 @@ */ public final class ResourceDetailsListByPoolSamples { /* - * x-ms-original-file: - * specification/devopsinfrastructure/Microsoft.DevOpsInfrastructure.Management/examples/2024-04-04-preview/ - * ResourceDetails_ListByPool.json + * x-ms-original-file: 2024-04-04-preview/ResourceDetails_ListByPool.json */ /** * Sample code: ResourceDetails_ListByPool. diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/SkuListByLocationSamples.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/SkuListByLocationSamples.java index d9fac486a465..ec117d92e4ba 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/SkuListByLocationSamples.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/SkuListByLocationSamples.java @@ -9,9 +9,7 @@ */ public final class SkuListByLocationSamples { /* - * x-ms-original-file: - * specification/devopsinfrastructure/Microsoft.DevOpsInfrastructure.Management/examples/2024-04-04-preview/ - * Sku_ListByLocation.json + * x-ms-original-file: 2024-04-04-preview/Sku_ListByLocation.json */ /** * Sample code: Sku_ListByLocation. diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/SubscriptionUsagesUsagesSamples.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/SubscriptionUsagesUsagesSamples.java index 1cd01cbcb0a0..10dc7129cc8f 100644 --- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/SubscriptionUsagesUsagesSamples.java +++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/samples/java/com/azure/resourcemanager/devopsinfrastructure/generated/SubscriptionUsagesUsagesSamples.java @@ -9,9 +9,7 @@ */ public final class SubscriptionUsagesUsagesSamples { /* - * x-ms-original-file: - * specification/devopsinfrastructure/Microsoft.DevOpsInfrastructure.Management/examples/2024-04-04-preview/ - * SubscriptionUsages_Usages.json + * x-ms-original-file: 2024-04-04-preview/SubscriptionUsages_Usages.json */ /** * Sample code: SubscriptionUsages_Usages. diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentClassifierBuildOperationDetails.java b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentClassifierBuildOperationDetails.java index 05cf0ca64ce1..5619882bdd59 100644 --- a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentClassifierBuildOperationDetails.java +++ b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentClassifierBuildOperationDetails.java @@ -12,7 +12,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.Map; /** @@ -20,12 +19,6 @@ */ @Immutable public final class DocumentClassifierBuildOperationDetails extends OperationDetails { - /* - * Type of operation. - */ - @Generated - private OperationKind kind = OperationKind.DOCUMENT_CLASSIFIER_BUILD; - /* * Operation result upon success. */ @@ -68,17 +61,7 @@ public final class DocumentClassifierBuildOperationDetails extends OperationDeta private DocumentClassifierBuildOperationDetails(OperationStatus status, OffsetDateTime createdDateTime, OffsetDateTime lastUpdatedDateTime, String resourceLocation) { super(status, createdDateTime, lastUpdatedDateTime, resourceLocation); - } - - /** - * Get the kind property: Type of operation. - * - * @return the kind value. - */ - @Generated - @Override - public OperationKind getKind() { - return this.kind; + this.kind = OperationKind.DOCUMENT_CLASSIFIER_BUILD; } /** @@ -142,19 +125,7 @@ public Integer getPercentCompleted() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("status", getStatus() == null ? null : getStatus().toString()); - jsonWriter.writeStringField("createdDateTime", - getCreatedDateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreatedDateTime())); - jsonWriter.writeStringField("lastUpdatedDateTime", - getLastUpdatedDateTime() == null - ? null - : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getLastUpdatedDateTime())); - jsonWriter.writeStringField("resourceLocation", getResourceLocation()); - jsonWriter.writeNumberField("percentCompleted", getPercentCompleted()); - jsonWriter.writeStringField("apiVersion", getApiVersion()); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeJsonField("error", getError()); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("result", this.result); return jsonWriter.writeEndObject(); } diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentClassifierCopyToOperationDetails.java b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentClassifierCopyToOperationDetails.java index 9d5513b13325..3a30c68f90a1 100644 --- a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentClassifierCopyToOperationDetails.java +++ b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentClassifierCopyToOperationDetails.java @@ -12,7 +12,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.Map; /** @@ -20,12 +19,6 @@ */ @Immutable public final class DocumentClassifierCopyToOperationDetails extends OperationDetails { - /* - * Type of operation. - */ - @Generated - private OperationKind kind = OperationKind.DOCUMENT_CLASSIFIER_COPY_TO; - /* * Operation result upon success. */ @@ -68,17 +61,7 @@ public final class DocumentClassifierCopyToOperationDetails extends OperationDet private DocumentClassifierCopyToOperationDetails(OperationStatus status, OffsetDateTime createdDateTime, OffsetDateTime lastUpdatedDateTime, String resourceLocation) { super(status, createdDateTime, lastUpdatedDateTime, resourceLocation); - } - - /** - * Get the kind property: Type of operation. - * - * @return the kind value. - */ - @Generated - @Override - public OperationKind getKind() { - return this.kind; + this.kind = OperationKind.DOCUMENT_CLASSIFIER_COPY_TO; } /** @@ -142,19 +125,7 @@ public Integer getPercentCompleted() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("status", getStatus() == null ? null : getStatus().toString()); - jsonWriter.writeStringField("createdDateTime", - getCreatedDateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreatedDateTime())); - jsonWriter.writeStringField("lastUpdatedDateTime", - getLastUpdatedDateTime() == null - ? null - : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getLastUpdatedDateTime())); - jsonWriter.writeStringField("resourceLocation", getResourceLocation()); - jsonWriter.writeNumberField("percentCompleted", getPercentCompleted()); - jsonWriter.writeStringField("apiVersion", getApiVersion()); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeJsonField("error", getError()); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("result", this.result); return jsonWriter.writeEndObject(); } diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentModelBuildOperationDetails.java b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentModelBuildOperationDetails.java index df4cadf3dabd..3c036aafada9 100644 --- a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentModelBuildOperationDetails.java +++ b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentModelBuildOperationDetails.java @@ -12,7 +12,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.Map; /** @@ -20,12 +19,6 @@ */ @Immutable public final class DocumentModelBuildOperationDetails extends OperationDetails { - /* - * Type of operation. - */ - @Generated - private OperationKind kind = OperationKind.DOCUMENT_MODEL_BUILD; - /* * Operation result upon success. */ @@ -68,17 +61,7 @@ public final class DocumentModelBuildOperationDetails extends OperationDetails { private DocumentModelBuildOperationDetails(OperationStatus status, OffsetDateTime createdDateTime, OffsetDateTime lastUpdatedDateTime, String resourceLocation) { super(status, createdDateTime, lastUpdatedDateTime, resourceLocation); - } - - /** - * Get the kind property: Type of operation. - * - * @return the kind value. - */ - @Generated - @Override - public OperationKind getKind() { - return this.kind; + this.kind = OperationKind.DOCUMENT_MODEL_BUILD; } /** @@ -142,19 +125,7 @@ public Integer getPercentCompleted() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("status", getStatus() == null ? null : getStatus().toString()); - jsonWriter.writeStringField("createdDateTime", - getCreatedDateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreatedDateTime())); - jsonWriter.writeStringField("lastUpdatedDateTime", - getLastUpdatedDateTime() == null - ? null - : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getLastUpdatedDateTime())); - jsonWriter.writeStringField("resourceLocation", getResourceLocation()); - jsonWriter.writeNumberField("percentCompleted", getPercentCompleted()); - jsonWriter.writeStringField("apiVersion", getApiVersion()); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeJsonField("error", getError()); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("result", this.result); return jsonWriter.writeEndObject(); } diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentModelComposeOperationDetails.java b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentModelComposeOperationDetails.java index f4b365886d89..43476921510d 100644 --- a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentModelComposeOperationDetails.java +++ b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentModelComposeOperationDetails.java @@ -12,7 +12,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.Map; /** @@ -20,12 +19,6 @@ */ @Immutable public final class DocumentModelComposeOperationDetails extends OperationDetails { - /* - * Type of operation. - */ - @Generated - private OperationKind kind = OperationKind.DOCUMENT_MODEL_COMPOSE; - /* * Operation result upon success. */ @@ -68,17 +61,7 @@ public final class DocumentModelComposeOperationDetails extends OperationDetails private DocumentModelComposeOperationDetails(OperationStatus status, OffsetDateTime createdDateTime, OffsetDateTime lastUpdatedDateTime, String resourceLocation) { super(status, createdDateTime, lastUpdatedDateTime, resourceLocation); - } - - /** - * Get the kind property: Type of operation. - * - * @return the kind value. - */ - @Generated - @Override - public OperationKind getKind() { - return this.kind; + this.kind = OperationKind.DOCUMENT_MODEL_COMPOSE; } /** @@ -142,19 +125,7 @@ public Integer getPercentCompleted() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("status", getStatus() == null ? null : getStatus().toString()); - jsonWriter.writeStringField("createdDateTime", - getCreatedDateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreatedDateTime())); - jsonWriter.writeStringField("lastUpdatedDateTime", - getLastUpdatedDateTime() == null - ? null - : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getLastUpdatedDateTime())); - jsonWriter.writeStringField("resourceLocation", getResourceLocation()); - jsonWriter.writeNumberField("percentCompleted", getPercentCompleted()); - jsonWriter.writeStringField("apiVersion", getApiVersion()); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeJsonField("error", getError()); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("result", this.result); return jsonWriter.writeEndObject(); } diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentModelCopyToOperationDetails.java b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentModelCopyToOperationDetails.java index 708417233b58..2f53471f5fe8 100644 --- a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentModelCopyToOperationDetails.java +++ b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/DocumentModelCopyToOperationDetails.java @@ -12,7 +12,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.Map; /** @@ -20,12 +19,6 @@ */ @Immutable public final class DocumentModelCopyToOperationDetails extends OperationDetails { - /* - * Type of operation. - */ - @Generated - private OperationKind kind = OperationKind.DOCUMENT_MODEL_COPY_TO; - /* * Operation result upon success. */ @@ -68,17 +61,7 @@ public final class DocumentModelCopyToOperationDetails extends OperationDetails private DocumentModelCopyToOperationDetails(OperationStatus status, OffsetDateTime createdDateTime, OffsetDateTime lastUpdatedDateTime, String resourceLocation) { super(status, createdDateTime, lastUpdatedDateTime, resourceLocation); - } - - /** - * Get the kind property: Type of operation. - * - * @return the kind value. - */ - @Generated - @Override - public OperationKind getKind() { - return this.kind; + this.kind = OperationKind.DOCUMENT_MODEL_COPY_TO; } /** @@ -142,19 +125,7 @@ public Integer getPercentCompleted() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("status", getStatus() == null ? null : getStatus().toString()); - jsonWriter.writeStringField("createdDateTime", - getCreatedDateTime() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreatedDateTime())); - jsonWriter.writeStringField("lastUpdatedDateTime", - getLastUpdatedDateTime() == null - ? null - : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getLastUpdatedDateTime())); - jsonWriter.writeStringField("resourceLocation", getResourceLocation()); - jsonWriter.writeNumberField("percentCompleted", getPercentCompleted()); - jsonWriter.writeStringField("apiVersion", getApiVersion()); - jsonWriter.writeMapField("tags", getTags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeJsonField("error", getError()); - jsonWriter.writeStringField("kind", this.kind == null ? null : this.kind.toString()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("result", this.result); return jsonWriter.writeEndObject(); } diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/OperationDetails.java b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/OperationDetails.java index 6f134d006f4b..47801c5e223d 100644 --- a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/OperationDetails.java +++ b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/models/OperationDetails.java @@ -25,7 +25,7 @@ public class OperationDetails implements JsonSerializable { * Type of operation. */ @Generated - private OperationKind kind = OperationKind.fromString("OperationDetails"); + OperationKind kind; /* * Operation ID @@ -96,6 +96,7 @@ protected OperationDetails(OperationStatus status, OffsetDateTime createdDateTim this.createdDateTime = createdDateTime; this.lastUpdatedDateTime = lastUpdatedDateTime; this.resourceLocation = resourceLocation; + this.kind = OperationKind.fromString("OperationDetails"); } /** @@ -265,6 +266,11 @@ OperationDetails setError(Error error) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); + toJsonShared(jsonWriter); + return jsonWriter.writeEndObject(); + } + + void toJsonShared(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("status", this.status == null ? null : this.status.toString()); jsonWriter.writeStringField("createdDateTime", this.createdDateTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.createdDateTime)); @@ -278,7 +284,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("apiVersion", this.apiVersion); jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element)); jsonWriter.writeJsonField("error", this.error); - return jsonWriter.writeEndObject(); } /** diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AsAssetResource.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AsAssetResource.java index f9607a015fac..8f52d4ecd084 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AsAssetResource.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AsAssetResource.java @@ -11,7 +11,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -20,12 +19,6 @@ @Immutable public final class AsAssetResource extends AssetResource { - /* - * Discriminator property for AssetResource. - */ - @Generated - private String kind = "as"; - /* * asset */ @@ -112,17 +105,7 @@ public final class AsAssetResource extends AssetResource { @Generated private AsAssetResource(AsAsset asset) { this.asset = asset; - } - - /** - * Get the kind property: Discriminator property for AssetResource. - * - * @return the kind value. - */ - @Generated - @Override - public String getKind() { - return this.kind; + this.kind = "as"; } /** @@ -276,22 +259,8 @@ public String getReason() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getName()); - jsonWriter.writeStringField("displayName", getDisplayName()); - jsonWriter.writeStringField("uuid", getUuid()); - jsonWriter.writeStringField("createdDate", - getCreatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreatedDate())); - jsonWriter.writeStringField("updatedDate", - getUpdatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getUpdatedDate())); - jsonWriter.writeStringField("state", getState() == null ? null : getState().toString()); - jsonWriter.writeStringField("externalId", getExternalId()); - jsonWriter.writeArrayField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeBooleanField("wildcard", isWildcard()); - jsonWriter.writeStringField("discoGroupName", getDiscoGroupName()); - jsonWriter.writeArrayField("auditTrail", getAuditTrail(), (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("reason", getReason()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("asset", this.asset); - jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AssetResource.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AssetResource.java index e24ea259e548..3176cefd97da 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AssetResource.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AssetResource.java @@ -25,7 +25,7 @@ public class AssetResource implements JsonSerializable { * Discriminator property for AssetResource. */ @Generated - private String kind = "AssetResource"; + String kind; /* * The system generated unique id for the resource. @@ -110,6 +110,7 @@ public class AssetResource implements JsonSerializable { */ @Generated protected AssetResource() { + this.kind = "AssetResource"; } /** @@ -419,21 +420,7 @@ AssetResource setReason(String reason) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("kind", this.kind); - jsonWriter.writeStringField("name", this.name); - jsonWriter.writeStringField("displayName", this.displayName); - jsonWriter.writeStringField("uuid", this.uuid); - jsonWriter.writeStringField("createdDate", - this.createdDate == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.createdDate)); - jsonWriter.writeStringField("updatedDate", - this.updatedDate == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.updatedDate)); - jsonWriter.writeStringField("state", this.state == null ? null : this.state.toString()); - jsonWriter.writeStringField("externalId", this.externalId); - jsonWriter.writeArrayField("labels", this.labels, (writer, element) -> writer.writeString(element)); - jsonWriter.writeBooleanField("wildcard", this.wildcard); - jsonWriter.writeStringField("discoGroupName", this.discoGroupName); - jsonWriter.writeArrayField("auditTrail", this.auditTrail, (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("reason", this.reason); + toJsonShared(jsonWriter); return jsonWriter.writeEndObject(); } @@ -494,43 +481,82 @@ static AssetResource fromJsonKnownDiscriminator(JsonReader jsonReader) throws IO while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("id".equals(fieldName)) { - deserializedAssetResource.id = reader.getString(); - } else if ("kind".equals(fieldName)) { - deserializedAssetResource.kind = reader.getString(); - } else if ("name".equals(fieldName)) { - deserializedAssetResource.name = reader.getString(); - } else if ("displayName".equals(fieldName)) { - deserializedAssetResource.displayName = reader.getString(); - } else if ("uuid".equals(fieldName)) { - deserializedAssetResource.uuid = reader.getString(); - } else if ("createdDate".equals(fieldName)) { - deserializedAssetResource.createdDate = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("updatedDate".equals(fieldName)) { - deserializedAssetResource.updatedDate = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("state".equals(fieldName)) { - deserializedAssetResource.state = AssetState.fromString(reader.getString()); - } else if ("externalId".equals(fieldName)) { - deserializedAssetResource.externalId = reader.getString(); - } else if ("labels".equals(fieldName)) { - List labels = reader.readArray(reader1 -> reader1.getString()); - deserializedAssetResource.labels = labels; - } else if ("wildcard".equals(fieldName)) { - deserializedAssetResource.wildcard = reader.getNullable(JsonReader::getBoolean); - } else if ("discoGroupName".equals(fieldName)) { - deserializedAssetResource.discoGroupName = reader.getString(); - } else if ("auditTrail".equals(fieldName)) { - List auditTrail = reader.readArray(reader1 -> AuditTrailItem.fromJson(reader1)); - deserializedAssetResource.auditTrail = auditTrail; - } else if ("reason".equals(fieldName)) { - deserializedAssetResource.reason = reader.getString(); - } else { + if (!AssetResource.fromJsonShared(reader, fieldName, deserializedAssetResource)) { reader.skipChildren(); } } return deserializedAssetResource; }); } + + void toJsonShared(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStringField("kind", this.kind); + jsonWriter.writeStringField("name", this.name); + jsonWriter.writeStringField("displayName", this.displayName); + jsonWriter.writeStringField("uuid", this.uuid); + jsonWriter.writeStringField("createdDate", + this.createdDate == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.createdDate)); + jsonWriter.writeStringField("updatedDate", + this.updatedDate == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.updatedDate)); + jsonWriter.writeStringField("state", this.state == null ? null : this.state.toString()); + jsonWriter.writeStringField("externalId", this.externalId); + jsonWriter.writeArrayField("labels", this.labels, (writer, element) -> writer.writeString(element)); + jsonWriter.writeBooleanField("wildcard", this.wildcard); + jsonWriter.writeStringField("discoGroupName", this.discoGroupName); + jsonWriter.writeArrayField("auditTrail", this.auditTrail, (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("reason", this.reason); + } + + @Generated + static boolean fromJsonShared(JsonReader reader, String fieldName, AssetResource deserializedAssetResource) + throws IOException { + if ("id".equals(fieldName)) { + deserializedAssetResource.id = reader.getString(); + return true; + } else if ("kind".equals(fieldName)) { + deserializedAssetResource.kind = reader.getString(); + return true; + } else if ("name".equals(fieldName)) { + deserializedAssetResource.name = reader.getString(); + return true; + } else if ("displayName".equals(fieldName)) { + deserializedAssetResource.displayName = reader.getString(); + return true; + } else if ("uuid".equals(fieldName)) { + deserializedAssetResource.uuid = reader.getString(); + return true; + } else if ("createdDate".equals(fieldName)) { + deserializedAssetResource.createdDate + = reader.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + return true; + } else if ("updatedDate".equals(fieldName)) { + deserializedAssetResource.updatedDate + = reader.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + return true; + } else if ("state".equals(fieldName)) { + deserializedAssetResource.state = AssetState.fromString(reader.getString()); + return true; + } else if ("externalId".equals(fieldName)) { + deserializedAssetResource.externalId = reader.getString(); + return true; + } else if ("labels".equals(fieldName)) { + List labels = reader.readArray(reader1 -> reader1.getString()); + deserializedAssetResource.labels = labels; + return true; + } else if ("wildcard".equals(fieldName)) { + deserializedAssetResource.wildcard = reader.getNullable(JsonReader::getBoolean); + return true; + } else if ("discoGroupName".equals(fieldName)) { + deserializedAssetResource.discoGroupName = reader.getString(); + return true; + } else if ("auditTrail".equals(fieldName)) { + List auditTrail = reader.readArray(reader1 -> AuditTrailItem.fromJson(reader1)); + deserializedAssetResource.auditTrail = auditTrail; + return true; + } else if ("reason".equals(fieldName)) { + deserializedAssetResource.reason = reader.getString(); + return true; + } + return false; + } } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AzureDataExplorerDataConnection.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AzureDataExplorerDataConnection.java index 4e51ec6a9908..01320bf27379 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AzureDataExplorerDataConnection.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AzureDataExplorerDataConnection.java @@ -18,12 +18,6 @@ @Immutable public final class AzureDataExplorerDataConnection extends DataConnection { - /* - * Discriminator property for DataConnection. - */ - @Generated - private String kind = "azureDataExplorer"; - /* * properties */ @@ -98,17 +92,7 @@ public final class AzureDataExplorerDataConnection extends DataConnection { @Generated private AzureDataExplorerDataConnection(AzureDataExplorerDataConnectionProperties properties) { this.properties = properties; - } - - /** - * Get the kind property: Discriminator property for DataConnection. - * - * @return the kind value. - */ - @Generated - @Override - public String getKind() { - return this.kind; + this.kind = "azureDataExplorer"; } /** @@ -238,14 +222,8 @@ public String getInactiveMessage() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("id", getId()); - jsonWriter.writeStringField("displayName", getDisplayName()); - jsonWriter.writeStringField("content", getContent() == null ? null : getContent().toString()); - jsonWriter.writeStringField("frequency", getFrequency() == null ? null : getFrequency().toString()); - jsonWriter.writeNumberField("frequencyOffset", getFrequencyOffset()); - jsonWriter.writeBooleanField("active", isActive()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("properties", this.properties); - jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AzureDataExplorerDataConnectionData.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AzureDataExplorerDataConnectionData.java index 4e02c1a2874e..7b0ffa8a8b54 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AzureDataExplorerDataConnectionData.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/AzureDataExplorerDataConnectionData.java @@ -16,12 +16,6 @@ @Fluent public final class AzureDataExplorerDataConnectionData extends DataConnectionData { - /* - * Discriminator property for DataConnectionData. - */ - @Generated - private String kind = "azureDataExplorer"; - /* * properties */ @@ -36,17 +30,7 @@ public final class AzureDataExplorerDataConnectionData extends DataConnectionDat @Generated public AzureDataExplorerDataConnectionData(AzureDataExplorerDataConnectionProperties properties) { this.properties = properties; - } - - /** - * Get the kind property: Discriminator property for DataConnectionData. - * - * @return the kind value. - */ - @Generated - @Override - public String getKind() { - return this.kind; + this.kind = "azureDataExplorer"; } /** @@ -106,12 +90,8 @@ public AzureDataExplorerDataConnectionData setFrequencyOffset(Integer frequencyO @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getName()); - jsonWriter.writeStringField("content", getContent() == null ? null : getContent().toString()); - jsonWriter.writeStringField("frequency", getFrequency() == null ? null : getFrequency().toString()); - jsonWriter.writeNumberField("frequencyOffset", getFrequencyOffset()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("properties", this.properties); - jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/ContactAssetResource.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/ContactAssetResource.java index 2c09f5082746..4636e23131d7 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/ContactAssetResource.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/ContactAssetResource.java @@ -11,7 +11,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -20,12 +19,6 @@ @Immutable public final class ContactAssetResource extends AssetResource { - /* - * Discriminator property for AssetResource. - */ - @Generated - private String kind = "contact"; - /* * asset */ @@ -112,17 +105,7 @@ public final class ContactAssetResource extends AssetResource { @Generated private ContactAssetResource(ContactAsset asset) { this.asset = asset; - } - - /** - * Get the kind property: Discriminator property for AssetResource. - * - * @return the kind value. - */ - @Generated - @Override - public String getKind() { - return this.kind; + this.kind = "contact"; } /** @@ -276,22 +259,8 @@ public String getReason() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getName()); - jsonWriter.writeStringField("displayName", getDisplayName()); - jsonWriter.writeStringField("uuid", getUuid()); - jsonWriter.writeStringField("createdDate", - getCreatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreatedDate())); - jsonWriter.writeStringField("updatedDate", - getUpdatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getUpdatedDate())); - jsonWriter.writeStringField("state", getState() == null ? null : getState().toString()); - jsonWriter.writeStringField("externalId", getExternalId()); - jsonWriter.writeArrayField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeBooleanField("wildcard", isWildcard()); - jsonWriter.writeStringField("discoGroupName", getDiscoGroupName()); - jsonWriter.writeArrayField("auditTrail", getAuditTrail(), (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("reason", getReason()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("asset", this.asset); - jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/DataConnection.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/DataConnection.java index 2b218f6c398f..e3d2725166c9 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/DataConnection.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/DataConnection.java @@ -23,7 +23,7 @@ public class DataConnection implements JsonSerializable { * Discriminator property for DataConnection. */ @Generated - private String kind = "DataConnection"; + String kind; /* * The system generated unique id for the resource. @@ -96,6 +96,7 @@ public class DataConnection implements JsonSerializable { */ @Generated protected DataConnection() { + this.kind = "DataConnection"; } /** @@ -357,13 +358,7 @@ DataConnection setInactiveMessage(String inactiveMessage) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("kind", this.kind); - jsonWriter.writeStringField("id", this.id); - jsonWriter.writeStringField("displayName", this.displayName); - jsonWriter.writeStringField("content", this.content == null ? null : this.content.toString()); - jsonWriter.writeStringField("frequency", this.frequency == null ? null : this.frequency.toString()); - jsonWriter.writeNumberField("frequencyOffset", this.frequencyOffset); - jsonWriter.writeBooleanField("active", this.active); + toJsonShared(jsonWriter); return jsonWriter.writeEndObject(); } @@ -412,38 +407,67 @@ static DataConnection fromJsonKnownDiscriminator(JsonReader jsonReader) throws I while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("name".equals(fieldName)) { - deserializedDataConnection.name = reader.getString(); - } else if ("kind".equals(fieldName)) { - deserializedDataConnection.kind = reader.getString(); - } else if ("id".equals(fieldName)) { - deserializedDataConnection.id = reader.getString(); - } else if ("displayName".equals(fieldName)) { - deserializedDataConnection.displayName = reader.getString(); - } else if ("content".equals(fieldName)) { - deserializedDataConnection.content = DataConnectionContent.fromString(reader.getString()); - } else if ("createdDate".equals(fieldName)) { - deserializedDataConnection.createdDate = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("frequency".equals(fieldName)) { - deserializedDataConnection.frequency = DataConnectionFrequency.fromString(reader.getString()); - } else if ("frequencyOffset".equals(fieldName)) { - deserializedDataConnection.frequencyOffset = reader.getNullable(JsonReader::getInt); - } else if ("updatedDate".equals(fieldName)) { - deserializedDataConnection.updatedDate = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("userUpdatedAt".equals(fieldName)) { - deserializedDataConnection.userUpdatedAt = reader - .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); - } else if ("active".equals(fieldName)) { - deserializedDataConnection.active = reader.getNullable(JsonReader::getBoolean); - } else if ("inactiveMessage".equals(fieldName)) { - deserializedDataConnection.inactiveMessage = reader.getString(); - } else { + if (!DataConnection.fromJsonShared(reader, fieldName, deserializedDataConnection)) { reader.skipChildren(); } } return deserializedDataConnection; }); } + + void toJsonShared(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStringField("kind", this.kind); + jsonWriter.writeStringField("id", this.id); + jsonWriter.writeStringField("displayName", this.displayName); + jsonWriter.writeStringField("content", this.content == null ? null : this.content.toString()); + jsonWriter.writeStringField("frequency", this.frequency == null ? null : this.frequency.toString()); + jsonWriter.writeNumberField("frequencyOffset", this.frequencyOffset); + jsonWriter.writeBooleanField("active", this.active); + } + + @Generated + static boolean fromJsonShared(JsonReader reader, String fieldName, DataConnection deserializedDataConnection) + throws IOException { + if ("name".equals(fieldName)) { + deserializedDataConnection.name = reader.getString(); + return true; + } else if ("kind".equals(fieldName)) { + deserializedDataConnection.kind = reader.getString(); + return true; + } else if ("id".equals(fieldName)) { + deserializedDataConnection.id = reader.getString(); + return true; + } else if ("displayName".equals(fieldName)) { + deserializedDataConnection.displayName = reader.getString(); + return true; + } else if ("content".equals(fieldName)) { + deserializedDataConnection.content = DataConnectionContent.fromString(reader.getString()); + return true; + } else if ("createdDate".equals(fieldName)) { + deserializedDataConnection.createdDate + = reader.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + return true; + } else if ("frequency".equals(fieldName)) { + deserializedDataConnection.frequency = DataConnectionFrequency.fromString(reader.getString()); + return true; + } else if ("frequencyOffset".equals(fieldName)) { + deserializedDataConnection.frequencyOffset = reader.getNullable(JsonReader::getInt); + return true; + } else if ("updatedDate".equals(fieldName)) { + deserializedDataConnection.updatedDate + = reader.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + return true; + } else if ("userUpdatedAt".equals(fieldName)) { + deserializedDataConnection.userUpdatedAt + = reader.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())); + return true; + } else if ("active".equals(fieldName)) { + deserializedDataConnection.active = reader.getNullable(JsonReader::getBoolean); + return true; + } else if ("inactiveMessage".equals(fieldName)) { + deserializedDataConnection.inactiveMessage = reader.getString(); + return true; + } + return false; + } } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/DataConnectionData.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/DataConnectionData.java index 8097bf4d0d40..a7fb2234c2f2 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/DataConnectionData.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/DataConnectionData.java @@ -21,7 +21,7 @@ public class DataConnectionData implements JsonSerializable * Discriminator property for DataConnectionData. */ @Generated - private String kind = "DataConnectionData"; + String kind; /* * The name of data connection @@ -52,6 +52,7 @@ public class DataConnectionData implements JsonSerializable */ @Generated public DataConnectionData() { + this.kind = "DataConnectionData"; } /** @@ -159,11 +160,7 @@ public DataConnectionData setFrequencyOffset(Integer frequencyOffset) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("kind", this.kind); - jsonWriter.writeStringField("name", this.name); - jsonWriter.writeStringField("content", this.content == null ? null : this.content.toString()); - jsonWriter.writeStringField("frequency", this.frequency == null ? null : this.frequency.toString()); - jsonWriter.writeNumberField("frequencyOffset", this.frequencyOffset); + toJsonShared(jsonWriter); return jsonWriter.writeEndObject(); } @@ -211,21 +208,41 @@ static DataConnectionData fromJsonKnownDiscriminator(JsonReader jsonReader) thro while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("kind".equals(fieldName)) { - deserializedDataConnectionData.kind = reader.getString(); - } else if ("name".equals(fieldName)) { - deserializedDataConnectionData.name = reader.getString(); - } else if ("content".equals(fieldName)) { - deserializedDataConnectionData.content = DataConnectionContent.fromString(reader.getString()); - } else if ("frequency".equals(fieldName)) { - deserializedDataConnectionData.frequency = DataConnectionFrequency.fromString(reader.getString()); - } else if ("frequencyOffset".equals(fieldName)) { - deserializedDataConnectionData.frequencyOffset = reader.getNullable(JsonReader::getInt); - } else { + if (!DataConnectionData.fromJsonShared(reader, fieldName, deserializedDataConnectionData)) { reader.skipChildren(); } } return deserializedDataConnectionData; }); } + + void toJsonShared(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStringField("kind", this.kind); + jsonWriter.writeStringField("name", this.name); + jsonWriter.writeStringField("content", this.content == null ? null : this.content.toString()); + jsonWriter.writeStringField("frequency", this.frequency == null ? null : this.frequency.toString()); + jsonWriter.writeNumberField("frequencyOffset", this.frequencyOffset); + } + + @Generated + static boolean fromJsonShared(JsonReader reader, String fieldName, + DataConnectionData deserializedDataConnectionData) throws IOException { + if ("kind".equals(fieldName)) { + deserializedDataConnectionData.kind = reader.getString(); + return true; + } else if ("name".equals(fieldName)) { + deserializedDataConnectionData.name = reader.getString(); + return true; + } else if ("content".equals(fieldName)) { + deserializedDataConnectionData.content = DataConnectionContent.fromString(reader.getString()); + return true; + } else if ("frequency".equals(fieldName)) { + deserializedDataConnectionData.frequency = DataConnectionFrequency.fromString(reader.getString()); + return true; + } else if ("frequencyOffset".equals(fieldName)) { + deserializedDataConnectionData.frequencyOffset = reader.getNullable(JsonReader::getInt); + return true; + } + return false; + } } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/DomainAssetResource.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/DomainAssetResource.java index 2f5bbac37775..6850580db987 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/DomainAssetResource.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/DomainAssetResource.java @@ -11,7 +11,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -20,12 +19,6 @@ @Immutable public final class DomainAssetResource extends AssetResource { - /* - * Discriminator property for AssetResource. - */ - @Generated - private String kind = "domain"; - /* * asset */ @@ -112,17 +105,7 @@ public final class DomainAssetResource extends AssetResource { @Generated private DomainAssetResource(DomainAsset asset) { this.asset = asset; - } - - /** - * Get the kind property: Discriminator property for AssetResource. - * - * @return the kind value. - */ - @Generated - @Override - public String getKind() { - return this.kind; + this.kind = "domain"; } /** @@ -276,22 +259,8 @@ public String getReason() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getName()); - jsonWriter.writeStringField("displayName", getDisplayName()); - jsonWriter.writeStringField("uuid", getUuid()); - jsonWriter.writeStringField("createdDate", - getCreatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreatedDate())); - jsonWriter.writeStringField("updatedDate", - getUpdatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getUpdatedDate())); - jsonWriter.writeStringField("state", getState() == null ? null : getState().toString()); - jsonWriter.writeStringField("externalId", getExternalId()); - jsonWriter.writeArrayField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeBooleanField("wildcard", isWildcard()); - jsonWriter.writeStringField("discoGroupName", getDiscoGroupName()); - jsonWriter.writeArrayField("auditTrail", getAuditTrail(), (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("reason", getReason()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("asset", this.asset); - jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/HostAssetResource.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/HostAssetResource.java index 4fab520c2f17..265eb1a75781 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/HostAssetResource.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/HostAssetResource.java @@ -11,7 +11,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -20,12 +19,6 @@ @Immutable public final class HostAssetResource extends AssetResource { - /* - * Discriminator property for AssetResource. - */ - @Generated - private String kind = "host"; - /* * asset */ @@ -112,17 +105,7 @@ public final class HostAssetResource extends AssetResource { @Generated private HostAssetResource(HostAsset asset) { this.asset = asset; - } - - /** - * Get the kind property: Discriminator property for AssetResource. - * - * @return the kind value. - */ - @Generated - @Override - public String getKind() { - return this.kind; + this.kind = "host"; } /** @@ -276,22 +259,8 @@ public String getReason() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getName()); - jsonWriter.writeStringField("displayName", getDisplayName()); - jsonWriter.writeStringField("uuid", getUuid()); - jsonWriter.writeStringField("createdDate", - getCreatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreatedDate())); - jsonWriter.writeStringField("updatedDate", - getUpdatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getUpdatedDate())); - jsonWriter.writeStringField("state", getState() == null ? null : getState().toString()); - jsonWriter.writeStringField("externalId", getExternalId()); - jsonWriter.writeArrayField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeBooleanField("wildcard", isWildcard()); - jsonWriter.writeStringField("discoGroupName", getDiscoGroupName()); - jsonWriter.writeArrayField("auditTrail", getAuditTrail(), (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("reason", getReason()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("asset", this.asset); - jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/IpAddressAssetResource.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/IpAddressAssetResource.java index 491165d8afc8..4df0350f7c6d 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/IpAddressAssetResource.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/IpAddressAssetResource.java @@ -11,7 +11,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -20,12 +19,6 @@ @Immutable public final class IpAddressAssetResource extends AssetResource { - /* - * Discriminator property for AssetResource. - */ - @Generated - private String kind = "ipAddress"; - /* * asset */ @@ -112,17 +105,7 @@ public final class IpAddressAssetResource extends AssetResource { @Generated private IpAddressAssetResource(IpAddressAsset asset) { this.asset = asset; - } - - /** - * Get the kind property: Discriminator property for AssetResource. - * - * @return the kind value. - */ - @Generated - @Override - public String getKind() { - return this.kind; + this.kind = "ipAddress"; } /** @@ -276,22 +259,8 @@ public String getReason() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getName()); - jsonWriter.writeStringField("displayName", getDisplayName()); - jsonWriter.writeStringField("uuid", getUuid()); - jsonWriter.writeStringField("createdDate", - getCreatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreatedDate())); - jsonWriter.writeStringField("updatedDate", - getUpdatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getUpdatedDate())); - jsonWriter.writeStringField("state", getState() == null ? null : getState().toString()); - jsonWriter.writeStringField("externalId", getExternalId()); - jsonWriter.writeArrayField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeBooleanField("wildcard", isWildcard()); - jsonWriter.writeStringField("discoGroupName", getDiscoGroupName()); - jsonWriter.writeArrayField("auditTrail", getAuditTrail(), (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("reason", getReason()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("asset", this.asset); - jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/IpBlockAssetResource.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/IpBlockAssetResource.java index 2d7b9c03ef9b..f638a7ab7356 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/IpBlockAssetResource.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/IpBlockAssetResource.java @@ -11,7 +11,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -20,12 +19,6 @@ @Immutable public final class IpBlockAssetResource extends AssetResource { - /* - * Discriminator property for AssetResource. - */ - @Generated - private String kind = "ipBlock"; - /* * asset */ @@ -112,17 +105,7 @@ public final class IpBlockAssetResource extends AssetResource { @Generated private IpBlockAssetResource(IpBlockAsset asset) { this.asset = asset; - } - - /** - * Get the kind property: Discriminator property for AssetResource. - * - * @return the kind value. - */ - @Generated - @Override - public String getKind() { - return this.kind; + this.kind = "ipBlock"; } /** @@ -276,22 +259,8 @@ public String getReason() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getName()); - jsonWriter.writeStringField("displayName", getDisplayName()); - jsonWriter.writeStringField("uuid", getUuid()); - jsonWriter.writeStringField("createdDate", - getCreatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreatedDate())); - jsonWriter.writeStringField("updatedDate", - getUpdatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getUpdatedDate())); - jsonWriter.writeStringField("state", getState() == null ? null : getState().toString()); - jsonWriter.writeStringField("externalId", getExternalId()); - jsonWriter.writeArrayField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeBooleanField("wildcard", isWildcard()); - jsonWriter.writeStringField("discoGroupName", getDiscoGroupName()); - jsonWriter.writeArrayField("auditTrail", getAuditTrail(), (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("reason", getReason()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("asset", this.asset); - jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/LogAnalyticsDataConnection.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/LogAnalyticsDataConnection.java index 5d664a843f27..91bc3972fffb 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/LogAnalyticsDataConnection.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/LogAnalyticsDataConnection.java @@ -18,12 +18,6 @@ @Immutable public final class LogAnalyticsDataConnection extends DataConnection { - /* - * Discriminator property for DataConnection. - */ - @Generated - private String kind = "logAnalytics"; - /* * properties */ @@ -98,17 +92,7 @@ public final class LogAnalyticsDataConnection extends DataConnection { @Generated private LogAnalyticsDataConnection(LogAnalyticsDataConnectionProperties properties) { this.properties = properties; - } - - /** - * Get the kind property: Discriminator property for DataConnection. - * - * @return the kind value. - */ - @Generated - @Override - public String getKind() { - return this.kind; + this.kind = "logAnalytics"; } /** @@ -238,14 +222,8 @@ public String getInactiveMessage() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("id", getId()); - jsonWriter.writeStringField("displayName", getDisplayName()); - jsonWriter.writeStringField("content", getContent() == null ? null : getContent().toString()); - jsonWriter.writeStringField("frequency", getFrequency() == null ? null : getFrequency().toString()); - jsonWriter.writeNumberField("frequencyOffset", getFrequencyOffset()); - jsonWriter.writeBooleanField("active", isActive()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("properties", this.properties); - jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/LogAnalyticsDataConnectionData.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/LogAnalyticsDataConnectionData.java index 63354816b6fd..9ec99e42ef73 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/LogAnalyticsDataConnectionData.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/LogAnalyticsDataConnectionData.java @@ -16,12 +16,6 @@ @Fluent public final class LogAnalyticsDataConnectionData extends DataConnectionData { - /* - * Discriminator property for DataConnectionData. - */ - @Generated - private String kind = "logAnalytics"; - /* * properties */ @@ -36,17 +30,7 @@ public final class LogAnalyticsDataConnectionData extends DataConnectionData { @Generated public LogAnalyticsDataConnectionData(LogAnalyticsDataConnectionProperties properties) { this.properties = properties; - } - - /** - * Get the kind property: Discriminator property for DataConnectionData. - * - * @return the kind value. - */ - @Generated - @Override - public String getKind() { - return this.kind; + this.kind = "logAnalytics"; } /** @@ -106,12 +90,8 @@ public LogAnalyticsDataConnectionData setFrequencyOffset(Integer frequencyOffset @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getName()); - jsonWriter.writeStringField("content", getContent() == null ? null : getContent().toString()); - jsonWriter.writeStringField("frequency", getFrequency() == null ? null : getFrequency().toString()); - jsonWriter.writeNumberField("frequencyOffset", getFrequencyOffset()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("properties", this.properties); - jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/PageAssetResource.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/PageAssetResource.java index f4fc9f68f3a4..f622dde548bd 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/PageAssetResource.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/PageAssetResource.java @@ -11,7 +11,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -20,12 +19,6 @@ @Immutable public final class PageAssetResource extends AssetResource { - /* - * Discriminator property for AssetResource. - */ - @Generated - private String kind = "page"; - /* * asset */ @@ -112,17 +105,7 @@ public final class PageAssetResource extends AssetResource { @Generated private PageAssetResource(PageAsset asset) { this.asset = asset; - } - - /** - * Get the kind property: Discriminator property for AssetResource. - * - * @return the kind value. - */ - @Generated - @Override - public String getKind() { - return this.kind; + this.kind = "page"; } /** @@ -276,22 +259,8 @@ public String getReason() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getName()); - jsonWriter.writeStringField("displayName", getDisplayName()); - jsonWriter.writeStringField("uuid", getUuid()); - jsonWriter.writeStringField("createdDate", - getCreatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreatedDate())); - jsonWriter.writeStringField("updatedDate", - getUpdatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getUpdatedDate())); - jsonWriter.writeStringField("state", getState() == null ? null : getState().toString()); - jsonWriter.writeStringField("externalId", getExternalId()); - jsonWriter.writeArrayField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeBooleanField("wildcard", isWildcard()); - jsonWriter.writeStringField("discoGroupName", getDiscoGroupName()); - jsonWriter.writeArrayField("auditTrail", getAuditTrail(), (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("reason", getReason()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("asset", this.asset); - jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/SslCertAssetResource.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/SslCertAssetResource.java index adb84552d0c9..6d149c6a3b39 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/SslCertAssetResource.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/SslCertAssetResource.java @@ -11,7 +11,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -20,12 +19,6 @@ @Immutable public final class SslCertAssetResource extends AssetResource { - /* - * Discriminator property for AssetResource. - */ - @Generated - private String kind = "sslCert"; - /* * asset */ @@ -112,17 +105,7 @@ public final class SslCertAssetResource extends AssetResource { @Generated private SslCertAssetResource(SslCertAsset asset) { this.asset = asset; - } - - /** - * Get the kind property: Discriminator property for AssetResource. - * - * @return the kind value. - */ - @Generated - @Override - public String getKind() { - return this.kind; + this.kind = "sslCert"; } /** @@ -276,22 +259,8 @@ public String getReason() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeStringField("name", getName()); - jsonWriter.writeStringField("displayName", getDisplayName()); - jsonWriter.writeStringField("uuid", getUuid()); - jsonWriter.writeStringField("createdDate", - getCreatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getCreatedDate())); - jsonWriter.writeStringField("updatedDate", - getUpdatedDate() == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(getUpdatedDate())); - jsonWriter.writeStringField("state", getState() == null ? null : getState().toString()); - jsonWriter.writeStringField("externalId", getExternalId()); - jsonWriter.writeArrayField("labels", getLabels(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeBooleanField("wildcard", isWildcard()); - jsonWriter.writeStringField("discoGroupName", getDiscoGroupName()); - jsonWriter.writeArrayField("auditTrail", getAuditTrail(), (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("reason", getReason()); + toJsonShared(jsonWriter); jsonWriter.writeJsonField("asset", this.asset); - jsonWriter.writeStringField("kind", this.kind); return jsonWriter.writeEndObject(); } diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionAsyncClient.java b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionAsyncClient.java index 8e34f8333d0f..42ad631a5180 100644 --- a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionAsyncClient.java +++ b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionAsyncClient.java @@ -68,7 +68,7 @@ public final class FaceSessionAsyncClient { * retrieve a result, use the Get Liveness Session. To audit the individual requests that a client has made to your * resource, use the List Liveness Session Audit Entries. *

Request Body Schema

- * + * * 
{@code
      * {
      *     livenessOperationMode: String(Passive/PassiveActive) (Required)
@@ -80,9 +80,9 @@ public final class FaceSessionAsyncClient {
      *     authTokenTimeToLiveInSeconds: Integer (Optional)
      * }
      * }
- * + * *

Response Body Schema

- * + * * 
{@code
      * {
      *     sessionId: String (Required)
@@ -132,7 +132,7 @@ public Mono> deleteLivenessSessionWithResponse(String sessionId,
     /**
      * Get session result of detectLiveness/singleModal call.
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * {
      *     id: String (Required)
@@ -225,7 +225,7 @@ public Mono> getLivenessSessionResultWithResponse(String se
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * [
      *      (Required){
@@ -265,7 +265,7 @@ public Mono> getLivenessSessionsWithResponse(RequestOptions
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * [
      *      (Required){
@@ -361,7 +361,7 @@ public Mono> getLivenessSessionAuditEntriesWithResponse(Str
      * > [!NOTE]
      * > Extra measures should be taken to validate that the client is sending the expected VerifyImage.
      * 
Request Body Schema

-     *
+     * 
      * 
{@code
      * {
      *     livenessOperationMode: String(Passive/PassiveActive) (Required)
@@ -375,9 +375,9 @@ public Mono> getLivenessSessionAuditEntriesWithResponse(Str
      *     verifyConfidenceThreshold: Double (Optional)
      * }
      * }

-     *
+     * 
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * {
      *     sessionId: String (Required)
@@ -434,7 +434,7 @@ Mono> createLivenessWithVerifySessionWithResponse(BinaryDat
      *
      * Recommended Option: VerifyImage is provided during session creation.
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * {
      *     sessionId: String (Required)
@@ -496,7 +496,7 @@ public Mono> deleteLivenessWithVerifySessionWithResponse(String s
     /**
      * Get session result of detectLivenessWithVerify/singleModal call.
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * {
      *     id: String (Required)
@@ -589,7 +589,7 @@ public Mono> getLivenessWithVerifySessionResultWithResponse
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * [
      *      (Required){
@@ -629,7 +629,7 @@ public Mono> getLivenessWithVerifySessionsWithResponse(Requ
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * [
      *      (Required){
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClient.java b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClient.java
index a915481c0c7d..87aef94402d2 100644
--- a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClient.java
+++ b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClient.java
@@ -66,7 +66,7 @@ public final class FaceSessionClient {
      * retrieve a result, use the Get Liveness Session. To audit the individual requests that a client has made to your
      * resource, use the List Liveness Session Audit Entries.
      * 
Request Body Schema

-     *
+     * 
      * 
{@code
      * {
      *     livenessOperationMode: String(Passive/PassiveActive) (Required)
@@ -78,9 +78,9 @@ public final class FaceSessionClient {
      *     authTokenTimeToLiveInSeconds: Integer (Optional)
      * }
      * }

-     *
+     * 
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * {
      *     sessionId: String (Required)
@@ -128,7 +128,7 @@ public Response deleteLivenessSessionWithResponse(String sessionId, Reques
     /**
      * Get session result of detectLiveness/singleModal call.
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * {
      *     id: String (Required)
@@ -219,7 +219,7 @@ public Response getLivenessSessionResultWithResponse(String sessionI
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * [
      *      (Required){
@@ -259,7 +259,7 @@ public Response getLivenessSessionsWithResponse(RequestOptions reque
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * [
      *      (Required){
@@ -354,7 +354,7 @@ public Response getLivenessSessionAuditEntriesWithResponse(String se
      * > [!NOTE]
      * > Extra measures should be taken to validate that the client is sending the expected VerifyImage.
      * 
Request Body Schema

-     *
+     * 
      * 
{@code
      * {
      *     livenessOperationMode: String(Passive/PassiveActive) (Required)
@@ -368,9 +368,9 @@ public Response getLivenessSessionAuditEntriesWithResponse(String se
      *     verifyConfidenceThreshold: Double (Optional)
      * }
      * }

-     *
+     * 
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * {
      *     sessionId: String (Required)
@@ -425,7 +425,7 @@ Response createLivenessWithVerifySessionWithResponse(BinaryData body
      *
      * Recommended Option: VerifyImage is provided during session creation.
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * {
      *     sessionId: String (Required)
@@ -485,7 +485,7 @@ public Response deleteLivenessWithVerifySessionWithResponse(String session
     /**
      * Get session result of detectLivenessWithVerify/singleModal call.
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * {
      *     id: String (Required)
@@ -577,7 +577,7 @@ public Response getLivenessWithVerifySessionResultWithResponse(Strin
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * [
      *      (Required){
@@ -617,7 +617,7 @@ public Response getLivenessWithVerifySessionsWithResponse(RequestOpt
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     *
+     * 
      * 
{@code
      * [
      *      (Required){
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesCreateSamples.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesCreateSamples.java
index edf2c535ff4c..02a48b7c2219 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesCreateSamples.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesCreateSamples.java
@@ -16,9 +16,7 @@
  */
 public final class DeidServicesCreateSamples {
     /*
-     * x-ms-original-file:
-     * specification/healthdataaiservices/HealthDataAIServices.Management/examples/2024-02-28-preview/
-     * DeidServices_Create_MaximumSet_Gen.json
+     * x-ms-original-file: 2024-02-28-preview/DeidServices_Create_MaximumSet_Gen.json
      */
     /**
      * Sample code: DeidServices_Create - generated by [MaximumSet] rule - generated by [MaximumSet] rule.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesDeleteSamples.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesDeleteSamples.java
index 0dfecb6471e3..0dd284c4de18 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesDeleteSamples.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesDeleteSamples.java
@@ -9,9 +9,7 @@
  */
 public final class DeidServicesDeleteSamples {
     /*
-     * x-ms-original-file:
-     * specification/healthdataaiservices/HealthDataAIServices.Management/examples/2024-02-28-preview/
-     * DeidServices_Delete_MaximumSet_Gen.json
+     * x-ms-original-file: 2024-02-28-preview/DeidServices_Delete_MaximumSet_Gen.json
      */
     /**
      * Sample code: DeidServices_Delete - generated by [MaximumSet] rule - generated by [MaximumSet] rule.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesGetByResourceGroupSamples.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesGetByResourceGroupSamples.java
index 76fa2f34bf58..0d9d68277139 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesGetByResourceGroupSamples.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesGetByResourceGroupSamples.java
@@ -9,9 +9,7 @@
  */
 public final class DeidServicesGetByResourceGroupSamples {
     /*
-     * x-ms-original-file:
-     * specification/healthdataaiservices/HealthDataAIServices.Management/examples/2024-02-28-preview/
-     * DeidServices_Get_MaximumSet_Gen.json
+     * x-ms-original-file: 2024-02-28-preview/DeidServices_Get_MaximumSet_Gen.json
      */
     /**
      * Sample code: DeidServices_Get - generated by [MaximumSet] rule - generated by [MaximumSet] rule.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesListByResourceGroupSamples.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesListByResourceGroupSamples.java
index 7683262e19ad..4083ad058eb5 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesListByResourceGroupSamples.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesListByResourceGroupSamples.java
@@ -9,9 +9,7 @@
  */
 public final class DeidServicesListByResourceGroupSamples {
     /*
-     * x-ms-original-file:
-     * specification/healthdataaiservices/HealthDataAIServices.Management/examples/2024-02-28-preview/
-     * DeidServices_ListByResourceGroup_MaximumSet_Gen.json
+     * x-ms-original-file: 2024-02-28-preview/DeidServices_ListByResourceGroup_MaximumSet_Gen.json
      */
     /**
      * Sample code: DeidServices_ListByResourceGroup - generated by [MaximumSet] rule - generated by [MaximumSet] rule.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesListSamples.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesListSamples.java
index c121db762060..2d8161cfc7b4 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesListSamples.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesListSamples.java
@@ -9,9 +9,7 @@
  */
 public final class DeidServicesListSamples {
     /*
-     * x-ms-original-file:
-     * specification/healthdataaiservices/HealthDataAIServices.Management/examples/2024-02-28-preview/
-     * DeidServices_ListBySubscription_MaximumSet_Gen.json
+     * x-ms-original-file: 2024-02-28-preview/DeidServices_ListBySubscription_MaximumSet_Gen.json
      */
     /**
      * Sample code: DeidServices_ListBySubscription - generated by [MaximumSet] rule - generated by [MaximumSet] rule.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesUpdateSamples.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesUpdateSamples.java
index 2b66f76d37e9..703f4d53e4ba 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesUpdateSamples.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/DeidServicesUpdateSamples.java
@@ -17,9 +17,7 @@
  */
 public final class DeidServicesUpdateSamples {
     /*
-     * x-ms-original-file:
-     * specification/healthdataaiservices/HealthDataAIServices.Management/examples/2024-02-28-preview/
-     * DeidServices_Update_MaximumSet_Gen.json
+     * x-ms-original-file: 2024-02-28-preview/DeidServices_Update_MaximumSet_Gen.json
      */
     /**
      * Sample code: DeidServices_Update - generated by [MaximumSet] rule - generated by [MaximumSet] rule.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/OperationsListSamples.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/OperationsListSamples.java
index 84785bb13f92..3f8f5017c822 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/OperationsListSamples.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/OperationsListSamples.java
@@ -9,9 +9,7 @@
  */
 public final class OperationsListSamples {
     /*
-     * x-ms-original-file:
-     * specification/healthdataaiservices/HealthDataAIServices.Management/examples/2024-02-28-preview/
-     * Operations_List_MinimumSet_Gen.json
+     * x-ms-original-file: 2024-02-28-preview/Operations_List_MinimumSet_Gen.json
      */
     /**
      * Sample code: Operations_List_MaximumSet - generated by [MaximumSet] rule - generated by [MinimumSet] rule.
@@ -24,9 +22,7 @@ public static void operationsListMaximumSetGeneratedByMaximumSetRuleGeneratedByM
     }
 
     /*
-     * x-ms-original-file:
-     * specification/healthdataaiservices/HealthDataAIServices.Management/examples/2024-02-28-preview/
-     * Operations_List_MaximumSet_Gen.json
+     * x-ms-original-file: 2024-02-28-preview/Operations_List_MaximumSet_Gen.json
      */
     /**
      * Sample code: Operations_List_MaximumSet - generated by [MaximumSet] rule - generated by [MaximumSet] rule.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsCreateSamples.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsCreateSamples.java
index 0509db49f3f6..0de87f03f2d1 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsCreateSamples.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsCreateSamples.java
@@ -14,9 +14,7 @@
  */
 public final class PrivateEndpointConnectionsCreateSamples {
     /*
-     * x-ms-original-file:
-     * specification/healthdataaiservices/HealthDataAIServices.Management/examples/2024-02-28-preview/
-     * PrivateEndpointConnections_Create_MaximumSet_Gen.json
+     * x-ms-original-file: 2024-02-28-preview/PrivateEndpointConnections_Create_MaximumSet_Gen.json
      */
     /**
      * Sample code: PrivateEndpointConnections_Create - generated by [MaximumSet] rule - generated by [MaximumSet] rule.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsDeleteSamples.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsDeleteSamples.java
index f53c998278b5..851eeb771d0e 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsDeleteSamples.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsDeleteSamples.java
@@ -9,9 +9,7 @@
  */
 public final class PrivateEndpointConnectionsDeleteSamples {
     /*
-     * x-ms-original-file:
-     * specification/healthdataaiservices/HealthDataAIServices.Management/examples/2024-02-28-preview/
-     * PrivateEndpointConnections_Delete_MaximumSet_Gen.json
+     * x-ms-original-file: 2024-02-28-preview/PrivateEndpointConnections_Delete_MaximumSet_Gen.json
      */
     /**
      * Sample code: PrivateEndpointConnections_Delete - generated by [MaximumSet] rule - generated by [MaximumSet] rule.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsGetSamples.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsGetSamples.java
index 60b8cf5e8193..479361c18349 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsGetSamples.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsGetSamples.java
@@ -9,9 +9,7 @@
  */
 public final class PrivateEndpointConnectionsGetSamples {
     /*
-     * x-ms-original-file:
-     * specification/healthdataaiservices/HealthDataAIServices.Management/examples/2024-02-28-preview/
-     * PrivateEndpointConnections_Get_MaximumSet_Gen.json
+     * x-ms-original-file: 2024-02-28-preview/PrivateEndpointConnections_Get_MaximumSet_Gen.json
      */
     /**
      * Sample code: PrivateEndpointConnections_Get - generated by [MaximumSet] rule - generated by [MaximumSet] rule.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsListByDeidServiceSamples.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsListByDeidServiceSamples.java
index b42c15ea5f62..e5f7a52a0514 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsListByDeidServiceSamples.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateEndpointConnectionsListByDeidServiceSamples.java
@@ -9,9 +9,7 @@
  */
 public final class PrivateEndpointConnectionsListByDeidServiceSamples {
     /*
-     * x-ms-original-file:
-     * specification/healthdataaiservices/HealthDataAIServices.Management/examples/2024-02-28-preview/
-     * PrivateEndpointConnections_ListByDeidService_MaximumSet_Gen.json
+     * x-ms-original-file: 2024-02-28-preview/PrivateEndpointConnections_ListByDeidService_MaximumSet_Gen.json
      */
     /**
      * Sample code: PrivateEndpointConnections_ListByDeidService - generated by [MaximumSet] rule.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateLinksListByDeidServiceSamples.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateLinksListByDeidServiceSamples.java
index 70ccbc9f328b..576dd737b9ab 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateLinksListByDeidServiceSamples.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/samples/java/com/azure/resourcemanager/healthdataaiservices/generated/PrivateLinksListByDeidServiceSamples.java
@@ -9,9 +9,7 @@
  */
 public final class PrivateLinksListByDeidServiceSamples {
     /*
-     * x-ms-original-file:
-     * specification/healthdataaiservices/HealthDataAIServices.Management/examples/2024-02-28-preview/
-     * PrivateLinks_ListByDeidService_MaximumSet_Gen.json
+     * x-ms-original-file: 2024-02-28-preview/PrivateLinks_ListByDeidService_MaximumSet_Gen.json
      */
     /**
      * Sample code: PrivateLinks_ListByDeidService - generated by [MaximumSet] rule - generated by [MaximumSet] rule.
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsAsyncClient.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsAsyncClient.java
index bc4cd3dc1c76..d21584235cdd 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsAsyncClient.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsAsyncClient.java
@@ -15,9 +15,12 @@
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.health.insights.radiologyinsights.implementation.RadiologyInsightsClientImpl;
-import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsData;
+import com.azure.health.insights.radiologyinsights.implementation.models.InferRadiologyInsightsRequest;
+import com.azure.health.insights.radiologyinsights.models.PatientRecord;
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInferenceResult;
+import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsModelConfiguration;
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsResult;
+import java.util.List;
 
 /**
  * Initializes a new instance of the asynchronous RadiologyInsightsClient type.
@@ -390,7 +393,7 @@ public final class RadiologyInsightsAsyncClient {
      * }
      * }

      *
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -400,9 +403,9 @@ public final class RadiologyInsightsAsyncClient {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public PollerFlux beginInferRadiologyInsights(BinaryData radiologyInsightsData,
+    public PollerFlux beginInferRadiologyInsights(BinaryData inferRadiologyInsightsRequest,
         RequestOptions requestOptions) {
-        return this.serviceClient.beginInferRadiologyInsightsAsync(radiologyInsightsData, requestOptions);
+        return this.serviceClient.beginInferRadiologyInsightsAsync(inferRadiologyInsightsRequest, requestOptions);
     }
 
     /**
@@ -410,7 +413,8 @@ public PollerFlux beginInferRadiologyInsights(BinaryData
      *
      * Creates a Radiology Insights job with the given request body.
      *
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param patients The list of patients, including their clinical information and data.
+     * @param configuration Configuration affecting the Radiology Insights model's inference.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -422,10 +426,37 @@ public PollerFlux beginInferRadiologyInsights(BinaryData
     @Generated
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public PollerFlux
-        beginInferRadiologyInsights(RadiologyInsightsData radiologyInsightsData) {
+        beginInferRadiologyInsights(List patients, RadiologyInsightsModelConfiguration configuration) {
         // Generated convenience method for beginInferRadiologyInsightsWithModel
         RequestOptions requestOptions = new RequestOptions();
-        return serviceClient.beginInferRadiologyInsightsWithModelAsync(BinaryData.fromObject(radiologyInsightsData),
-            requestOptions);
+        InferRadiologyInsightsRequest inferRadiologyInsightsRequestObj
+            = new InferRadiologyInsightsRequest(patients).setConfiguration(configuration);
+        BinaryData inferRadiologyInsightsRequest = BinaryData.fromObject(inferRadiologyInsightsRequestObj);
+        return serviceClient.beginInferRadiologyInsightsWithModelAsync(inferRadiologyInsightsRequest, requestOptions);
+    }
+
+    /**
+     * Create Radiology Insights job
+     *
+     * Creates a Radiology Insights job with the given request body.
+     *
+     * @param patients The list of patients, including their clinical information and data.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws HttpResponseException thrown if the request is rejected by server.
+     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
+     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
+     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of provides status details for long running operations.
+     */
+    @Generated
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux
+        beginInferRadiologyInsights(List patients) {
+        // Generated convenience method for beginInferRadiologyInsightsWithModel
+        RequestOptions requestOptions = new RequestOptions();
+        InferRadiologyInsightsRequest inferRadiologyInsightsRequestObj = new InferRadiologyInsightsRequest(patients);
+        BinaryData inferRadiologyInsightsRequest = BinaryData.fromObject(inferRadiologyInsightsRequestObj);
+        return serviceClient.beginInferRadiologyInsightsWithModelAsync(inferRadiologyInsightsRequest, requestOptions);
     }
 }
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsClient.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsClient.java
index 7de41efdfc19..658085ef0a84 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsClient.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsClient.java
@@ -15,9 +15,12 @@
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.health.insights.radiologyinsights.implementation.RadiologyInsightsClientImpl;
-import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsData;
+import com.azure.health.insights.radiologyinsights.implementation.models.InferRadiologyInsightsRequest;
+import com.azure.health.insights.radiologyinsights.models.PatientRecord;
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInferenceResult;
+import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsModelConfiguration;
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsResult;
+import java.util.List;
 
 /**
  * Initializes a new instance of the synchronous RadiologyInsightsClient type.
@@ -390,7 +393,7 @@ public final class RadiologyInsightsClient {
      * }
      * }

      *
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -400,9 +403,9 @@ public final class RadiologyInsightsClient {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller beginInferRadiologyInsights(BinaryData radiologyInsightsData,
+    public SyncPoller beginInferRadiologyInsights(BinaryData inferRadiologyInsightsRequest,
         RequestOptions requestOptions) {
-        return this.serviceClient.beginInferRadiologyInsights(radiologyInsightsData, requestOptions);
+        return this.serviceClient.beginInferRadiologyInsights(inferRadiologyInsightsRequest, requestOptions);
     }
 
     /**
@@ -410,7 +413,8 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      *
      * Creates a Radiology Insights job with the given request body.
      *
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param patients The list of patients, including their clinical information and data.
+     * @param configuration Configuration affecting the Radiology Insights model's inference.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -422,10 +426,37 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
     @Generated
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller
-        beginInferRadiologyInsights(RadiologyInsightsData radiologyInsightsData) {
+        beginInferRadiologyInsights(List patients, RadiologyInsightsModelConfiguration configuration) {
         // Generated convenience method for beginInferRadiologyInsightsWithModel
         RequestOptions requestOptions = new RequestOptions();
-        return serviceClient.beginInferRadiologyInsightsWithModel(BinaryData.fromObject(radiologyInsightsData),
-            requestOptions);
+        InferRadiologyInsightsRequest inferRadiologyInsightsRequestObj
+            = new InferRadiologyInsightsRequest(patients).setConfiguration(configuration);
+        BinaryData inferRadiologyInsightsRequest = BinaryData.fromObject(inferRadiologyInsightsRequestObj);
+        return serviceClient.beginInferRadiologyInsightsWithModel(inferRadiologyInsightsRequest, requestOptions);
+    }
+
+    /**
+     * Create Radiology Insights job
+     *
+     * Creates a Radiology Insights job with the given request body.
+     *
+     * @param patients The list of patients, including their clinical information and data.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws HttpResponseException thrown if the request is rejected by server.
+     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
+     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
+     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of provides status details for long running operations.
+     */
+    @Generated
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller
+        beginInferRadiologyInsights(List patients) {
+        // Generated convenience method for beginInferRadiologyInsightsWithModel
+        RequestOptions requestOptions = new RequestOptions();
+        InferRadiologyInsightsRequest inferRadiologyInsightsRequestObj = new InferRadiologyInsightsRequest(patients);
+        BinaryData inferRadiologyInsightsRequest = BinaryData.fromObject(inferRadiologyInsightsRequestObj);
+        return serviceClient.beginInferRadiologyInsightsWithModel(inferRadiologyInsightsRequest, requestOptions);
     }
 }
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/RadiologyInsightsClientImpl.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/RadiologyInsightsClientImpl.java
index b1b46bfb3bdb..08b91ed68438 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/RadiologyInsightsClientImpl.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/RadiologyInsightsClientImpl.java
@@ -29,6 +29,7 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
+import com.azure.core.util.CoreUtils;
 import com.azure.core.util.DateTimeRfc1123;
 import com.azure.core.util.FluxUtil;
 import com.azure.core.util.polling.PollerFlux;
@@ -42,7 +43,6 @@
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsResult;
 import java.time.Duration;
 import java.time.OffsetDateTime;
-import java.util.UUID;
 import reactor.core.publisher.Mono;
 
 /**
@@ -171,7 +171,7 @@ public interface RadiologyInsightsClientService {
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> inferRadiologyInsights(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData radiologyInsightsData, RequestOptions requestOptions,
+            @BodyParam("application/json") BinaryData inferRadiologyInsightsRequest, RequestOptions requestOptions,
             Context context);
 
         @Post("/radiology-insights/jobs")
@@ -182,7 +182,7 @@ Mono> inferRadiologyInsights(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response inferRadiologyInsightsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData radiologyInsightsData, RequestOptions requestOptions,
+            @BodyParam("application/json") BinaryData inferRadiologyInsightsRequest, RequestOptions requestOptions,
             Context context);
     }
 
@@ -538,7 +538,7 @@ Response inferRadiologyInsightsSync(@HostParam("endpoint") String en
      * }
      * }

      * 
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -548,26 +548,26 @@ Response inferRadiologyInsightsSync(@HostParam("endpoint") String en
      * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono> inferRadiologyInsightsWithResponseAsync(BinaryData radiologyInsightsData,
+    private Mono> inferRadiologyInsightsWithResponseAsync(BinaryData inferRadiologyInsightsRequest,
         RequestOptions requestOptions) {
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
-        String repeatabilityRequestId = UUID.randomUUID().toString();
-        String repeatabilityFirstSent = DateTimeRfc1123.toRfc1123String(OffsetDateTime.now());
         requestOptionsLocal.addRequestCallback(requestLocal -> {
             if (requestLocal.getHeaders().get(HttpHeaderName.fromString("repeatability-request-id")) == null) {
                 requestLocal.getHeaders()
-                    .set(HttpHeaderName.fromString("repeatability-request-id"), repeatabilityRequestId);
+                    .set(HttpHeaderName.fromString("repeatability-request-id"), CoreUtils.randomUuid().toString());
             }
         });
         requestOptionsLocal.addRequestCallback(requestLocal -> {
             if (requestLocal.getHeaders().get(HttpHeaderName.fromString("repeatability-first-sent")) == null) {
                 requestLocal.getHeaders()
-                    .set(HttpHeaderName.fromString("repeatability-first-sent"), repeatabilityFirstSent);
+                    .set(HttpHeaderName.fromString("repeatability-first-sent"),
+                        DateTimeRfc1123.toRfc1123String(OffsetDateTime.now()));
             }
         });
-        return FluxUtil.withContext(context -> service.inferRadiologyInsights(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, radiologyInsightsData, requestOptionsLocal, context));
+        return FluxUtil.withContext(
+            context -> service.inferRadiologyInsights(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
+                inferRadiologyInsightsRequest, requestOptionsLocal, context));
     }
 
     /**
@@ -922,7 +922,7 @@ private Mono> inferRadiologyInsightsWithResponseAsync(Binar
      * }
      * }

      * 
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -931,26 +931,25 @@ private Mono> inferRadiologyInsightsWithResponseAsync(Binar
      * @return provides status details for long running operations along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Response inferRadiologyInsightsWithResponse(BinaryData radiologyInsightsData,
+    private Response inferRadiologyInsightsWithResponse(BinaryData inferRadiologyInsightsRequest,
         RequestOptions requestOptions) {
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
-        String repeatabilityRequestId = UUID.randomUUID().toString();
-        String repeatabilityFirstSent = DateTimeRfc1123.toRfc1123String(OffsetDateTime.now());
         requestOptionsLocal.addRequestCallback(requestLocal -> {
             if (requestLocal.getHeaders().get(HttpHeaderName.fromString("repeatability-request-id")) == null) {
                 requestLocal.getHeaders()
-                    .set(HttpHeaderName.fromString("repeatability-request-id"), repeatabilityRequestId);
+                    .set(HttpHeaderName.fromString("repeatability-request-id"), CoreUtils.randomUuid().toString());
             }
         });
         requestOptionsLocal.addRequestCallback(requestLocal -> {
             if (requestLocal.getHeaders().get(HttpHeaderName.fromString("repeatability-first-sent")) == null) {
                 requestLocal.getHeaders()
-                    .set(HttpHeaderName.fromString("repeatability-first-sent"), repeatabilityFirstSent);
+                    .set(HttpHeaderName.fromString("repeatability-first-sent"),
+                        DateTimeRfc1123.toRfc1123String(OffsetDateTime.now()));
             }
         });
         return service.inferRadiologyInsightsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
-            radiologyInsightsData, requestOptionsLocal, Context.NONE);
+            inferRadiologyInsightsRequest, requestOptionsLocal, Context.NONE);
     }
 
     /**
@@ -1305,7 +1304,7 @@ private Response inferRadiologyInsightsWithResponse(BinaryData radio
      * }
      * }

      * 
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -1314,10 +1313,10 @@ private Response inferRadiologyInsightsWithResponse(BinaryData radio
      * @return the {@link PollerFlux} for polling of provides status details for long running operations.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public PollerFlux beginInferRadiologyInsightsAsync(BinaryData radiologyInsightsData,
+    public PollerFlux beginInferRadiologyInsightsAsync(BinaryData inferRadiologyInsightsRequest,
         RequestOptions requestOptions) {
         return PollerFlux.create(Duration.ofSeconds(1),
-            () -> this.inferRadiologyInsightsWithResponseAsync(radiologyInsightsData, requestOptions),
+            () -> this.inferRadiologyInsightsWithResponseAsync(inferRadiologyInsightsRequest, requestOptions),
             new com.azure.health.insights.radiologyinsights.implementation.OperationLocationPollingStrategy<>(
                 new PollingStrategyOptions(this.getHttpPipeline())
                     .setEndpoint("{endpoint}/health-insights".replace("{endpoint}", this.getEndpoint()))
@@ -1681,7 +1680,7 @@ public PollerFlux beginInferRadiologyInsightsAsync(Binar
      * }
      * }

      * 
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -1690,10 +1689,10 @@ public PollerFlux beginInferRadiologyInsightsAsync(Binar
      * @return the {@link SyncPoller} for polling of provides status details for long running operations.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller beginInferRadiologyInsights(BinaryData radiologyInsightsData,
+    public SyncPoller beginInferRadiologyInsights(BinaryData inferRadiologyInsightsRequest,
         RequestOptions requestOptions) {
         return SyncPoller.createPoller(Duration.ofSeconds(1),
-            () -> this.inferRadiologyInsightsWithResponse(radiologyInsightsData, requestOptions),
+            () -> this.inferRadiologyInsightsWithResponse(inferRadiologyInsightsRequest, requestOptions),
             new com.azure.health.insights.radiologyinsights.implementation.SyncOperationLocationPollingStrategy<>(
                 new PollingStrategyOptions(this.getHttpPipeline())
                     .setEndpoint("{endpoint}/health-insights".replace("{endpoint}", this.getEndpoint()))
@@ -2057,7 +2056,7 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      * }
      * }

      * 
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -2067,9 +2066,10 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public PollerFlux
-        beginInferRadiologyInsightsWithModelAsync(BinaryData radiologyInsightsData, RequestOptions requestOptions) {
+        beginInferRadiologyInsightsWithModelAsync(BinaryData inferRadiologyInsightsRequest,
+            RequestOptions requestOptions) {
         return PollerFlux.create(Duration.ofSeconds(1),
-            () -> this.inferRadiologyInsightsWithResponseAsync(radiologyInsightsData, requestOptions),
+            () -> this.inferRadiologyInsightsWithResponseAsync(inferRadiologyInsightsRequest, requestOptions),
             new com.azure.health.insights.radiologyinsights.implementation.OperationLocationPollingStrategy<>(
                 new PollingStrategyOptions(this.getHttpPipeline())
                     .setEndpoint("{endpoint}/health-insights".replace("{endpoint}", this.getEndpoint()))
@@ -2434,7 +2434,7 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      * }
      * }

      * 
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -2444,9 +2444,9 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller
-        beginInferRadiologyInsightsWithModel(BinaryData radiologyInsightsData, RequestOptions requestOptions) {
+        beginInferRadiologyInsightsWithModel(BinaryData inferRadiologyInsightsRequest, RequestOptions requestOptions) {
         return SyncPoller.createPoller(Duration.ofSeconds(1),
-            () -> this.inferRadiologyInsightsWithResponse(radiologyInsightsData, requestOptions),
+            () -> this.inferRadiologyInsightsWithResponse(inferRadiologyInsightsRequest, requestOptions),
             new com.azure.health.insights.radiologyinsights.implementation.SyncOperationLocationPollingStrategy<>(
                 new PollingStrategyOptions(this.getHttpPipeline())
                     .setEndpoint("{endpoint}/health-insights".replace("{endpoint}", this.getEndpoint()))
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/InferRadiologyInsightsRequest.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/InferRadiologyInsightsRequest.java
new file mode 100644
index 000000000000..f818f7599f68
--- /dev/null
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/InferRadiologyInsightsRequest.java
@@ -0,0 +1,76 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.health.insights.radiologyinsights.implementation.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Generated;
+import com.azure.health.insights.radiologyinsights.models.PatientRecord;
+import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsModelConfiguration;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+/**
+ * The InferRadiologyInsightsRequest model.
+ */
+@Fluent
+public final class InferRadiologyInsightsRequest {
+    /*
+     * The list of patients, including their clinical information and data.
+     */
+    @Generated
+    @JsonProperty(value = "patients")
+    private final List patients;
+
+    /*
+     * Configuration affecting the Radiology Insights model's inference.
+     */
+    @Generated
+    @JsonProperty(value = "configuration")
+    private RadiologyInsightsModelConfiguration configuration;
+
+    /**
+     * Creates an instance of InferRadiologyInsightsRequest class.
+     * 
+     * @param patients the patients value to set.
+     */
+    @Generated
+    @JsonCreator
+    public InferRadiologyInsightsRequest(@JsonProperty(value = "patients") List patients) {
+        this.patients = patients;
+    }
+
+    /**
+     * Get the patients property: The list of patients, including their clinical information and data.
+     * 
+     * @return the patients value.
+     */
+    @Generated
+    public List getPatients() {
+        return this.patients;
+    }
+
+    /**
+     * Get the configuration property: Configuration affecting the Radiology Insights model's inference.
+     * 
+     * @return the configuration value.
+     */
+    @Generated
+    public RadiologyInsightsModelConfiguration getConfiguration() {
+        return this.configuration;
+    }
+
+    /**
+     * Set the configuration property: Configuration affecting the Radiology Insights model's inference.
+     * 
+     * @param configuration the configuration value to set.
+     * @return the InferRadiologyInsightsRequest object itself.
+     */
+    @Generated
+    public InferRadiologyInsightsRequest setConfiguration(RadiologyInsightsModelConfiguration configuration) {
+        this.configuration = configuration;
+        return this;
+    }
+}
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/package-info.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/package-info.java
new file mode 100644
index 000000000000..bdd36364a223
--- /dev/null
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/package-info.java
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+/**
+ * 
+ * Package containing the data models for RadiologyInsights.
+ * Azure AI Health Insights provides an API that serves insight models, specific for Health & Life Sciences, that
+ * perform analysis and provide inferences to be used by a human.
+ * 
+ */
+package com.azure.health.insights.radiologyinsights.implementation.models;
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/AgeMismatchInference.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/AgeMismatchInference.java
index 5c62da90dd26..dc2baf9de1ba 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/AgeMismatchInference.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/AgeMismatchInference.java
@@ -5,8 +5,6 @@
 
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.Immutable;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
@@ -19,29 +17,11 @@
 @Immutable
 public final class AgeMismatchInference extends RadiologyInsightsInference {
 
-    /*
-     * Discriminator property for RadiologyInsightsInference.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "kind")
-    private RadiologyInsightsInferenceType kind = RadiologyInsightsInferenceType.AGE_MISMATCH;
-
     /**
      * Creates an instance of AgeMismatchInference class.
      */
     @Generated
     private AgeMismatchInference() {
-    }
-
-    /**
-     * Get the kind property: Discriminator property for RadiologyInsightsInference.
-     *
-     * @return the kind value.
-     */
-    @Generated
-    @Override
-    public RadiologyInsightsInferenceType getKind() {
-        return this.kind;
+        this.kind = RadiologyInsightsInferenceType.AGE_MISMATCH;
     }
 }
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/CompleteOrderDiscrepancyInference.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/CompleteOrderDiscrepancyInference.java
index 21bcadcc5cef..55549b889686 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/CompleteOrderDiscrepancyInference.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/CompleteOrderDiscrepancyInference.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.util.List;
@@ -25,14 +24,6 @@
 @Immutable
 public final class CompleteOrderDiscrepancyInference extends RadiologyInsightsInference {
 
-    /*
-     * Discriminator property for RadiologyInsightsInference.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "kind")
-    private RadiologyInsightsInferenceType kind = RadiologyInsightsInferenceType.COMPLETE_ORDER_DISCREPANCY;
-
     /*
      * Order type : CPT ultrasound complete code for abdomen, retroperitoneal, pelvis or breast.
      */
@@ -63,17 +54,7 @@ public final class CompleteOrderDiscrepancyInference extends RadiologyInsightsIn
     @JsonCreator
     private CompleteOrderDiscrepancyInference(@JsonProperty(value = "orderType") FhirR4CodeableConcept orderType) {
         this.orderType = orderType;
-    }
-
-    /**
-     * Get the kind property: Discriminator property for RadiologyInsightsInference.
-     *
-     * @return the kind value.
-     */
-    @Generated
-    @Override
-    public RadiologyInsightsInferenceType getKind() {
-        return this.kind;
+        this.kind = RadiologyInsightsInferenceType.COMPLETE_ORDER_DISCREPANCY;
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/CriticalResultInference.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/CriticalResultInference.java
index bf74d0fc12f7..3b24d2ef5275 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/CriticalResultInference.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/CriticalResultInference.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
@@ -24,14 +23,6 @@
 @Immutable
 public final class CriticalResultInference extends RadiologyInsightsInference {
 
-    /*
-     * Discriminator property for RadiologyInsightsInference.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "kind")
-    private RadiologyInsightsInferenceType kind = RadiologyInsightsInferenceType.CRITICAL_RESULT;
-
     /*
      * The complete Critical Result, as outlined below, will be reused for the recommendation.
      */
@@ -48,17 +39,7 @@ public final class CriticalResultInference extends RadiologyInsightsInference {
     @JsonCreator
     private CriticalResultInference(@JsonProperty(value = "result") CriticalResult result) {
         this.result = result;
-    }
-
-    /**
-     * Get the kind property: Discriminator property for RadiologyInsightsInference.
-     *
-     * @return the kind value.
-     */
-    @Generated
-    @Override
-    public RadiologyInsightsInferenceType getKind() {
-        return this.kind;
+        this.kind = RadiologyInsightsInferenceType.CRITICAL_RESULT;
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4Condition.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4Condition.java
index 52a305299909..5dd2fecba1f5 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4Condition.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4Condition.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.util.List;
@@ -25,14 +24,6 @@
 @Immutable
 public final class FhirR4Condition extends FhirR4DomainResource {
 
-    /*
-     * Discriminator property for Fhir_R4_DomainResource.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "resourceType")
-    private String resourceType = "Condition";
-
     /*
      * External Ids for this condition
      */
@@ -189,17 +180,7 @@ public final class FhirR4Condition extends FhirR4DomainResource {
     @JsonCreator
     private FhirR4Condition(@JsonProperty(value = "resourceType") String resourceType) {
         super(resourceType);
-    }
-
-    /**
-     * Get the resourceType property: Discriminator property for Fhir_R4_DomainResource.
-     *
-     * @return the resourceType value.
-     */
-    @Generated
-    @Override
-    public String getResourceType() {
-        return this.resourceType;
+        this.resourceType = "Condition";
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4DomainResource.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4DomainResource.java
index 859307b2a09f..7fe05f43336e 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4DomainResource.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4DomainResource.java
@@ -8,7 +8,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.util.List;
@@ -30,14 +29,6 @@
 @Immutable
 public class FhirR4DomainResource extends FhirR4Resource {
 
-    /*
-     * Discriminator property for Fhir_R4_DomainResource.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "resourceType")
-    private String resourceType = "Fhir_R4_DomainResource";
-
     /*
      * Text summary of the resource, for human interpretation
      */
@@ -75,17 +66,7 @@ public class FhirR4DomainResource extends FhirR4Resource {
     @JsonCreator
     protected FhirR4DomainResource(@JsonProperty(value = "resourceType") String resourceType) {
         super(resourceType);
-    }
-
-    /**
-     * Get the resourceType property: Discriminator property for Fhir_R4_DomainResource.
-     *
-     * @return the resourceType value.
-     */
-    @Generated
-    @Override
-    public String getResourceType() {
-        return this.resourceType;
+        this.resourceType = "Fhir_R4_DomainResource";
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4Observation.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4Observation.java
index ad3e1843b988..5865e4b2b23c 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4Observation.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4Observation.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.util.List;
@@ -25,14 +24,6 @@
 @Immutable
 public final class FhirR4Observation extends FhirR4DomainResource {
 
-    /*
-     * Discriminator property for Fhir_R4_DomainResource.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "resourceType")
-    private String resourceType = "Observation";
-
     /*
      * Business Identifier for observation
      */
@@ -258,17 +249,7 @@ private FhirR4Observation(@JsonProperty(value = "resourceType") String resourceT
         super(resourceType);
         this.status = status;
         this.code = code;
-    }
-
-    /**
-     * Get the resourceType property: Discriminator property for Fhir_R4_DomainResource.
-     *
-     * @return the resourceType value.
-     */
-    @Generated
-    @Override
-    public String getResourceType() {
-        return this.resourceType;
+        this.resourceType = "Observation";
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4ResearchStudy.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4ResearchStudy.java
index aded3b2e9818..cd3d9e3c4d39 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4ResearchStudy.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FhirR4ResearchStudy.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.util.List;
@@ -25,14 +24,6 @@
 @Immutable
 public final class FhirR4ResearchStudy extends FhirR4DomainResource {
 
-    /*
-     * Discriminator property for Fhir_R4_DomainResource.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "resourceType")
-    private String resourceType = "ResearchStudy";
-
     /*
      * Business Identifier for study
      */
@@ -210,17 +201,7 @@ private FhirR4ResearchStudy(@JsonProperty(value = "resourceType") String resourc
         @JsonProperty(value = "status") ResearchStudyStatusCodeType status) {
         super(resourceType);
         this.status = status;
-    }
-
-    /**
-     * Get the resourceType property: Discriminator property for Fhir_R4_DomainResource.
-     *
-     * @return the resourceType value.
-     */
-    @Generated
-    @Override
-    public String getResourceType() {
-        return this.resourceType;
+        this.resourceType = "ResearchStudy";
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FindingInference.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FindingInference.java
index 72ff804c09a1..d213bdb7e4f8 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FindingInference.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FindingInference.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
@@ -20,14 +19,6 @@
 @Immutable
 public final class FindingInference extends RadiologyInsightsInference {
 
-    /*
-     * Discriminator property for RadiologyInsightsInference.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "kind")
-    private RadiologyInsightsInferenceType kind = RadiologyInsightsInferenceType.FINDING;
-
     /*
      * Finding data : contains extensions, fields and components linked with the finding.
      */
@@ -44,17 +35,7 @@ public final class FindingInference extends RadiologyInsightsInference {
     @JsonCreator
     private FindingInference(@JsonProperty(value = "finding") FhirR4Observation finding) {
         this.finding = finding;
-    }
-
-    /**
-     * Get the kind property: Discriminator property for RadiologyInsightsInference.
-     *
-     * @return the kind value.
-     */
-    @Generated
-    @Override
-    public RadiologyInsightsInferenceType getKind() {
-        return this.kind;
+        this.kind = RadiologyInsightsInferenceType.FINDING;
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FollowupCommunicationInference.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FollowupCommunicationInference.java
index cf07875117e3..30badaa5f554 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FollowupCommunicationInference.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FollowupCommunicationInference.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.time.OffsetDateTime;
@@ -26,14 +25,6 @@
 @Immutable
 public final class FollowupCommunicationInference extends RadiologyInsightsInference {
 
-    /*
-     * Discriminator property for RadiologyInsightsInference.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "kind")
-    private RadiologyInsightsInferenceType kind = RadiologyInsightsInferenceType.FOLLOWUP_COMMUNICATION;
-
     /*
      * Communication date and time.
      */
@@ -64,17 +55,7 @@ public final class FollowupCommunicationInference extends RadiologyInsightsInfer
     @JsonCreator
     private FollowupCommunicationInference(@JsonProperty(value = "wasAcknowledged") boolean wasAcknowledged) {
         this.wasAcknowledged = wasAcknowledged;
-    }
-
-    /**
-     * Get the kind property: Discriminator property for RadiologyInsightsInference.
-     *
-     * @return the kind value.
-     */
-    @Generated
-    @Override
-    public RadiologyInsightsInferenceType getKind() {
-        return this.kind;
+        this.kind = RadiologyInsightsInferenceType.FOLLOWUP_COMMUNICATION;
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FollowupRecommendationInference.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FollowupRecommendationInference.java
index ef08a068f81d..827bd8b1ca09 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FollowupRecommendationInference.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/FollowupRecommendationInference.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.util.List;
@@ -25,14 +24,6 @@
 @Immutable
 public final class FollowupRecommendationInference extends RadiologyInsightsInference {
 
-    /*
-     * Discriminator property for RadiologyInsightsInference.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "kind")
-    private RadiologyInsightsInferenceType kind = RadiologyInsightsInferenceType.FOLLOWUP_RECOMMENDATION;
-
     /*
      * Date and time are displayed when the procedure is recommended to be done at a specific point in time.
      */
@@ -113,17 +104,7 @@ private FollowupRecommendationInference(@JsonProperty(value = "isConditional") b
         this.isGuideline = isGuideline;
         this.isHedging = isHedging;
         this.recommendedProcedure = recommendedProcedure;
-    }
-
-    /**
-     * Get the kind property: Discriminator property for RadiologyInsightsInference.
-     *
-     * @return the kind value.
-     */
-    @Generated
-    @Override
-    public RadiologyInsightsInferenceType getKind() {
-        return this.kind;
+        this.kind = RadiologyInsightsInferenceType.FOLLOWUP_RECOMMENDATION;
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/GenericProcedureRecommendation.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/GenericProcedureRecommendation.java
index f80744e136c6..82a236feb56d 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/GenericProcedureRecommendation.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/GenericProcedureRecommendation.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
@@ -23,14 +22,6 @@
 @Immutable
 public final class GenericProcedureRecommendation extends ProcedureRecommendation {
 
-    /*
-     * Discriminator property for ProcedureRecommendation.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "kind")
-    private String kind = "genericProcedureRecommendation";
-
     /*
      * Procedure modality : SNOMED CT code.
      */
@@ -54,17 +45,7 @@ public final class GenericProcedureRecommendation extends ProcedureRecommendatio
     @JsonCreator
     private GenericProcedureRecommendation(@JsonProperty(value = "code") FhirR4CodeableConcept code) {
         this.code = code;
-    }
-
-    /**
-     * Get the kind property: Discriminator property for ProcedureRecommendation.
-     *
-     * @return the kind value.
-     */
-    @Generated
-    @Override
-    public String getKind() {
-        return this.kind;
+        this.kind = "genericProcedureRecommendation";
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/ImagingProcedureRecommendation.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/ImagingProcedureRecommendation.java
index cdca36f002a8..d9cf48dfda58 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/ImagingProcedureRecommendation.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/ImagingProcedureRecommendation.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.util.List;
@@ -24,14 +23,6 @@
 @Immutable
 public final class ImagingProcedureRecommendation extends ProcedureRecommendation {
 
-    /*
-     * Discriminator property for ProcedureRecommendation.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "kind")
-    private String kind = "imagingProcedureRecommendation";
-
     /*
      * LOINC codes for the procedure.
      */
@@ -56,17 +47,7 @@ public final class ImagingProcedureRecommendation extends ProcedureRecommendatio
     private ImagingProcedureRecommendation(
         @JsonProperty(value = "imagingProcedures") List imagingProcedures) {
         this.imagingProcedures = imagingProcedures;
-    }
-
-    /**
-     * Get the kind property: Discriminator property for ProcedureRecommendation.
-     *
-     * @return the kind value.
-     */
-    @Generated
-    @Override
-    public String getKind() {
-        return this.kind;
+        this.kind = "imagingProcedureRecommendation";
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/LateralityDiscrepancyInference.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/LateralityDiscrepancyInference.java
index 4fea067ca737..f070228ef4ac 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/LateralityDiscrepancyInference.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/LateralityDiscrepancyInference.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
@@ -25,14 +24,6 @@
 @Immutable
 public final class LateralityDiscrepancyInference extends RadiologyInsightsInference {
 
-    /*
-     * Discriminator property for RadiologyInsightsInference.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "kind")
-    private RadiologyInsightsInferenceType kind = RadiologyInsightsInferenceType.LATERALITY_DISCREPANCY;
-
     /*
      * Laterality indication : SNOMED CT code for laterality qualifier value.
      */
@@ -57,17 +48,7 @@ public final class LateralityDiscrepancyInference extends RadiologyInsightsInfer
     private LateralityDiscrepancyInference(
         @JsonProperty(value = "discrepancyType") LateralityDiscrepancyType discrepancyType) {
         this.discrepancyType = discrepancyType;
-    }
-
-    /**
-     * Get the kind property: Discriminator property for RadiologyInsightsInference.
-     *
-     * @return the kind value.
-     */
-    @Generated
-    @Override
-    public RadiologyInsightsInferenceType getKind() {
-        return this.kind;
+        this.kind = RadiologyInsightsInferenceType.LATERALITY_DISCREPANCY;
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/LimitedOrderDiscrepancyInference.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/LimitedOrderDiscrepancyInference.java
index 88fd8bf52493..72fc4ce626e7 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/LimitedOrderDiscrepancyInference.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/LimitedOrderDiscrepancyInference.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.util.List;
@@ -25,14 +24,6 @@
 @Immutable
 public final class LimitedOrderDiscrepancyInference extends RadiologyInsightsInference {
 
-    /*
-     * Discriminator property for RadiologyInsightsInference.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "kind")
-    private RadiologyInsightsInferenceType kind = RadiologyInsightsInferenceType.LIMITED_ORDER_DISCREPANCY;
-
     /*
      * Order type : CPT ultrasound complete code for abdomen, retroperitoneal, pelvis or breast.
      */
@@ -63,17 +54,7 @@ public final class LimitedOrderDiscrepancyInference extends RadiologyInsightsInf
     @JsonCreator
     private LimitedOrderDiscrepancyInference(@JsonProperty(value = "orderType") FhirR4CodeableConcept orderType) {
         this.orderType = orderType;
-    }
-
-    /**
-     * Get the kind property: Discriminator property for RadiologyInsightsInference.
-     *
-     * @return the kind value.
-     */
-    @Generated
-    @Override
-    public RadiologyInsightsInferenceType getKind() {
-        return this.kind;
+        this.kind = RadiologyInsightsInferenceType.LIMITED_ORDER_DISCREPANCY;
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/ProcedureRecommendation.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/ProcedureRecommendation.java
index aacac639c0e8..6209cd82f74e 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/ProcedureRecommendation.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/ProcedureRecommendation.java
@@ -32,13 +32,14 @@ public class ProcedureRecommendation {
     @Generated
     @JsonTypeId
     @JsonProperty(value = "kind")
-    private String kind = "ProcedureRecommendation";
+    String kind;
 
     /**
      * Creates an instance of ProcedureRecommendation class.
      */
     @Generated
     protected ProcedureRecommendation() {
+        this.kind = "ProcedureRecommendation";
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/RadiologyInsightsInference.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/RadiologyInsightsInference.java
index 58973c2ea1ec..e7a9e2b59b84 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/RadiologyInsightsInference.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/RadiologyInsightsInference.java
@@ -51,8 +51,7 @@ public class RadiologyInsightsInference {
     @Generated
     @JsonTypeId
     @JsonProperty(value = "kind")
-    private RadiologyInsightsInferenceType kind
-        = RadiologyInsightsInferenceType.fromString("RadiologyInsightsInference");
+    RadiologyInsightsInferenceType kind;
 
     /*
      * Additional Content defined by implementations
@@ -66,6 +65,7 @@ public class RadiologyInsightsInference {
      */
     @Generated
     protected RadiologyInsightsInference() {
+        this.kind = RadiologyInsightsInferenceType.fromString("RadiologyInsightsInference");
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/RadiologyProcedureInference.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/RadiologyProcedureInference.java
index a90af1df002b..b03399e3ad36 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/RadiologyProcedureInference.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/RadiologyProcedureInference.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.util.List;
@@ -25,14 +24,6 @@
 @Immutable
 public final class RadiologyProcedureInference extends RadiologyInsightsInference {
 
-    /*
-     * Discriminator property for RadiologyInsightsInference.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "kind")
-    private RadiologyInsightsInferenceType kind = RadiologyInsightsInferenceType.RADIOLOGY_PROCEDURE;
-
     /*
      * LOINC codes for the procedure.
      */
@@ -67,17 +58,7 @@ private RadiologyProcedureInference(
         @JsonProperty(value = "orderedProcedure") OrderedProcedure orderedProcedure) {
         this.imagingProcedures = imagingProcedures;
         this.orderedProcedure = orderedProcedure;
-    }
-
-    /**
-     * Get the kind property: Discriminator property for RadiologyInsightsInference.
-     *
-     * @return the kind value.
-     */
-    @Generated
-    @Override
-    public RadiologyInsightsInferenceType getKind() {
-        return this.kind;
+        this.kind = RadiologyInsightsInferenceType.RADIOLOGY_PROCEDURE;
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/SexMismatchInference.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/SexMismatchInference.java
index 56ae3b55dff0..32852e8c6415 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/SexMismatchInference.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/models/SexMismatchInference.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
@@ -21,14 +20,6 @@
 @Immutable
 public final class SexMismatchInference extends RadiologyInsightsInference {
 
-    /*
-     * Discriminator property for RadiologyInsightsInference.
-     */
-    @Generated
-    @JsonTypeId
-    @JsonProperty(value = "kind")
-    private RadiologyInsightsInferenceType kind = RadiologyInsightsInferenceType.SEX_MISMATCH;
-
     /*
      * Sex indication : SNOMED CT code for gender finding.
      */
@@ -45,17 +36,7 @@ public final class SexMismatchInference extends RadiologyInsightsInference {
     @JsonCreator
     private SexMismatchInference(@JsonProperty(value = "sexIndication") FhirR4CodeableConcept sexIndication) {
         this.sexIndication = sexIndication;
-    }
-
-    /**
-     * Get the kind property: Discriminator property for RadiologyInsightsInference.
-     *
-     * @return the kind value.
-     */
-    @Generated
-    @Override
-    public RadiologyInsightsInferenceType getKind() {
-        return this.kind;
+        this.kind = RadiologyInsightsInferenceType.SEX_MISMATCH;
     }
 
     /**
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/module-info.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/module-info.java
index ad70b8fff0f4..948526aea445 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/module-info.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/module-info.java
@@ -6,5 +6,6 @@
     requires transitive com.azure.core;
     exports com.azure.health.insights.radiologyinsights;
     exports com.azure.health.insights.radiologyinsights.models;
+    opens com.azure.health.insights.radiologyinsights.implementation.models to com.azure.core, com.fasterxml.jackson.databind;
     opens com.azure.health.insights.radiologyinsights.models to com.azure.core, com.fasterxml.jackson.databind;
 }
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/resources/META-INF/azure-health-insights-radiologyinsights_apiview_properties.json b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/resources/META-INF/azure-health-insights-radiologyinsights_apiview_properties.json
index 5dc1ae409f06..b919bfadfde8 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/resources/META-INF/azure-health-insights-radiologyinsights_apiview_properties.json
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/resources/META-INF/azure-health-insights-radiologyinsights_apiview_properties.json
@@ -8,6 +8,7 @@
     "com.azure.health.insights.radiologyinsights.RadiologyInsightsClient.beginInferRadiologyInsights": "ClientForAzureHealthInsights.RadiologyInsightsClient.inferRadiologyInsights",
     "com.azure.health.insights.radiologyinsights.RadiologyInsightsClient.beginInferRadiologyInsightsWithModel": "ClientForAzureHealthInsights.RadiologyInsightsClient.inferRadiologyInsights",
     "com.azure.health.insights.radiologyinsights.RadiologyInsightsClientBuilder": "AzureHealthInsights.RadiologyInsightsClient",
+    "com.azure.health.insights.radiologyinsights.implementation.models.InferRadiologyInsightsRequest": "inferRadiologyInsights.Request.anonymous",
     "com.azure.health.insights.radiologyinsights.models.AgeMismatchInference": "AzureHealthInsights.AgeMismatchInference",
     "com.azure.health.insights.radiologyinsights.models.ClinicalDocumentType": "AzureHealthInsights.ClinicalDocumentType",
     "com.azure.health.insights.radiologyinsights.models.CompleteOrderDiscrepancyInference": "AzureHealthInsights.CompleteOrderDiscrepancyInference",
@@ -67,7 +68,6 @@
     "com.azure.health.insights.radiologyinsights.models.PatientSex": "AzureHealthInsights.PatientInfoSex",
     "com.azure.health.insights.radiologyinsights.models.ProcedureRecommendation": "AzureHealthInsights.ProcedureRecommendation",
     "com.azure.health.insights.radiologyinsights.models.RadiologyCodeWithTypes": "AzureHealthInsights.RadiologyCodeWithTypes",
-    "com.azure.health.insights.radiologyinsights.models.RadiologyInsightsData": "AzureHealthInsights.RadiologyInsightsData",
     "com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInference": "AzureHealthInsights.RadiologyInsightsInference",
     "com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInferenceOptions": "AzureHealthInsights.RadiologyInsightsInferenceOptions",
     "com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInferenceResult": "AzureHealthInsights.RadiologyInsightsInferenceResult",
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesCreateOrUpdateSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesCreateOrUpdateSamples.java
index 5022e0659512..aeba7a743c01 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesCreateOrUpdateSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesCreateOrUpdateSamples.java
@@ -11,8 +11,7 @@
  */
 public final class FirewallRulesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_FirewallRuleCreate.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_FirewallRuleCreate.json
      */
     /**
      * Sample code: Creates a firewall rule on a Mongo Cluster resource.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesDeleteSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesDeleteSamples.java
index 1f9fcc9eff51..306d31d568c4 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesDeleteSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesDeleteSamples.java
@@ -9,8 +9,7 @@
  */
 public final class FirewallRulesDeleteSamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_FirewallRuleDelete.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_FirewallRuleDelete.json
      */
     /**
      * Sample code: Deletes a firewall rule on a Mongo Cluster resource.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesGetSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesGetSamples.java
index ae5b03f893e1..40e9cf8845a1 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesGetSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesGetSamples.java
@@ -9,8 +9,7 @@
  */
 public final class FirewallRulesGetSamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_FirewallRuleGet.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_FirewallRuleGet.json
      */
     /**
      * Sample code: Gets a firewall rule on a Mongo Cluster resource.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesListByMongoClusterSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesListByMongoClusterSamples.java
index ca9648b8c3c8..c83512a21e24 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesListByMongoClusterSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/FirewallRulesListByMongoClusterSamples.java
@@ -9,8 +9,7 @@
  */
 public final class FirewallRulesListByMongoClusterSamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_FirewallRuleList.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_FirewallRuleList.json
      */
     /**
      * Sample code: List the firewall rules on a Mongo Cluster resource.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersCheckNameAvailabilitySamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersCheckNameAvailabilitySamples.java
index 5a7c6932fdcf..638936725ea6 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersCheckNameAvailabilitySamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersCheckNameAvailabilitySamples.java
@@ -11,8 +11,7 @@
  */
 public final class MongoClustersCheckNameAvailabilitySamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_NameAvailability.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_NameAvailability.json
      */
     /**
      * Sample code: Checks and confirms the Mongo Cluster name is availability for use.
@@ -27,8 +26,7 @@ public static void checksAndConfirmsTheMongoClusterNameIsAvailabilityForUse(
     }
 
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_NameAvailability_AlreadyExists.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_NameAvailability_AlreadyExists.json
      */
     /**
      * Sample code: Checks and returns that the Mongo Cluster name is already in-use.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersCreateOrUpdateSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersCreateOrUpdateSamples.java
index 6f41cfc4dd81..4df02141250e 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersCreateOrUpdateSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersCreateOrUpdateSamples.java
@@ -17,8 +17,7 @@
  */
 public final class MongoClustersCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_CreatePITR.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_CreatePITR.json
      */
     /**
      * Sample code: Creates a Mongo Cluster resource from a point in time restore.
@@ -40,9 +39,7 @@ public static void createsAMongoClusterResourceFromAPointInTimeRestore(
     }
 
     /*
-     * x-ms-original-file:
-     * specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/MongoClusters_Create.
-     * json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_Create.json
      */
     /**
      * Sample code: Creates a new Mongo Cluster resource.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersDeleteSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersDeleteSamples.java
index 9d23c6f80638..34da87affa16 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersDeleteSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersDeleteSamples.java
@@ -9,9 +9,7 @@
  */
 public final class MongoClustersDeleteSamples {
     /*
-     * x-ms-original-file:
-     * specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/MongoClusters_Delete.
-     * json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_Delete.json
      */
     /**
      * Sample code: Deletes a Mongo Cluster resource.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersGetByResourceGroupSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersGetByResourceGroupSamples.java
index 1e10c628f4b1..6edc49032639 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersGetByResourceGroupSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersGetByResourceGroupSamples.java
@@ -9,8 +9,7 @@
  */
 public final class MongoClustersGetByResourceGroupSamples {
     /*
-     * x-ms-original-file:
-     * specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/MongoClusters_Get.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_Get.json
      */
     /**
      * Sample code: Gets a Mongo Cluster resource.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersListByResourceGroupSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersListByResourceGroupSamples.java
index edd7b1e476e4..97912b0164d2 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersListByResourceGroupSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersListByResourceGroupSamples.java
@@ -9,8 +9,7 @@
  */
 public final class MongoClustersListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_ListByResourceGroup.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_ListByResourceGroup.json
      */
     /**
      * Sample code: Lists the Mongo Cluster resources in a resource group.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersListConnectionStringsSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersListConnectionStringsSamples.java
index 1274f8753a2b..074ce336a148 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersListConnectionStringsSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersListConnectionStringsSamples.java
@@ -9,8 +9,7 @@
  */
 public final class MongoClustersListConnectionStringsSamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_ListConnectionStrings.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_ListConnectionStrings.json
      */
     /**
      * Sample code: List the available connection strings for the Mongo Cluster resource.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersListSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersListSamples.java
index e20ca6a45328..2e670db5f816 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersListSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersListSamples.java
@@ -9,8 +9,7 @@
  */
 public final class MongoClustersListSamples {
     /*
-     * x-ms-original-file:
-     * specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/MongoClusters_List.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_List.json
      */
     /**
      * Sample code: Lists the Mongo Cluster resources in a subscription.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersUpdateSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersUpdateSamples.java
index d56b98c0fdfa..ed9fe2ee0a66 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersUpdateSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/MongoClustersUpdateSamples.java
@@ -16,8 +16,7 @@
  */
 public final class MongoClustersUpdateSamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_PatchDiskSize.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_PatchDiskSize.json
      */
     /**
      * Sample code: Updates the disk size on a Mongo Cluster resource.
@@ -36,8 +35,7 @@ public final class MongoClustersUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_PatchPrivateNetworkAccess.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_PatchPrivateNetworkAccess.json
      */
     /**
      * Sample code: Disables public network access on a Mongo Cluster resource with a private endpoint connection.
@@ -55,9 +53,7 @@ public static void disablesPublicNetworkAccessOnAMongoClusterResourceWithAPrivat
     }
 
     /*
-     * x-ms-original-file:
-     * specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/MongoClusters_Update.
-     * json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_Update.json
      */
     /**
      * Sample code: Updates a Mongo Cluster resource.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/OperationsListSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/OperationsListSamples.java
index d9abaa3765c4..a5547e98f815 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/OperationsListSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/OperationsListSamples.java
@@ -9,8 +9,7 @@
  */
 public final class OperationsListSamples {
     /*
-     * x-ms-original-file:
-     * specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/Operations_List.json
+     * x-ms-original-file: 2024-03-01-preview/Operations_List.json
      */
     /**
      * Sample code: Operations_List.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsCreateSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsCreateSamples.java
index 3906e8d37aa2..c8410fc57fcd 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsCreateSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsCreateSamples.java
@@ -13,8 +13,7 @@
  */
 public final class PrivateEndpointConnectionsCreateSamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_PrivateEndpointConnectionPut.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_PrivateEndpointConnectionPut.json
      */
     /**
      * Sample code: Approves a private endpoint connection on a Mongo Cluster resource.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsDeleteSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsDeleteSamples.java
index c909e9de721a..1eeb5e444dd5 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsDeleteSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsDeleteSamples.java
@@ -9,8 +9,7 @@
  */
 public final class PrivateEndpointConnectionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_PrivateEndpointConnectionDelete.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_PrivateEndpointConnectionDelete.json
      */
     /**
      * Sample code: Delete a private endpoint connection on a Mongo Cluster resource.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsGetSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsGetSamples.java
index b2bfa1dfd1bb..b5e7d74d0ef2 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsGetSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsGetSamples.java
@@ -9,8 +9,7 @@
  */
 public final class PrivateEndpointConnectionsGetSamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_PrivateEndpointConnectionGet.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_PrivateEndpointConnectionGet.json
      */
     /**
      * Sample code: Get a private endpoint connection on a Mongo Cluster resource.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsListByMongoClusterSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsListByMongoClusterSamples.java
index 03a45aafc596..9b099718e7e0 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsListByMongoClusterSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateEndpointConnectionsListByMongoClusterSamples.java
@@ -9,8 +9,7 @@
  */
 public final class PrivateEndpointConnectionsListByMongoClusterSamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_PrivateEndpointConnectionList.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_PrivateEndpointConnectionList.json
      */
     /**
      * Sample code: Lists the private endpoint connection resources on a Mongo Cluster resource.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateLinksListByMongoClusterSamples.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateLinksListByMongoClusterSamples.java
index 9e62436ca817..8728206bc0a7 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateLinksListByMongoClusterSamples.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/samples/java/com/azure/resourcemanager/mongocluster/generated/PrivateLinksListByMongoClusterSamples.java
@@ -9,8 +9,7 @@
  */
 public final class PrivateLinksListByMongoClusterSamples {
     /*
-     * x-ms-original-file: specification/mongocluster/DocumentDB.MongoCluster.Management/examples/2024-03-01-preview/
-     * MongoClusters_PrivateLinkResourceList.json
+     * x-ms-original-file: 2024-03-01-preview/MongoClusters_PrivateLinkResourceList.json
      */
     /**
      * Sample code: Lists the private link resources available on a Mongo Cluster resource.
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/CodeInterpreterToolDefinition.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/CodeInterpreterToolDefinition.java
index 1f60251883a7..69299d3785a1 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/CodeInterpreterToolDefinition.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/CodeInterpreterToolDefinition.java
@@ -21,6 +21,7 @@ public final class CodeInterpreterToolDefinition extends ToolDefinition {
      */
     @Generated
     public CodeInterpreterToolDefinition() {
+        this.type = "code_interpreter";
     }
 
     @Override
@@ -30,23 +31,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         return jsonWriter.writeEndObject();
     }
 
-    /*
-     * The object type.
-     */
-    @Generated
-    private String type = "code_interpreter";
-
-    /**
-     * Get the type property: The object type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
-    }
-
     /**
      * Reads an instance of CodeInterpreterToolDefinition from the JsonReader.
      *
@@ -63,8 +47,8 @@ public static CodeInterpreterToolDefinition fromJson(JsonReader jsonReader) thro
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
-                if ("type".equals(fieldName)) {
-                    deserializedCodeInterpreterToolDefinition.type = reader.getString();
+                if (ToolDefinition.fromJsonShared(reader, fieldName, deserializedCodeInterpreterToolDefinition)) {
+                    continue;
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/FileSearchToolDefinition.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/FileSearchToolDefinition.java
index ce59229776ca..f94a43dc0c06 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/FileSearchToolDefinition.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/FileSearchToolDefinition.java
@@ -16,28 +16,12 @@
 @Immutable
 public final class FileSearchToolDefinition extends ToolDefinition {
 
-    /*
-     * The object type.
-     */
-    @Generated
-    private String type = "file_search";
-
     /**
      * Creates an instance of FileSearchToolDefinition class.
      */
     @Generated
     public FileSearchToolDefinition() {
-    }
-
-    /**
-     * Get the type property: The object type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
+        this.type = "file_search";
     }
 
     /**
@@ -47,7 +31,7 @@ public String getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("type", this.type);
+        toJsonShared(jsonWriter);
         return jsonWriter.writeEndObject();
     }
 
@@ -66,8 +50,8 @@ public static FileSearchToolDefinition fromJson(JsonReader jsonReader) throws IO
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
-                if ("type".equals(fieldName)) {
-                    deserializedFileSearchToolDefinition.type = reader.getString();
+                if (ToolDefinition.fromJsonShared(reader, fieldName, deserializedFileSearchToolDefinition)) {
+                    continue;
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/FunctionToolDefinition.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/FunctionToolDefinition.java
index 73f046a781ce..51c56654a6d2 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/FunctionToolDefinition.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/FunctionToolDefinition.java
@@ -30,6 +30,7 @@ public final class FunctionToolDefinition extends ToolDefinition {
     @Generated
     public FunctionToolDefinition(FunctionDefinition function) {
         this.function = function;
+        this.type = "function";
     }
 
     /**
@@ -73,23 +74,6 @@ public static FunctionToolDefinition fromJson(JsonReader jsonReader) throws IOEx
         });
     }
 
-    /*
-     * The object type.
-     */
-    @Generated
-    private String type = "function";
-
-    /**
-     * Get the type property: The object type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -97,8 +81,8 @@ public String getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        toJsonShared(jsonWriter);
         jsonWriter.writeJsonField("function", this.function);
-        jsonWriter.writeStringField("type", this.type);
         return jsonWriter.writeEndObject();
     }
 }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/MessageContent.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/MessageContent.java
index 1fc24f678573..fb2659bb14c1 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/MessageContent.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/MessageContent.java
@@ -22,6 +22,7 @@ public class MessageContent implements JsonSerializable {
      */
     @Generated
     public MessageContent() {
+        this.type = "MessageContent";
     }
 
     /**
@@ -31,7 +32,7 @@ public MessageContent() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("type", this.type);
+        toJsonShared(jsonWriter);
         return jsonWriter.writeEndObject();
     }
 
@@ -88,7 +89,7 @@ static MessageContent fromJsonKnownDiscriminator(JsonReader jsonReader) throws I
      * The object type.
      */
     @Generated
-    private String type = "MessageContent";
+    String type;
 
     /**
      * Get the type property: The object type.
@@ -99,4 +100,18 @@ static MessageContent fromJsonKnownDiscriminator(JsonReader jsonReader) throws I
     public String getType() {
         return this.type;
     }
+
+    void toJsonShared(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStringField("type", this.type);
+    }
+
+    @Generated
+    static boolean fromJsonShared(JsonReader reader, String fieldName, MessageContent deserializedMessageContent)
+        throws IOException {
+        if ("type".equals(fieldName)) {
+            deserializedMessageContent.type = reader.getString();
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/MessageDeltaContent.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/MessageDeltaContent.java
index fcd0132d5c62..0aee0654ac91 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/MessageDeltaContent.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/MessageDeltaContent.java
@@ -21,7 +21,7 @@ public class MessageDeltaContent implements JsonSerializable {
      */
     @Generated
     protected RequiredAction() {
+        this.type = "RequiredAction";
     }
 
     /**
@@ -31,7 +32,7 @@ protected RequiredAction() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("type", this.type);
+        toJsonShared(jsonWriter);
         return jsonWriter.writeEndObject();
     }
 
@@ -86,7 +87,7 @@ static RequiredAction fromJsonKnownDiscriminator(JsonReader jsonReader) throws I
      * The object type.
      */
     @Generated
-    private String type = "RequiredAction";
+    String type;
 
     /**
      * Get the type property: The object type.
@@ -97,4 +98,18 @@ static RequiredAction fromJsonKnownDiscriminator(JsonReader jsonReader) throws I
     public String getType() {
         return this.type;
     }
+
+    void toJsonShared(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStringField("type", this.type);
+    }
+
+    @Generated
+    static boolean fromJsonShared(JsonReader reader, String fieldName, RequiredAction deserializedRequiredAction)
+        throws IOException {
+        if ("type".equals(fieldName)) {
+            deserializedRequiredAction.type = reader.getString();
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RequiredFunctionToolCall.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RequiredFunctionToolCall.java
index 2dc9b49a7e21..5e65344d338a 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RequiredFunctionToolCall.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RequiredFunctionToolCall.java
@@ -43,6 +43,7 @@ public RequiredFunctionToolCallDetails getFunction() {
     private RequiredFunctionToolCall(String id, RequiredFunctionToolCallDetails function) {
         super(id);
         this.function = function;
+        this.type = "function";
     }
 
     /**
@@ -52,9 +53,8 @@ private RequiredFunctionToolCall(String id, RequiredFunctionToolCallDetails func
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("id", getId());
+        toJsonShared(jsonWriter);
         jsonWriter.writeJsonField("function", this.function);
-        jsonWriter.writeStringField("type", this.type);
         return jsonWriter.writeEndObject();
     }
 
@@ -91,21 +91,4 @@ public static RequiredFunctionToolCall fromJson(JsonReader jsonReader) throws IO
             return deserializedRequiredFunctionToolCall;
         });
     }
-
-    /*
-     * The object type for the required tool call.
-     */
-    @Generated
-    private String type = "function";
-
-    /**
-     * Get the type property: The object type for the required tool call.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
-    }
 }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RequiredToolCall.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RequiredToolCall.java
index 59fe60db301e..66c84e0dd594 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RequiredToolCall.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RequiredToolCall.java
@@ -31,6 +31,7 @@ public class RequiredToolCall implements JsonSerializable {
     @Generated
     protected RequiredToolCall(String id) {
         this.id = id;
+        this.type = "RequiredToolCall";
     }
 
     /**
@@ -50,8 +51,7 @@ public String getId() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("id", this.id);
-        jsonWriter.writeStringField("type", this.type);
+        toJsonShared(jsonWriter);
         return jsonWriter.writeEndObject();
     }
 
@@ -111,7 +111,7 @@ static RequiredToolCall fromJsonKnownDiscriminator(JsonReader jsonReader) throws
      * The object type for the required tool call.
      */
     @Generated
-    private String type = "RequiredToolCall";
+    String type;
 
     /**
      * Get the type property: The object type for the required tool call.
@@ -122,4 +122,9 @@ static RequiredToolCall fromJsonKnownDiscriminator(JsonReader jsonReader) throws
     public String getType() {
         return this.type;
     }
+
+    void toJsonShared(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStringField("id", this.id);
+        jsonWriter.writeStringField("type", this.type);
+    }
 }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterImageOutput.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterImageOutput.java
index 697ba24c490f..a0cff30debae 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterImageOutput.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterImageOutput.java
@@ -30,6 +30,7 @@ public final class RunStepCodeInterpreterImageOutput extends RunStepCodeInterpre
     @Generated
     private RunStepCodeInterpreterImageOutput(RunStepCodeInterpreterImageReference image) {
         this.image = image;
+        this.type = "image";
     }
 
     /**
@@ -49,8 +50,8 @@ public RunStepCodeInterpreterImageReference getImage() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        toJsonShared(jsonWriter);
         jsonWriter.writeJsonField("image", this.image);
-        jsonWriter.writeStringField("type", this.type);
         return jsonWriter.writeEndObject();
     }
 
@@ -85,21 +86,4 @@ public static RunStepCodeInterpreterImageOutput fromJson(JsonReader jsonReader)
             return deserializedRunStepCodeInterpreterImageOutput;
         });
     }
-
-    /*
-     * The object type.
-     */
-    @Generated
-    private String type = "image";
-
-    /**
-     * Get the type property: The object type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
-    }
 }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterLogOutput.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterLogOutput.java
index 381736d7836e..40cd722a04dd 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterLogOutput.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterLogOutput.java
@@ -30,6 +30,7 @@ public final class RunStepCodeInterpreterLogOutput extends RunStepCodeInterprete
     @Generated
     private RunStepCodeInterpreterLogOutput(String logs) {
         this.logs = logs;
+        this.type = "logs";
     }
 
     /**
@@ -42,23 +43,6 @@ public String getLogs() {
         return this.logs;
     }
 
-    /*
-     * The object type.
-     */
-    @Generated
-    private String type = "logs";
-
-    /**
-     * Get the type property: The object type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -66,8 +50,8 @@ public String getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        toJsonShared(jsonWriter);
         jsonWriter.writeStringField("logs", this.logs);
-        jsonWriter.writeStringField("type", this.type);
         return jsonWriter.writeEndObject();
     }
 
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterToolCall.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterToolCall.java
index 98e57a82c59e..a74698c8d827 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterToolCall.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterToolCall.java
@@ -33,6 +33,7 @@ public final class RunStepCodeInterpreterToolCall extends RunStepToolCall {
     private RunStepCodeInterpreterToolCall(String id, RunStepCodeInterpreterToolCallDetails codeInterpreter) {
         super(id);
         this.codeInterpreter = codeInterpreter;
+        this.type = "code_interpreter";
     }
 
     /**
@@ -45,23 +46,6 @@ public RunStepCodeInterpreterToolCallDetails getCodeInterpreter() {
         return this.codeInterpreter;
     }
 
-    /*
-     * The object type.
-     */
-    @Generated
-    private String type = "code_interpreter";
-
-    /**
-     * Get the type property: The object type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -69,9 +53,8 @@ public String getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("id", getId());
+        toJsonShared(jsonWriter);
         jsonWriter.writeJsonField("code_interpreter", this.codeInterpreter);
-        jsonWriter.writeStringField("type", this.type);
         return jsonWriter.writeEndObject();
     }
 
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterToolCallOutput.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterToolCallOutput.java
index 5d4ac8c40f44..b6f42b5c0dd8 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterToolCallOutput.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepCodeInterpreterToolCallOutput.java
@@ -22,6 +22,7 @@ public class RunStepCodeInterpreterToolCallOutput implements JsonSerializable
      * The object type for the run step detail object.
      */
     @Generated
-    private String type = "RunStepDeltaDetail";
+    String type;
 
     /**
      * Creates an instance of RunStepDeltaDetail class.
      */
     @Generated
     protected RunStepDeltaDetail() {
+        this.type = "RunStepDeltaDetail";
     }
 
     /**
@@ -47,7 +48,7 @@ public String getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("type", this.type);
+        toJsonShared(jsonWriter);
         return jsonWriter.writeEndObject();
     }
 
@@ -95,13 +96,25 @@ static RunStepDeltaDetail fromJsonKnownDiscriminator(JsonReader jsonReader) thro
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
-                if ("type".equals(fieldName)) {
-                    deserializedRunStepDeltaDetail.type = reader.getString();
-                } else {
+                if (!RunStepDeltaDetail.fromJsonShared(reader, fieldName, deserializedRunStepDeltaDetail)) {
                     reader.skipChildren();
                 }
             }
             return deserializedRunStepDeltaDetail;
         });
     }
+
+    void toJsonShared(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStringField("type", this.type);
+    }
+
+    @Generated
+    static boolean fromJsonShared(JsonReader reader, String fieldName,
+        RunStepDeltaDetail deserializedRunStepDeltaDetail) throws IOException {
+        if ("type".equals(fieldName)) {
+            deserializedRunStepDeltaDetail.type = reader.getString();
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaFileSearchToolCall.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaFileSearchToolCall.java
index e9c3a03f0ee0..655df03d30e3 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaFileSearchToolCall.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaFileSearchToolCall.java
@@ -17,12 +17,6 @@
 @Immutable
 public final class RunStepDeltaFileSearchToolCall extends RunStepDeltaToolCall {
 
-    /*
-     * The type of the tool call detail item in a streaming run step's details.
-     */
-    @Generated
-    private String type = "file_search";
-
     /*
      * Reserved for future use.
      */
@@ -38,17 +32,7 @@ public final class RunStepDeltaFileSearchToolCall extends RunStepDeltaToolCall {
     @Generated
     private RunStepDeltaFileSearchToolCall(int index, String id) {
         super(index, id);
-    }
-
-    /**
-     * Get the type property: The type of the tool call detail item in a streaming run step's details.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
+        this.type = "file_search";
     }
 
     /**
@@ -68,9 +52,7 @@ public Map getFileSearch() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeIntField("index", getIndex());
-        jsonWriter.writeStringField("id", getId());
-        jsonWriter.writeStringField("type", this.type);
+        toJsonShared(jsonWriter);
         jsonWriter.writeMapField("file_search", this.fileSearch, (writer, element) -> writer.writeString(element));
         return jsonWriter.writeEndObject();
     }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaFunctionToolCall.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaFunctionToolCall.java
index 8dc3654ebbdb..dda999eb98d8 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaFunctionToolCall.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaFunctionToolCall.java
@@ -16,12 +16,6 @@
 @Immutable
 public final class RunStepDeltaFunctionToolCall extends RunStepDeltaToolCall {
 
-    /*
-     * The type of the tool call detail item in a streaming run step's details.
-     */
-    @Generated
-    private String type = "function";
-
     /*
      * The function data for the tool call.
      */
@@ -37,17 +31,7 @@ public final class RunStepDeltaFunctionToolCall extends RunStepDeltaToolCall {
     @Generated
     private RunStepDeltaFunctionToolCall(int index, String id) {
         super(index, id);
-    }
-
-    /**
-     * Get the type property: The type of the tool call detail item in a streaming run step's details.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
+        this.type = "function";
     }
 
     /**
@@ -67,9 +51,7 @@ public RunStepDeltaFunction getFunction() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeIntField("index", getIndex());
-        jsonWriter.writeStringField("id", getId());
-        jsonWriter.writeStringField("type", this.type);
+        toJsonShared(jsonWriter);
         jsonWriter.writeJsonField("function", this.function);
         return jsonWriter.writeEndObject();
     }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaMessageCreation.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaMessageCreation.java
index 484d4e7bac41..27fe873257b6 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaMessageCreation.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaMessageCreation.java
@@ -16,12 +16,6 @@
 @Immutable
 public final class RunStepDeltaMessageCreation extends RunStepDeltaDetail {
 
-    /*
-     * The object type for the run step detail object.
-     */
-    @Generated
-    private String type = "message_creation";
-
     /*
      * The message creation data.
      */
@@ -33,17 +27,7 @@ public final class RunStepDeltaMessageCreation extends RunStepDeltaDetail {
      */
     @Generated
     private RunStepDeltaMessageCreation() {
-    }
-
-    /**
-     * Get the type property: The object type for the run step detail object.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
+        this.type = "message_creation";
     }
 
     /**
@@ -63,7 +47,7 @@ public RunStepDeltaMessageCreationObject getMessageCreation() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("type", this.type);
+        toJsonShared(jsonWriter);
         jsonWriter.writeJsonField("message_creation", this.messageCreation);
         return jsonWriter.writeEndObject();
     }
@@ -83,8 +67,8 @@ public static RunStepDeltaMessageCreation fromJson(JsonReader jsonReader) throws
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
-                if ("type".equals(fieldName)) {
-                    deserializedRunStepDeltaMessageCreation.type = reader.getString();
+                if (RunStepDeltaDetail.fromJsonShared(reader, fieldName, deserializedRunStepDeltaMessageCreation)) {
+                    continue;
                 } else if ("message_creation".equals(fieldName)) {
                     deserializedRunStepDeltaMessageCreation.messageCreation
                         = RunStepDeltaMessageCreationObject.fromJson(reader);
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaToolCall.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaToolCall.java
index bedf1ea3d073..b8fb1e7c052a 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaToolCall.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDeltaToolCall.java
@@ -21,7 +21,7 @@ public class RunStepDeltaToolCall implements JsonSerializable getToolCalls() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("type", this.type);
+        toJsonShared(jsonWriter);
         jsonWriter.writeArrayField("tool_calls", this.toolCalls, (writer, element) -> writer.writeJson(element));
         return jsonWriter.writeEndObject();
     }
@@ -84,8 +68,8 @@ public static RunStepDeltaToolCallObject fromJson(JsonReader jsonReader) throws
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
-                if ("type".equals(fieldName)) {
-                    deserializedRunStepDeltaToolCallObject.type = reader.getString();
+                if (RunStepDeltaDetail.fromJsonShared(reader, fieldName, deserializedRunStepDeltaToolCallObject)) {
+                    continue;
                 } else if ("tool_calls".equals(fieldName)) {
                     List toolCalls
                         = reader.readArray(reader1 -> RunStepDeltaToolCall.fromJson(reader1));
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDetails.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDetails.java
index afd68fdd8395..24e6d191f225 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDetails.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepDetails.java
@@ -22,6 +22,7 @@ public class RunStepDetails implements JsonSerializable {
      */
     @Generated
     protected RunStepDetails() {
+        this.type = RunStepType.fromString("RunStepDetails");
     }
 
     static RunStepDetails fromJsonKnownDiscriminator(JsonReader jsonReader) throws IOException {
@@ -40,7 +41,7 @@ static RunStepDetails fromJsonKnownDiscriminator(JsonReader jsonReader) throws I
      * The object type.
      */
     @Generated
-    private RunStepType type = RunStepType.fromString("RunStepDetails");
+    RunStepType type;
 
     /**
      * Get the type property: The object type.
@@ -59,7 +60,7 @@ public RunStepType getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("type", this.type == null ? null : this.type.toString());
+        toJsonShared(jsonWriter);
         return jsonWriter.writeEndObject();
     }
 
@@ -99,4 +100,18 @@ public static RunStepDetails fromJson(JsonReader jsonReader) throws IOException
             }
         });
     }
+
+    void toJsonShared(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStringField("type", this.type == null ? null : this.type.toString());
+    }
+
+    @Generated
+    static boolean fromJsonShared(JsonReader reader, String fieldName, RunStepDetails deserializedRunStepDetails)
+        throws IOException {
+        if ("type".equals(fieldName)) {
+            deserializedRunStepDetails.type = RunStepType.fromString(reader.getString());
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepFileSearchToolCall.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepFileSearchToolCall.java
index 309bef61d241..06dbd9626bf0 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepFileSearchToolCall.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepFileSearchToolCall.java
@@ -18,12 +18,6 @@
 @Immutable
 public final class RunStepFileSearchToolCall extends RunStepToolCall {
 
-    /*
-     * The object type.
-     */
-    @Generated
-    private String type = "file_search";
-
     /*
      * Reserved for future use.
      */
@@ -40,17 +34,7 @@ public final class RunStepFileSearchToolCall extends RunStepToolCall {
     private RunStepFileSearchToolCall(String id, Map fileSearch) {
         super(id);
         this.fileSearch = fileSearch;
-    }
-
-    /**
-     * Get the type property: The object type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
+        this.type = "file_search";
     }
 
     /**
@@ -70,9 +54,8 @@ public Map getFileSearch() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("id", getId());
+        toJsonShared(jsonWriter);
         jsonWriter.writeMapField("file_search", this.fileSearch, (writer, element) -> writer.writeString(element));
-        jsonWriter.writeStringField("type", this.type);
         return jsonWriter.writeEndObject();
     }
 
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepFunctionToolCall.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepFunctionToolCall.java
index 4d1b5fc90a6f..3f6bfbd6ad4a 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepFunctionToolCall.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepFunctionToolCall.java
@@ -34,6 +34,7 @@ public final class RunStepFunctionToolCall extends RunStepToolCall {
     private RunStepFunctionToolCall(String id, RunStepFunctionToolCallDetails function) {
         super(id);
         this.function = function;
+        this.type = "function";
     }
 
     /**
@@ -46,23 +47,6 @@ public RunStepFunctionToolCallDetails getFunction() {
         return this.function;
     }
 
-    /*
-     * The object type.
-     */
-    @Generated
-    private String type = "function";
-
-    /**
-     * Get the type property: The object type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -70,9 +54,8 @@ public String getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("id", getId());
+        toJsonShared(jsonWriter);
         jsonWriter.writeJsonField("function", this.function);
-        jsonWriter.writeStringField("type", this.type);
         return jsonWriter.writeEndObject();
     }
 
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepMessageCreationDetails.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepMessageCreationDetails.java
index 83107a9d7619..ac847366b30a 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepMessageCreationDetails.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepMessageCreationDetails.java
@@ -30,6 +30,7 @@ public final class RunStepMessageCreationDetails extends RunStepDetails {
     @Generated
     private RunStepMessageCreationDetails(RunStepMessageCreationReference messageCreation) {
         this.messageCreation = messageCreation;
+        this.type = RunStepType.MESSAGE_CREATION;
     }
 
     /**
@@ -42,23 +43,6 @@ public RunStepMessageCreationReference getMessageCreation() {
         return this.messageCreation;
     }
 
-    /*
-     * The object type.
-     */
-    @Generated
-    private RunStepType type = RunStepType.MESSAGE_CREATION;
-
-    /**
-     * Get the type property: The object type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public RunStepType getType() {
-        return this.type;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -66,8 +50,8 @@ public RunStepType getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        toJsonShared(jsonWriter);
         jsonWriter.writeJsonField("message_creation", this.messageCreation);
-        jsonWriter.writeStringField("type", this.type == null ? null : this.type.toString());
         return jsonWriter.writeEndObject();
     }
 
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepToolCall.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepToolCall.java
index 4b4e68e4ce09..89f3db1aaf45 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepToolCall.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepToolCall.java
@@ -31,6 +31,7 @@ public class RunStepToolCall implements JsonSerializable {
     @Generated
     protected RunStepToolCall(String id) {
         this.id = id;
+        this.type = "RunStepToolCall";
     }
 
     /**
@@ -50,8 +51,7 @@ public String getId() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("id", this.id);
-        jsonWriter.writeStringField("type", this.type);
+        toJsonShared(jsonWriter);
         return jsonWriter.writeEndObject();
     }
 
@@ -115,7 +115,7 @@ static RunStepToolCall fromJsonKnownDiscriminator(JsonReader jsonReader) throws
      * The object type.
      */
     @Generated
-    private String type = "RunStepToolCall";
+    String type;
 
     /**
      * Get the type property: The object type.
@@ -126,4 +126,9 @@ static RunStepToolCall fromJsonKnownDiscriminator(JsonReader jsonReader) throws
     public String getType() {
         return this.type;
     }
+
+    void toJsonShared(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStringField("id", this.id);
+        jsonWriter.writeStringField("type", this.type);
+    }
 }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepToolCallDetails.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepToolCallDetails.java
index 67c33239b194..8b04571d1967 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepToolCallDetails.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/RunStepToolCallDetails.java
@@ -31,6 +31,7 @@ public final class RunStepToolCallDetails extends RunStepDetails {
     @Generated
     private RunStepToolCallDetails(List toolCalls) {
         this.toolCalls = toolCalls;
+        this.type = RunStepType.TOOL_CALLS;
     }
 
     /**
@@ -74,23 +75,6 @@ public static RunStepToolCallDetails fromJson(JsonReader jsonReader) throws IOEx
         });
     }
 
-    /*
-     * The object type.
-     */
-    @Generated
-    private RunStepType type = RunStepType.TOOL_CALLS;
-
-    /**
-     * Get the type property: The object type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public RunStepType getType() {
-        return this.type;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -98,8 +82,8 @@ public RunStepType getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        toJsonShared(jsonWriter);
         jsonWriter.writeArrayField("tool_calls", this.toolCalls, (writer, element) -> writer.writeJson(element));
-        jsonWriter.writeStringField("type", this.type == null ? null : this.type.toString());
         return jsonWriter.writeEndObject();
     }
 }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/SubmitToolOutputsAction.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/SubmitToolOutputsAction.java
index daffb0a86179..389bce9bbfb4 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/SubmitToolOutputsAction.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/SubmitToolOutputsAction.java
@@ -30,6 +30,7 @@ public final class SubmitToolOutputsAction extends RequiredAction {
     @Generated
     private SubmitToolOutputsAction(SubmitToolOutputsDetails submitToolOutputs) {
         this.submitToolOutputs = submitToolOutputs;
+        this.type = "submit_tool_outputs";
     }
 
     /**
@@ -49,8 +50,8 @@ public SubmitToolOutputsDetails getSubmitToolOutputs() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        toJsonShared(jsonWriter);
         jsonWriter.writeJsonField("submit_tool_outputs", this.submitToolOutputs);
-        jsonWriter.writeStringField("type", this.type);
         return jsonWriter.writeEndObject();
     }
 
@@ -85,21 +86,4 @@ public static SubmitToolOutputsAction fromJson(JsonReader jsonReader) throws IOE
             return deserializedSubmitToolOutputsAction;
         });
     }
-
-    /*
-     * The object type.
-     */
-    @Generated
-    private String type = "submit_tool_outputs";
-
-    /**
-     * Get the type property: The object type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
-    }
 }
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/ToolDefinition.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/ToolDefinition.java
index 5f91ab36dc1f..8d462ac20997 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/ToolDefinition.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/ToolDefinition.java
@@ -22,6 +22,7 @@ public class ToolDefinition implements JsonSerializable {
      */
     @Generated
     public ToolDefinition() {
+        this.type = "ToolDefinition";
     }
 
     /**
@@ -31,7 +32,7 @@ public ToolDefinition() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("type", this.type);
+        toJsonShared(jsonWriter);
         return jsonWriter.writeEndObject();
     }
 
@@ -90,7 +91,7 @@ static ToolDefinition fromJsonKnownDiscriminator(JsonReader jsonReader) throws I
      * The object type.
      */
     @Generated
-    private String type = "ToolDefinition";
+    String type;
 
     /**
      * Get the type property: The object type.
@@ -101,4 +102,18 @@ static ToolDefinition fromJsonKnownDiscriminator(JsonReader jsonReader) throws I
     public String getType() {
         return this.type;
     }
+
+    void toJsonShared(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStringField("type", this.type);
+    }
+
+    @Generated
+    static boolean fromJsonShared(JsonReader reader, String fieldName, ToolDefinition deserializedToolDefinition)
+        throws IOException {
+        if ("type".equals(fieldName)) {
+            deserializedToolDefinition.type = reader.getString();
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/AzureChatExtensionConfiguration.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/AzureChatExtensionConfiguration.java
index 3d5c7ef1f9f7..a728b1e41082 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/AzureChatExtensionConfiguration.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/AzureChatExtensionConfiguration.java
@@ -24,6 +24,7 @@ public class AzureChatExtensionConfiguration implements JsonSerializable {
      */
     @Generated
     protected ChatFinishDetails() {
+        this.type = "ChatFinishDetails";
     }
 
     /*
      * The object type.
      */
     @Generated
-    private String type = "ChatFinishDetails";
+    String type;
 
     /**
      * Get the type property: The object type.
@@ -47,7 +48,7 @@ public String getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("type", this.type);
+        toJsonShared(jsonWriter);
         return jsonWriter.writeEndObject();
     }
 
@@ -95,13 +96,25 @@ static ChatFinishDetails fromJsonKnownDiscriminator(JsonReader jsonReader) throw
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
-                if ("type".equals(fieldName)) {
-                    deserializedChatFinishDetails.type = reader.getString();
-                } else {
+                if (!ChatFinishDetails.fromJsonShared(reader, fieldName, deserializedChatFinishDetails)) {
                     reader.skipChildren();
                 }
             }
             return deserializedChatFinishDetails;
         });
     }
+
+    void toJsonShared(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStringField("type", this.type);
+    }
+
+    @Generated
+    static boolean fromJsonShared(JsonReader reader, String fieldName, ChatFinishDetails deserializedChatFinishDetails)
+        throws IOException {
+        if ("type".equals(fieldName)) {
+            deserializedChatFinishDetails.type = reader.getString();
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatMessageContentItem.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatMessageContentItem.java
index 0b159fe8452e..e022e2d47b13 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatMessageContentItem.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatMessageContentItem.java
@@ -22,13 +22,14 @@ public class ChatMessageContentItem implements JsonSerializable writer.writeJson(element));
         jsonWriter.writeJsonField("function_call", this.functionCall);
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestFunctionMessage.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestFunctionMessage.java
index f4b11585af85..b3ef061e848c 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestFunctionMessage.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestFunctionMessage.java
@@ -38,6 +38,7 @@ public final class ChatRequestFunctionMessage extends ChatRequestMessage {
     public ChatRequestFunctionMessage(String name, String content) {
         this.name = name;
         this.content = content;
+        this.role = ChatRole.FUNCTION;
     }
 
     /**
@@ -60,23 +61,6 @@ public String getContent() {
         return this.content;
     }
 
-    /*
-     * The chat role associated with this message.
-     */
-    @Generated
-    private ChatRole role = ChatRole.FUNCTION;
-
-    /**
-     * Get the role property: The chat role associated with this message.
-     *
-     * @return the role value.
-     */
-    @Generated
-    @Override
-    public ChatRole getRole() {
-        return this.role;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -84,9 +68,9 @@ public ChatRole getRole() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        toJsonShared(jsonWriter);
         jsonWriter.writeStringField("name", this.name);
         jsonWriter.writeStringField("content", this.content);
-        jsonWriter.writeStringField("role", this.role == null ? null : this.role.toString());
         return jsonWriter.writeEndObject();
     }
 
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestMessage.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestMessage.java
index 8659a4fa5f0c..1f1709840352 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestMessage.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestMessage.java
@@ -22,13 +22,14 @@ public class ChatRequestMessage implements JsonSerializable
      */
     @Generated
     public ChatRequestMessage() {
+        this.role = ChatRole.fromString("ChatRequestMessage");
     }
 
     /*
      * The chat role associated with this message.
      */
     @Generated
-    private ChatRole role = ChatRole.fromString("ChatRequestMessage");
+    ChatRole role;
 
     /**
      * Get the role property: The chat role associated with this message.
@@ -47,7 +48,7 @@ public ChatRole getRole() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("role", this.role == null ? null : this.role.toString());
+        toJsonShared(jsonWriter);
         return jsonWriter.writeEndObject();
     }
 
@@ -101,13 +102,25 @@ static ChatRequestMessage fromJsonKnownDiscriminator(JsonReader jsonReader) thro
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
-                if ("role".equals(fieldName)) {
-                    deserializedChatRequestMessage.role = ChatRole.fromString(reader.getString());
-                } else {
+                if (!ChatRequestMessage.fromJsonShared(reader, fieldName, deserializedChatRequestMessage)) {
                     reader.skipChildren();
                 }
             }
             return deserializedChatRequestMessage;
         });
     }
+
+    void toJsonShared(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStringField("role", this.role == null ? null : this.role.toString());
+    }
+
+    @Generated
+    static boolean fromJsonShared(JsonReader reader, String fieldName,
+        ChatRequestMessage deserializedChatRequestMessage) throws IOException {
+        if ("role".equals(fieldName)) {
+            deserializedChatRequestMessage.role = ChatRole.fromString(reader.getString());
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestSystemMessage.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestSystemMessage.java
index 0a180691c293..cb5598ca6a7d 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestSystemMessage.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestSystemMessage.java
@@ -37,6 +37,7 @@ public final class ChatRequestSystemMessage extends ChatRequestMessage {
     @Generated
     public ChatRequestSystemMessage(String content) {
         this.content = content;
+        this.role = ChatRole.SYSTEM;
     }
 
     /**
@@ -71,23 +72,6 @@ public ChatRequestSystemMessage setName(String name) {
         return this;
     }
 
-    /*
-     * The chat role associated with this message.
-     */
-    @Generated
-    private ChatRole role = ChatRole.SYSTEM;
-
-    /**
-     * Get the role property: The chat role associated with this message.
-     *
-     * @return the role value.
-     */
-    @Generated
-    @Override
-    public ChatRole getRole() {
-        return this.role;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -95,8 +79,8 @@ public ChatRole getRole() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        toJsonShared(jsonWriter);
         jsonWriter.writeStringField("content", this.content);
-        jsonWriter.writeStringField("role", this.role == null ? null : this.role.toString());
         jsonWriter.writeStringField("name", this.name);
         return jsonWriter.writeEndObject();
     }
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestToolMessage.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestToolMessage.java
index 9538f2811ba4..91de81b72c8d 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestToolMessage.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestToolMessage.java
@@ -38,6 +38,7 @@ public final class ChatRequestToolMessage extends ChatRequestMessage {
     public ChatRequestToolMessage(String content, String toolCallId) {
         this.content = content;
         this.toolCallId = toolCallId;
+        this.role = ChatRole.TOOL;
     }
 
     /**
@@ -60,23 +61,6 @@ public String getToolCallId() {
         return this.toolCallId;
     }
 
-    /*
-     * The chat role associated with this message.
-     */
-    @Generated
-    private ChatRole role = ChatRole.TOOL;
-
-    /**
-     * Get the role property: The chat role associated with this message.
-     *
-     * @return the role value.
-     */
-    @Generated
-    @Override
-    public ChatRole getRole() {
-        return this.role;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -84,9 +68,9 @@ public ChatRole getRole() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        toJsonShared(jsonWriter);
         jsonWriter.writeStringField("content", this.content);
         jsonWriter.writeStringField("tool_call_id", this.toolCallId);
-        jsonWriter.writeStringField("role", this.role == null ? null : this.role.toString());
         return jsonWriter.writeEndObject();
     }
 
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestUserMessage.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestUserMessage.java
index 58c5dd1e595c..cbf3e56dd484 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestUserMessage.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ChatRequestUserMessage.java
@@ -111,23 +111,6 @@ public ChatRequestUserMessage setName(String name) {
         return this;
     }
 
-    /*
-     * The chat role associated with this message.
-     */
-    @Generated
-    private ChatRole role = ChatRole.USER;
-
-    /**
-     * Get the role property: The chat role associated with this message.
-     *
-     * @return the role value.
-     */
-    @Generated
-    @Override
-    public ChatRole getRole() {
-        return this.role;
-    }
-
     /**
      * {@inheritDoc}
      */
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ElasticsearchChatExtensionConfiguration.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ElasticsearchChatExtensionConfiguration.java
index d567e4b46ec7..f1db121b74fa 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ElasticsearchChatExtensionConfiguration.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/ElasticsearchChatExtensionConfiguration.java
@@ -41,26 +41,7 @@ public ElasticsearchChatExtensionParameters getParameters() {
     @Generated
     public ElasticsearchChatExtensionConfiguration(ElasticsearchChatExtensionParameters parameters) {
         this.parameters = parameters;
-    }
-
-    /*
-     * The label for the type of an Azure chat extension. This typically corresponds to a matching Azure resource.
-     * Azure chat extensions are only compatible with Azure OpenAI.
-     */
-    @Generated
-    private AzureChatExtensionType type = AzureChatExtensionType.ELASTICSEARCH;
-
-    /**
-     * Get the type property: The label for the type of an Azure chat extension. This typically corresponds to a
-     * matching Azure resource.
-     * Azure chat extensions are only compatible with Azure OpenAI.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public AzureChatExtensionType getType() {
-        return this.type;
+        this.type = AzureChatExtensionType.ELASTICSEARCH;
     }
 
     /**
@@ -70,8 +51,8 @@ public AzureChatExtensionType getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        toJsonShared(jsonWriter);
         jsonWriter.writeJsonField("parameters", this.parameters);
-        jsonWriter.writeStringField("type", this.type == null ? null : this.type.toString());
         return jsonWriter.writeEndObject();
     }
 
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/MaxTokensFinishDetails.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/MaxTokensFinishDetails.java
index c8b66788132b..49d00ffd91d3 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/MaxTokensFinishDetails.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/MaxTokensFinishDetails.java
@@ -23,23 +23,7 @@ public final class MaxTokensFinishDetails extends ChatFinishDetails {
      */
     @Generated
     private MaxTokensFinishDetails() {
-    }
-
-    /*
-     * The object type.
-     */
-    @Generated
-    private String type = "max_tokens";
-
-    /**
-     * Get the type property: The object type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public String getType() {
-        return this.type;
+        this.type = "max_tokens";
     }
 
     /**
@@ -49,7 +33,7 @@ public String getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("type", this.type);
+        toJsonShared(jsonWriter);
         return jsonWriter.writeEndObject();
     }
 
@@ -68,8 +52,8 @@ public static MaxTokensFinishDetails fromJson(JsonReader jsonReader) throws IOEx
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
-                if ("type".equals(fieldName)) {
-                    deserializedMaxTokensFinishDetails.type = reader.getString();
+                if (ChatFinishDetails.fromJsonShared(reader, fieldName, deserializedMaxTokensFinishDetails)) {
+                    continue;
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/OnYourDataAccessTokenAuthenticationOptions.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/OnYourDataAccessTokenAuthenticationOptions.java
index 3b42b9ae3197..c3d9aff50138 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/OnYourDataAccessTokenAuthenticationOptions.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/OnYourDataAccessTokenAuthenticationOptions.java
@@ -30,6 +30,7 @@ public final class OnYourDataAccessTokenAuthenticationOptions extends OnYourData
     @Generated
     public OnYourDataAccessTokenAuthenticationOptions(String accessToken) {
         this.accessToken = accessToken;
+        this.type = OnYourDataAuthenticationType.ACCESS_TOKEN;
     }
 
     /**
@@ -42,23 +43,6 @@ public String getAccessToken() {
         return this.accessToken;
     }
 
-    /*
-     * The authentication type.
-     */
-    @Generated
-    private OnYourDataAuthenticationType type = OnYourDataAuthenticationType.ACCESS_TOKEN;
-
-    /**
-     * Get the type property: The authentication type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public OnYourDataAuthenticationType getType() {
-        return this.type;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -66,8 +50,8 @@ public OnYourDataAuthenticationType getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        toJsonShared(jsonWriter);
         jsonWriter.writeStringField("access_token", this.accessToken);
-        jsonWriter.writeStringField("type", this.type == null ? null : this.type.toString());
         return jsonWriter.writeEndObject();
     }
 
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/OnYourDataApiKeyAuthenticationOptions.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/OnYourDataApiKeyAuthenticationOptions.java
index 44812dc9aaa3..944f619eeac0 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/OnYourDataApiKeyAuthenticationOptions.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/OnYourDataApiKeyAuthenticationOptions.java
@@ -30,6 +30,7 @@ public final class OnYourDataApiKeyAuthenticationOptions extends OnYourDataAuthe
     @Generated
     public OnYourDataApiKeyAuthenticationOptions(String key) {
         this.key = key;
+        this.type = OnYourDataAuthenticationType.API_KEY;
     }
 
     /**
@@ -42,23 +43,6 @@ public String getKey() {
         return this.key;
     }
 
-    /*
-     * The authentication type.
-     */
-    @Generated
-    private OnYourDataAuthenticationType type = OnYourDataAuthenticationType.API_KEY;
-
-    /**
-     * Get the type property: The authentication type.
-     *
-     * @return the type value.
-     */
-    @Generated
-    @Override
-    public OnYourDataAuthenticationType getType() {
-        return this.type;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -66,8 +50,8 @@ public OnYourDataAuthenticationType getType() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        toJsonShared(jsonWriter);
         jsonWriter.writeStringField("key", this.key);
-        jsonWriter.writeStringField("type", this.type == null ? null : this.type.toString());
         return jsonWriter.writeEndObject();
     }
 
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/OnYourDataAuthenticationOptions.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/OnYourDataAuthenticationOptions.java
index ff35cada2631..b19034c85596 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/OnYourDataAuthenticationOptions.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/OnYourDataAuthenticationOptions.java
@@ -22,14 +22,14 @@ public class OnYourDataAuthenticationOptions implements JsonSerializable