Skip to content

Simplify StreamSerializationModelTemplate #2928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weidongxu-microsoft merged 4 commits into from
Aug 27, 2024
Merged

Simplify StreamSerializationModelTemplate #2928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
432c07d
Simplify StreamSerializationModelTemplate
alzimmermsft Aug 20, 2024
9adcea5
Put shared JsonSerializable code behind a feature flag
alzimmermsft Aug 22, 2024
b2d4f8b
Merge branch 'main' into SimplifyStreamStyleCode
alzimmermsft Aug 23, 2024
7847427
Fix override missing
alzimmermsft Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Generate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ $job = @(
"$VANILLA_ARGUMENTS --input-file=$SWAGGER_PATH/body-boolean.json --namespace=fixtures.bodyboolean --client-logger",
"$VANILLA_ARGUMENTS --input-file=$SWAGGER_PATH/body-boolean.quirks.json --namespace=fixtures.bodyboolean.quirks",
"$VANILLA_ARGUMENTS --input-file=$SWAGGER_PATH/body-complex.json --namespace=fixtures.bodycomplex --required-fields-as-ctor-args --client-logger --output-model-immutable --generate-tests --stream-style-serialization=false",
"$VANILLA_ARGUMENTS --input-file=$SWAGGER_PATH/body-complex.json --namespace=fixtures.streamstyleserialization --enable-sync-stack --client-logger",
"$VANILLA_ARGUMENTS --input-file=$SWAGGER_PATH/body-complex.json --namespace=fixtures.streamstyleserializationimmutableoutput --enable-sync-stack --output-model-immutable --client-logger",
"$VANILLA_ARGUMENTS --input-file=$SWAGGER_PATH/body-complex.json --namespace=fixtures.streamstyleserializationctorargs --enable-sync-stack --required-fields-as-ctor-args --client-logger",
"$VANILLA_ARGUMENTS --input-file=$SWAGGER_PATH/body-complex.json --namespace=fixtures.streamstyleserialization --enable-sync-stack --client-logger --share-jsonserializable-code",
"$VANILLA_ARGUMENTS --input-file=$SWAGGER_PATH/body-complex.json --namespace=fixtures.streamstyleserializationimmutableoutput --enable-sync-stack --output-model-immutable --client-logger --share-jsonserializable-code",
"$VANILLA_ARGUMENTS --input-file=$SWAGGER_PATH/body-complex.json --namespace=fixtures.streamstyleserializationctorargs --enable-sync-stack --required-fields-as-ctor-args --client-logger --share-jsonserializable-code",
"$VANILLA_ARGUMENTS --input-file=$SWAGGER_PATH/body-file.json --namespace=fixtures.bodyfile",
"$VANILLA_ARGUMENTS --input-file=$SWAGGER_PATH/body-string.json --namespace=fixtures.bodystring --generate-client-interfaces",
"$VANILLA_ARGUMENTS --input-file=$SWAGGER_PATH/custom-baseUrl.json --namespace=fixtures.custombaseuri",
Expand Down
61 changes: 56 additions & 5 deletions ...recognizer/documentanalysis/implementation/models/DocumentModelBuildOperationDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,25 @@
package com.azure.ai.formrecognizer.documentanalysis.implementation.models;

import com.azure.core.annotation.Fluent;
import com.azure.core.util.CoreUtils;
import com.azure.json.JsonReader;
import com.azure.json.JsonToken;
import com.azure.json.JsonWriter;
import java.io.IOException;
import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Map;

/**
* Get Operation response object.
*/
@Fluent
public final class DocumentModelBuildOperationDetails extends OperationDetails {
/*
* Type of operation.
*/
private String kind = "documentModelBuild";

/*
* Operation result upon success.
*/
Expand All @@ -26,7 +33,16 @@ public final class DocumentModelBuildOperationDetails extends OperationDetails {
* Creates an instance of DocumentModelBuildOperationDetails class.
*/
public DocumentModelBuildOperationDetails() {
this.kind = "documentModelBuild";
}

/**
* Get the kind property: Type of operation.
*
* @return the kind value.
*/
@Override
public String getKind() {
return this.kind;
}

/**
Expand Down Expand Up @@ -136,7 +152,20 @@ public DocumentModelBuildOperationDetails setError(Error error) {
@Override
public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
jsonWriter.writeStartObject();
toJsonShared(jsonWriter);
jsonWriter.writeStringField("operationId", getOperationId());
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);
jsonWriter.writeJsonField("result", this.result);
return jsonWriter.writeEndObject();
}
Expand All @@ -158,9 +187,31 @@ public static DocumentModelBuildOperationDetails fromJson(JsonReader jsonReader)
String fieldName = reader.getFieldName();
reader.nextToken();

if (OperationDetails.fromJsonShared(reader, fieldName,
deserializedDocumentModelBuildOperationDetails)) {
continue;
if ("operationId".equals(fieldName)) {
deserializedDocumentModelBuildOperationDetails.setOperationId(reader.getString());
} else if ("status".equals(fieldName)) {
deserializedDocumentModelBuildOperationDetails
.setStatus(OperationStatus.fromString(reader.getString()));
} else if ("createdDateTime".equals(fieldName)) {
deserializedDocumentModelBuildOperationDetails.setCreatedDateTime(reader
.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())));
} else if ("lastUpdatedDateTime".equals(fieldName)) {
deserializedDocumentModelBuildOperationDetails.setLastUpdatedDateTime(reader
.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())));
} else if ("resourceLocation".equals(fieldName)) {
deserializedDocumentModelBuildOperationDetails.setResourceLocation(reader.getString());
} else if ("percentCompleted".equals(fieldName)) {
deserializedDocumentModelBuildOperationDetails
.setPercentCompleted(reader.getNullable(JsonReader::getInt));
} else if ("apiVersion".equals(fieldName)) {
deserializedDocumentModelBuildOperationDetails.setApiVersion(reader.getString());
} else if ("tags".equals(fieldName)) {
Map<String, String> tags = reader.readMap(reader1 -> reader1.getString());
deserializedDocumentModelBuildOperationDetails.setTags(tags);
} else if ("error".equals(fieldName)) {
deserializedDocumentModelBuildOperationDetails.setError(Error.fromJson(reader));
} else if ("kind".equals(fieldName)) {
deserializedDocumentModelBuildOperationDetails.kind = reader.getString();
} else if ("result".equals(fieldName)) {
deserializedDocumentModelBuildOperationDetails.result = DocumentModelDetails.fromJson(reader);
} else {
Expand Down
61 changes: 56 additions & 5 deletions ...cognizer/documentanalysis/implementation/models/DocumentModelComposeOperationDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,25 @@
package com.azure.ai.formrecognizer.documentanalysis.implementation.models;

import com.azure.core.annotation.Fluent;
import com.azure.core.util.CoreUtils;
import com.azure.json.JsonReader;
import com.azure.json.JsonToken;
import com.azure.json.JsonWriter;
import java.io.IOException;
import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Map;

/**
* Get Operation response object.
*/
@Fluent
public final class DocumentModelComposeOperationDetails extends OperationDetails {
/*
* Type of operation.
*/
private String kind = "documentModelCompose";

/*
* Operation result upon success.
*/
Expand All @@ -26,7 +33,16 @@ public final class DocumentModelComposeOperationDetails extends OperationDetails
* Creates an instance of DocumentModelComposeOperationDetails class.
*/
public DocumentModelComposeOperationDetails() {
this.kind = "documentModelCompose";
}

/**
* Get the kind property: Type of operation.
*
* @return the kind value.
*/
@Override
public String getKind() {
return this.kind;
}

/**
Expand Down Expand Up @@ -136,7 +152,20 @@ public DocumentModelComposeOperationDetails setError(Error error) {
@Override
public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
jsonWriter.writeStartObject();
toJsonShared(jsonWriter);
jsonWriter.writeStringField("operationId", getOperationId());
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);
jsonWriter.writeJsonField("result", this.result);
return jsonWriter.writeEndObject();
}
Expand All @@ -158,9 +187,31 @@ public static DocumentModelComposeOperationDetails fromJson(JsonReader jsonReade
String fieldName = reader.getFieldName();
reader.nextToken();

if (OperationDetails.fromJsonShared(reader, fieldName,
deserializedDocumentModelComposeOperationDetails)) {
continue;
if ("operationId".equals(fieldName)) {
deserializedDocumentModelComposeOperationDetails.setOperationId(reader.getString());
} else if ("status".equals(fieldName)) {
deserializedDocumentModelComposeOperationDetails
.setStatus(OperationStatus.fromString(reader.getString()));
} else if ("createdDateTime".equals(fieldName)) {
deserializedDocumentModelComposeOperationDetails.setCreatedDateTime(reader
.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())));
} else if ("lastUpdatedDateTime".equals(fieldName)) {
deserializedDocumentModelComposeOperationDetails.setLastUpdatedDateTime(reader
.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())));
} else if ("resourceLocation".equals(fieldName)) {
deserializedDocumentModelComposeOperationDetails.setResourceLocation(reader.getString());
} else if ("percentCompleted".equals(fieldName)) {
deserializedDocumentModelComposeOperationDetails
.setPercentCompleted(reader.getNullable(JsonReader::getInt));
} else if ("apiVersion".equals(fieldName)) {
deserializedDocumentModelComposeOperationDetails.setApiVersion(reader.getString());
} else if ("tags".equals(fieldName)) {
Map<String, String> tags = reader.readMap(reader1 -> reader1.getString());
deserializedDocumentModelComposeOperationDetails.setTags(tags);
} else if ("error".equals(fieldName)) {
deserializedDocumentModelComposeOperationDetails.setError(Error.fromJson(reader));
} else if ("kind".equals(fieldName)) {
deserializedDocumentModelComposeOperationDetails.kind = reader.getString();
} else if ("result".equals(fieldName)) {
deserializedDocumentModelComposeOperationDetails.result = DocumentModelDetails.fromJson(reader);
} else {
Expand Down
61 changes: 56 additions & 5 deletions ...ecognizer/documentanalysis/implementation/models/DocumentModelCopyToOperationDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,25 @@
package com.azure.ai.formrecognizer.documentanalysis.implementation.models;

import com.azure.core.annotation.Fluent;
import com.azure.core.util.CoreUtils;
import com.azure.json.JsonReader;
import com.azure.json.JsonToken;
import com.azure.json.JsonWriter;
import java.io.IOException;
import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Map;

/**
* Get Operation response object.
*/
@Fluent
public final class DocumentModelCopyToOperationDetails extends OperationDetails {
/*
* Type of operation.
*/
private String kind = "documentModelCopyTo";

/*
* Operation result upon success.
*/
Expand All @@ -26,7 +33,16 @@ public final class DocumentModelCopyToOperationDetails extends OperationDetails
* Creates an instance of DocumentModelCopyToOperationDetails class.
*/
public DocumentModelCopyToOperationDetails() {
this.kind = "documentModelCopyTo";
}

/**
* Get the kind property: Type of operation.
*
* @return the kind value.
*/
@Override
public String getKind() {
return this.kind;
}

/**
Expand Down Expand Up @@ -136,7 +152,20 @@ public DocumentModelCopyToOperationDetails setError(Error error) {
@Override
public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
jsonWriter.writeStartObject();
toJsonShared(jsonWriter);
jsonWriter.writeStringField("operationId", getOperationId());
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);
jsonWriter.writeJsonField("result", this.result);
return jsonWriter.writeEndObject();
}
Expand All @@ -158,9 +187,31 @@ public static DocumentModelCopyToOperationDetails fromJson(JsonReader jsonReader
String fieldName = reader.getFieldName();
reader.nextToken();

if (OperationDetails.fromJsonShared(reader, fieldName,
deserializedDocumentModelCopyToOperationDetails)) {
continue;
if ("operationId".equals(fieldName)) {
deserializedDocumentModelCopyToOperationDetails.setOperationId(reader.getString());
} else if ("status".equals(fieldName)) {
deserializedDocumentModelCopyToOperationDetails
.setStatus(OperationStatus.fromString(reader.getString()));
} else if ("createdDateTime".equals(fieldName)) {
deserializedDocumentModelCopyToOperationDetails.setCreatedDateTime(reader
.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())));
} else if ("lastUpdatedDateTime".equals(fieldName)) {
deserializedDocumentModelCopyToOperationDetails.setLastUpdatedDateTime(reader
.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString())));
} else if ("resourceLocation".equals(fieldName)) {
deserializedDocumentModelCopyToOperationDetails.setResourceLocation(reader.getString());
} else if ("percentCompleted".equals(fieldName)) {
deserializedDocumentModelCopyToOperationDetails
.setPercentCompleted(reader.getNullable(JsonReader::getInt));
} else if ("apiVersion".equals(fieldName)) {
deserializedDocumentModelCopyToOperationDetails.setApiVersion(reader.getString());
} else if ("tags".equals(fieldName)) {
Map<String, String> tags = reader.readMap(reader1 -> reader1.getString());
deserializedDocumentModelCopyToOperationDetails.setTags(tags);
} else if ("error".equals(fieldName)) {
deserializedDocumentModelCopyToOperationDetails.setError(Error.fromJson(reader));
} else if ("kind".equals(fieldName)) {
deserializedDocumentModelCopyToOperationDetails.kind = reader.getString();
} else if ("result".equals(fieldName)) {
deserializedDocumentModelCopyToOperationDetails.result = DocumentModelDetails.fromJson(reader);
} else {
Expand Down
Loading