Skip to content

[AutoPR azure-messaging-eventgrid-systemevents] [eg] fix record<unknown> #15824

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[AutoPR azure-messaging-eventgrid-systemevents] [eg] fix record<unknown> #15824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 9 additions & 10 deletions ...c/main/java/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedEventData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import com.azure.core.annotation.Generated;
import com.azure.core.annotation.Immutable;
import com.azure.core.util.BinaryData;
import com.azure.core.util.CoreUtils;
import com.azure.json.JsonReader;
import com.azure.json.JsonToken;
Expand All @@ -32,7 +31,7 @@ public final class AcsChatThreadCreatedEventData extends AcsChatThreadEventInThr
* The thread properties
*/
@Generated
private final Map<String, BinaryData> properties;
private final Map<String, AcsChatThreadCreatedWithUserEventDataProperty> properties;

/*
* The thread metadata
Expand Down Expand Up @@ -75,8 +74,9 @@ public final class AcsChatThreadCreatedEventData extends AcsChatThreadEventInThr
*/
@Generated
private AcsChatThreadCreatedEventData(OffsetDateTime createTime,
CommunicationIdentifierModel createdByCommunicationIdentifier, Map<String, BinaryData> properties,
Map<String, String> metadata, List<AcsChatThreadParticipantProperties> participants) {
CommunicationIdentifierModel createdByCommunicationIdentifier,
Map<String, AcsChatThreadCreatedWithUserEventDataProperty> properties, Map<String, String> metadata,
List<AcsChatThreadParticipantProperties> participants) {
super(createTime);
this.createdByCommunicationIdentifier = createdByCommunicationIdentifier;
this.properties = properties;
Expand All @@ -101,7 +101,7 @@ public CommunicationIdentifierModel getCreatedByCommunicationIdentifier() {
* @return the properties value.
*/
@Generated
public Map<String, BinaryData> getProperties() {
public Map<String, AcsChatThreadCreatedWithUserEventDataProperty> getProperties() {
return this.properties;
}

Expand Down Expand Up @@ -171,8 +171,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
jsonWriter.writeStringField("threadId", getThreadId());
jsonWriter.writeNumberField("version", getVersion());
jsonWriter.writeJsonField("createdByCommunicationIdentifier", this.createdByCommunicationIdentifier);
jsonWriter.writeMapField("properties", this.properties,
(writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class)));
jsonWriter.writeMapField("properties", this.properties, (writer, element) -> writer.writeJson(element));
jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element));
jsonWriter.writeArrayField("participants", this.participants, (writer, element) -> writer.writeJson(element));
return jsonWriter.writeEndObject();
Expand All @@ -195,7 +194,7 @@ public static AcsChatThreadCreatedEventData fromJson(JsonReader jsonReader) thro
String threadId = null;
Long version = null;
CommunicationIdentifierModel createdByCommunicationIdentifier = null;
Map<String, BinaryData> properties = null;
Map<String, AcsChatThreadCreatedWithUserEventDataProperty> properties = null;
Map<String, String> metadata = null;
List<AcsChatThreadParticipantProperties> participants = null;
while (reader.nextToken() != JsonToken.END_OBJECT) {
Expand All @@ -214,8 +213,8 @@ public static AcsChatThreadCreatedEventData fromJson(JsonReader jsonReader) thro
} else if ("createdByCommunicationIdentifier".equals(fieldName)) {
createdByCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader);
} else if ("properties".equals(fieldName)) {
properties = reader.readMap(reader1 -> reader1
.getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped())));
properties
= reader.readMap(reader1 -> AcsChatThreadCreatedWithUserEventDataProperty.fromJson(reader1));
} else if ("metadata".equals(fieldName)) {
metadata = reader.readMap(reader1 -> reader1.getString());
} else if ("participants".equals(fieldName)) {
Expand Down
16 changes: 7 additions & 9 deletions ...ava/com/azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedWithUserEventData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import com.azure.core.annotation.Generated;
import com.azure.core.annotation.Immutable;
import com.azure.core.util.BinaryData;
import com.azure.core.util.CoreUtils;
import com.azure.json.JsonReader;
import com.azure.json.JsonToken;
Expand All @@ -32,7 +31,7 @@ public final class AcsChatThreadCreatedWithUserEventData extends AcsChatThreadEv
* The thread properties
*/
@Generated
private final Map<String, BinaryData> properties;
private final Map<String, AcsChatThreadCreatedWithUserEventDataProperty> properties;

/*
* The thread metadata
Expand Down Expand Up @@ -77,7 +76,7 @@ public final class AcsChatThreadCreatedWithUserEventData extends AcsChatThreadEv
@Generated
private AcsChatThreadCreatedWithUserEventData(CommunicationIdentifierModel recipientCommunicationIdentifier,
OffsetDateTime createTime, CommunicationIdentifierModel createdByCommunicationIdentifier,
Map<String, BinaryData> properties, Map<String, String> metadata,
Map<String, AcsChatThreadCreatedWithUserEventDataProperty> properties, Map<String, String> metadata,
List<AcsChatThreadParticipantProperties> participants) {
super(recipientCommunicationIdentifier, createTime);
this.createdByCommunicationIdentifier = createdByCommunicationIdentifier;
Expand All @@ -103,7 +102,7 @@ public CommunicationIdentifierModel getCreatedByCommunicationIdentifier() {
* @return the properties value.
*/
@Generated
public Map<String, BinaryData> getProperties() {
public Map<String, AcsChatThreadCreatedWithUserEventDataProperty> getProperties() {
return this.properties;
}

Expand Down Expand Up @@ -174,8 +173,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
jsonWriter.writeStringField("threadId", getThreadId());
jsonWriter.writeNumberField("version", getVersion());
jsonWriter.writeJsonField("createdByCommunicationIdentifier", this.createdByCommunicationIdentifier);
jsonWriter.writeMapField("properties", this.properties,
(writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class)));
jsonWriter.writeMapField("properties", this.properties, (writer, element) -> writer.writeJson(element));
jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element));
jsonWriter.writeArrayField("participants", this.participants, (writer, element) -> writer.writeJson(element));
return jsonWriter.writeEndObject();
Expand All @@ -199,7 +197,7 @@ public static AcsChatThreadCreatedWithUserEventData fromJson(JsonReader jsonRead
String threadId = null;
Long version = null;
CommunicationIdentifierModel createdByCommunicationIdentifier = null;
Map<String, BinaryData> properties = null;
Map<String, AcsChatThreadCreatedWithUserEventDataProperty> properties = null;
Map<String, String> metadata = null;
List<AcsChatThreadParticipantProperties> participants = null;
while (reader.nextToken() != JsonToken.END_OBJECT) {
Expand All @@ -220,8 +218,8 @@ public static AcsChatThreadCreatedWithUserEventData fromJson(JsonReader jsonRead
} else if ("createdByCommunicationIdentifier".equals(fieldName)) {
createdByCommunicationIdentifier = CommunicationIdentifierModel.fromJson(reader);
} else if ("properties".equals(fieldName)) {
properties = reader.readMap(reader1 -> reader1
.getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped())));
properties
= reader.readMap(reader1 -> AcsChatThreadCreatedWithUserEventDataProperty.fromJson(reader1));
} else if ("metadata".equals(fieldName)) {
metadata = reader.readMap(reader1 -> reader1.getString());
} else if ("participants".equals(fieldName)) {
Expand Down
61 changes: 61 additions & 0 deletions ...azure/messaging/eventgrid/systemevents/AcsChatThreadCreatedWithUserEventDataProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
// Code generated by Microsoft (R) TypeSpec Code Generator.

package com.azure.messaging.eventgrid.systemevents;

import com.azure.core.annotation.Generated;
import com.azure.core.annotation.Immutable;
import com.azure.json.JsonReader;
import com.azure.json.JsonSerializable;
import com.azure.json.JsonToken;
import com.azure.json.JsonWriter;
import java.io.IOException;

/**
* The AcsChatThreadCreatedWithUserEventDataProperty model.
*/
@Immutable
public final class AcsChatThreadCreatedWithUserEventDataProperty
implements JsonSerializable<AcsChatThreadCreatedWithUserEventDataProperty> {
/**
* Creates an instance of AcsChatThreadCreatedWithUserEventDataProperty class.
*/
@Generated
private AcsChatThreadCreatedWithUserEventDataProperty() {
}

/**
* {@inheritDoc}
*/
@Generated
@Override
public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
jsonWriter.writeStartObject();
return jsonWriter.writeEndObject();
}

/**
* Reads an instance of AcsChatThreadCreatedWithUserEventDataProperty from the JsonReader.
*
* @param jsonReader The JsonReader being read.
* @return An instance of AcsChatThreadCreatedWithUserEventDataProperty if the JsonReader was pointing to an
* instance of it, or null if it was pointing to JSON null.
* @throws IOException If an error occurs while reading the AcsChatThreadCreatedWithUserEventDataProperty.
*/
@Generated
public static AcsChatThreadCreatedWithUserEventDataProperty fromJson(JsonReader jsonReader) throws IOException {
return jsonReader.readObject(reader -> {
AcsChatThreadCreatedWithUserEventDataProperty deserializedAcsChatThreadCreatedWithUserEventDataProperty
= new AcsChatThreadCreatedWithUserEventDataProperty();
while (reader.nextToken() != JsonToken.END_OBJECT) {
String fieldName = reader.getFieldName();
reader.nextToken();

reader.skipChildren();
}

return deserializedAcsChatThreadCreatedWithUserEventDataProperty;
});
}
}
16 changes: 7 additions & 9 deletions ...a/com/azure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedEventData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import com.azure.core.annotation.Generated;
import com.azure.core.annotation.Immutable;
import com.azure.core.util.BinaryData;
import com.azure.core.util.CoreUtils;
import com.azure.json.JsonReader;
import com.azure.json.JsonToken;
Expand Down Expand Up @@ -37,7 +36,7 @@ public final class AcsChatThreadPropertiesUpdatedEventData extends AcsChatThread
* The updated thread properties
*/
@Generated
private final Map<String, BinaryData> properties;
private final Map<String, AcsChatThreadPropertiesUpdatedEventDataProperty> properties;

/*
* The thread metadata
Expand Down Expand Up @@ -75,7 +74,7 @@ public final class AcsChatThreadPropertiesUpdatedEventData extends AcsChatThread
@Generated
private AcsChatThreadPropertiesUpdatedEventData(OffsetDateTime createTime,
CommunicationIdentifierModel editedByCommunicationIdentifier, OffsetDateTime editTime,
Map<String, BinaryData> properties, Map<String, String> metadata) {
Map<String, AcsChatThreadPropertiesUpdatedEventDataProperty> properties, Map<String, String> metadata) {
super(createTime);
this.editedByCommunicationIdentifier = editedByCommunicationIdentifier;
this.editTime = editTime;
Expand Down Expand Up @@ -110,7 +109,7 @@ public OffsetDateTime getEditTime() {
* @return the properties value.
*/
@Generated
public Map<String, BinaryData> getProperties() {
public Map<String, AcsChatThreadPropertiesUpdatedEventDataProperty> getProperties() {
return this.properties;
}

Expand Down Expand Up @@ -172,8 +171,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
jsonWriter.writeJsonField("editedByCommunicationIdentifier", this.editedByCommunicationIdentifier);
jsonWriter.writeStringField("editTime",
this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime));
jsonWriter.writeMapField("properties", this.properties,
(writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class)));
jsonWriter.writeMapField("properties", this.properties, (writer, element) -> writer.writeJson(element));
jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element));
return jsonWriter.writeEndObject();
}
Expand All @@ -196,7 +194,7 @@ public static AcsChatThreadPropertiesUpdatedEventData fromJson(JsonReader jsonRe
Long version = null;
CommunicationIdentifierModel editedByCommunicationIdentifier = null;
OffsetDateTime editTime = null;
Map<String, BinaryData> properties = null;
Map<String, AcsChatThreadPropertiesUpdatedEventDataProperty> properties = null;
Map<String, String> metadata = null;
while (reader.nextToken() != JsonToken.END_OBJECT) {
String fieldName = reader.getFieldName();
Expand All @@ -217,8 +215,8 @@ public static AcsChatThreadPropertiesUpdatedEventData fromJson(JsonReader jsonRe
editTime = reader
.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
} else if ("properties".equals(fieldName)) {
properties = reader.readMap(reader1 -> reader1
.getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped())));
properties
= reader.readMap(reader1 -> AcsChatThreadPropertiesUpdatedEventDataProperty.fromJson(reader1));
} else if ("metadata".equals(fieldName)) {
metadata = reader.readMap(reader1 -> reader1.getString());
} else {
Expand Down
61 changes: 61 additions & 0 deletions ...ure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedEventDataProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
// Code generated by Microsoft (R) TypeSpec Code Generator.

package com.azure.messaging.eventgrid.systemevents;

import com.azure.core.annotation.Generated;
import com.azure.core.annotation.Immutable;
import com.azure.json.JsonReader;
import com.azure.json.JsonSerializable;
import com.azure.json.JsonToken;
import com.azure.json.JsonWriter;
import java.io.IOException;

/**
* The AcsChatThreadPropertiesUpdatedEventDataProperty model.
*/
@Immutable
public final class AcsChatThreadPropertiesUpdatedEventDataProperty
implements JsonSerializable<AcsChatThreadPropertiesUpdatedEventDataProperty> {
/**
* Creates an instance of AcsChatThreadPropertiesUpdatedEventDataProperty class.
*/
@Generated
private AcsChatThreadPropertiesUpdatedEventDataProperty() {
}

/**
* {@inheritDoc}
*/
@Generated
@Override
public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
jsonWriter.writeStartObject();
return jsonWriter.writeEndObject();
}

/**
* Reads an instance of AcsChatThreadPropertiesUpdatedEventDataProperty from the JsonReader.
*
* @param jsonReader The JsonReader being read.
* @return An instance of AcsChatThreadPropertiesUpdatedEventDataProperty if the JsonReader was pointing to an
* instance of it, or null if it was pointing to JSON null.
* @throws IOException If an error occurs while reading the AcsChatThreadPropertiesUpdatedEventDataProperty.
*/
@Generated
public static AcsChatThreadPropertiesUpdatedEventDataProperty fromJson(JsonReader jsonReader) throws IOException {
return jsonReader.readObject(reader -> {
AcsChatThreadPropertiesUpdatedEventDataProperty deserializedAcsChatThreadPropertiesUpdatedEventDataProperty
= new AcsChatThreadPropertiesUpdatedEventDataProperty();
while (reader.nextToken() != JsonToken.END_OBJECT) {
String fieldName = reader.getFieldName();
reader.nextToken();

reader.skipChildren();
}

return deserializedAcsChatThreadPropertiesUpdatedEventDataProperty;
});
}
}
16 changes: 7 additions & 9 deletions ...zure/messaging/eventgrid/systemevents/AcsChatThreadPropertiesUpdatedPerUserEventData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import com.azure.core.annotation.Generated;
import com.azure.core.annotation.Immutable;
import com.azure.core.util.BinaryData;
import com.azure.core.util.CoreUtils;
import com.azure.json.JsonReader;
import com.azure.json.JsonToken;
Expand Down Expand Up @@ -44,7 +43,7 @@ public final class AcsChatThreadPropertiesUpdatedPerUserEventData extends AcsCha
* The updated thread properties
*/
@Generated
private final Map<String, BinaryData> properties;
private final Map<String, AcsChatThreadPropertiesUpdatedPerUserEventDataProperty> properties;

/*
* The version of the thread
Expand Down Expand Up @@ -78,7 +77,7 @@ public final class AcsChatThreadPropertiesUpdatedPerUserEventData extends AcsCha
private AcsChatThreadPropertiesUpdatedPerUserEventData(
CommunicationIdentifierModel recipientCommunicationIdentifier, OffsetDateTime createTime,
CommunicationIdentifierModel editedByCommunicationIdentifier, OffsetDateTime editTime,
Map<String, String> metadata, Map<String, BinaryData> properties) {
Map<String, String> metadata, Map<String, AcsChatThreadPropertiesUpdatedPerUserEventDataProperty> properties) {
super(recipientCommunicationIdentifier, createTime);
this.editedByCommunicationIdentifier = editedByCommunicationIdentifier;
this.editTime = editTime;
Expand Down Expand Up @@ -123,7 +122,7 @@ public Map<String, String> getMetadata() {
* @return the properties value.
*/
@Generated
public Map<String, BinaryData> getProperties() {
public Map<String, AcsChatThreadPropertiesUpdatedPerUserEventDataProperty> getProperties() {
return this.properties;
}

Expand Down Expand Up @@ -177,8 +176,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
jsonWriter.writeStringField("editTime",
this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime));
jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element));
jsonWriter.writeMapField("properties", this.properties,
(writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class)));
jsonWriter.writeMapField("properties", this.properties, (writer, element) -> writer.writeJson(element));
return jsonWriter.writeEndObject();
}

Expand All @@ -202,7 +200,7 @@ public static AcsChatThreadPropertiesUpdatedPerUserEventData fromJson(JsonReader
CommunicationIdentifierModel editedByCommunicationIdentifier = null;
OffsetDateTime editTime = null;
Map<String, String> metadata = null;
Map<String, BinaryData> properties = null;
Map<String, AcsChatThreadPropertiesUpdatedPerUserEventDataProperty> properties = null;
while (reader.nextToken() != JsonToken.END_OBJECT) {
String fieldName = reader.getFieldName();
reader.nextToken();
Expand All @@ -226,8 +224,8 @@ public static AcsChatThreadPropertiesUpdatedPerUserEventData fromJson(JsonReader
} else if ("metadata".equals(fieldName)) {
metadata = reader.readMap(reader1 -> reader1.getString());
} else if ("properties".equals(fieldName)) {
properties = reader.readMap(reader1 -> reader1
.getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped())));
properties = reader
.readMap(reader1 -> AcsChatThreadPropertiesUpdatedPerUserEventDataProperty.fromJson(reader1));
} else {
reader.skipChildren();
}
Expand Down
Loading