diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 52612cd71bb4..ff74e7f0200d 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -144,7 +144,7 @@ com.azure:azure-maps-geolocation;1.0.0-beta.3;1.0.0-beta.4 com.azure:azure-maps-render;2.0.0-beta.2;2.0.0-beta.3 com.azure:azure-maps-route;1.0.0-beta.3;1.0.0-beta.4 com.azure:azure-maps-search;2.0.0-beta.2;2.0.0-beta.3 -com.azure:azure-messaging-eventgrid;4.27.0;4.28.0-beta.1 +com.azure:azure-messaging-eventgrid;4.27.0;4.28.0 com.azure:azure-messaging-eventgrid-namespaces;1.1.1;1.2.0-beta.1 com.azure:azure-messaging-eventgrid-cloudnative-cloudevents;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-messaging-eventhubs;5.19.2;5.20.0-beta.1 diff --git a/sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/pom.xml index fc4e9e886303..1a8f16b39010 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/pom.xml +++ b/sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/pom.xml @@ -92,7 +92,7 @@ com.azure azure-messaging-eventgrid - 4.28.0-beta.1 + 4.28.0 com.azure diff --git a/sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md b/sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md index af3b1a2ff8b3..b11bea30235c 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md +++ b/sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md @@ -1,14 +1,11 @@ # Release History -## 4.28.0-beta.1 (Unreleased) +## 4.28.0 (2025-01-21) ### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes +- Added `internetMessageId` property to `AcsEmailDeliveryReportReceivedEventData`. +- Added `recipientMailServerHostName` property to `AcsEmailDeliveryReportStatusDetails`. +- Added `segmentCount` property to `AcsSmsReceivedEventData`. ## 4.27.0 (2024-11-18) diff --git a/sdk/eventgrid/azure-messaging-eventgrid/README.md b/sdk/eventgrid/azure-messaging-eventgrid/README.md index 0f42bb94bfc8..2384f8e28afe 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/README.md +++ b/sdk/eventgrid/azure-messaging-eventgrid/README.md @@ -82,7 +82,7 @@ add the direct dependency to your project as follows. com.azure azure-messaging-eventgrid - 4.27.0 + 4.28.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml index 8c2277912bbb..7152b5a49d1a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml +++ b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml @@ -12,7 +12,7 @@ com.azure azure-messaging-eventgrid - 4.28.0-beta.1 + 4.28.0 jar Microsoft Azure SDK for eventgrid diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java index faad3f5c6408..adb947525c6b 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsSmsReceivedEventData.java @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. - package com.azure.messaging.eventgrid.systemevents; import com.azure.core.annotation.Fluent; @@ -18,6 +17,7 @@ */ @Fluent public final class AcsSmsReceivedEventData extends AcsSmsEventBaseProperties { + /* * The SMS content */ @@ -31,7 +31,7 @@ public final class AcsSmsReceivedEventData extends AcsSmsEventBaseProperties { /* * Number of segments in the message */ - private int segmentCount; + private Integer segmentCount; /** * Creates an instance of AcsSmsReceivedEventData class. @@ -41,7 +41,7 @@ public AcsSmsReceivedEventData() { /** * Get the message property: The SMS content. - * + * * @return the message value. */ public String getMessage() { @@ -50,7 +50,7 @@ public String getMessage() { /** * Set the message property: The SMS content. - * + * * @param message the message value to set. * @return the AcsSmsReceivedEventData object itself. */ @@ -61,7 +61,7 @@ public AcsSmsReceivedEventData setMessage(String message) { /** * Get the receivedTimestamp property: The time at which the SMS was received. - * + * * @return the receivedTimestamp value. */ public OffsetDateTime getReceivedTimestamp() { @@ -70,7 +70,7 @@ public OffsetDateTime getReceivedTimestamp() { /** * Set the receivedTimestamp property: The time at which the SMS was received. - * + * * @param receivedTimestamp the receivedTimestamp value to set. * @return the AcsSmsReceivedEventData object itself. */ @@ -81,20 +81,20 @@ public AcsSmsReceivedEventData setReceivedTimestamp(OffsetDateTime receivedTimes /** * Get the segmentCount property: Number of segments in the message. - * + * * @return the segmentCount value. */ - public int getSegmentCount() { + public Integer getSegmentCount() { return this.segmentCount; } /** * Set the segmentCount property: Number of segments in the message. - * + * * @param segmentCount the segmentCount value to set. * @return the AcsSmsReceivedEventData object itself. */ - public AcsSmsReceivedEventData setSegmentCount(int segmentCount) { + public AcsSmsReceivedEventData setSegmentCount(Integer segmentCount) { this.segmentCount = segmentCount; return this; } @@ -146,7 +146,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { /** * Reads an instance of AcsSmsReceivedEventData from the JsonReader. - * + * * @param jsonReader The JsonReader being read. * @return An instance of AcsSmsReceivedEventData if the JsonReader was pointing to an instance of it, or null if it * was pointing to JSON null. @@ -159,7 +159,6 @@ public static AcsSmsReceivedEventData fromJson(JsonReader jsonReader) throws IOE while (reader.nextToken() != JsonToken.END_OBJECT) { String fieldName = reader.getFieldName(); reader.nextToken(); - if ("messageId".equals(fieldName)) { deserializedAcsSmsReceivedEventData.setMessageId(reader.getString()); } else if ("from".equals(fieldName)) { @@ -177,7 +176,6 @@ public static AcsSmsReceivedEventData fromJson(JsonReader jsonReader) throws IOE reader.skipChildren(); } } - return deserializedAcsSmsReceivedEventData; }); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md b/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md index 8cec4424e430..55c4eba5f51b 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md +++ b/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md @@ -86,34 +86,34 @@ custom-types: CloudEvent,EventGridEvent,AcsRouterCommunicationError,AcsMessageCh input-file: -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/EventGrid.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/SystemEvents.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Devices/stable/2018-01-01/IotHub.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ContainerRegistry/stable/2018-01-01/ContainerRegistry.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Media/stable/2018-01-01/MediaServices.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Maps/stable/2018-01-01/Maps.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.MachineLearningServices/stable/2018-01-01/MachineLearningServices.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Web/stable/2018-01-01/Web.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.PolicyInsights/stable/2018-01-01/PolicyInsights.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ContainerService/stable/2018-01-01/ContainerService.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ApiManagement/stable/2018-01-01/APIManagement.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.HealthcareApis/stable/2018-01-01/HealthcareApis.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.DataBox/stable/2018-01-01/DataBox.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/common.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/HealthResources.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/Resources.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.AVS/stable/2018-01-01/PrivateCloud.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ApiCenter/stable/2018-01-01/ApiCenter.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/8e10d65d0c92871abf9b0e6f044ceae9c7965aee/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/ContainerServiceEventResources.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/EventGrid.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/SystemEvents.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.Devices/stable/2018-01-01/IotHub.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.ContainerRegistry/stable/2018-01-01/ContainerRegistry.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.Media/stable/2018-01-01/MediaServices.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.Maps/stable/2018-01-01/Maps.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.MachineLearningServices/stable/2018-01-01/MachineLearningServices.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.Web/stable/2018-01-01/Web.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.PolicyInsights/stable/2018-01-01/PolicyInsights.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.ContainerService/stable/2018-01-01/ContainerService.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.ApiManagement/stable/2018-01-01/APIManagement.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.HealthcareApis/stable/2018-01-01/HealthcareApis.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.DataBox/stable/2018-01-01/DataBox.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/common.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/HealthResources.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/Resources.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.AVS/stable/2018-01-01/PrivateCloud.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.ApiCenter/stable/2018-01-01/ApiCenter.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/c18f249c85d002b7b2ddcc36b648512b574e1f4a/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/ContainerServiceEventResources.json ``` diff --git a/sdk/eventgrid/azure-messaging-eventgrid/swagger/src/main/java/EventGridCustomization.java b/sdk/eventgrid/azure-messaging-eventgrid/swagger/src/main/java/EventGridCustomization.java index 9aa78ff69793..e613d3033176 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/swagger/src/main/java/EventGridCustomization.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/swagger/src/main/java/EventGridCustomization.java @@ -248,6 +248,27 @@ public void customize(LibraryCustomization customization, Logger logger) { customizeCommunicationIdentifierModelKind(customization); customizeAcsMessageChannelEventError(customization); customizeCentralCommuicationEvents(customization); + customizeCommuicationSMSEvents(customization); + } + + public void customizeCommuicationSMSEvents(LibraryCustomization customization) { + PackageCustomization packageModels = customization.getPackage("com.azure.messaging.eventgrid.systemevents"); + ClassCustomization classCustomization = packageModels.getClass("AcsSmsReceivedEventData"); + classCustomization.customizeAst(ast -> { + ast.getClassByName("AcsSmsReceivedEventData").ifPresent(clazz -> { + clazz.getFieldByName("segmentCount").get().getVariable(0).setType("Integer"); + }); + }); + + classCustomization.customizeAst(comp -> { + ClassOrInterfaceDeclaration clazz = comp.getClassByName("AcsSmsReceivedEventData").get(); + clazz.getMethodsByName("setSegmentCount").forEach(m -> { + m.getParameter(0).setType(Integer.class); + }); + clazz.getMethodsByName("getSegmentCount").forEach(m -> { + m.setType(Integer.class); + }); + }); } public void customizeCentralCommuicationEvents(LibraryCustomization customization) {