From b59c6635ea41f8f39d18720088a6409a7ec1dbfc Mon Sep 17 00:00:00 2001 From: Shawn Fang <45607042+mssfang@users.noreply.github.com> Date: Fri, 1 Oct 2021 19:03:59 -0700 Subject: [PATCH 01/10] [EventGrid] Regenerate code using the latest rest commit sha (#24482) --- .../azure-messaging-eventgrid/CHANGELOG.md | 15 ++- .../messaging/eventgrid/SystemEventNames.java | 107 +++++++++++++++++- .../SystemEventMappingNames.java | 95 +++++++++++++++- .../AcsUserDisconnectedEventData.java | 39 +++++++ .../ApiManagementApiCreatedEventData.java | 44 +++++++ .../ApiManagementApiDeletedEventData.java | 44 +++++++ ...iManagementApiReleaseCreatedEventData.java | 44 +++++++ ...iManagementApiReleaseDeletedEventData.java | 44 +++++++ ...iManagementApiReleaseUpdatedEventData.java | 44 +++++++ .../ApiManagementApiUpdatedEventData.java | 44 +++++++ .../ApiManagementProductCreatedEventData.java | 44 +++++++ .../ApiManagementProductDeletedEventData.java | 44 +++++++ .../ApiManagementProductUpdatedEventData.java | 44 +++++++ ...anagementSubscriptionCreatedEventData.java | 44 +++++++ ...anagementSubscriptionDeletedEventData.java | 44 +++++++ ...anagementSubscriptionUpdatedEventData.java | 44 +++++++ .../ApiManagementUserCreatedEventData.java | 44 +++++++ .../ApiManagementUserDeletedEventData.java | 44 +++++++ .../ApiManagementUserUpdatedEventData.java | 44 +++++++ ...EventChannelArchiveHeartbeatEventData.java | 45 ++++++++ ...ncomingVideoStreamsOutOfSyncEventData.java | 2 +- ...ediaLiveEventIngestHeartbeatEventData.java | 62 +++++++++- .../swagger/README.md | 37 +++--- 23 files changed, 1035 insertions(+), 27 deletions(-) create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsUserDisconnectedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiCreatedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiDeletedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiReleaseCreatedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiReleaseDeletedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiReleaseUpdatedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiUpdatedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementProductCreatedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementProductDeletedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementProductUpdatedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementSubscriptionCreatedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementSubscriptionDeletedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementSubscriptionUpdatedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementUserCreatedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementUserDeletedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementUserUpdatedEventData.java create mode 100644 sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/MediaLiveEventChannelArchiveHeartbeatEventData.java diff --git a/sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md b/sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md index 3b5b81d5689a1..a9b8420873adf 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md +++ b/sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md @@ -3,10 +3,17 @@ ## 4.7.0-beta.1 (Unreleased) ### Features Added - -### Breaking Changes - -### Bugs Fixed +- Added new Api Management service system events, `ApiManagementApiCreatedEventData`, `ApiManagementApiDeletedEventData`, + `ApiManagementApiReleaseCreatedEventData`, `ApiManagementApiReleaseDeletedEventData`, + `ApiManagementApiReleaseUpdatedEventData`, `ApiManagementApiUpdatedEventData`, `ApiManagementProductCreatedEventData`, + `ApiManagementProductDeletedEventData`, `ApiManagementProductUpdatedEventData`, + `ApiManagementSubscriptionCreatedEventData`, `ApiManagementSubscriptionDeletedEventData`, + `ApiManagementSubscriptionUpdatedEventData`,`ApiManagementUserCreatedEventData`, `ApiManagementUserDeletedEventData`, + `ApiManagementUserUpdatedEventData`. +- Added a new Media service system event, `MediaLiveEventChannelArchiveHeartbeatEventData`. +- Added a new Communication service system event, `AcsUserDisconnectedEventData`. +- Added fields `transcriptionLanguage`, `transcriptionState`, `ingestDriftValue`, `lastFragmentArrivalTime` + to system event classes `MediaLiveEventIngestHeartbeatEventData`. ### Other Changes diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/SystemEventNames.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/SystemEventNames.java index cf348cce11516..877a74a540808 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/SystemEventNames.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/SystemEventNames.java @@ -24,6 +24,22 @@ import com.azure.messaging.eventgrid.systemevents.AcsRecordingFileStatusUpdatedEventData; import com.azure.messaging.eventgrid.systemevents.AcsSmsDeliveryReportReceivedEventData; import com.azure.messaging.eventgrid.systemevents.AcsSmsReceivedEventData; +import com.azure.messaging.eventgrid.systemevents.AcsUserDisconnectedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementApiCreatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementApiDeletedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementApiReleaseCreatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementApiReleaseDeletedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementApiReleaseUpdatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementApiUpdatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementProductCreatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementProductDeletedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementProductUpdatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementSubscriptionCreatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementSubscriptionDeletedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementSubscriptionUpdatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementUserCreatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementUserDeletedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementUserUpdatedEventData; import com.azure.messaging.eventgrid.systemevents.AppConfigurationKeyValueDeletedEventData; import com.azure.messaging.eventgrid.systemevents.AppConfigurationKeyValueModifiedEventData; import com.azure.messaging.eventgrid.systemevents.ContainerRegistryChartDeletedEventData; @@ -70,6 +86,7 @@ import com.azure.messaging.eventgrid.systemevents.MediaJobProcessingEventData; import com.azure.messaging.eventgrid.systemevents.MediaJobScheduledEventData; import com.azure.messaging.eventgrid.systemevents.MediaJobStateChangeEventData; +import com.azure.messaging.eventgrid.systemevents.MediaLiveEventChannelArchiveHeartbeatEventData; import com.azure.messaging.eventgrid.systemevents.MediaLiveEventConnectionRejectedEventData; import com.azure.messaging.eventgrid.systemevents.MediaLiveEventEncoderConnectedEventData; import com.azure.messaging.eventgrid.systemevents.MediaLiveEventEncoderDisconnectedEventData; @@ -142,6 +159,68 @@ public final class SystemEventNames { // Keep this sorted by the name of the service publishing the events. + // ApiManagement events. + /** + * indicate an event of ApiCreated in ApiManagement. + */ + public static final String API_MANAGEMENT_API_CREATED = "Microsoft.ApiManagement.ApiCreated"; + /** + * indicate an event of ApiDeleted in ApiManagement. + */ + public static final String API_MANAGEMENT_API_DELETED = "Microsoft.ApiManagement.ApiDeleted"; + /** + * indicate an event of ApiReleaseCreated in ApiManagement. + */ + public static final String API_MANAGEMENT_API_RELEASE_CREATED = "Microsoft.ApiManagement.ApiReleaseCreated"; + /** + * indicate an event of ApiReleaseDeleted in ApiManagement. + */ + public static final String API_MANAGEMENT_API_RELEASE_DELETED = "Microsoft.ApiManagement.ApiReleaseDeleted"; + /** + * indicate an event of ApiReleaseUpdated in ApiManagement. + */ + public static final String API_MANAGEMENT_API_RELEASE_UPDATED = "Microsoft.ApiManagement.ApiReleaseUpdated"; + /** + * indicate an event of ApiUpdated in ApiManagement. + */ + public static final String API_MANAGEMENT_API_UPDATED = "Microsoft.ApiManagement.ApiUpdated"; + /** + * indicate an event of ProductCreated in ApiManagement. + */ + public static final String API_MANAGEMENT_PRODUCT_CREATED = "Microsoft.ApiManagement.ProductCreated"; + /** + * indicate an event of ProductDeleted in ApiManagement. + */ + public static final String API_MANAGEMENT_PRODUCT_DELETED = "Microsoft.ApiManagement.ProductDeleted"; + /** + * indicate an event of ProductUpdated in ApiManagement. + */ + public static final String API_MANAGEMENT_PRODUCT_UPDATED = "Microsoft.ApiManagement.ProductUpdated"; + /** + * indicate an event of SubscriptionCreated in ApiManagement. + */ + public static final String API_MANAGEMENT_SUBSCRIPTION_CREATED = "Microsoft.ApiManagement.SubscriptionCreated"; + /** + * indicate an event of SubscriptionDeleted in ApiManagement. + */ + public static final String API_MANAGEMENT_SUBSCRIPTION_DELETED = "Microsoft.ApiManagement.SubscriptionDeleted"; + /** + * indicate an event of SubscriptionUpdated in ApiManagement. + */ + public static final String API_MANAGEMENT_SUBSCRIPTION_UPDATED = "Microsoft.ApiManagement.SubscriptionUpdated"; + /** + * indicate an event of UserCreated in ApiManagement. + */ + public static final String API_MANAGEMENT_USER_CREATED = "Microsoft.ApiManagement.UserCreated"; + /** + * indicate an event of UserDeleted in ApiManagement. + */ + public static final String API_MANAGEMENT_USER_DELETED = "Microsoft.ApiManagement.UserDeleted"; + /** + * indicate an event of UserUpdated in ApiManagement. + */ + public static final String API_MANAGEMENT_USER_UPDATED = "Microsoft.ApiManagement.UserUpdated"; + // AppConfiguration events. /** * indicate an event of KeyValueDeleted in AppConfiguration. @@ -300,6 +379,12 @@ public final class SystemEventNames { */ public static final String MEDIA_JOB_STATE_CHANGE = "Microsoft.Media.JobStateChange"; + /** + * Media Services Live Event Channel Archive Heartbeat event. + */ + public static final String MEDIA_LIVE_EVENT_CHANNEL_ARCHIVE_HEARTBEAT = + "Microsoft.Media.LiveEventChannelArchiveHeartbeat"; + /** * Media Services Live Event Connection Rejected event. */ @@ -450,7 +535,6 @@ public final class SystemEventNames { "Microsoft.Communication.SMSDeliveryReportReceived"; public static final String COMMUNICATION_SMS_RECEIVED = "Microsoft.Communication.SMSReceived"; - public static final String COMMUNICATION_CHAT_MESSAGE_DELETED_IN_THREAD = "Microsoft.Communication.ChatMessageDeletedInThread"; public static final String COMMUNICATION_CHAT_MESSAGE_EDITED_IN_THREAD = @@ -461,6 +545,8 @@ public final class SystemEventNames { "Microsoft.Communication.ChatThreadParticipantAdded"; public static final String COMMUNICATION_CHAT_PARTICIPANT_ADDED_TO_THREAD_WITH_USER = "Microsoft.Communication.ChatParticipantAddedToThreadWithUser"; + public static final String COMMUNICATION_USER_DISCONNECTED = + "Microsoft.Communication.UserDisconnected"; /** * Schema of the Data property of an EventGridEvent for a Microsoft.ContainerService.NewKubernetesVersionAvailable @@ -547,6 +633,23 @@ public final class SystemEventNames { private static final Map> SYSTEM_EVENT_MAPPINGS = new HashMap>() { { + // API events. + put(API_MANAGEMENT_API_CREATED, ApiManagementApiCreatedEventData.class); + put(API_MANAGEMENT_API_DELETED, ApiManagementApiDeletedEventData.class); + put(API_MANAGEMENT_API_RELEASE_CREATED, ApiManagementApiReleaseCreatedEventData.class); + put(API_MANAGEMENT_API_RELEASE_DELETED, ApiManagementApiReleaseDeletedEventData.class); + put(API_MANAGEMENT_API_RELEASE_UPDATED, ApiManagementApiReleaseUpdatedEventData.class); + put(API_MANAGEMENT_API_UPDATED, ApiManagementApiUpdatedEventData.class); + put(API_MANAGEMENT_PRODUCT_CREATED, ApiManagementProductCreatedEventData.class); + put(API_MANAGEMENT_PRODUCT_DELETED, ApiManagementProductDeletedEventData.class); + put(API_MANAGEMENT_PRODUCT_UPDATED, ApiManagementProductUpdatedEventData.class); + put(API_MANAGEMENT_SUBSCRIPTION_CREATED, ApiManagementSubscriptionCreatedEventData.class); + put(API_MANAGEMENT_SUBSCRIPTION_DELETED, ApiManagementSubscriptionDeletedEventData.class); + put(API_MANAGEMENT_SUBSCRIPTION_UPDATED, ApiManagementSubscriptionUpdatedEventData.class); + put(API_MANAGEMENT_USER_CREATED, ApiManagementUserCreatedEventData.class); + put(API_MANAGEMENT_USER_DELETED, ApiManagementUserDeletedEventData.class); + put(API_MANAGEMENT_USER_UPDATED, ApiManagementUserUpdatedEventData.class); + // AppConfiguration events. put(APP_CONFIGURATION_KEY_VALUE_DELETED, AppConfigurationKeyValueDeletedEventData.class); put(APP_CONFIGURATION_KEY_VALUE_MODIFIED, AppConfigurationKeyValueModifiedEventData.class); @@ -591,6 +694,7 @@ public final class SystemEventNames { put(MEDIA_JOB_PROCESSING, MediaJobProcessingEventData.class); put(MEDIA_JOB_SCHEDULED, MediaJobScheduledEventData.class); put(MEDIA_JOB_STATE_CHANGE, MediaJobStateChangeEventData.class); + put(MEDIA_LIVE_EVENT_CHANNEL_ARCHIVE_HEARTBEAT, MediaLiveEventChannelArchiveHeartbeatEventData.class); put(MEDIA_LIVE_EVENT_CONNECTION_REJECTED, MediaLiveEventConnectionRejectedEventData.class); put(MEDIA_LIVE_EVENT_ENCODER_CONNECTED, MediaLiveEventEncoderConnectedEventData.class); put(MEDIA_LIVE_EVENT_ENCODER_DISCONNECTED, MediaLiveEventEncoderDisconnectedEventData.class); @@ -654,6 +758,7 @@ public final class SystemEventNames { put(COMMUNICATION_CHAT_THREAD_DELETED, AcsChatThreadDeletedEventData.class); put(COMMUNICATION_CHAT_THREAD_PROPERTIES_UPDATED, AcsChatThreadPropertiesUpdatedEventData.class); put(COMMUNICATION_RECORDING_FILE_STATUS_UPDATED, AcsRecordingFileStatusUpdatedEventData.class); + put(COMMUNICATION_USER_DISCONNECTED, AcsUserDisconnectedEventData.class); // Web events put(WEB_APP_UPDATED, WebAppUpdatedEventData.class); diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/implementation/SystemEventMappingNames.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/implementation/SystemEventMappingNames.java index f5b434cc1d7c9..adb8d5d58769a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/implementation/SystemEventMappingNames.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/implementation/SystemEventMappingNames.java @@ -24,6 +24,22 @@ import com.azure.messaging.eventgrid.systemevents.AcsRecordingFileStatusUpdatedEventData; import com.azure.messaging.eventgrid.systemevents.AcsSmsDeliveryReportReceivedEventData; import com.azure.messaging.eventgrid.systemevents.AcsSmsReceivedEventData; +import com.azure.messaging.eventgrid.systemevents.AcsUserDisconnectedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementApiCreatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementApiDeletedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementApiReleaseCreatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementApiReleaseDeletedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementApiReleaseUpdatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementApiUpdatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementProductCreatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementProductDeletedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementProductUpdatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementSubscriptionCreatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementSubscriptionDeletedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementSubscriptionUpdatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementUserCreatedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementUserDeletedEventData; +import com.azure.messaging.eventgrid.systemevents.ApiManagementUserUpdatedEventData; import com.azure.messaging.eventgrid.systemevents.AppConfigurationKeyValueDeletedEventData; import com.azure.messaging.eventgrid.systemevents.AppConfigurationKeyValueModifiedEventData; import com.azure.messaging.eventgrid.systemevents.ContainerRegistryChartDeletedEventData; @@ -70,6 +86,7 @@ import com.azure.messaging.eventgrid.systemevents.MediaJobProcessingEventData; import com.azure.messaging.eventgrid.systemevents.MediaJobScheduledEventData; import com.azure.messaging.eventgrid.systemevents.MediaJobStateChangeEventData; +import com.azure.messaging.eventgrid.systemevents.MediaLiveEventChannelArchiveHeartbeatEventData; import com.azure.messaging.eventgrid.systemevents.MediaLiveEventConnectionRejectedEventData; import com.azure.messaging.eventgrid.systemevents.MediaLiveEventEncoderConnectedEventData; import com.azure.messaging.eventgrid.systemevents.MediaLiveEventEncoderDisconnectedEventData; @@ -233,6 +250,54 @@ public final class SystemEventMappingNames { /** Schema of the Data property of an EventGridEvent for a Microsoft.Communication.SMSReceived event. */ public static final String ACS_SMS_RECEIVED = "Microsoft.Communication.SMSReceived"; + /** Schema of the Data property of an EventGridEvent for an Microsoft.Communication.UserDisconnected event. */ + public static final String ACS_USER_DISCONNECTED = "Microsoft.Communication.UserDisconnected"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ApiCreated event. */ + public static final String API_MANAGEMENT_API_CREATED = "Microsoft.ApiManagement.ApiCreated"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ApiDeleted event. */ + public static final String API_MANAGEMENT_API_DELETED = "Microsoft.ApiManagement.ApiDeleted"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ApiReleaseCreated event. */ + public static final String API_MANAGEMENT_API_RELEASE_CREATED = "Microsoft.ApiManagement.ApiReleaseCreated"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ApiReleaseDeleted event. */ + public static final String API_MANAGEMENT_API_RELEASE_DELETED = "Microsoft.ApiManagement.ApiReleaseDeleted"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ApiReleaseUpdated event. */ + public static final String API_MANAGEMENT_API_RELEASE_UPDATED = "Microsoft.ApiManagement.ApiReleaseUpdated"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ApiUpdated event. */ + public static final String API_MANAGEMENT_API_UPDATED = "Microsoft.ApiManagement.ApiUpdated"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ProductCreated event. */ + public static final String API_MANAGEMENT_PRODUCT_CREATED = "Microsoft.ApiManagement.ProductCreated"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ProductDeleted event. */ + public static final String API_MANAGEMENT_PRODUCT_DELETED = "Microsoft.ApiManagement.ProductDeleted"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ProductUpdated event. */ + public static final String API_MANAGEMENT_PRODUCT_UPDATED = "Microsoft.ApiManagement.ProductUpdated"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.SubscriptionCreated event. */ + public static final String API_MANAGEMENT_SUBSCRIPTION_CREATED = "Microsoft.ApiManagement.SubscriptionCreated"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.SubscriptionDeleted event. */ + public static final String API_MANAGEMENT_SUBSCRIPTION_DELETED = "Microsoft.ApiManagement.SubscriptionDeleted"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.SubscriptionUpdated event. */ + public static final String API_MANAGEMENT_SUBSCRIPTION_UPDATED = "Microsoft.ApiManagement.SubscriptionUpdated"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.UserCreated event. */ + public static final String API_MANAGEMENT_USER_CREATED = "Microsoft.ApiManagement.UserCreated"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.UserDeleted event. */ + public static final String API_MANAGEMENT_USER_DELETED = "Microsoft.ApiManagement.UserDeleted"; + + /** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.UserUpdated event. */ + public static final String API_MANAGEMENT_USER_UPDATED = "Microsoft.ApiManagement.UserUpdated"; + /** Schema of the Data property of an EventGridEvent for a Microsoft.AppConfiguration.KeyValueDeleted event. */ public static final String APP_CONFIGURATION_KEY_VALUE_DELETED = "Microsoft.AppConfiguration.KeyValueDeleted"; @@ -427,6 +492,13 @@ public final class SystemEventMappingNames { /** Schema of the Data property of an EventGridEvent for a Microsoft.Media.JobStateChange event. */ public static final String MEDIA_JOB_STATE_CHANGE = "Microsoft.Media.JobStateChange"; + /** + * Channel Archive heartbeat event data. Schema of the data property of an EventGridEvent for a + * Microsoft.Media.LiveEventChannelArchiveHeartbeat event. + */ + public static final String MEDIA_LIVE_EVENT_CHANNEL_ARCHIVE_HEARTBEAT = + "Microsoft.Media.LiveEventChannelArchiveHeartbeat"; + /** * Encoder connection rejected event data. Schema of the data property of an EventGridEvent for a * Microsoft.Media.LiveEventConnectionRejected event. @@ -467,14 +539,14 @@ public final class SystemEventMappingNames { "Microsoft.Media.LiveEventIncomingStreamsOutOfSync"; /** - * Incoming video stream out of synch event data. Schema of the data property of an EventGridEvent for a + * Incoming video stream out of sync event data. Schema of the data property of an EventGridEvent for a * Microsoft.Media.LiveEventIncomingVideoStreamsOutOfSync event. */ public static final String MEDIA_LIVE_EVENT_INCOMING_VIDEO_STREAMS_OUT_OF_SYNC = "Microsoft.Media.LiveEventIncomingVideoStreamsOutOfSync"; /** - * Ingest fragment dropped event data. Schema of the data property of an EventGridEvent for a + * Ingest heartbeat event data. Schema of the data property of an EventGridEvent for a * Microsoft.Media.LiveEventIngestHeartbeat event. */ public static final String MEDIA_LIVE_EVENT_INGEST_HEARTBEAT = "Microsoft.Media.LiveEventIngestHeartbeat"; @@ -706,6 +778,22 @@ public final class SystemEventMappingNames { put(ACS_RECORDING_FILE_STATUS_UPDATED, AcsRecordingFileStatusUpdatedEventData.class); put(ACS_SMS_DELIVERY_REPORT_RECEIVED, AcsSmsDeliveryReportReceivedEventData.class); put(ACS_SMS_RECEIVED, AcsSmsReceivedEventData.class); + put(ACS_USER_DISCONNECTED, AcsUserDisconnectedEventData.class); + put(API_MANAGEMENT_API_CREATED, ApiManagementApiCreatedEventData.class); + put(API_MANAGEMENT_API_DELETED, ApiManagementApiDeletedEventData.class); + put(API_MANAGEMENT_API_RELEASE_CREATED, ApiManagementApiReleaseCreatedEventData.class); + put(API_MANAGEMENT_API_RELEASE_DELETED, ApiManagementApiReleaseDeletedEventData.class); + put(API_MANAGEMENT_API_RELEASE_UPDATED, ApiManagementApiReleaseUpdatedEventData.class); + put(API_MANAGEMENT_API_UPDATED, ApiManagementApiUpdatedEventData.class); + put(API_MANAGEMENT_PRODUCT_CREATED, ApiManagementProductCreatedEventData.class); + put(API_MANAGEMENT_PRODUCT_DELETED, ApiManagementProductDeletedEventData.class); + put(API_MANAGEMENT_PRODUCT_UPDATED, ApiManagementProductUpdatedEventData.class); + put(API_MANAGEMENT_SUBSCRIPTION_CREATED, ApiManagementSubscriptionCreatedEventData.class); + put(API_MANAGEMENT_SUBSCRIPTION_DELETED, ApiManagementSubscriptionDeletedEventData.class); + put(API_MANAGEMENT_SUBSCRIPTION_UPDATED, ApiManagementSubscriptionUpdatedEventData.class); + put(API_MANAGEMENT_USER_CREATED, ApiManagementUserCreatedEventData.class); + put(API_MANAGEMENT_USER_DELETED, ApiManagementUserDeletedEventData.class); + put(API_MANAGEMENT_USER_UPDATED, ApiManagementUserUpdatedEventData.class); put(APP_CONFIGURATION_KEY_VALUE_DELETED, AppConfigurationKeyValueDeletedEventData.class); put(APP_CONFIGURATION_KEY_VALUE_MODIFIED, AppConfigurationKeyValueModifiedEventData.class); put(CONTAINER_REGISTRY_CHART_DELETED, ContainerRegistryChartDeletedEventData.class); @@ -760,6 +848,9 @@ public final class SystemEventMappingNames { put(MEDIA_JOB_PROCESSING, MediaJobProcessingEventData.class); put(MEDIA_JOB_SCHEDULED, MediaJobScheduledEventData.class); put(MEDIA_JOB_STATE_CHANGE, MediaJobStateChangeEventData.class); + put( + MEDIA_LIVE_EVENT_CHANNEL_ARCHIVE_HEARTBEAT, + MediaLiveEventChannelArchiveHeartbeatEventData.class); put(MEDIA_LIVE_EVENT_CONNECTION_REJECTED, MediaLiveEventConnectionRejectedEventData.class); put(MEDIA_LIVE_EVENT_ENCODER_CONNECTED, MediaLiveEventEncoderConnectedEventData.class); put(MEDIA_LIVE_EVENT_ENCODER_DISCONNECTED, MediaLiveEventEncoderDisconnectedEventData.class); diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsUserDisconnectedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsUserDisconnectedEventData.java new file mode 100644 index 0000000000000..d1e951299325e --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsUserDisconnectedEventData.java @@ -0,0 +1,39 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for an Microsoft.Communication.UserDisconnected event. */ +@Immutable +public final class AcsUserDisconnectedEventData { + /* + * The communication identifier of the user who was disconnected + */ + @JsonProperty(value = "userCommunicationIdentifier") + private CommunicationIdentifierModel userCommunicationIdentifier; + + /** + * Get the userCommunicationIdentifier property: The communication identifier of the user who was disconnected. + * + * @return the userCommunicationIdentifier value. + */ + public CommunicationIdentifierModel getUserCommunicationIdentifier() { + return this.userCommunicationIdentifier; + } + + /** + * Set the userCommunicationIdentifier property: The communication identifier of the user who was disconnected. + * + * @param userCommunicationIdentifier the userCommunicationIdentifier value to set. + * @return the AcsUserDisconnectedEventData object itself. + */ + public AcsUserDisconnectedEventData setUserCommunicationIdentifier( + CommunicationIdentifierModel userCommunicationIdentifier) { + this.userCommunicationIdentifier = userCommunicationIdentifier; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiCreatedEventData.java new file mode 100644 index 0000000000000..748a90d3b6a39 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiCreatedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ApiCreated event. */ +@Immutable +public final class ApiManagementApiCreatedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementApiCreatedEventData object itself. + */ + public ApiManagementApiCreatedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiDeletedEventData.java new file mode 100644 index 0000000000000..8715a40fb5a79 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiDeletedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ApiDeleted event. */ +@Immutable +public final class ApiManagementApiDeletedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementApiDeletedEventData object itself. + */ + public ApiManagementApiDeletedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiReleaseCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiReleaseCreatedEventData.java new file mode 100644 index 0000000000000..58773f274d996 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiReleaseCreatedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ApiReleaseCreated event. */ +@Immutable +public final class ApiManagementApiReleaseCreatedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementApiReleaseCreatedEventData object itself. + */ + public ApiManagementApiReleaseCreatedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiReleaseDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiReleaseDeletedEventData.java new file mode 100644 index 0000000000000..5f9ce47990ab7 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiReleaseDeletedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ApiReleaseDeleted event. */ +@Immutable +public final class ApiManagementApiReleaseDeletedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementApiReleaseDeletedEventData object itself. + */ + public ApiManagementApiReleaseDeletedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiReleaseUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiReleaseUpdatedEventData.java new file mode 100644 index 0000000000000..0b5b749fb0373 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiReleaseUpdatedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ApiReleaseUpdated event. */ +@Immutable +public final class ApiManagementApiReleaseUpdatedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementApiReleaseUpdatedEventData object itself. + */ + public ApiManagementApiReleaseUpdatedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiUpdatedEventData.java new file mode 100644 index 0000000000000..c8900a8ee06f6 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementApiUpdatedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ApiUpdated event. */ +@Immutable +public final class ApiManagementApiUpdatedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementApiUpdatedEventData object itself. + */ + public ApiManagementApiUpdatedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementProductCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementProductCreatedEventData.java new file mode 100644 index 0000000000000..c0892017a8c8e --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementProductCreatedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ProductCreated event. */ +@Immutable +public final class ApiManagementProductCreatedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementProductCreatedEventData object itself. + */ + public ApiManagementProductCreatedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementProductDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementProductDeletedEventData.java new file mode 100644 index 0000000000000..aa847f0cd739f --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementProductDeletedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ProductDeleted event. */ +@Immutable +public final class ApiManagementProductDeletedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementProductDeletedEventData object itself. + */ + public ApiManagementProductDeletedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementProductUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementProductUpdatedEventData.java new file mode 100644 index 0000000000000..b1598b3cd9095 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementProductUpdatedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.ProductUpdated event. */ +@Immutable +public final class ApiManagementProductUpdatedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementProductUpdatedEventData object itself. + */ + public ApiManagementProductUpdatedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementSubscriptionCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementSubscriptionCreatedEventData.java new file mode 100644 index 0000000000000..3dea7c830b866 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementSubscriptionCreatedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.SubscriptionCreated event. */ +@Immutable +public final class ApiManagementSubscriptionCreatedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementSubscriptionCreatedEventData object itself. + */ + public ApiManagementSubscriptionCreatedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementSubscriptionDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementSubscriptionDeletedEventData.java new file mode 100644 index 0000000000000..8b63c639d8ec0 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementSubscriptionDeletedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.SubscriptionDeleted event. */ +@Immutable +public final class ApiManagementSubscriptionDeletedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementSubscriptionDeletedEventData object itself. + */ + public ApiManagementSubscriptionDeletedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementSubscriptionUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementSubscriptionUpdatedEventData.java new file mode 100644 index 0000000000000..18c784b76eecd --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementSubscriptionUpdatedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.SubscriptionUpdated event. */ +@Immutable +public final class ApiManagementSubscriptionUpdatedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementSubscriptionUpdatedEventData object itself. + */ + public ApiManagementSubscriptionUpdatedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementUserCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementUserCreatedEventData.java new file mode 100644 index 0000000000000..d56758d404171 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementUserCreatedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.UserCreated event. */ +@Immutable +public final class ApiManagementUserCreatedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementUserCreatedEventData object itself. + */ + public ApiManagementUserCreatedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementUserDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementUserDeletedEventData.java new file mode 100644 index 0000000000000..50868104491e6 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementUserDeletedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.UserDeleted event. */ +@Immutable +public final class ApiManagementUserDeletedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementUserDeletedEventData object itself. + */ + public ApiManagementUserDeletedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementUserUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementUserUpdatedEventData.java new file mode 100644 index 0000000000000..8c060976f8393 --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/ApiManagementUserUpdatedEventData.java @@ -0,0 +1,44 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Schema of the Data property of an EventGridEvent for a Microsoft.ApiManagement.UserUpdated event. */ +@Immutable +public final class ApiManagementUserUpdatedEventData { + /* + * The fully qualified ID of the resource that the compliance state change + * is for, including the resource name and resource type. Uses the format, + * `/subscriptions//resourceGroups//Microsoft.ApiManagement/service///` + */ + @JsonProperty(value = "resourceUri") + private String resourceUri; + + /** + * Get the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @return the resourceUri value. + */ + public String getResourceUri() { + return this.resourceUri; + } + + /** + * Set the resourceUri property: The fully qualified ID of the resource that the compliance state change is for, + * including the resource name and resource type. Uses the format, + * `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroup>/Microsoft.ApiManagement/service/<ServiceName>/<ResourceType>/<ResourceName>`. + * + * @param resourceUri the resourceUri value to set. + * @return the ApiManagementUserUpdatedEventData object itself. + */ + public ApiManagementUserUpdatedEventData setResourceUri(String resourceUri) { + this.resourceUri = resourceUri; + return this; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/MediaLiveEventChannelArchiveHeartbeatEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/MediaLiveEventChannelArchiveHeartbeatEventData.java new file mode 100644 index 0000000000000..9fbc66541c6be --- /dev/null +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/MediaLiveEventChannelArchiveHeartbeatEventData.java @@ -0,0 +1,45 @@ +// 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.Immutable; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Channel Archive heartbeat event data. Schema of the data property of an EventGridEvent for a + * Microsoft.Media.LiveEventChannelArchiveHeartbeat event. + */ +@Immutable +public final class MediaLiveEventChannelArchiveHeartbeatEventData { + /* + * Gets the channel latency in ms. + */ + @JsonProperty(value = "channelLatencyMs", required = true, access = JsonProperty.Access.WRITE_ONLY) + private String channelLatencyMs; + + /* + * Gets the latency result code. + */ + @JsonProperty(value = "latencyResultCode", required = true, access = JsonProperty.Access.WRITE_ONLY) + private String latencyResultCode; + + /** + * Get the channelLatencyMs property: Gets the channel latency in ms. + * + * @return the channelLatencyMs value. + */ + public String getChannelLatencyMs() { + return this.channelLatencyMs; + } + + /** + * Get the latencyResultCode property: Gets the latency result code. + * + * @return the latencyResultCode value. + */ + public String getLatencyResultCode() { + return this.latencyResultCode; + } +} diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.java index 61dda3af9486a..66b70cb495da3 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** - * Incoming video stream out of synch event data. Schema of the data property of an EventGridEvent for a + * Incoming video stream out of sync event data. Schema of the data property of an EventGridEvent for a * Microsoft.Media.LiveEventIncomingVideoStreamsOutOfSync event. */ @Immutable diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/MediaLiveEventIngestHeartbeatEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/MediaLiveEventIngestHeartbeatEventData.java index fdfd92ff10942..f76c7ed3873d9 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/MediaLiveEventIngestHeartbeatEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/MediaLiveEventIngestHeartbeatEventData.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** - * Ingest fragment dropped event data. Schema of the data property of an EventGridEvent for a + * Ingest heartbeat event data. Schema of the data property of an EventGridEvent for a * Microsoft.Media.LiveEventIngestHeartbeat event. */ @Immutable @@ -25,6 +25,18 @@ public final class MediaLiveEventIngestHeartbeatEventData { @JsonProperty(value = "trackName", access = JsonProperty.Access.WRITE_ONLY) private String trackName; + /* + * Gets the Live Transcription language. + */ + @JsonProperty(value = "transcriptionLanguage", access = JsonProperty.Access.WRITE_ONLY) + private String transcriptionLanguage; + + /* + * Gets the Live Transcription state. + */ + @JsonProperty(value = "transcriptionState", access = JsonProperty.Access.WRITE_ONLY) + private String transcriptionState; + /* * Gets the bitrate of the track. */ @@ -37,6 +49,18 @@ public final class MediaLiveEventIngestHeartbeatEventData { @JsonProperty(value = "incomingBitrate", access = JsonProperty.Access.WRITE_ONLY) private Long incomingBitrate; + /* + * Gets the track ingest drift value. + */ + @JsonProperty(value = "ingestDriftValue", access = JsonProperty.Access.WRITE_ONLY) + private String ingestDriftValue; + + /* + * Gets the arrival UTC time of the last fragment. + */ + @JsonProperty(value = "lastFragmentArrivalTime", access = JsonProperty.Access.WRITE_ONLY) + private String lastFragmentArrivalTime; + /* * Gets the last timestamp. */ @@ -103,6 +127,24 @@ public String getTrackName() { return this.trackName; } + /** + * Get the transcriptionLanguage property: Gets the Live Transcription language. + * + * @return the transcriptionLanguage value. + */ + public String getTranscriptionLanguage() { + return this.transcriptionLanguage; + } + + /** + * Get the transcriptionState property: Gets the Live Transcription state. + * + * @return the transcriptionState value. + */ + public String getTranscriptionState() { + return this.transcriptionState; + } + /** * Get the bitrate property: Gets the bitrate of the track. * @@ -121,6 +163,24 @@ public Long getIncomingBitrate() { return this.incomingBitrate; } + /** + * Get the ingestDriftValue property: Gets the track ingest drift value. + * + * @return the ingestDriftValue value. + */ + public String getIngestDriftValue() { + return this.ingestDriftValue; + } + + /** + * Get the lastFragmentArrivalTime property: Gets the arrival UTC time of the last fragment. + * + * @return the lastFragmentArrivalTime value. + */ + public String getLastFragmentArrivalTime() { + return this.lastFragmentArrivalTime; + } + /** * Get the lastTimestamp property: Gets the last timestamp. * diff --git a/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md b/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md index c702976e9a06e..89aabb922e36d 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md +++ b/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md @@ -74,24 +74,25 @@ custom-types: CloudEvent,EventGridEvent model-override-setter-from-superclass: true input-file: -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/EventGrid.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.Devices/stable/2018-01-01/IotHub.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.ContainerRegistry/stable/2018-01-01/ContainerRegistry.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.Media/stable/2018-01-01/MediaServices.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.Maps/stable/2018-01-01/Maps.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.MachineLearningServices/stable/2018-01-01/MachineLearningServices.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.Web/stable/2018-01-01/Web.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.PolicyInsights/stable/2018-01-01/PolicyInsights.json -- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/504bc4ece6c4a1ad983f148237c71a3f72fc977f/specification/eventgrid/data-plane/Microsoft.ContainerService/stable/2018-01-01/ContainerService.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/EventGrid.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.Devices/stable/2018-01-01/IotHub.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.ContainerRegistry/stable/2018-01-01/ContainerRegistry.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.Media/stable/2018-01-01/MediaServices.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.Maps/stable/2018-01-01/Maps.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.MachineLearningServices/stable/2018-01-01/MachineLearningServices.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.Web/stable/2018-01-01/Web.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.PolicyInsights/stable/2018-01-01/PolicyInsights.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.ContainerService/stable/2018-01-01/ContainerService.json +- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cd92e4a9c00d6cac0acfe7996796fdc49c36ffad/specification/eventgrid/data-plane/Microsoft.ApiManagement/stable/2018-01-01/APIManagement.json ``` From 5835f9c85ad665340cc16403143f7a96edf5d52d Mon Sep 17 00:00:00 2001 From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com> Date: Sat, 2 Oct 2021 15:39:53 -0700 Subject: [PATCH 02/10] Add Storage Live Test Run to Core Live Test Run (#24499) Add Storage Live Test Run to Core Live Test Run --- sdk/core/tests.yml | 4 ++ sdk/storage/tests-template.yml | 112 +++++++++++++++++++++++++++++++++ sdk/storage/tests.yml | 106 +------------------------------ 3 files changed, 117 insertions(+), 105 deletions(-) create mode 100644 sdk/storage/tests-template.yml diff --git a/sdk/core/tests.yml b/sdk/core/tests.yml index 355098a1f90bc..ffd71c481481e 100644 --- a/sdk/core/tests.yml +++ b/sdk/core/tests.yml @@ -74,3 +74,7 @@ stages: - name: azure-core-jackson-tests groupId: com.azure safeName: azurecorejacksontests + - template: /sdk/storage/tests-template.yml + parameters: + AdditionalMatrixReplace: + - TestFromSource=(.*)/true diff --git a/sdk/storage/tests-template.yml b/sdk/storage/tests-template.yml new file mode 100644 index 0000000000000..31dccc49a35e6 --- /dev/null +++ b/sdk/storage/tests-template.yml @@ -0,0 +1,112 @@ +parameters: + - name: AdditionalMatrixReplace + type: object + default: [] + +stages: + - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml + parameters: + ServiceDirectory: storage + Artifacts: + - name: azure-storage-common + groupId: com.azure + safeName: azurestoragecommon + - name: azure-storage-blob + groupId: com.azure + safeName: azurestorageblob + - name: azure-storage-blob-batch + groupId: com.azure + safeName: azurestorageblobbatch + - name: azure-storage-blob-changefeed + groupId: com.azure + safeName: azurestorageblobchangefeed + - name: azure-storage-blob-cryptography + groupId: com.azure + safeName: azurestorageblobcryptography + - name: azure-storage-blob-nio + groupId: com.azure + safeName: azurestorageblobnio + - name: azure-storage-file-share + groupId: com.azure + safeName: azurestoragefileshare + - name: azure-storage-file-datalake + groupId: com.azure + safeName: azurestoragefiledatalake + - name: azure-storage-internal-avro + groupId: com.azure + safeName: azurestorageinternalavro + - name: azure-storage-queue + groupId: com.azure + safeName: azurestoragequeue + AdditionalModules: + - name: perf-test-core + groupId: com.azure + - name: azure-storage-perf + groupId: com.azure + TestMode: 'LIVE' + TimeoutInMinutes: 60 + Location: canadacentral + CloudConfig: + Preview: + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview) + PrivatePreview: + SubscriptionConfiguration: $(sub-config-storage-test-resources) + Clouds: Preview + SupportedClouds: Preview + TestStepMavenInputs: + options: '$(DefaultTestOptions) $(AdditionalOptions) -T 1C' + mavenOptions: '$(DefaultTestMavenOptions)' + MatrixReplace: + # Use dedicated storage pool in canadacentral with higher memory capacity + - Pool=(.*)-general/$1-storage + - ${{ each additionalReplace in parameters.AdditionalMatrixReplace }}: + - ${{ additionalReplace }} + MatrixConfigs: + - ${{ if contains(variables['Build.DefinitionName'], 'tests-weekly') }}: + - Name: Storage_all_versions_live_test + Path: sdk/storage/platform-matrix-all-versions.json + Selection: sparse + GenerateVMJobs: true + - ${{ if not(contains(variables['Build.DefinitionName'], 'tests-weekly')) }}: + - Name: Storage_live_test + Path: sdk/storage/platform-matrix.json + Selection: sparse + GenerateVMJobs: true + PreSteps: + - template: /sdk/storage/tests-install-azurite.yml + PostSteps: + - task: PowerShell@2 + displayName: 'Run Stress Scenarios' + inputs: + targetType: 'filePath' + filePath: sdk/storage/azure-storage-perf/memory-stress-scenarios.ps1 + env: + ${{ if eq(variables['JavaTestVersion'], '1.11') }}: + JAVA_HOME: $(JAVA_HOME_11_X64) + ${{ if eq(variables['JavaTestVersion'], '1.8') }}: + JAVA_HOME: $(JAVA_HOME_8_X64) + condition: and(succeeded(), eq(variables['StorageRunStressScenarios'], 'true')) + - pwsh: | + New-Item $(Build.ArtifactStagingDirectory)/test-logs -ItemType directory + Copy-Item sdk/storage/azure-storage-blob/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-blob-test.log -ErrorAction SilentlyContinue + Copy-Item sdk/storage/azure-storage-blob-batch/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-blob-batch-test.log -ErrorAction SilentlyContinue + Copy-Item sdk/storage/azure-storage-blob-changefeed/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-blob-changefeed-test.log -ErrorAction SilentlyContinue + Copy-Item sdk/storage/azure-storage-blob-cryptography/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-blob-cryptography-test.log -ErrorAction SilentlyContinue + Copy-Item sdk/storage/azure-storage-blob-nio/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-blob-nio-test.log -ErrorAction SilentlyContinue + Copy-Item sdk/storage/azure-storage-common/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-common-test.log -ErrorAction SilentlyContinue + Copy-Item sdk/storage/azure-storage-file-datalake/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-file-datalake-test.log -ErrorAction SilentlyContinue + Copy-Item sdk/storage/azure-storage-file-share/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-file-share-test.log -ErrorAction SilentlyContinue + Copy-Item sdk/storage/azure-storage-internal-avro/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-internal-avro-test.log -ErrorAction SilentlyContinue + Copy-Item sdk/storage/azure-storage-queue/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-queue-test.log -ErrorAction SilentlyContinue + displayName: 'Copy test logs to artifact staging' + condition: always() + - publish: $(Build.ArtifactStagingDirectory)/test-logs + displayName: 'Publish test logs' + artifact: test-log-$(System.StageName)-$(System.JobName)-$(System.JobAttempt) + condition: always() + EnvVars: + AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id) + AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id) + AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret) + VERSIONED_STORAGE_ACCOUNT_NAME: $(java-storage-versioned-account-name) + VERSIONED_STORAGE_ACCOUNT_KEY: $(java-storage-versioned-account-key) diff --git a/sdk/storage/tests.yml b/sdk/storage/tests.yml index a8a46fbf99c96..8b6badb2cc742 100644 --- a/sdk/storage/tests.yml +++ b/sdk/storage/tests.yml @@ -1,108 +1,4 @@ trigger: none stages: - - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml - parameters: - ServiceDirectory: storage - Artifacts: - - name: azure-storage-common - groupId: com.azure - safeName: azurestoragecommon - - name: azure-storage-blob - groupId: com.azure - safeName: azurestorageblob - - name: azure-storage-blob-batch - groupId: com.azure - safeName: azurestorageblobbatch - - name: azure-storage-blob-changefeed - groupId: com.azure - safeName: azurestorageblobchangefeed - - name: azure-storage-blob-cryptography - groupId: com.azure - safeName: azurestorageblobcryptography - - name: azure-storage-blob-nio - groupId: com.azure - safeName: azurestorageblobnio - - name: azure-storage-file-share - groupId: com.azure - safeName: azurestoragefileshare - - name: azure-storage-file-datalake - groupId: com.azure - safeName: azurestoragefiledatalake - - name: azure-storage-internal-avro - groupId: com.azure - safeName: azurestorageinternalavro - - name: azure-storage-queue - groupId: com.azure - safeName: azurestoragequeue - AdditionalModules: - - name: perf-test-core - groupId: com.azure - - name: azure-storage-perf - groupId: com.azure - TestMode: 'LIVE' - TimeoutInMinutes: 60 - Location: canadacentral - CloudConfig: - Preview: - SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview) - PrivatePreview: - SubscriptionConfiguration: $(sub-config-storage-test-resources) - Clouds: Preview - SupportedClouds: Preview - TestStepMavenInputs: - options: '$(DefaultTestOptions) $(AdditionalOptions) -T 1C' - mavenOptions: '$(DefaultTestMavenOptions)' - MatrixReplace: - # Use dedicated storage pool in canadacentral with higher memory capacity - - Pool=(.*)-general/$1-storage - MatrixConfigs: - - ${{ if contains(variables['Build.DefinitionName'], 'tests-weekly') }}: - - Name: Storage_all_versions_live_test - Path: sdk/storage/platform-matrix-all-versions.json - Selection: sparse - GenerateVMJobs: true - - ${{ if not(contains(variables['Build.DefinitionName'], 'tests-weekly')) }}: - - Name: Storage_live_test - Path: sdk/storage/platform-matrix.json - Selection: sparse - GenerateVMJobs: true - PreSteps: - - template: /sdk/storage/tests-install-azurite.yml - PostSteps: - - task: PowerShell@2 - displayName: 'Run Stress Scenarios' - inputs: - targetType: 'filePath' - filePath: sdk/storage/azure-storage-perf/memory-stress-scenarios.ps1 - env: - ${{ if eq(variables['JavaTestVersion'], '1.11') }}: - JAVA_HOME: $(JAVA_HOME_11_X64) - ${{ if eq(variables['JavaTestVersion'], '1.8') }}: - JAVA_HOME: $(JAVA_HOME_8_X64) - condition: and(succeeded(), eq(variables['StorageRunStressScenarios'], 'true')) - - pwsh: | - New-Item $(Build.ArtifactStagingDirectory)/test-logs -ItemType directory - Copy-Item sdk/storage/azure-storage-blob/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-blob-test.log -ErrorAction SilentlyContinue - Copy-Item sdk/storage/azure-storage-blob-batch/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-blob-batch-test.log -ErrorAction SilentlyContinue - Copy-Item sdk/storage/azure-storage-blob-changefeed/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-blob-changefeed-test.log -ErrorAction SilentlyContinue - Copy-Item sdk/storage/azure-storage-blob-cryptography/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-blob-cryptography-test.log -ErrorAction SilentlyContinue - Copy-Item sdk/storage/azure-storage-blob-nio/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-blob-nio-test.log -ErrorAction SilentlyContinue - Copy-Item sdk/storage/azure-storage-common/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-common-test.log -ErrorAction SilentlyContinue - Copy-Item sdk/storage/azure-storage-file-datalake/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-file-datalake-test.log -ErrorAction SilentlyContinue - Copy-Item sdk/storage/azure-storage-file-share/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-file-share-test.log -ErrorAction SilentlyContinue - Copy-Item sdk/storage/azure-storage-internal-avro/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-internal-avro-test.log -ErrorAction SilentlyContinue - Copy-Item sdk/storage/azure-storage-queue/target/test.log $(Build.ArtifactStagingDirectory)/test-logs/azure-storage-queue-test.log -ErrorAction SilentlyContinue - displayName: 'Copy test logs to artifact staging' - condition: always() - - publish: $(Build.ArtifactStagingDirectory)/test-logs - displayName: 'Publish test logs' - artifact: test-log-$(System.StageName)-$(System.JobName)-$(System.JobAttempt) - condition: always() - EnvVars: - AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id) - AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id) - AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret) - VERSIONED_STORAGE_ACCOUNT_NAME: $(java-storage-versioned-account-name) - VERSIONED_STORAGE_ACCOUNT_KEY: $(java-storage-versioned-account-key) - + - template: /sdk/storage/tests-template.yml From 7f4dd0edb2b5016a0431d4dc6b88f335ea63fd57 Mon Sep 17 00:00:00 2001 From: Kamil Sobol <61715331+kasobol-msft@users.noreply.github.com> Date: Mon, 4 Oct 2021 08:40:10 -0700 Subject: [PATCH 03/10] [Storage] Run CI and live tests on Java 17 (#24492) * does this work? * try this. * Revert "try this." This reverts commit f157e60d1f69e7c1933bd3cc0cbea9e7658e0bd7. * does this help ? * hmm? * hungry? * use java 17 in ci. * fix at least nio. * move it. * fixes. * disable these tests on java 17. CGLib doesn't work * fix that. --- .../EncyptedBlockBlobAPITest.groovy | 15 +++++++---- sdk/storage/azure-storage-blob/pom.xml | 2 +- .../com/azure/storage/blob/BlobAPITest.groovy | 21 ++++++++++------ .../storage/blob/BlobOutputStreamTest.groovy | 12 ++++++++- .../blob/specialized/BlockBlobAPITest.groovy | 14 ++++++++--- .../common/test/shared/StorageSpec.groovy | 3 ++- .../shared/policy/NoOpHttpPipelinePolicy.java | 23 +++++++++++++++++ .../file/datalake/DirectoryAPITest.groovy | 25 ++++++++++++++----- .../storage/file/datalake/FileAPITest.groovy | 21 +++++++++++++--- sdk/storage/ci.yml | 6 +++++ sdk/storage/platform-matrix-ci.json | 14 +++++++++++ sdk/storage/platform-matrix.json | 5 ++++ 12 files changed, 132 insertions(+), 29 deletions(-) create mode 100644 sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/policy/NoOpHttpPipelinePolicy.java create mode 100644 sdk/storage/platform-matrix-ci.json diff --git a/sdk/storage/azure-storage-blob-cryptography/src/test/java/com/azure/storage/blob/specialized/cryptography/EncyptedBlockBlobAPITest.groovy b/sdk/storage/azure-storage-blob-cryptography/src/test/java/com/azure/storage/blob/specialized/cryptography/EncyptedBlockBlobAPITest.groovy index 5efb9eaa2c88a..f1141f4e48a6c 100644 --- a/sdk/storage/azure-storage-blob-cryptography/src/test/java/com/azure/storage/blob/specialized/cryptography/EncyptedBlockBlobAPITest.groovy +++ b/sdk/storage/azure-storage-blob-cryptography/src/test/java/com/azure/storage/blob/specialized/cryptography/EncyptedBlockBlobAPITest.groovy @@ -1246,9 +1246,10 @@ class EncyptedBlockBlobAPITest extends APISpec { ebc.getBlobUrl().toString()) .buildEncryptedBlobAsyncClient() - def bacDownloading = getEncryptedClientBuilder(fakeKey, null, environment.primaryAccount.credential, - ebc.getBlobUrl().toString()) - .addPolicy({ context, next -> + def localData = data + def policy = new HttpPipelinePolicy() { + @Override + Mono process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) { return next.process() .flatMap({ r -> if (counter.incrementAndGet() == 1) { @@ -1256,12 +1257,16 @@ class EncyptedBlockBlobAPITest extends APISpec { * When the download begins trigger an upload to overwrite the downloading blob * so that the download is able to get an ETag before it is changed. */ - return bacUploading.upload(data.defaultFlux, null, true) + return bacUploading.upload(localData.defaultFlux, null, true) .thenReturn(r) } return Mono.just(r) }) - }) + } + } + def bacDownloading = getEncryptedClientBuilder(fakeKey, null, environment.primaryAccount.credential, + ebc.getBlobUrl().toString()) + .addPolicy(policy) .buildEncryptedBlobAsyncClient() /* diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml index 66d32b7c05ce5..3ebcaa4ef06ce 100644 --- a/sdk/storage/azure-storage-blob/pom.xml +++ b/sdk/storage/azure-storage-blob/pom.xml @@ -36,7 +36,7 @@ src/main/java src/test/java ../azure-storage-common/ci.system.properties - 6g + 8g --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobAPITest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobAPITest.groovy index caa5efa8ca749..22e3904127024 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobAPITest.groovy +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobAPITest.groovy @@ -3,8 +3,11 @@ package com.azure.storage.blob - +import com.azure.core.http.HttpPipelineCallContext +import com.azure.core.http.HttpPipelineNextPolicy +import com.azure.core.http.HttpResponse import com.azure.core.http.RequestConditions +import com.azure.core.http.policy.HttpPipelinePolicy import com.azure.core.util.BinaryData import com.azure.core.util.CoreUtils import com.azure.core.util.polling.LongRunningOperationStatus @@ -1151,9 +1154,10 @@ class BlobAPITest extends APISpec { .credential(environment.primaryAccount.credential)) .buildAsyncClient() .getBlockBlobAsyncClient() - - def bacDownloading = instrument(new BlobClientBuilder() - .addPolicy({ context, next -> + def dataLocal = data + def policy = new HttpPipelinePolicy() { + @Override + Mono process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) { return next.process() .flatMap({ r -> if (counter.incrementAndGet() == 1) { @@ -1161,12 +1165,15 @@ class BlobAPITest extends APISpec { * When the download begins trigger an upload to overwrite the downloading blob * so that the download is able to get an ETag before it is changed. */ - return bacUploading.upload(data.defaultFlux, data.defaultDataSize, true) - .thenReturn(r) + return bacUploading.upload(dataLocal.defaultFlux, dataLocal.defaultDataSize, true) + .thenReturn(r) } return Mono.just(r) }) - }) + } + } + def bacDownloading = instrument(new BlobClientBuilder() + .addPolicy(policy) .endpoint(bc.getBlobUrl()) .credential(environment.primaryAccount.credential)) .buildAsyncClient() diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobOutputStreamTest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobOutputStreamTest.groovy index 2913f729f47c5..f4794cdfca9c1 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobOutputStreamTest.groovy +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobOutputStreamTest.groovy @@ -1,5 +1,8 @@ package com.azure.storage.blob +import com.azure.core.http.HttpClient +import com.azure.core.http.HttpRequest +import com.azure.core.http.HttpResponse import com.azure.storage.blob.models.BlobErrorCode import com.azure.storage.blob.models.BlobStorageException import com.azure.storage.blob.models.PageRange @@ -93,12 +96,19 @@ class BlobOutputStreamTest extends APISpec { def credentials = new StorageSharedKeyCredential("accountName", "accountKey") def endpoint = "https://account.blob.core.windows.net/" def data = getRandomByteArray(10 * Constants.MB) + def ex = (Exception) exception + def httpClient = new HttpClient() { + @Override + Mono send(HttpRequest httpRequest) { + return Mono.error(ex) + } + } def blockBlobClient = new SpecializedBlobClientBuilder() .endpoint(endpoint) .containerName("container") .blobName("blob") .credential(credentials) - .httpClient({ httpRequest -> return Mono.error(exception) }) + .httpClient(httpClient) .buildBlockBlobClient() when: diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlockBlobAPITest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlockBlobAPITest.groovy index 08a77580e035c..3b782a370797c 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlockBlobAPITest.groovy +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlockBlobAPITest.groovy @@ -8,6 +8,8 @@ import com.azure.core.http.HttpMethod import com.azure.core.http.HttpPipelineCallContext import com.azure.core.http.HttpPipelineNextPolicy import com.azure.core.http.HttpRequest +import com.azure.core.http.HttpResponse +import com.azure.core.http.policy.HttpPipelinePolicy import com.azure.core.util.Context import com.azure.core.util.FluxUtil import com.azure.identity.DefaultAzureCredentialBuilder @@ -1792,10 +1794,14 @@ class BlockBlobAPITest extends APISpec { def mockHttpResponse = getStubResponse(500, new HttpRequest(HttpMethod.PUT, new URL("https://www.fake.com"))) // Mock a policy that will always then check that the data is still the same and return a retryable error. - def mockPolicy = { HttpPipelineCallContext context, HttpPipelineNextPolicy next -> - return collectBytesInBuffer(context.getHttpRequest().getBody()) - .map({ it == data.defaultData }) - .flatMap({ it ? Mono.just(mockHttpResponse) : Mono.error(new IllegalArgumentException()) }) + def localData = data.defaultData + def mockPolicy = new HttpPipelinePolicy() { + @Override + Mono process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) { + return collectBytesInBuffer(context.getHttpRequest().getBody()) + .map({ it == localData }) + .flatMap({ it ? Mono.just(mockHttpResponse) : Mono.error(new IllegalArgumentException()) }) as Mono + } } // Build the pipeline diff --git a/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/StorageSpec.groovy b/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/StorageSpec.groovy index be76a5ebc6184..6a91e7507657a 100644 --- a/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/StorageSpec.groovy +++ b/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/StorageSpec.groovy @@ -15,6 +15,7 @@ import com.azure.core.test.TestMode import com.azure.core.util.ServiceVersion import com.azure.core.util.logging.ClientLogger import com.azure.identity.EnvironmentCredentialBuilder +import com.azure.storage.common.test.shared.policy.NoOpHttpPipelinePolicy import okhttp3.ConnectionPool import spock.lang.Specification @@ -87,7 +88,7 @@ class StorageSpec extends Specification { if (ENVIRONMENT.testMode == TestMode.RECORD) { return interceptorManager.getRecordPolicy() } else { - return { context, next -> return next.process() } + return NoOpHttpPipelinePolicy.INSTANCE } } diff --git a/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/policy/NoOpHttpPipelinePolicy.java b/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/policy/NoOpHttpPipelinePolicy.java new file mode 100644 index 0000000000000..742d4d19bb1e8 --- /dev/null +++ b/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/policy/NoOpHttpPipelinePolicy.java @@ -0,0 +1,23 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.storage.common.test.shared.policy; + +import com.azure.core.http.HttpPipelineCallContext; +import com.azure.core.http.HttpPipelineNextPolicy; +import com.azure.core.http.HttpResponse; +import com.azure.core.http.policy.HttpPipelinePolicy; +import reactor.core.publisher.Mono; + +public final class NoOpHttpPipelinePolicy implements HttpPipelinePolicy { + + public static final HttpPipelinePolicy INSTANCE = new NoOpHttpPipelinePolicy(); + + private NoOpHttpPipelinePolicy() { + } + + @Override + public Mono process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) { + return next.process(); + } +} diff --git a/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/DirectoryAPITest.groovy b/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/DirectoryAPITest.groovy index 8dd5cb9d84fb0..3a50049bafbeb 100644 --- a/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/DirectoryAPITest.groovy +++ b/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/DirectoryAPITest.groovy @@ -4,6 +4,7 @@ import com.azure.core.http.HttpMethod import com.azure.core.http.HttpPipelineCallContext import com.azure.core.http.HttpPipelineNextPolicy import com.azure.core.http.HttpRequest +import com.azure.core.http.HttpResponse import com.azure.core.http.policy.HttpPipelinePolicy import com.azure.core.http.rest.Response import com.azure.core.util.Context @@ -854,8 +855,12 @@ class DirectoryAPITest extends APISpec { .setBatchSize(2) // Mock a policy that will return an error on the call with the continuation token - HttpPipelinePolicy mockPolicy = { HttpPipelineCallContext context, HttpPipelineNextPolicy next -> - return context.getHttpRequest().getUrl().toString().contains("continuation") ? Mono.error(error) : next.process() + def localError = error + HttpPipelinePolicy mockPolicy = new HttpPipelinePolicy() { + @Override + Mono process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) { + return context.getHttpRequest().getUrl().toString().contains("continuation") ? Mono.error(localError) : next.process() as Mono + } } dc = getDirectoryClient(environment.dataLakeAccount.credential, dc.getDirectoryUrl(), dc.getObjectPath(), mockPolicy) @@ -1261,8 +1266,12 @@ class DirectoryAPITest extends APISpec { .setBatchSize(2) // Mock a policy that will return an error on the call with the continuation token - HttpPipelinePolicy mockPolicy = { HttpPipelineCallContext context, HttpPipelineNextPolicy next -> - return context.getHttpRequest().getUrl().toString().contains("continuation") ? Mono.error(error) : next.process() + def localError = error + HttpPipelinePolicy mockPolicy = new HttpPipelinePolicy() { + @Override + Mono process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) { + return context.getHttpRequest().getUrl().toString().contains("continuation") ? Mono.error(localError) : next.process() as Mono + } } dc = getDirectoryClient(environment.dataLakeAccount.credential, dc.getDirectoryUrl(), dc.getObjectPath(), mockPolicy) @@ -1667,8 +1676,12 @@ class DirectoryAPITest extends APISpec { .setBatchSize(2) // Mock a policy that will return an error on the call with the continuation token - HttpPipelinePolicy mockPolicy = { HttpPipelineCallContext context, HttpPipelineNextPolicy next -> - return context.getHttpRequest().getUrl().toString().contains("continuation") ? Mono.error(error) : next.process() + def localError = error + HttpPipelinePolicy mockPolicy = new HttpPipelinePolicy() { + @Override + Mono process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) { + return context.getHttpRequest().getUrl().toString().contains("continuation") ? Mono.error(localError) : next.process() as Mono + } } dc = getDirectoryClient(environment.dataLakeAccount.credential, dc.getDirectoryUrl(), dc.getObjectPath(), mockPolicy) diff --git a/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileAPITest.groovy b/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileAPITest.groovy index 2e12ae98a7926..4d88e1c5f79fe 100644 --- a/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileAPITest.groovy +++ b/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileAPITest.groovy @@ -1,6 +1,10 @@ package com.azure.storage.file.datalake import com.azure.core.exception.UnexpectedLengthException +import com.azure.core.http.HttpPipelineCallContext +import com.azure.core.http.HttpPipelineNextPolicy +import com.azure.core.http.HttpResponse +import com.azure.core.http.policy.HttpPipelinePolicy import com.azure.core.test.TestMode import com.azure.core.util.Context import com.azure.core.util.FluxUtil @@ -1515,8 +1519,10 @@ class FileAPITest extends APISpec { .credential(environment.dataLakeAccount.credential)) .buildFileAsyncClient() - def facDownloading = instrument(new DataLakePathClientBuilder() - .addPolicy({ context, next -> + def localData = data + def policy = new HttpPipelinePolicy() { + @Override + Mono process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) { return next.process() .flatMap({ r -> if (counter.incrementAndGet() == 1) { @@ -1524,12 +1530,15 @@ class FileAPITest extends APISpec { * When the download begins trigger an upload to overwrite the downloading blob * so that the download is able to get an ETag before it is changed. */ - return facUploading.upload(data.defaultFlux, null, true) + return facUploading.upload(localData.defaultFlux, null, true) .thenReturn(r) } return Mono.just(r) }) - }) + } + } + def facDownloading = instrument(new DataLakePathClientBuilder() + .addPolicy(policy) .endpoint(fc.getPathUrl()) .credential(environment.dataLakeAccount.credential)) .buildFileAsyncClient() @@ -2658,6 +2667,8 @@ class FileAPITest extends APISpec { "foo" | "bar" | "fizz" | "buzz" } + // TODO https://github.com/cglib/cglib/issues/191 CGLib used to generate Spy doesn't work in Java 17 + @IgnoreIf( { Runtime.version().feature() > 11 } ) @Unroll @LiveOnly def "Buffered upload options"() { @@ -3921,6 +3932,8 @@ class FileAPITest extends APISpec { } /* Due to the inability to spy on a private method, we are just calling the async client with the input stream constructor */ + // TODO https://github.com/cglib/cglib/issues/191 CGLib used to generate Spy doesn't work in Java 17 + @IgnoreIf( { Runtime.version().feature() > 11 } ) @Unroll @LiveOnly /* Flaky in playback. */ def "Upload numAppends"() { diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index fd81a12570934..3b0860985fb35 100644 --- a/sdk/storage/ci.yml +++ b/sdk/storage/ci.yml @@ -107,3 +107,9 @@ extends: AdditionalModules: - name: azure-storage-perf groupId: com.azure + MatrixConfigs: + - Name: Storage_ci + Path: sdk/storage/platform-matrix-ci.json + Selection: sparse + NonSparseParameters: Agent + GenerateVMJobs: true diff --git a/sdk/storage/platform-matrix-ci.json b/sdk/storage/platform-matrix-ci.json new file mode 100644 index 0000000000000..fbd91446aacef --- /dev/null +++ b/sdk/storage/platform-matrix-ci.json @@ -0,0 +1,14 @@ +{ + "matrix": { + "$IMPORT": "eng/pipelines/templates/stages/platform-matrix.json" + }, + "include": [ + { + "Agent": { "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" } }, + "JavaTestVersion": "1.17", + "AZURE_TEST_HTTP_CLIENTS": "netty", + "TestGoals": "surefire:test", + "TestOptions": "" + } + ] +} diff --git a/sdk/storage/platform-matrix.json b/sdk/storage/platform-matrix.json index aa3262bb6605c..ab26652d6f1d7 100644 --- a/sdk/storage/platform-matrix.json +++ b/sdk/storage/platform-matrix.json @@ -16,6 +16,11 @@ "JavaTestVersion": "1.11", "AZURE_TEST_HTTP_CLIENTS": "okhttp" }, + { + "Agent": { "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" } }, + "JavaTestVersion": "1.17", + "AZURE_TEST_HTTP_CLIENTS": "netty" + }, { "Agent": { "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" } From 6b96d75e91dd9d9f78d92228fc432d5fa1a26c2e Mon Sep 17 00:00:00 2001 From: Blackbaud-MikeLueders Date: Mon, 4 Oct 2021 11:13:28 -0500 Subject: [PATCH 04/10] add support for setting throughput on database creation (#24456) * add support for setting throughput on database creation * added section to readme * removed locale from links * fix checkstyle issues * do not overwrite cosmosTemplate --- .../data/cosmos/core/CosmosTemplateIT.java | 50 +++++++++++++++---- .../cosmos/core/ReactiveCosmosTemplateIT.java | 49 ++++++++++++++---- sdk/cosmos/azure-spring-data-cosmos/README.md | 18 +++++++ .../data/cosmos/config/CosmosConfig.java | 35 ++++++++++++- .../config/DatabaseThroughputConfig.java | 34 +++++++++++++ .../data/cosmos/core/CosmosTemplate.java | 20 +++++++- .../cosmos/core/ReactiveCosmosTemplate.java | 20 +++++++- 7 files changed, 202 insertions(+), 24 deletions(-) create mode 100644 sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/DatabaseThroughputConfig.java diff --git a/sdk/cosmos/azure-spring-data-cosmos-test/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java b/sdk/cosmos/azure-spring-data-cosmos-test/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java index ff82e533c30ac..a06887c999e06 100644 --- a/sdk/cosmos/azure-spring-data-cosmos-test/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java +++ b/sdk/cosmos/azure-spring-data-cosmos-test/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java @@ -3,6 +3,7 @@ package com.azure.spring.data.cosmos.core; import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncDatabase; import com.azure.cosmos.CosmosClientBuilder; import com.azure.cosmos.CosmosException; import com.azure.cosmos.implementation.ConflictException; @@ -117,18 +118,9 @@ public class CosmosTemplateIT { public void setUp() throws ClassNotFoundException { if (cosmosTemplate == null) { client = CosmosFactory.createCosmosAsyncClient(cosmosClientBuilder); - final CosmosFactory cosmosFactory = new CosmosFactory(client, TestConstants.DB_NAME); - - final CosmosMappingContext mappingContext = new CosmosMappingContext(); personInfo = new CosmosEntityInformation<>(Person.class); containerName = personInfo.getContainerName(); - - mappingContext.setInitialEntitySet(new EntityScanner(this.applicationContext).scan(Persistent.class)); - - final MappingCosmosConverter cosmosConverter = new MappingCosmosConverter(mappingContext, - null); - - cosmosTemplate = new CosmosTemplate(cosmosFactory, cosmosConfig, cosmosConverter); + cosmosTemplate = createCosmosTemplate(cosmosConfig, TestConstants.DB_NAME); } collectionManager.ensureContainersCreatedAndEmpty(cosmosTemplate, Person.class, @@ -137,6 +129,14 @@ public void setUp() throws ClassNotFoundException { new PartitionKey(TEST_PERSON.getLastName())); } + private CosmosTemplate createCosmosTemplate(CosmosConfig config, String dbName) throws ClassNotFoundException { + final CosmosFactory cosmosFactory = new CosmosFactory(client, dbName); + final CosmosMappingContext mappingContext = new CosmosMappingContext(); + mappingContext.setInitialEntitySet(new EntityScanner(this.applicationContext).scan(Persistent.class)); + final MappingCosmosConverter cosmosConverter = new MappingCosmosConverter(mappingContext, null); + return new CosmosTemplate(cosmosFactory, config, cosmosConverter); + } + private void insertPerson(Person person) { cosmosTemplate.insert(person, new PartitionKey(personInfo.getPartitionKeyFieldValue(person))); @@ -660,4 +660,34 @@ public void createWithAutoscale() throws ClassNotFoundException { assertEquals(Integer.parseInt(TestConstants.AUTOSCALE_MAX_THROUGHPUT), throughput.getProperties().getAutoscaleMaxThroughput()); } + + @Test + public void createDatabaseWithThroughput() throws ClassNotFoundException { + final String configuredThroughputDbName = TestConstants.DB_NAME + "-configured-throughput"; + deleteDatabaseIfExists(configuredThroughputDbName); + + Integer expectedRequestUnits = 700; + final CosmosConfig config = CosmosConfig.builder() + .enableDatabaseThroughput(false, expectedRequestUnits) + .build(); + final CosmosTemplate configuredThroughputCosmosTemplate = createCosmosTemplate(config, configuredThroughputDbName); + + final CosmosEntityInformation personInfo = + new CosmosEntityInformation<>(Person.class); + configuredThroughputCosmosTemplate.createContainerIfNotExists(personInfo); + + final CosmosAsyncDatabase database = client.getDatabase(configuredThroughputDbName); + final ThroughputResponse response = database.readThroughput().block(); + assertEquals(expectedRequestUnits, response.getProperties().getManualThroughput()); + } + + private void deleteDatabaseIfExists(String dbName) { + CosmosAsyncDatabase database = client.getDatabase(dbName); + try { + database.delete().block(); + } catch (CosmosException ex) { + assertEquals(ex.getStatusCode(), 404); + } + } + } diff --git a/sdk/cosmos/azure-spring-data-cosmos-test/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java b/sdk/cosmos/azure-spring-data-cosmos-test/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java index ede2e69118dcf..ae4676eb498c1 100644 --- a/sdk/cosmos/azure-spring-data-cosmos-test/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java +++ b/sdk/cosmos/azure-spring-data-cosmos-test/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java @@ -4,6 +4,7 @@ import com.azure.core.credential.AzureKeyCredential; import com.azure.cosmos.CosmosAsyncClient; +import com.azure.cosmos.CosmosAsyncDatabase; import com.azure.cosmos.CosmosClientBuilder; import com.azure.cosmos.CosmosException; import com.azure.cosmos.implementation.ConflictException; @@ -119,17 +120,9 @@ public void setUp() throws ClassNotFoundException { azureKeyCredential = new AzureKeyCredential(cosmosDbKey); cosmosClientBuilder.credential(azureKeyCredential); client = CosmosFactory.createCosmosAsyncClient(cosmosClientBuilder); - final CosmosFactory dbFactory = new CosmosFactory(client, TestConstants.DB_NAME); - - final CosmosMappingContext mappingContext = new CosmosMappingContext(); personInfo = new CosmosEntityInformation<>(Person.class); containerName = personInfo.getContainerName(); - - mappingContext.setInitialEntitySet(new EntityScanner(this.applicationContext).scan(Persistent.class)); - - final MappingCosmosConverter dbConverter = - new MappingCosmosConverter(mappingContext, null); - cosmosTemplate = new ReactiveCosmosTemplate(dbFactory, cosmosConfig, dbConverter); + cosmosTemplate = createReactiveCosmosTemplate(cosmosConfig, TestConstants.DB_NAME); } collectionManager.ensureContainersCreatedAndEmpty(cosmosTemplate, Person.class, GenIdEntity.class, AuditableEntity.class); @@ -138,6 +131,14 @@ public void setUp() throws ClassNotFoundException { new PartitionKey(personInfo.getPartitionKeyFieldValue(TEST_PERSON))).block(); } + private ReactiveCosmosTemplate createReactiveCosmosTemplate(CosmosConfig config, String dbName) throws ClassNotFoundException { + final CosmosFactory cosmosFactory = new CosmosFactory(client, dbName); + final CosmosMappingContext mappingContext = new CosmosMappingContext(); + mappingContext.setInitialEntitySet(new EntityScanner(this.applicationContext).scan(Persistent.class)); + final MappingCosmosConverter cosmosConverter = new MappingCosmosConverter(mappingContext, null); + return new ReactiveCosmosTemplate(cosmosFactory, config, cosmosConverter); + } + @After public void cleanup() { // Reset master key @@ -545,4 +546,34 @@ public void createWithAutoscale() { assertEquals(Integer.parseInt(TestConstants.AUTOSCALE_MAX_THROUGHPUT), throughput.getProperties().getAutoscaleMaxThroughput()); } + + @Test + public void createDatabaseWithThroughput() throws ClassNotFoundException { + final String configuredThroughputDbName = TestConstants.DB_NAME + "-other"; + deleteDatabaseIfExists(configuredThroughputDbName); + + Integer expectedRequestUnits = 700; + final CosmosConfig config = CosmosConfig.builder() + .enableDatabaseThroughput(false, expectedRequestUnits) + .build(); + final ReactiveCosmosTemplate configuredThroughputCosmosTemplate = createReactiveCosmosTemplate(config, configuredThroughputDbName); + + final CosmosEntityInformation personInfo = + new CosmosEntityInformation<>(Person.class); + configuredThroughputCosmosTemplate.createContainerIfNotExists(personInfo).block(); + + final CosmosAsyncDatabase database = client.getDatabase(configuredThroughputDbName); + final ThroughputResponse response = database.readThroughput().block(); + assertEquals(expectedRequestUnits, response.getProperties().getManualThroughput()); + } + + private void deleteDatabaseIfExists(String dbName) { + CosmosAsyncDatabase database = client.getDatabase(dbName); + try { + database.delete().block(); + } catch (CosmosException ex) { + assertEquals(ex.getStatusCode(), 404); + } + } + } diff --git a/sdk/cosmos/azure-spring-data-cosmos/README.md b/sdk/cosmos/azure-spring-data-cosmos/README.md index 09c71fe5a6fe0..5ec4994de3ae0 100644 --- a/sdk/cosmos/azure-spring-data-cosmos/README.md +++ b/sdk/cosmos/azure-spring-data-cosmos/README.md @@ -180,6 +180,24 @@ public CosmosConfig cosmosConfig() { By default, `@EnableCosmosRepositories` will scan the current package for any interfaces that extend one of Spring Data's repository interfaces. Use it to annotate your Configuration class to scan a different root package by `@EnableCosmosRepositories(basePackageClass=UserRepository.class)` if your project layout has multiple projects. +#### Using database provisioned throughput + +Cosmos supports both [container](https://docs.microsoft.com/azure/cosmos-db/sql/how-to-provision-container-throughput) +and [database](https://docs.microsoft.com/azure/cosmos-db/sql/how-to-provision-database-throughput) provisioned +throughput. By default, spring-data-cosmos will provision throughput for each container created. If you prefer +to share throughput between containers, you can enable database provisioned throughput via CosmosConfig. + +```java +@Override +public CosmosConfig cosmosConfig() { + int autoscale = false; + int initialRequestUnits = 400; + return CosmosConfig.builder() + .enableDatabaseThroughput(autoscale, initialRequestUnits) + .build(); +} +``` + ### Define an entity - Define a simple entity as item in Azure Cosmos DB. diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/CosmosConfig.java b/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/CosmosConfig.java index 97d61aa158239..156d28623469f 100644 --- a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/CosmosConfig.java +++ b/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/CosmosConfig.java @@ -13,6 +13,8 @@ public class CosmosConfig { private final ResponseDiagnosticsProcessor responseDiagnosticsProcessor; + private final DatabaseThroughputConfig databaseThroughputConfig; + private final boolean queryMetricsEnabled; /** @@ -24,7 +26,22 @@ public class CosmosConfig { @ConstructorProperties({"responseDiagnosticsProcessor", "queryMetricsEnabled"}) public CosmosConfig(ResponseDiagnosticsProcessor responseDiagnosticsProcessor, boolean queryMetricsEnabled) { + this(responseDiagnosticsProcessor, null, queryMetricsEnabled); + } + + /** + * Initialization + * + * @param responseDiagnosticsProcessor must not be {@literal null} + * @param databaseThroughputConfig may be @{literal null} + * @param queryMetricsEnabled must not be {@literal null} + */ + @ConstructorProperties({"responseDiagnosticsProcessor", "databaseThroughputConfig", "queryMetricsEnabled"}) + public CosmosConfig(ResponseDiagnosticsProcessor responseDiagnosticsProcessor, + DatabaseThroughputConfig databaseThroughputConfig, + boolean queryMetricsEnabled) { this.responseDiagnosticsProcessor = responseDiagnosticsProcessor; + this.databaseThroughputConfig = databaseThroughputConfig; this.queryMetricsEnabled = queryMetricsEnabled; } @@ -46,6 +63,15 @@ public boolean isQueryMetricsEnabled() { return queryMetricsEnabled; } + /** + * Gets the database throughput configuration. + * + * @return DatabaseThroughputConfig, or null if no database throughput is configured + */ + public DatabaseThroughputConfig getDatabaseThroughputConfig() { + return databaseThroughputConfig; + } + /** * Create a CosmosConfigBuilder instance * @@ -60,6 +86,7 @@ public static CosmosConfigBuilder builder() { */ public static class CosmosConfigBuilder { private ResponseDiagnosticsProcessor responseDiagnosticsProcessor; + private DatabaseThroughputConfig databaseThroughputConfig; private boolean queryMetricsEnabled; CosmosConfigBuilder() { } @@ -88,19 +115,25 @@ public CosmosConfigBuilder enableQueryMetrics(boolean queryMetricsEnabled) { return this; } + public CosmosConfigBuilder enableDatabaseThroughput(boolean autoscale, int requestUnits) { + this.databaseThroughputConfig = new DatabaseThroughputConfig(autoscale, requestUnits); + return this; + } + /** * Build a CosmosConfig instance * * @return CosmosConfig */ public CosmosConfig build() { - return new CosmosConfig(this.responseDiagnosticsProcessor, this.queryMetricsEnabled); + return new CosmosConfig(this.responseDiagnosticsProcessor, this.databaseThroughputConfig, this.queryMetricsEnabled); } @Override public String toString() { return "CosmosConfigBuilder{" + "responseDiagnosticsProcessor=" + responseDiagnosticsProcessor + + ", databaseThroughputConfig=" + databaseThroughputConfig + ", queryMetricsEnabled=" + queryMetricsEnabled + '}'; } diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/DatabaseThroughputConfig.java b/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/DatabaseThroughputConfig.java new file mode 100644 index 0000000000000..c593588cf8132 --- /dev/null +++ b/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/config/DatabaseThroughputConfig.java @@ -0,0 +1,34 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +package com.azure.spring.data.cosmos.config; + +/** + * Throughput config for database creation + */ +public class DatabaseThroughputConfig { + + private final boolean autoScale; + private final int requestUnits; + + public DatabaseThroughputConfig(boolean autoScale, int requestUnits) { + this.autoScale = autoScale; + this.requestUnits = requestUnits; + } + + public boolean isAutoScale() { + return autoScale; + } + + public int getRequestUnits() { + return requestUnits; + } + + @Override + public String toString() { + return "DatabaseThroughputConfig{" + + "autoScale=" + autoScale + + ", requestUnits=" + requestUnits + + '}'; + } + +} diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java b/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java index 946b802f23133..655c7ed189375 100644 --- a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java +++ b/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java @@ -8,6 +8,7 @@ import com.azure.cosmos.CosmosAsyncDatabase; import com.azure.cosmos.models.CosmosContainerProperties; import com.azure.cosmos.models.CosmosContainerResponse; +import com.azure.cosmos.models.CosmosDatabaseResponse; import com.azure.cosmos.models.CosmosItemRequestOptions; import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.models.CosmosQueryRequestOptions; @@ -20,6 +21,7 @@ import com.azure.spring.data.cosmos.CosmosFactory; import com.azure.spring.data.cosmos.common.CosmosUtils; import com.azure.spring.data.cosmos.config.CosmosConfig; +import com.azure.spring.data.cosmos.config.DatabaseThroughputConfig; import com.azure.spring.data.cosmos.core.convert.MappingCosmosConverter; import com.azure.spring.data.cosmos.core.generator.CountQueryGenerator; import com.azure.spring.data.cosmos.core.generator.FindQuerySpecGenerator; @@ -75,6 +77,7 @@ public class CosmosTemplate implements CosmosOperations, ApplicationContextAware private final ResponseDiagnosticsProcessor responseDiagnosticsProcessor; private final boolean queryMetricsEnabled; private final CosmosAsyncClient cosmosAsyncClient; + private final DatabaseThroughputConfig databaseThroughputConfig; private ApplicationContext applicationContext; @@ -126,6 +129,7 @@ public CosmosTemplate(CosmosFactory cosmosFactory, this.databaseName = cosmosFactory.getDatabaseName(); this.responseDiagnosticsProcessor = cosmosConfig.getResponseDiagnosticsProcessor(); this.queryMetricsEnabled = cosmosConfig.isQueryMetricsEnabled(); + this.databaseThroughputConfig = cosmosConfig.getDatabaseThroughputConfig(); } /** @@ -458,8 +462,7 @@ public String getContainerName(Class domainType) { @Override public CosmosContainerProperties createContainerIfNotExists(CosmosEntityInformation information) { - final CosmosContainerResponse response = cosmosAsyncClient - .createDatabaseIfNotExists(this.databaseName) + final CosmosContainerResponse response = createDatabaseIfNotExists() .publishOn(Schedulers.parallel()) .onErrorResume(throwable -> CosmosExceptionUtils.exceptionHandler("Failed to create database", throwable)) @@ -501,6 +504,19 @@ public CosmosContainerProperties createContainerIfNotExists(CosmosEntityInformat return response.getProperties(); } + private Mono createDatabaseIfNotExists() { + if (databaseThroughputConfig == null) { + return cosmosAsyncClient + .createDatabaseIfNotExists(this.databaseName); + } else { + ThroughputProperties throughputProperties = databaseThroughputConfig.isAutoScale() + ? ThroughputProperties.createAutoscaledThroughput(databaseThroughputConfig.getRequestUnits()) + : ThroughputProperties.createManualThroughput(databaseThroughputConfig.getRequestUnits()); + return cosmosAsyncClient + .createDatabaseIfNotExists(this.databaseName, throughputProperties); + } + } + @Override public CosmosContainerProperties getContainerProperties(String containerName) { final CosmosContainerResponse response = cosmosAsyncClient.getDatabase(this.databaseName) diff --git a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java b/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java index 0e0d8ede36a2a..44566c01130b5 100644 --- a/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java +++ b/sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java @@ -7,6 +7,7 @@ import com.azure.cosmos.CosmosAsyncDatabase; import com.azure.cosmos.models.CosmosContainerProperties; import com.azure.cosmos.models.CosmosContainerResponse; +import com.azure.cosmos.models.CosmosDatabaseResponse; import com.azure.cosmos.models.CosmosItemRequestOptions; import com.azure.cosmos.models.CosmosQueryRequestOptions; import com.azure.cosmos.models.FeedResponse; @@ -18,6 +19,7 @@ import com.azure.spring.data.cosmos.CosmosFactory; import com.azure.spring.data.cosmos.common.CosmosUtils; import com.azure.spring.data.cosmos.config.CosmosConfig; +import com.azure.spring.data.cosmos.config.DatabaseThroughputConfig; import com.azure.spring.data.cosmos.core.convert.MappingCosmosConverter; import com.azure.spring.data.cosmos.core.generator.CountQueryGenerator; import com.azure.spring.data.cosmos.core.generator.FindQuerySpecGenerator; @@ -61,6 +63,7 @@ public class ReactiveCosmosTemplate implements ReactiveCosmosOperations, Applica private final boolean queryMetricsEnabled; private final CosmosAsyncClient cosmosAsyncClient; private final IsNewAwareAuditingHandler cosmosAuditingHandler; + private final DatabaseThroughputConfig databaseThroughputConfig; private ApplicationContext applicationContext; @@ -114,6 +117,7 @@ public ReactiveCosmosTemplate(CosmosFactory cosmosFactory, this.responseDiagnosticsProcessor = cosmosConfig.getResponseDiagnosticsProcessor(); this.queryMetricsEnabled = cosmosConfig.isQueryMetricsEnabled(); this.cosmosAuditingHandler = cosmosAuditingHandler; + this.databaseThroughputConfig = cosmosConfig.getDatabaseThroughputConfig(); } /** @@ -146,8 +150,7 @@ public void setApplicationContext(@NonNull ApplicationContext applicationContext @Override public Mono createContainerIfNotExists(CosmosEntityInformation information) { - return cosmosAsyncClient - .createDatabaseIfNotExists(this.databaseName) + return createDatabaseIfNotExists() .publishOn(Schedulers.parallel()) .onErrorResume(throwable -> CosmosExceptionUtils.exceptionHandler("Failed to create database", throwable)) @@ -188,6 +191,19 @@ public Mono createContainerIfNotExists(CosmosEntityInfo } + private Mono createDatabaseIfNotExists() { + if (databaseThroughputConfig == null) { + return cosmosAsyncClient + .createDatabaseIfNotExists(this.databaseName); + } else { + ThroughputProperties throughputProperties = databaseThroughputConfig.isAutoScale() + ? ThroughputProperties.createAutoscaledThroughput(databaseThroughputConfig.getRequestUnits()) + : ThroughputProperties.createManualThroughput(databaseThroughputConfig.getRequestUnits()); + return cosmosAsyncClient + .createDatabaseIfNotExists(this.databaseName, throughputProperties); + } + } + @Override public Mono getContainerProperties(String containerName) { return cosmosAsyncClient.getDatabase(this.databaseName) From 8a10ae6d35b0d4c5109c35da090a86adb02f4b29 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 4 Oct 2021 09:23:28 -0700 Subject: [PATCH 05/10] Increment version for core releases (#24504) Increment package version after release of Core libraries --- common/perf-test-core/pom.xml | 2 +- common/smoke-tests/pom.xml | 8 +++---- eng/jacoco-test-coverage/pom.xml | 18 ++++++++-------- eng/versioning/version_client.txt | 21 +++++++++---------- .../azure-resourcemanager-advisor/pom.xml | 4 ++-- .../azure-verticals-agrifood-farming/pom.xml | 10 ++++----- .../azure-ai-anomalydetector/pom.xml | 6 +++--- .../pom.xml | 4 ++-- .../azure-data-appconfiguration/pom.xml | 8 +++---- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-resourcemanager-attestation/pom.xml | 4 ++-- .../azure-security-attestation/pom.xml | 6 +++--- .../azure-resourcemanager-automation/pom.xml | 4 ++-- sdk/avs/azure-resourcemanager-avs/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-resourcemanager-azurestack/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- sdk/batch/azure-resourcemanager-batch/pom.xml | 6 +++--- sdk/batch/microsoft-azure-batch/pom.xml | 2 +- .../azure-resourcemanager-batchai/pom.xml | 4 ++-- .../azure-resourcemanager-billing/pom.xml | 4 ++-- .../azure-resourcemanager-botservice/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-resourcemanager-commerce/pom.xml | 4 ++-- .../azure-communication-callingserver/pom.xml | 6 +++--- .../azure-communication-chat/pom.xml | 6 +++--- .../azure-communication-common/pom.xml | 4 ++-- .../azure-communication-identity/pom.xml | 6 +++--- .../pom.xml | 6 +++--- .../azure-communication-phonenumbers/pom.xml | 6 +++--- .../azure-communication-sms/pom.xml | 6 +++--- .../pom.xml | 4 ++-- .../azure-security-confidentialledger/pom.xml | 10 ++++----- .../azure-resourcemanager-confluent/pom.xml | 6 +++--- .../azure-resourcemanager-consumption/pom.xml | 4 ++-- .../pom.xml | 8 +++---- sdk/core/azure-core-amqp/pom.xml | 2 +- sdk/core/azure-core-experimental/CHANGELOG.md | 10 +++++++++ sdk/core/azure-core-experimental/pom.xml | 4 ++-- .../azure-core-http-jdk-httpclient/pom.xml | 8 +++---- sdk/core/azure-core-http-netty/CHANGELOG.md | 10 +++++++++ sdk/core/azure-core-http-netty/pom.xml | 10 ++++----- sdk/core/azure-core-http-okhttp/CHANGELOG.md | 10 +++++++++ sdk/core/azure-core-http-okhttp/pom.xml | 10 ++++----- sdk/core/azure-core-jackson-tests/pom.xml | 4 ++-- sdk/core/azure-core-management/CHANGELOG.md | 10 +++++++++ sdk/core/azure-core-management/pom.xml | 6 +++--- .../CHANGELOG.md | 10 +++++++++ .../azure-core-serializer-avro-apache/pom.xml | 6 +++--- .../pom.xml | 4 ++-- .../CHANGELOG.md | 10 +++++++++ .../azure-core-serializer-json-gson/pom.xml | 4 ++-- .../CHANGELOG.md | 10 +++++++++ .../pom.xml | 4 ++-- sdk/core/azure-core-test/CHANGELOG.md | 10 +++++++++ sdk/core/azure-core-test/pom.xml | 4 ++-- .../CHANGELOG.md | 10 +++++++++ .../azure-core-tracing-opentelemetry/pom.xml | 8 +++---- sdk/core/azure-core/CHANGELOG.md | 10 +++++++++ sdk/core/azure-core/pom.xml | 2 +- sdk/core/pom.xml | 18 ++++++++-------- sdk/cosmos/azure-cosmos/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-resourcemanager-databox/pom.xml | 4 ++-- .../azure-resourcemanager-databoxedge/pom.xml | 4 ++-- .../azure-resourcemanager-databricks/pom.xml | 4 ++-- .../azure-resourcemanager-datadog/pom.xml | 4 ++-- .../azure-resourcemanager-datafactory/pom.xml | 6 +++--- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 6 +++--- .../azure-iot-deviceupdate/pom.xml | 6 +++--- .../azure-resourcemanager-devspaces/pom.xml | 4 ++-- .../azure-resourcemanager-devtestlabs/pom.xml | 4 ++-- .../azure-digitaltwins-core/pom.xml | 10 ++++----- .../pom.xml | 6 +++--- sdk/e2e/pom.xml | 6 +++--- .../azure-resourcemanager-elastic/pom.xml | 4 ++-- .../azure-messaging-eventgrid/pom.xml | 8 +++---- .../azure-resourcemanager-eventgrid/pom.xml | 6 +++--- .../azure-messaging-eventhubs/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-ai-formrecognizer/pom.xml | 8 +++---- .../azure-resourcemanager-frontdoor/pom.xml | 6 +++--- .../azure-resourcemanager-hanaonazure/pom.xml | 4 ++-- .../azure-resourcemanager-hdinsight/pom.xml | 6 +++--- .../azure-resourcemanager-healthbot/pom.xml | 2 +- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- sdk/identity/azure-identity/pom.xml | 4 ++-- .../pom.xml | 6 +++--- .../azure-resourcemanager-iotcentral/pom.xml | 4 ++-- .../azure-resourcemanager-iothub/pom.xml | 6 +++--- .../pom.xml | 8 +++---- .../pom.xml | 8 +++---- .../azure-security-keyvault-jca/pom.xml | 2 +- .../azure-security-keyvault-keys/pom.xml | 8 +++---- .../azure-security-keyvault-perf/pom.xml | 2 +- .../azure-security-keyvault-secrets/pom.xml | 8 +++---- .../azure-security-test-keyvault-jca/pom.xml | 2 +- .../pom.xml | 4 ++-- sdk/kusto/azure-resourcemanager-kusto/pom.xml | 4 ++-- .../azure-resourcemanager-labservices/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../microsoft-azure-loganalytics/pom.xml | 2 +- sdk/logic/azure-resourcemanager-logic/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-resourcemanager-maintenance/pom.xml | 6 +++--- .../pom.xml | 4 ++-- sdk/maps/azure-resourcemanager-maps/pom.xml | 6 +++--- .../azure-resourcemanager-mariadb/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-ai-metricsadvisor/pom.xml | 8 +++---- .../azure-mixedreality-authentication/pom.xml | 8 +++---- .../pom.xml | 4 ++-- .../azure-iot-modelsrepository/pom.xml | 8 +++---- .../pom.xml | 8 +++---- sdk/monitor/azure-monitor-query/pom.xml | 8 +++---- sdk/mysql/azure-resourcemanager-mysql/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-resourcemanager-netapp/pom.xml | 6 +++--- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-resourcemanager-peering/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-resourcemanager-postgresql/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-analytics-purview-catalog/pom.xml | 10 ++++----- .../azure-analytics-purview-scanning/pom.xml | 10 ++++----- .../azure-resourcemanager-purview/pom.xml | 4 ++-- sdk/quantum/azure-quantum-jobs/pom.xml | 6 +++--- sdk/quota/azure-resourcemanager-quota/pom.xml | 4 ++-- .../pom.xml | 2 +- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- sdk/relay/azure-resourcemanager-relay/pom.xml | 2 +- .../pom.xml | 6 +++--- .../pom.xml | 6 +++--- .../pom.xml | 4 ++-- .../azure-resourcemanager-appplatform/pom.xml | 2 +- .../azure-resourcemanager-appservice/pom.xml | 2 +- .../pom.xml | 2 +- .../azure-resourcemanager-cdn/pom.xml | 2 +- .../azure-resourcemanager-compute/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../azure-resourcemanager-cosmos/pom.xml | 2 +- .../azure-resourcemanager-dns/pom.xml | 2 +- .../azure-resourcemanager-eventhubs/pom.xml | 2 +- .../azure-resourcemanager-keyvault/pom.xml | 2 +- .../azure-resourcemanager-monitor/pom.xml | 2 +- .../azure-resourcemanager-msi/pom.xml | 2 +- .../azure-resourcemanager-network/pom.xml | 2 +- .../azure-resourcemanager-privatedns/pom.xml | 2 +- .../azure-resourcemanager-redis/pom.xml | 2 +- .../azure-resourcemanager-resources/pom.xml | 6 +++--- .../azure-resourcemanager-samples/pom.xml | 2 +- .../azure-resourcemanager-search/pom.xml | 2 +- .../azure-resourcemanager-servicebus/pom.xml | 2 +- .../azure-resourcemanager-sql/pom.xml | 2 +- .../azure-resourcemanager-storage/pom.xml | 2 +- .../azure-resourcemanager-test/pom.xml | 8 +++---- .../pom.xml | 2 +- .../azure-resourcemanager/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-data-schemaregistry-avro/pom.xml | 2 +- .../azure-data-schemaregistry/pom.xml | 6 +++--- sdk/search/azure-search-documents/pom.xml | 8 +++---- .../azure-resourcemanager-security/pom.xml | 4 ++-- .../azure-messaging-servicebus/pom.xml | 8 +++---- .../pom.xml | 4 ++-- .../azure-resourcemanager-signalr/pom.xml | 4 ++-- .../azure-spring-boot-test-parent/pom.xml | 2 +- .../azure-spring-cloud-test-parent/pom.xml | 2 +- .../pom.xml | 7 ++++++- .../pom.xml | 2 +- sdk/storage/azure-storage-blob-batch/pom.xml | 8 +++---- .../azure-storage-blob-changefeed/pom.xml | 8 +++---- .../azure-storage-blob-cryptography/pom.xml | 8 +++---- sdk/storage/azure-storage-blob-nio/pom.xml | 8 +++---- sdk/storage/azure-storage-blob/pom.xml | 8 +++---- sdk/storage/azure-storage-common/pom.xml | 8 +++---- .../azure-storage-file-datalake/pom.xml | 8 +++---- sdk/storage/azure-storage-file-share/pom.xml | 8 +++---- .../azure-storage-internal-avro/pom.xml | 4 ++-- sdk/storage/azure-storage-queue/pom.xml | 8 +++---- .../microsoft-azure-storage-blob/pom.xml | 2 +- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-resourcemanager-support/pom.xml | 4 ++-- .../pom.xml | 8 +++---- .../azure-analytics-synapse-artifacts/pom.xml | 8 +++---- .../pom.xml | 8 +++---- .../pom.xml | 8 +++---- .../azure-analytics-synapse-spark/pom.xml | 8 +++---- .../azure-resourcemanager-synapse/pom.xml | 4 ++-- sdk/tables/azure-data-tables-perf/pom.xml | 2 +- sdk/tables/azure-data-tables/pom.xml | 6 +++--- sdk/template/azure-sdk-template/pom.xml | 2 +- .../azure-ai-textanalytics/pom.xml | 8 +++---- .../pom.xml | 4 ++-- .../azure-ai-documenttranslator/pom.xml | 10 ++++----- .../azure-media-videoanalyzer-edge/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../azure-messaging-webpubsub/pom.xml | 6 +++--- .../azure-resourcemanager-webpubsub/pom.xml | 4 ++-- 223 files changed, 635 insertions(+), 531 deletions(-) diff --git a/common/perf-test-core/pom.xml b/common/perf-test-core/pom.xml index 3f17c035f157b..61fba5257d298 100644 --- a/common/perf-test-core/pom.xml +++ b/common/perf-test-core/pom.xml @@ -83,7 +83,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 diff --git a/common/smoke-tests/pom.xml b/common/smoke-tests/pom.xml index e5aec68e5b53e..e16147498c9e0 100644 --- a/common/smoke-tests/pom.xml +++ b/common/smoke-tests/pom.xml @@ -88,25 +88,25 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-tracing-opentelemetry - 1.0.0-beta.14 + 1.0.0-beta.15 com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index d3edbe6d7c021..862c224b05e0a 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -114,7 +114,7 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 com.azure @@ -129,7 +129,7 @@ com.azure azure-core-experimental - 1.0.0-beta.19 + 1.0.0-beta.20 com.azure @@ -139,37 +139,37 @@ com.azure azure-core-http-netty - 1.11.1 + 1.12.0-beta.1 com.azure azure-core-http-okhttp - 1.7.4 + 1.8.0-beta.1 com.azure azure-core-management - 1.4.2 + 1.5.0-beta.1 com.azure azure-core-serializer-avro-apache - 1.0.0-beta.15 + 1.0.0-beta.16 com.azure azure-core-serializer-json-gson - 1.1.7 + 1.2.0-beta.1 com.azure azure-core-serializer-json-jackson - 1.2.8 + 1.3.0-beta.1 com.azure azure-core-tracing-opentelemetry - 1.0.0-beta.15 + 1.0.0-beta.16 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index c8e3fc3137d30..a23ebc6f7fa3f 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -60,20 +60,20 @@ com.azure:azure-communication-phonenumbers;1.0.4;1.1.0-beta.1 com.azure:azure-communication-networktraversal;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-containers-containerregistry;1.0.0-beta.4;1.0.0-beta.5 com.azure:azure-containers-containerregistry-perf;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-core;1.20.0;1.21.0 +com.azure:azure-core;1.21.0;1.22.0-beta.1 com.azure:azure-core-amqp;2.3.2;2.4.0-beta.1 com.azure:azure-core-amqp-experimental;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-core-experimental;1.0.0-beta.18;1.0.0-beta.19 +com.azure:azure-core-experimental;1.0.0-beta.19;1.0.0-beta.20 com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-core-http-netty;1.11.0;1.11.1 -com.azure:azure-core-http-okhttp;1.7.3;1.7.4 -com.azure:azure-core-management;1.4.1;1.4.2 -com.azure:azure-core-serializer-avro-apache;1.0.0-beta.14;1.0.0-beta.15 +com.azure:azure-core-http-netty;1.11.1;1.12.0-beta.1 +com.azure:azure-core-http-okhttp;1.7.4;1.8.0-beta.1 +com.azure:azure-core-management;1.4.2;1.5.0-beta.1 +com.azure:azure-core-serializer-avro-apache;1.0.0-beta.15;1.0.0-beta.16 com.azure:azure-core-serializer-avro-jackson;1.0.0-beta.1;1.0.0-beta.2 -com.azure:azure-core-serializer-json-gson;1.1.6;1.1.7 -com.azure:azure-core-serializer-json-jackson;1.2.7;1.2.8 -com.azure:azure-core-test;1.7.1;1.7.2 -com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.14;1.0.0-beta.15 +com.azure:azure-core-serializer-json-gson;1.1.7;1.2.0-beta.1 +com.azure:azure-core-serializer-json-jackson;1.2.8;1.3.0-beta.1 +com.azure:azure-core-test;1.7.2;1.8.0-beta.1 +com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.15;1.0.0-beta.16 com.azure:azure-cosmos;4.19.0;4.19.1 com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1 com.azure:azure-cosmos-dotnet-benchmark;4.0.1-beta.1;4.0.1-beta.1 @@ -326,7 +326,6 @@ com.azure.resourcemanager:azure-resourcemanager-extendedlocation;1.0.0-beta.1;1. # note: The unreleased dependencies will not be manipulated with the automatic PR creation code. # In the pom, the version update tag after the version should name the unreleased package and the dependency version: # -unreleased_com.azure:azure-core;1.21.0 # Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current # version and set the version to the released beta. Released beta dependencies are only valid diff --git a/sdk/advisor/azure-resourcemanager-advisor/pom.xml b/sdk/advisor/azure-resourcemanager-advisor/pom.xml index 9c664468e26f3..9bcbff7a5d35a 100644 --- a/sdk/advisor/azure-resourcemanager-advisor/pom.xml +++ b/sdk/advisor/azure-resourcemanager-advisor/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/agrifood/azure-verticals-agrifood-farming/pom.xml b/sdk/agrifood/azure-verticals-agrifood-farming/pom.xml index 58c7633a4737b..637ef42c009cf 100644 --- a/sdk/agrifood/azure-verticals-agrifood-farming/pom.xml +++ b/sdk/agrifood/azure-verticals-agrifood-farming/pom.xml @@ -41,17 +41,17 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-experimental - 1.0.0-beta.18 + 1.0.0-beta.19 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 @@ -76,7 +76,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -100,7 +100,7 @@ com.azure azure-core-serializer-json-jackson - 1.2.7 + 1.2.8 test diff --git a/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml b/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml index 924633f114fa3..7a4edd759319b 100644 --- a/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml +++ b/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml @@ -38,12 +38,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 @@ -68,7 +68,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/apimanagement/azure-resourcemanager-apimanagement/pom.xml b/sdk/apimanagement/azure-resourcemanager-apimanagement/pom.xml index 0874e337da72f..2b00284025813 100644 --- a/sdk/apimanagement/azure-resourcemanager-apimanagement/pom.xml +++ b/sdk/apimanagement/azure-resourcemanager-apimanagement/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml index 307d92b05ddfc..d4a4fb680a64d 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml +++ b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml @@ -44,25 +44,25 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml b/sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml index 4445ca76f7d6a..6676e8ed5fe65 100644 --- a/sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml +++ b/sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml index 9f245e6f51765..a35bef5696cd2 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml @@ -57,7 +57,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure @@ -77,7 +77,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 org.hibernate.validator diff --git a/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml b/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml index 2055ac6e42a5c..72576340fafe3 100644 --- a/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml @@ -62,7 +62,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure @@ -82,7 +82,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 org.apache.commons diff --git a/sdk/applicationinsights/azure-resourcemanager-applicationinsights/pom.xml b/sdk/applicationinsights/azure-resourcemanager-applicationinsights/pom.xml index 32bd339a722ff..de8ac898ec293 100644 --- a/sdk/applicationinsights/azure-resourcemanager-applicationinsights/pom.xml +++ b/sdk/applicationinsights/azure-resourcemanager-applicationinsights/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/attestation/azure-resourcemanager-attestation/pom.xml b/sdk/attestation/azure-resourcemanager-attestation/pom.xml index f9b38b82ab5be..9207c54f0a926 100644 --- a/sdk/attestation/azure-resourcemanager-attestation/pom.xml +++ b/sdk/attestation/azure-resourcemanager-attestation/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/attestation/azure-security-attestation/pom.xml b/sdk/attestation/azure-security-attestation/pom.xml index 0e40670f487ff..f16cfaff48718 100644 --- a/sdk/attestation/azure-security-attestation/pom.xml +++ b/sdk/attestation/azure-security-attestation/pom.xml @@ -45,7 +45,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.nimbusds @@ -57,7 +57,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -81,7 +81,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/automation/azure-resourcemanager-automation/pom.xml b/sdk/automation/azure-resourcemanager-automation/pom.xml index 29fc1f7678310..912f2aba9fa05 100644 --- a/sdk/automation/azure-resourcemanager-automation/pom.xml +++ b/sdk/automation/azure-resourcemanager-automation/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/avs/azure-resourcemanager-avs/pom.xml b/sdk/avs/azure-resourcemanager-avs/pom.xml index eb955953b904b..d0dd6759e02e4 100644 --- a/sdk/avs/azure-resourcemanager-avs/pom.xml +++ b/sdk/avs/azure-resourcemanager-avs/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/azurearcdata/azure-resourcemanager-azurearcdata/pom.xml b/sdk/azurearcdata/azure-resourcemanager-azurearcdata/pom.xml index 452512cb0485c..a80bc8aa8a121 100644 --- a/sdk/azurearcdata/azure-resourcemanager-azurearcdata/pom.xml +++ b/sdk/azurearcdata/azure-resourcemanager-azurearcdata/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/azurestack/azure-resourcemanager-azurestack/pom.xml b/sdk/azurestack/azure-resourcemanager-azurestack/pom.xml index 5a917429558c2..e047dffcda3a9 100644 --- a/sdk/azurestack/azure-resourcemanager-azurestack/pom.xml +++ b/sdk/azurestack/azure-resourcemanager-azurestack/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/azurestackhci/azure-resourcemanager-azurestackhci/pom.xml b/sdk/azurestackhci/azure-resourcemanager-azurestackhci/pom.xml index a1d7fea077885..62db377db9be9 100644 --- a/sdk/azurestackhci/azure-resourcemanager-azurestackhci/pom.xml +++ b/sdk/azurestackhci/azure-resourcemanager-azurestackhci/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/baremetalinfrastructure/azure-resourcemanager-baremetalinfrastructure/pom.xml b/sdk/baremetalinfrastructure/azure-resourcemanager-baremetalinfrastructure/pom.xml index f270dbf7361c9..5926bca2c541b 100644 --- a/sdk/baremetalinfrastructure/azure-resourcemanager-baremetalinfrastructure/pom.xml +++ b/sdk/baremetalinfrastructure/azure-resourcemanager-baremetalinfrastructure/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/batch/azure-resourcemanager-batch/pom.xml b/sdk/batch/azure-resourcemanager-batch/pom.xml index b36e64174875b..b6b9d42c5fbed 100644 --- a/sdk/batch/azure-resourcemanager-batch/pom.xml +++ b/sdk/batch/azure-resourcemanager-batch/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -66,7 +66,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/batch/microsoft-azure-batch/pom.xml b/sdk/batch/microsoft-azure-batch/pom.xml index 9cdceeb0e2f71..89d022e51adaa 100644 --- a/sdk/batch/microsoft-azure-batch/pom.xml +++ b/sdk/batch/microsoft-azure-batch/pom.xml @@ -85,7 +85,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 test diff --git a/sdk/batchai/azure-resourcemanager-batchai/pom.xml b/sdk/batchai/azure-resourcemanager-batchai/pom.xml index f39f35f1ff0c4..c85c056d595ad 100644 --- a/sdk/batchai/azure-resourcemanager-batchai/pom.xml +++ b/sdk/batchai/azure-resourcemanager-batchai/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/billing/azure-resourcemanager-billing/pom.xml b/sdk/billing/azure-resourcemanager-billing/pom.xml index 1165e881875e5..3c72c1d0f0992 100644 --- a/sdk/billing/azure-resourcemanager-billing/pom.xml +++ b/sdk/billing/azure-resourcemanager-billing/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/botservice/azure-resourcemanager-botservice/pom.xml b/sdk/botservice/azure-resourcemanager-botservice/pom.xml index a416d5293a57b..7920c3e71f4e2 100644 --- a/sdk/botservice/azure-resourcemanager-botservice/pom.xml +++ b/sdk/botservice/azure-resourcemanager-botservice/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/changeanalysis/azure-resourcemanager-changeanalysis/pom.xml b/sdk/changeanalysis/azure-resourcemanager-changeanalysis/pom.xml index 134105d903610..a609828400433 100644 --- a/sdk/changeanalysis/azure-resourcemanager-changeanalysis/pom.xml +++ b/sdk/changeanalysis/azure-resourcemanager-changeanalysis/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/pom.xml b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/pom.xml index 0d3be53196fce..c231fdbe708a0 100644 --- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/pom.xml +++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/commerce/azure-resourcemanager-commerce/pom.xml b/sdk/commerce/azure-resourcemanager-commerce/pom.xml index 333ba29767137..5f9f381c56f68 100644 --- a/sdk/commerce/azure-resourcemanager-commerce/pom.xml +++ b/sdk/commerce/azure-resourcemanager-commerce/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/communication/azure-communication-callingserver/pom.xml b/sdk/communication/azure-communication-callingserver/pom.xml index 085df78d9204b..e5f99bb6e4f90 100644 --- a/sdk/communication/azure-communication-callingserver/pom.xml +++ b/sdk/communication/azure-communication-callingserver/pom.xml @@ -53,7 +53,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure @@ -69,7 +69,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -117,7 +117,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/communication/azure-communication-chat/pom.xml b/sdk/communication/azure-communication-chat/pom.xml index fc0eef257e5a2..e85b035c70636 100644 --- a/sdk/communication/azure-communication-chat/pom.xml +++ b/sdk/communication/azure-communication-chat/pom.xml @@ -49,7 +49,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure @@ -65,7 +65,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -95,7 +95,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/communication/azure-communication-common/pom.xml b/sdk/communication/azure-communication-common/pom.xml index ae1b2173d1917..f9122fc00c1e3 100644 --- a/sdk/communication/azure-communication-common/pom.xml +++ b/sdk/communication/azure-communication-common/pom.xml @@ -46,12 +46,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 compile diff --git a/sdk/communication/azure-communication-identity/pom.xml b/sdk/communication/azure-communication-identity/pom.xml index 5ead5bdece25a..4b2cb877ef855 100644 --- a/sdk/communication/azure-communication-identity/pom.xml +++ b/sdk/communication/azure-communication-identity/pom.xml @@ -62,7 +62,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure @@ -102,7 +102,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -114,7 +114,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/communication/azure-communication-networktraversal/pom.xml b/sdk/communication/azure-communication-networktraversal/pom.xml index 792f360652a56..1b5ad4f1d73b2 100644 --- a/sdk/communication/azure-communication-networktraversal/pom.xml +++ b/sdk/communication/azure-communication-networktraversal/pom.xml @@ -60,7 +60,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure @@ -94,7 +94,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -106,7 +106,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/communication/azure-communication-phonenumbers/pom.xml b/sdk/communication/azure-communication-phonenumbers/pom.xml index 577dd2a379cda..f586c74ca0473 100644 --- a/sdk/communication/azure-communication-phonenumbers/pom.xml +++ b/sdk/communication/azure-communication-phonenumbers/pom.xml @@ -62,7 +62,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure @@ -102,7 +102,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -114,7 +114,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/communication/azure-communication-sms/pom.xml b/sdk/communication/azure-communication-sms/pom.xml index e3a5ecf38d938..8d2b0445a624c 100644 --- a/sdk/communication/azure-communication-sms/pom.xml +++ b/sdk/communication/azure-communication-sms/pom.xml @@ -50,7 +50,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure @@ -60,7 +60,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -96,7 +96,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/communication/azure-resourcemanager-communication/pom.xml b/sdk/communication/azure-resourcemanager-communication/pom.xml index 3d2fb76e41e13..0791b7bb975ab 100644 --- a/sdk/communication/azure-resourcemanager-communication/pom.xml +++ b/sdk/communication/azure-resourcemanager-communication/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/confidentialledger/azure-security-confidentialledger/pom.xml b/sdk/confidentialledger/azure-security-confidentialledger/pom.xml index fe4186a0e02aa..72402a6373587 100644 --- a/sdk/confidentialledger/azure-security-confidentialledger/pom.xml +++ b/sdk/confidentialledger/azure-security-confidentialledger/pom.xml @@ -41,17 +41,17 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-experimental - 1.0.0-beta.18 + 1.0.0-beta.19 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 @@ -76,7 +76,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -100,7 +100,7 @@ com.azure azure-core-serializer-json-jackson - 1.2.7 + 1.2.8 test diff --git a/sdk/confluent/azure-resourcemanager-confluent/pom.xml b/sdk/confluent/azure-resourcemanager-confluent/pom.xml index d15a25d13c5a4..fc49bd88afdc8 100644 --- a/sdk/confluent/azure-resourcemanager-confluent/pom.xml +++ b/sdk/confluent/azure-resourcemanager-confluent/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -60,7 +60,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/consumption/azure-resourcemanager-consumption/pom.xml b/sdk/consumption/azure-resourcemanager-consumption/pom.xml index b108f13ce9c55..54d50cc5bebb5 100644 --- a/sdk/consumption/azure-resourcemanager-consumption/pom.xml +++ b/sdk/consumption/azure-resourcemanager-consumption/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/containerregistry/azure-containers-containerregistry/pom.xml b/sdk/containerregistry/azure-containers-containerregistry/pom.xml index e17cea64cd0e1..92e663e0a1355 100644 --- a/sdk/containerregistry/azure-containers-containerregistry/pom.xml +++ b/sdk/containerregistry/azure-containers-containerregistry/pom.xml @@ -46,12 +46,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 @@ -87,13 +87,13 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index 968c2901ed855..e414b8dc2c5f0 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -67,7 +67,7 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 com.microsoft.azure diff --git a/sdk/core/azure-core-experimental/CHANGELOG.md b/sdk/core/azure-core-experimental/CHANGELOG.md index 55b4d476a2c7a..6e49f7ce829c0 100644 --- a/sdk/core/azure-core-experimental/CHANGELOG.md +++ b/sdk/core/azure-core-experimental/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 1.0.0-beta.20 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 1.0.0-beta.19 (2021-10-01) ### Breaking Changes diff --git a/sdk/core/azure-core-experimental/pom.xml b/sdk/core/azure-core-experimental/pom.xml index 8098a06c76ffb..d3bab4511c515 100644 --- a/sdk/core/azure-core-experimental/pom.xml +++ b/sdk/core/azure-core-experimental/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-experimental jar - 1.0.0-beta.19 + 1.0.0-beta.20 Microsoft Azure Java Core Experimental Library This package contains experimental core types for Azure Java clients. @@ -67,7 +67,7 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml index de2566bc8c942..def0a33e830f2 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/pom.xml +++ b/sdk/core/azure-core-http-jdk-httpclient/pom.xml @@ -71,27 +71,27 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 com.azure azure-core - 1.21.0 + 1.22.0-beta.1 test-jar test com.azure azure-core-test - 1.7.2 + 1.8.0-beta.1 test com.azure azure-core-test - 1.7.2 + 1.8.0-beta.1 test-jar test diff --git a/sdk/core/azure-core-http-netty/CHANGELOG.md b/sdk/core/azure-core-http-netty/CHANGELOG.md index e2ce84da2fa88..34897551175c7 100644 --- a/sdk/core/azure-core-http-netty/CHANGELOG.md +++ b/sdk/core/azure-core-http-netty/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 1.12.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 1.11.1 (2021-10-01) ### Bugs Fixed diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index e64e82ae977f6..06cf4bb79e60f 100644 --- a/sdk/core/azure-core-http-netty/pom.xml +++ b/sdk/core/azure-core-http-netty/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-http-netty jar - 1.11.1 + 1.12.0-beta.1 Microsoft Azure Netty HTTP Client Library This package contains the Netty HTTP client plugin for azure-core. @@ -67,7 +67,7 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 @@ -124,20 +124,20 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 test-jar test com.azure azure-core-test - 1.7.2 + 1.8.0-beta.1 test com.azure azure-core-test - 1.7.2 + 1.8.0-beta.1 test-jar test diff --git a/sdk/core/azure-core-http-okhttp/CHANGELOG.md b/sdk/core/azure-core-http-okhttp/CHANGELOG.md index 2f8b4b236e58b..859b03c09b5bf 100644 --- a/sdk/core/azure-core-http-okhttp/CHANGELOG.md +++ b/sdk/core/azure-core-http-okhttp/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 1.8.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 1.7.4 (2021-10-01) ### Other Changes diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index 7ff7818edf2de..af47977cd4a37 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-http-okhttp jar - 1.7.4 + 1.8.0-beta.1 Microsoft Azure OkHttp HTTP Client Library This package contains the OkHttp HTTP client plugin for azure-core. @@ -67,7 +67,7 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 @@ -80,20 +80,20 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 test-jar test com.azure azure-core-test - 1.7.2 + 1.8.0-beta.1 test com.azure azure-core-test - 1.7.2 + 1.8.0-beta.1 test-jar test diff --git a/sdk/core/azure-core-jackson-tests/pom.xml b/sdk/core/azure-core-jackson-tests/pom.xml index af30b49cc2224..3e50e76714d23 100644 --- a/sdk/core/azure-core-jackson-tests/pom.xml +++ b/sdk/core/azure-core-jackson-tests/pom.xml @@ -57,14 +57,14 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 test com.azure azure-core - 1.21.0 + 1.22.0-beta.1 tests test-jar test diff --git a/sdk/core/azure-core-management/CHANGELOG.md b/sdk/core/azure-core-management/CHANGELOG.md index 23a69a3da1ec6..bd45246f6abf0 100644 --- a/sdk/core/azure-core-management/CHANGELOG.md +++ b/sdk/core/azure-core-management/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 1.5.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 1.4.2 (2021-10-01) ### Other Changes diff --git a/sdk/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml index 266fb97e25667..23acaf972c2e3 100644 --- a/sdk/core/azure-core-management/pom.xml +++ b/sdk/core/azure-core-management/pom.xml @@ -13,7 +13,7 @@ com.azure azure-core-management - 1.4.2 + 1.5.0-beta.1 jar Microsoft Azure Management Java Core Library @@ -65,7 +65,7 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 @@ -89,7 +89,7 @@ com.azure azure-core-http-netty - 1.11.1 + 1.12.0-beta.1 test diff --git a/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md b/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md index 28ae7cdcb0a09..4cc538ee963c5 100644 --- a/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md +++ b/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 1.0.0-beta.16 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 1.0.0-beta.15 (2021-10-01) ### Other Changes diff --git a/sdk/core/azure-core-serializer-avro-apache/pom.xml b/sdk/core/azure-core-serializer-avro-apache/pom.xml index ad3d5736bdbad..a35232acaaa0f 100644 --- a/sdk/core/azure-core-serializer-avro-apache/pom.xml +++ b/sdk/core/azure-core-serializer-avro-apache/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-serializer-avro-apache jar - 1.0.0-beta.15 + 1.0.0-beta.16 Microsoft Azure Apache Avro Serializer Library This package contains the Apache Avro serializer client plugin for azure-core. @@ -65,12 +65,12 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 com.azure azure-core-experimental - 1.0.0-beta.19 + 1.0.0-beta.20 diff --git a/sdk/core/azure-core-serializer-avro-jackson/pom.xml b/sdk/core/azure-core-serializer-avro-jackson/pom.xml index cec9b5052138d..6d4c2bec8d164 100644 --- a/sdk/core/azure-core-serializer-avro-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-avro-jackson/pom.xml @@ -62,12 +62,12 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 com.azure azure-core-experimental - 1.0.0-beta.19 + 1.0.0-beta.20 diff --git a/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md b/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md index 4194f32b2d01e..cdf484097a1e4 100644 --- a/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md +++ b/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 1.2.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 1.1.7 (2021-10-01) ### Other Changes diff --git a/sdk/core/azure-core-serializer-json-gson/pom.xml b/sdk/core/azure-core-serializer-json-gson/pom.xml index c2303478efc50..88047c4a61eb7 100644 --- a/sdk/core/azure-core-serializer-json-gson/pom.xml +++ b/sdk/core/azure-core-serializer-json-gson/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-serializer-json-gson jar - 1.1.7 + 1.2.0-beta.1 Microsoft Azure Gson JSON Serializer Library This package contains the Gson JSON serializer client plugin for azure-core. @@ -65,7 +65,7 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 diff --git a/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md b/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md index 847089773f834..c12354cc256c6 100644 --- a/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md +++ b/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 1.3.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 1.2.8 (2021-10-01) ### Other Changes diff --git a/sdk/core/azure-core-serializer-json-jackson/pom.xml b/sdk/core/azure-core-serializer-json-jackson/pom.xml index 4bd105cd807c1..e39b33a2cf578 100644 --- a/sdk/core/azure-core-serializer-json-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-json-jackson/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-serializer-json-jackson jar - 1.2.8 + 1.3.0-beta.1 Microsoft Azure Jackson JSON Serializer Library This package contains the Jackson JSON serializer client plugin for azure-core. @@ -66,7 +66,7 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 diff --git a/sdk/core/azure-core-test/CHANGELOG.md b/sdk/core/azure-core-test/CHANGELOG.md index 5ebdf3873a968..85df65a4e90b6 100644 --- a/sdk/core/azure-core-test/CHANGELOG.md +++ b/sdk/core/azure-core-test/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 1.8.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 1.7.2 (2021-10-01) ### Other Changes diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index 08b5a8508fc42..8f580e07d6fef 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -13,7 +13,7 @@ com.azure azure-core-test jar - 1.7.2 + 1.8.0-beta.1 Microsoft Azure Java Core Test Library This package contains core test types for Azure Java clients. @@ -50,7 +50,7 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 diff --git a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md index 78863430ff6bc..a9566e85328ba 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md +++ b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 1.0.0-beta.16 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 1.0.0-beta.15 (2021-10-01) ### Other Changes diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml index b812a74789497..169ccd5a6d796 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/pom.xml +++ b/sdk/core/azure-core-tracing-opentelemetry/pom.xml @@ -12,7 +12,7 @@ com.azure azure-core-tracing-opentelemetry - 1.0.0-beta.15 + 1.0.0-beta.16 Microsoft Azure OpenTelemetry tracing plugin This package contains the OpenTelemetry tracing plugin for Azure client libraries. @@ -49,7 +49,7 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 com.google.code.findbugs @@ -68,13 +68,13 @@ com.azure azure-core-test - 1.7.2 + 1.8.0-beta.1 test com.azure azure-core-http-netty - 1.11.1 + 1.12.0-beta.1 test diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md index 1c2a5641238d9..d08a849c7970e 100644 --- a/sdk/core/azure-core/CHANGELOG.md +++ b/sdk/core/azure-core/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 1.22.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 1.21.0 (2021-10-01) ### Features Added diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index 5a9c9ae331e51..a27eaddc01963 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core jar - 1.21.0 + 1.22.0-beta.1 Microsoft Azure Java Core Library This package contains core types for Azure Java clients. diff --git a/sdk/core/pom.xml b/sdk/core/pom.xml index 90c33ae293f58..e01221d6fec0c 100644 --- a/sdk/core/pom.xml +++ b/sdk/core/pom.xml @@ -32,7 +32,7 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 com.azure @@ -47,7 +47,7 @@ com.azure azure-core-experimental - 1.0.0-beta.19 + 1.0.0-beta.20 com.azure @@ -57,37 +57,37 @@ com.azure azure-core-http-netty - 1.11.1 + 1.12.0-beta.1 com.azure azure-core-http-okhttp - 1.7.4 + 1.8.0-beta.1 com.azure azure-core-management - 1.4.2 + 1.5.0-beta.1 com.azure azure-core-serializer-avro-apache - 1.0.0-beta.15 + 1.0.0-beta.16 com.azure azure-core-serializer-json-gson - 1.1.7 + 1.2.0-beta.1 com.azure azure-core-serializer-json-jackson - 1.2.8 + 1.3.0-beta.1 com.azure azure-core-tracing-opentelemetry - 1.0.0-beta.15 + 1.0.0-beta.16 diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml index aebc11214f1df..160294dc77730 100644 --- a/sdk/cosmos/azure-cosmos/pom.xml +++ b/sdk/cosmos/azure-cosmos/pom.xml @@ -81,7 +81,7 @@ Licensed under the MIT License. com.azure azure-core - 1.20.0 + 1.21.0 com.azure @@ -93,7 +93,7 @@ Licensed under the MIT License. com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure diff --git a/sdk/costmanagement/azure-resourcemanager-costmanagement/pom.xml b/sdk/costmanagement/azure-resourcemanager-costmanagement/pom.xml index 3b9ea6a6f1654..ebbe3c91f9c8c 100644 --- a/sdk/costmanagement/azure-resourcemanager-costmanagement/pom.xml +++ b/sdk/costmanagement/azure-resourcemanager-costmanagement/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/customerinsights/azure-resourcemanager-customerinsights/pom.xml b/sdk/customerinsights/azure-resourcemanager-customerinsights/pom.xml index a0d7bc30ebc23..3df4427d71234 100644 --- a/sdk/customerinsights/azure-resourcemanager-customerinsights/pom.xml +++ b/sdk/customerinsights/azure-resourcemanager-customerinsights/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/databox/azure-resourcemanager-databox/pom.xml b/sdk/databox/azure-resourcemanager-databox/pom.xml index a53824c31b667..4eddc73900c42 100644 --- a/sdk/databox/azure-resourcemanager-databox/pom.xml +++ b/sdk/databox/azure-resourcemanager-databox/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/databoxedge/azure-resourcemanager-databoxedge/pom.xml b/sdk/databoxedge/azure-resourcemanager-databoxedge/pom.xml index e93ad9bd94378..1fb487ca0db1b 100644 --- a/sdk/databoxedge/azure-resourcemanager-databoxedge/pom.xml +++ b/sdk/databoxedge/azure-resourcemanager-databoxedge/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/databricks/azure-resourcemanager-databricks/pom.xml b/sdk/databricks/azure-resourcemanager-databricks/pom.xml index 6b3dd0f361d64..c51edc5a7f54d 100644 --- a/sdk/databricks/azure-resourcemanager-databricks/pom.xml +++ b/sdk/databricks/azure-resourcemanager-databricks/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/datadog/azure-resourcemanager-datadog/pom.xml b/sdk/datadog/azure-resourcemanager-datadog/pom.xml index 0d707b9198473..57623845c5f51 100644 --- a/sdk/datadog/azure-resourcemanager-datadog/pom.xml +++ b/sdk/datadog/azure-resourcemanager-datadog/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/pom.xml b/sdk/datafactory/azure-resourcemanager-datafactory/pom.xml index 3e4d19a6e9195..867c27475feaf 100644 --- a/sdk/datafactory/azure-resourcemanager-datafactory/pom.xml +++ b/sdk/datafactory/azure-resourcemanager-datafactory/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -60,7 +60,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml index 81e30a8533ada..9accc03ac0498 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/datalakestore/azure-resourcemanager-datalakestore/pom.xml b/sdk/datalakestore/azure-resourcemanager-datalakestore/pom.xml index 989318ab3e854..41e9ae9d8744b 100644 --- a/sdk/datalakestore/azure-resourcemanager-datalakestore/pom.xml +++ b/sdk/datalakestore/azure-resourcemanager-datalakestore/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/datamigration/azure-resourcemanager-datamigration/pom.xml b/sdk/datamigration/azure-resourcemanager-datamigration/pom.xml index bbd6b31dbf3e2..ba69fa9d0cfc7 100644 --- a/sdk/datamigration/azure-resourcemanager-datamigration/pom.xml +++ b/sdk/datamigration/azure-resourcemanager-datamigration/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/delegatednetwork/azure-resourcemanager-delegatednetwork/pom.xml b/sdk/delegatednetwork/azure-resourcemanager-delegatednetwork/pom.xml index d5973b2d9a0ba..a4fb4f08ba376 100644 --- a/sdk/delegatednetwork/azure-resourcemanager-delegatednetwork/pom.xml +++ b/sdk/delegatednetwork/azure-resourcemanager-delegatednetwork/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/deploymentmanager/azure-resourcemanager-deploymentmanager/pom.xml b/sdk/deploymentmanager/azure-resourcemanager-deploymentmanager/pom.xml index 47345fa5f3f09..bb0d411834708 100644 --- a/sdk/deploymentmanager/azure-resourcemanager-deploymentmanager/pom.xml +++ b/sdk/deploymentmanager/azure-resourcemanager-deploymentmanager/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/pom.xml b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/pom.xml index 968beef978cbd..97518b7e4d040 100644 --- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/pom.xml +++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -66,7 +66,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/deviceupdate/azure-iot-deviceupdate/pom.xml b/sdk/deviceupdate/azure-iot-deviceupdate/pom.xml index bc366abcfff07..8e38f1348696d 100644 --- a/sdk/deviceupdate/azure-iot-deviceupdate/pom.xml +++ b/sdk/deviceupdate/azure-iot-deviceupdate/pom.xml @@ -31,12 +31,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure @@ -47,7 +47,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/devspaces/azure-resourcemanager-devspaces/pom.xml b/sdk/devspaces/azure-resourcemanager-devspaces/pom.xml index a7a358933fe69..940bb3aa00cd0 100644 --- a/sdk/devspaces/azure-resourcemanager-devspaces/pom.xml +++ b/sdk/devspaces/azure-resourcemanager-devspaces/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/devtestlabs/azure-resourcemanager-devtestlabs/pom.xml b/sdk/devtestlabs/azure-resourcemanager-devtestlabs/pom.xml index 9da2332771465..4a30c0f966d75 100644 --- a/sdk/devtestlabs/azure-resourcemanager-devtestlabs/pom.xml +++ b/sdk/devtestlabs/azure-resourcemanager-devtestlabs/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml index b98836ab70947..0a148aedd686f 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml +++ b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml @@ -45,17 +45,17 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-serializer-json-jackson - 1.2.7 + 1.2.8 com.fasterxml.jackson.core @@ -67,7 +67,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -79,7 +79,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/pom.xml b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/pom.xml index 207f9e96caf11..af90b4a4f6f90 100644 --- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/pom.xml +++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -66,7 +66,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/e2e/pom.xml b/sdk/e2e/pom.xml index c3afc1ad696c0..c60a07a0a988d 100644 --- a/sdk/e2e/pom.xml +++ b/sdk/e2e/pom.xml @@ -23,12 +23,12 @@ com.azure azure-core - 1.21.0 + 1.22.0-beta.1 com.azure azure-core-http-netty - 1.11.1 + 1.12.0-beta.1 com.azure @@ -64,7 +64,7 @@ com.azure azure-core-test - 1.7.2 + 1.8.0-beta.1 test diff --git a/sdk/elastic/azure-resourcemanager-elastic/pom.xml b/sdk/elastic/azure-resourcemanager-elastic/pom.xml index e6e55e0d3e1ac..7f88569ca7d84 100644 --- a/sdk/elastic/azure-resourcemanager-elastic/pom.xml +++ b/sdk/elastic/azure-resourcemanager-elastic/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml index 66957edca8d31..4a9f2531003f4 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml +++ b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml @@ -68,19 +68,19 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-serializer-json-jackson - 1.2.7 + 1.2.8 test @@ -116,7 +116,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/eventgrid/azure-resourcemanager-eventgrid/pom.xml b/sdk/eventgrid/azure-resourcemanager-eventgrid/pom.xml index 9f2e3e2175d8c..acc632fd2d15d 100644 --- a/sdk/eventgrid/azure-resourcemanager-eventgrid/pom.xml +++ b/sdk/eventgrid/azure-resourcemanager-eventgrid/pom.xml @@ -44,19 +44,19 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index fc0d93b3ede20..c9e3954682d41 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -37,7 +37,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure @@ -55,7 +55,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/extendedlocation/azure-resourcemanager-extendedlocation/pom.xml b/sdk/extendedlocation/azure-resourcemanager-extendedlocation/pom.xml index 2b985cd5405da..72ff6e89203c0 100644 --- a/sdk/extendedlocation/azure-resourcemanager-extendedlocation/pom.xml +++ b/sdk/extendedlocation/azure-resourcemanager-extendedlocation/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml b/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml index d5ffa39a2ea42..5474591714b25 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml +++ b/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml @@ -45,25 +45,25 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/frontdoor/azure-resourcemanager-frontdoor/pom.xml b/sdk/frontdoor/azure-resourcemanager-frontdoor/pom.xml index 12a6a1d1c389e..12df87a9d23ad 100644 --- a/sdk/frontdoor/azure-resourcemanager-frontdoor/pom.xml +++ b/sdk/frontdoor/azure-resourcemanager-frontdoor/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -60,7 +60,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/hanaonazure/azure-resourcemanager-hanaonazure/pom.xml b/sdk/hanaonazure/azure-resourcemanager-hanaonazure/pom.xml index 95ecbc7e7997b..1f154401326f2 100644 --- a/sdk/hanaonazure/azure-resourcemanager-hanaonazure/pom.xml +++ b/sdk/hanaonazure/azure-resourcemanager-hanaonazure/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/pom.xml b/sdk/hdinsight/azure-resourcemanager-hdinsight/pom.xml index ff2b905acddb0..856c06b90f921 100644 --- a/sdk/hdinsight/azure-resourcemanager-hdinsight/pom.xml +++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -60,7 +60,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/healthbot/azure-resourcemanager-healthbot/pom.xml b/sdk/healthbot/azure-resourcemanager-healthbot/pom.xml index eb3b5ee285ca1..42b0e9d4d89e6 100644 --- a/sdk/healthbot/azure-resourcemanager-healthbot/pom.xml +++ b/sdk/healthbot/azure-resourcemanager-healthbot/pom.xml @@ -44,7 +44,7 @@ com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/healthcareapis/azure-resourcemanager-healthcareapis/pom.xml b/sdk/healthcareapis/azure-resourcemanager-healthcareapis/pom.xml index 7ebcb7cdec91e..f43218fa6ff06 100644 --- a/sdk/healthcareapis/azure-resourcemanager-healthcareapis/pom.xml +++ b/sdk/healthcareapis/azure-resourcemanager-healthcareapis/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/hybridcompute/azure-resourcemanager-hybridcompute/pom.xml b/sdk/hybridcompute/azure-resourcemanager-hybridcompute/pom.xml index 1a3dbd387569b..854ed11c3bc51 100644 --- a/sdk/hybridcompute/azure-resourcemanager-hybridcompute/pom.xml +++ b/sdk/hybridcompute/azure-resourcemanager-hybridcompute/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/hybridkubernetes/azure-resourcemanager-hybridkubernetes/pom.xml b/sdk/hybridkubernetes/azure-resourcemanager-hybridkubernetes/pom.xml index c283e2a8c42ec..ee96de97eabbd 100644 --- a/sdk/hybridkubernetes/azure-resourcemanager-hybridkubernetes/pom.xml +++ b/sdk/hybridkubernetes/azure-resourcemanager-hybridkubernetes/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/hybridnetwork/azure-resourcemanager-hybridnetwork/pom.xml b/sdk/hybridnetwork/azure-resourcemanager-hybridnetwork/pom.xml index 40bf4fc4e1148..ef99035f31af7 100644 --- a/sdk/hybridnetwork/azure-resourcemanager-hybridnetwork/pom.xml +++ b/sdk/hybridnetwork/azure-resourcemanager-hybridnetwork/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml index a96a2c99f67f5..370c06d9a2f8c 100644 --- a/sdk/identity/azure-identity/pom.xml +++ b/sdk/identity/azure-identity/pom.xml @@ -31,12 +31,12 @@ com.azure azure-core - 1.21.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.microsoft.azure diff --git a/sdk/imagebuilder/azure-resourcemanager-imagebuilder/pom.xml b/sdk/imagebuilder/azure-resourcemanager-imagebuilder/pom.xml index d1759c55dfc3c..a257bd3d59207 100644 --- a/sdk/imagebuilder/azure-resourcemanager-imagebuilder/pom.xml +++ b/sdk/imagebuilder/azure-resourcemanager-imagebuilder/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -60,7 +60,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/iotcentral/azure-resourcemanager-iotcentral/pom.xml b/sdk/iotcentral/azure-resourcemanager-iotcentral/pom.xml index decf4bb448c24..136d992f3a36b 100644 --- a/sdk/iotcentral/azure-resourcemanager-iotcentral/pom.xml +++ b/sdk/iotcentral/azure-resourcemanager-iotcentral/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/iothub/azure-resourcemanager-iothub/pom.xml b/sdk/iothub/azure-resourcemanager-iothub/pom.xml index eca849b649497..2375ecf4e84e7 100644 --- a/sdk/iothub/azure-resourcemanager-iothub/pom.xml +++ b/sdk/iothub/azure-resourcemanager-iothub/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -66,7 +66,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/keyvault/azure-security-keyvault-administration/pom.xml b/sdk/keyvault/azure-security-keyvault-administration/pom.xml index 9f745cbee562e..d4e8b9b28511a 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-administration/pom.xml @@ -45,12 +45,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 @@ -86,13 +86,13 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml index 8cf113693c6d0..53932c7c10b96 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml @@ -46,13 +46,13 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 @@ -94,14 +94,14 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index 1a9ff702a2335..860cafd9e74ee 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -61,7 +61,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/keyvault/azure-security-keyvault-keys/pom.xml b/sdk/keyvault/azure-security-keyvault-keys/pom.xml index 5dcd42189b094..3e6670d529f10 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-keys/pom.xml @@ -61,13 +61,13 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 @@ -104,13 +104,13 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/keyvault/azure-security-keyvault-perf/pom.xml b/sdk/keyvault/azure-security-keyvault-perf/pom.xml index ae2fd4b98cfb1..f4f3a4c6bbeba 100644 --- a/sdk/keyvault/azure-security-keyvault-perf/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-perf/pom.xml @@ -47,7 +47,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 com.azure diff --git a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml index 80526b10b4ca1..0cefe55038c41 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml @@ -57,20 +57,20 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test @@ -108,7 +108,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml index 9e11c8579caaf..be1631cf410ba 100644 --- a/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml @@ -78,7 +78,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml index fbf90866c3f68..4aed379dd6bff 100644 --- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml +++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/kusto/azure-resourcemanager-kusto/pom.xml b/sdk/kusto/azure-resourcemanager-kusto/pom.xml index 4a2b76e29c773..ecdb0d7777d59 100644 --- a/sdk/kusto/azure-resourcemanager-kusto/pom.xml +++ b/sdk/kusto/azure-resourcemanager-kusto/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/labservices/azure-resourcemanager-labservices/pom.xml b/sdk/labservices/azure-resourcemanager-labservices/pom.xml index 3a06ffe7ff65e..11116dbe00916 100644 --- a/sdk/labservices/azure-resourcemanager-labservices/pom.xml +++ b/sdk/labservices/azure-resourcemanager-labservices/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/loganalytics/azure-resourcemanager-loganalytics/pom.xml b/sdk/loganalytics/azure-resourcemanager-loganalytics/pom.xml index 99490f14c6953..a8dff49cb327a 100644 --- a/sdk/loganalytics/azure-resourcemanager-loganalytics/pom.xml +++ b/sdk/loganalytics/azure-resourcemanager-loganalytics/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml b/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml index e09cc95e51d0a..438352df6d8c7 100644 --- a/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml +++ b/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml @@ -71,7 +71,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/logic/azure-resourcemanager-logic/pom.xml b/sdk/logic/azure-resourcemanager-logic/pom.xml index b0f4820808b42..4660739cc938d 100644 --- a/sdk/logic/azure-resourcemanager-logic/pom.xml +++ b/sdk/logic/azure-resourcemanager-logic/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/machinelearningservices/azure-resourcemanager-machinelearningservices/pom.xml b/sdk/machinelearningservices/azure-resourcemanager-machinelearningservices/pom.xml index 42de52da90a52..09db400387b84 100644 --- a/sdk/machinelearningservices/azure-resourcemanager-machinelearningservices/pom.xml +++ b/sdk/machinelearningservices/azure-resourcemanager-machinelearningservices/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/maintenance/azure-resourcemanager-maintenance/pom.xml b/sdk/maintenance/azure-resourcemanager-maintenance/pom.xml index 5c825632cf289..3136e98214c31 100644 --- a/sdk/maintenance/azure-resourcemanager-maintenance/pom.xml +++ b/sdk/maintenance/azure-resourcemanager-maintenance/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -60,7 +60,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/managedapplications/azure-resourcemanager-managedapplications/pom.xml b/sdk/managedapplications/azure-resourcemanager-managedapplications/pom.xml index d70256a99dbb8..6b8dfe34ee64c 100644 --- a/sdk/managedapplications/azure-resourcemanager-managedapplications/pom.xml +++ b/sdk/managedapplications/azure-resourcemanager-managedapplications/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/maps/azure-resourcemanager-maps/pom.xml b/sdk/maps/azure-resourcemanager-maps/pom.xml index 9fa94b5da8d65..ffac9e9ac9eb3 100644 --- a/sdk/maps/azure-resourcemanager-maps/pom.xml +++ b/sdk/maps/azure-resourcemanager-maps/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -60,7 +60,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/mariadb/azure-resourcemanager-mariadb/pom.xml b/sdk/mariadb/azure-resourcemanager-mariadb/pom.xml index 09d70a2dd273f..4f77b77d6d18d 100644 --- a/sdk/mariadb/azure-resourcemanager-mariadb/pom.xml +++ b/sdk/mariadb/azure-resourcemanager-mariadb/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/marketplaceordering/azure-resourcemanager-marketplaceordering/pom.xml b/sdk/marketplaceordering/azure-resourcemanager-marketplaceordering/pom.xml index 6e048fa32a8ca..434f5b989ee1f 100644 --- a/sdk/marketplaceordering/azure-resourcemanager-marketplaceordering/pom.xml +++ b/sdk/marketplaceordering/azure-resourcemanager-marketplaceordering/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/mediaservices/azure-resourcemanager-mediaservices/pom.xml b/sdk/mediaservices/azure-resourcemanager-mediaservices/pom.xml index d0e4ddfa41bd4..a88741f07ef0c 100644 --- a/sdk/mediaservices/azure-resourcemanager-mediaservices/pom.xml +++ b/sdk/mediaservices/azure-resourcemanager-mediaservices/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml b/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml index 2fc7d2d597aac..e47f8388d20e9 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml @@ -44,25 +44,25 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/mixedreality/azure-mixedreality-authentication/pom.xml b/sdk/mixedreality/azure-mixedreality-authentication/pom.xml index cd8a547e2b18b..90c7fcdf18d18 100644 --- a/sdk/mixedreality/azure-mixedreality-authentication/pom.xml +++ b/sdk/mixedreality/azure-mixedreality-authentication/pom.xml @@ -34,25 +34,25 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/mixedreality/azure-resourcemanager-mixedreality/pom.xml b/sdk/mixedreality/azure-resourcemanager-mixedreality/pom.xml index b41b67be6d5a3..b681ebe903858 100644 --- a/sdk/mixedreality/azure-resourcemanager-mixedreality/pom.xml +++ b/sdk/mixedreality/azure-resourcemanager-mixedreality/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml b/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml index 913eb58abc932..8a6b43bf9a21b 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml +++ b/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml @@ -46,19 +46,19 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -70,7 +70,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml b/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml index e1442b1494d84..2de8c2518972e 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml @@ -43,12 +43,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 io.opentelemetry @@ -104,13 +104,13 @@ com.azure azure-core-tracing-opentelemetry - 1.0.0-beta.14 + 1.0.0-beta.15 test com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/monitor/azure-monitor-query/pom.xml b/sdk/monitor/azure-monitor-query/pom.xml index 97e07724de31e..a51d841c02306 100644 --- a/sdk/monitor/azure-monitor-query/pom.xml +++ b/sdk/monitor/azure-monitor-query/pom.xml @@ -37,12 +37,12 @@ com.azure azure-core - 1.21.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 org.junit.jupiter @@ -71,13 +71,13 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-serializer-json-jackson - 1.2.7 + 1.2.8 test diff --git a/sdk/mysql/azure-resourcemanager-mysql/pom.xml b/sdk/mysql/azure-resourcemanager-mysql/pom.xml index 12c4492bd03c1..187ae179f9319 100644 --- a/sdk/mysql/azure-resourcemanager-mysql/pom.xml +++ b/sdk/mysql/azure-resourcemanager-mysql/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/mysqlflexibleserver/azure-resourcemanager-mysqlflexibleserver/pom.xml b/sdk/mysqlflexibleserver/azure-resourcemanager-mysqlflexibleserver/pom.xml index 59d9f2f19af19..92c398a2a3668 100644 --- a/sdk/mysqlflexibleserver/azure-resourcemanager-mysqlflexibleserver/pom.xml +++ b/sdk/mysqlflexibleserver/azure-resourcemanager-mysqlflexibleserver/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/netapp/azure-resourcemanager-netapp/pom.xml b/sdk/netapp/azure-resourcemanager-netapp/pom.xml index 88a9c4d87751c..c32a942b3ab2d 100644 --- a/sdk/netapp/azure-resourcemanager-netapp/pom.xml +++ b/sdk/netapp/azure-resourcemanager-netapp/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -60,7 +60,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/notificationhubs/azure-resourcemanager-notificationhubs/pom.xml b/sdk/notificationhubs/azure-resourcemanager-notificationhubs/pom.xml index 4a501b989c1c9..9df436e6a7998 100644 --- a/sdk/notificationhubs/azure-resourcemanager-notificationhubs/pom.xml +++ b/sdk/notificationhubs/azure-resourcemanager-notificationhubs/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/operationsmanagement/azure-resourcemanager-operationsmanagement/pom.xml b/sdk/operationsmanagement/azure-resourcemanager-operationsmanagement/pom.xml index 482d354d34000..45420a93023ec 100644 --- a/sdk/operationsmanagement/azure-resourcemanager-operationsmanagement/pom.xml +++ b/sdk/operationsmanagement/azure-resourcemanager-operationsmanagement/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/peering/azure-resourcemanager-peering/pom.xml b/sdk/peering/azure-resourcemanager-peering/pom.xml index 7575116c6e6ef..0b2b913ed0de4 100644 --- a/sdk/peering/azure-resourcemanager-peering/pom.xml +++ b/sdk/peering/azure-resourcemanager-peering/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/policyinsights/azure-resourcemanager-policyinsights/pom.xml b/sdk/policyinsights/azure-resourcemanager-policyinsights/pom.xml index 3d30e92ff968d..568651e26080f 100644 --- a/sdk/policyinsights/azure-resourcemanager-policyinsights/pom.xml +++ b/sdk/policyinsights/azure-resourcemanager-policyinsights/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/postgresql/azure-resourcemanager-postgresql/pom.xml b/sdk/postgresql/azure-resourcemanager-postgresql/pom.xml index d314c1a9d5a45..83c1cc6d8ec43 100644 --- a/sdk/postgresql/azure-resourcemanager-postgresql/pom.xml +++ b/sdk/postgresql/azure-resourcemanager-postgresql/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/pom.xml b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/pom.xml index 22876d712eed3..9240815a463ba 100644 --- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/pom.xml +++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/powerbidedicated/azure-resourcemanager-powerbidedicated/pom.xml b/sdk/powerbidedicated/azure-resourcemanager-powerbidedicated/pom.xml index 489d927d462b3..64f3e4f02220b 100644 --- a/sdk/powerbidedicated/azure-resourcemanager-powerbidedicated/pom.xml +++ b/sdk/powerbidedicated/azure-resourcemanager-powerbidedicated/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/purview/azure-analytics-purview-catalog/pom.xml b/sdk/purview/azure-analytics-purview-catalog/pom.xml index e0b0658425b1c..7e25d66179114 100644 --- a/sdk/purview/azure-analytics-purview-catalog/pom.xml +++ b/sdk/purview/azure-analytics-purview-catalog/pom.xml @@ -40,17 +40,17 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-experimental - 1.0.0-beta.18 + 1.0.0-beta.19 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 @@ -75,7 +75,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -99,7 +99,7 @@ com.azure azure-core-serializer-json-jackson - 1.2.7 + 1.2.8 diff --git a/sdk/purview/azure-analytics-purview-scanning/pom.xml b/sdk/purview/azure-analytics-purview-scanning/pom.xml index 862dc73b94263..2c917f3540e09 100644 --- a/sdk/purview/azure-analytics-purview-scanning/pom.xml +++ b/sdk/purview/azure-analytics-purview-scanning/pom.xml @@ -40,17 +40,17 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-experimental - 1.0.0-beta.18 + 1.0.0-beta.19 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 @@ -75,7 +75,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -99,7 +99,7 @@ com.azure azure-core-serializer-json-jackson - 1.2.7 + 1.2.8 diff --git a/sdk/purview/azure-resourcemanager-purview/pom.xml b/sdk/purview/azure-resourcemanager-purview/pom.xml index 2a4feeac8093e..d59e2e9655e17 100644 --- a/sdk/purview/azure-resourcemanager-purview/pom.xml +++ b/sdk/purview/azure-resourcemanager-purview/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/quantum/azure-quantum-jobs/pom.xml b/sdk/quantum/azure-quantum-jobs/pom.xml index 3035b5f57d2b5..3c70b2b2b0c62 100644 --- a/sdk/quantum/azure-quantum-jobs/pom.xml +++ b/sdk/quantum/azure-quantum-jobs/pom.xml @@ -42,12 +42,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 @@ -62,7 +62,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/quota/azure-resourcemanager-quota/pom.xml b/sdk/quota/azure-resourcemanager-quota/pom.xml index 151b586719646..3916a9e642848 100644 --- a/sdk/quota/azure-resourcemanager-quota/pom.xml +++ b/sdk/quota/azure-resourcemanager-quota/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/recoveryservices/azure-resourcemanager-recoveryservices/pom.xml b/sdk/recoveryservices/azure-resourcemanager-recoveryservices/pom.xml index 98911f6852b32..e846251bd8de8 100644 --- a/sdk/recoveryservices/azure-resourcemanager-recoveryservices/pom.xml +++ b/sdk/recoveryservices/azure-resourcemanager-recoveryservices/pom.xml @@ -44,7 +44,7 @@ com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/recoveryservicesbackup/azure-resourcemanager-recoveryservicesbackup/pom.xml b/sdk/recoveryservicesbackup/azure-resourcemanager-recoveryservicesbackup/pom.xml index 5344979efc39e..f1889c856e581 100644 --- a/sdk/recoveryservicesbackup/azure-resourcemanager-recoveryservicesbackup/pom.xml +++ b/sdk/recoveryservicesbackup/azure-resourcemanager-recoveryservicesbackup/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/pom.xml b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/pom.xml index 662c362b700b3..a2606e7b1b942 100644 --- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/pom.xml +++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/relay/azure-resourcemanager-relay/pom.xml b/sdk/relay/azure-resourcemanager-relay/pom.xml index 7574d1f84d6e1..e97a412df4057 100644 --- a/sdk/relay/azure-resourcemanager-relay/pom.xml +++ b/sdk/relay/azure-resourcemanager-relay/pom.xml @@ -44,7 +44,7 @@ com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml b/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml index 7d8192a78c05f..b0a6b193fbb86 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml @@ -31,7 +31,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure @@ -43,13 +43,13 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml index db2a4d9cc4735..9c15de44b87ed 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -60,7 +60,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/resourcehealth/azure-resourcemanager-resourcehealth/pom.xml b/sdk/resourcehealth/azure-resourcemanager-resourcehealth/pom.xml index fca88454b715a..5a1df07f5c04f 100644 --- a/sdk/resourcehealth/azure-resourcemanager-resourcehealth/pom.xml +++ b/sdk/resourcehealth/azure-resourcemanager-resourcehealth/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml b/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml index 820f44651093f..98c5fa5eaf072 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml @@ -97,7 +97,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml b/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml index e9041311017e7..1b853e1afda4d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml @@ -105,7 +105,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml b/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml index 5850908b68d37..9880b3b04174d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml @@ -80,7 +80,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-cdn/pom.xml b/sdk/resourcemanager/azure-resourcemanager-cdn/pom.xml index 46da0ff14254f..be1264c5227b8 100644 --- a/sdk/resourcemanager/azure-resourcemanager-cdn/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-cdn/pom.xml @@ -73,7 +73,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml b/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml index 38f53f7e512f5..f5117671c1096 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml @@ -109,7 +109,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml index 6ab8eecce7e37..330b1cb19dcd8 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml @@ -103,7 +103,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml index 6c7a6d263ced1..0e6f174eb95f3 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml @@ -80,7 +80,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml index b0068ba5aa486..36945cbeae182 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml @@ -75,7 +75,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml b/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml index 205c2f23c2ff5..ff06ef4247a39 100644 --- a/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml @@ -90,7 +90,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml b/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml index 8a5bf35a88e31..c9bea3ba11c39 100644 --- a/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml @@ -85,7 +85,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml b/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml index 9967a547099e2..bc554ea558bd4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml @@ -79,7 +79,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml b/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml index 993a25d6a9307..356a2b4fd4ff6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml @@ -101,7 +101,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml b/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml index 2a2b75f42e99e..bbfd9f21cc485 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml @@ -76,7 +76,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml b/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml index a4571e0b85e81..34f81b7863d60 100644 --- a/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml @@ -71,7 +71,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-network/pom.xml b/sdk/resourcemanager/azure-resourcemanager-network/pom.xml index 8f59251ee71c2..8dd53c6dfee76 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-network/pom.xml @@ -80,7 +80,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml b/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml index 421e2bd79d8ee..24e7c36ad5adf 100644 --- a/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml @@ -82,7 +82,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml b/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml index 5d9cbb2395920..450638187520b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml @@ -76,7 +76,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml index c14c6a5e5a98d..0388e7ed00c9f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml @@ -56,12 +56,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 org.slf4j @@ -84,7 +84,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml index f9d538e877eb4..0720ab083f35c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml @@ -52,7 +52,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure diff --git a/sdk/resourcemanager/azure-resourcemanager-search/pom.xml b/sdk/resourcemanager/azure-resourcemanager-search/pom.xml index ed2632ca4a6d8..aaaf3f3bcb308 100644 --- a/sdk/resourcemanager/azure-resourcemanager-search/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-search/pom.xml @@ -73,7 +73,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml b/sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml index ba7e30aab98d7..66eb0472b75ed 100644 --- a/sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml @@ -73,7 +73,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml b/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml index d336bc15114fa..814be199e5a1b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml @@ -87,7 +87,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml b/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml index ed546e1d44424..06b3a1fd2e764 100644 --- a/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml @@ -73,7 +73,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-test/pom.xml b/sdk/resourcemanager/azure-resourcemanager-test/pom.xml index 339fc7dfe7c53..5a50b2590f491 100644 --- a/sdk/resourcemanager/azure-resourcemanager-test/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-test/pom.xml @@ -52,17 +52,17 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 com.azure @@ -72,7 +72,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 diff --git a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml index ec9a356e6a7dd..bc7ad3b85ba15 100644 --- a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml @@ -73,7 +73,7 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager/pom.xml index 329a49ac8fac8..9855c336edd01 100644 --- a/sdk/resourcemanager/azure-resourcemanager/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager/pom.xml @@ -201,13 +201,13 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/resourcemover/azure-resourcemanager-resourcemover/pom.xml b/sdk/resourcemover/azure-resourcemanager-resourcemover/pom.xml index b52c8183d9f5b..fb87fbd5e936a 100644 --- a/sdk/resourcemover/azure-resourcemanager-resourcemover/pom.xml +++ b/sdk/resourcemover/azure-resourcemanager-resourcemover/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml index b46ee021586c8..c3d1c0289c7c2 100644 --- a/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml +++ b/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml @@ -52,7 +52,7 @@ com.azure azure-core-serializer-avro-apache - 1.0.0-beta.14 + 1.0.0-beta.15 diff --git a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml index a1bcc2a2b64d7..59ea884594a66 100644 --- a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml +++ b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml @@ -49,12 +49,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 @@ -97,7 +97,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/search/azure-search-documents/pom.xml b/sdk/search/azure-search-documents/pom.xml index eac251296c731..6b0458105b529 100644 --- a/sdk/search/azure-search-documents/pom.xml +++ b/sdk/search/azure-search-documents/pom.xml @@ -46,17 +46,17 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-serializer-json-jackson - 1.2.7 + 1.2.8 + 1.7.2 test diff --git a/sdk/security/azure-resourcemanager-security/pom.xml b/sdk/security/azure-resourcemanager-security/pom.xml index cd42a0a3f6079..c1e19f90405b8 100644 --- a/sdk/security/azure-resourcemanager-security/pom.xml +++ b/sdk/security/azure-resourcemanager-security/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/servicebus/azure-messaging-servicebus/pom.xml b/sdk/servicebus/azure-messaging-servicebus/pom.xml index 75e3eccdb044d..939d41d6fa0e8 100644 --- a/sdk/servicebus/azure-messaging-servicebus/pom.xml +++ b/sdk/servicebus/azure-messaging-servicebus/pom.xml @@ -48,7 +48,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure @@ -58,20 +58,20 @@ com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/pom.xml b/sdk/servicefabric/azure-resourcemanager-servicefabric/pom.xml index 957904a2f3e7a..ed99331137726 100644 --- a/sdk/servicefabric/azure-resourcemanager-servicefabric/pom.xml +++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/signalr/azure-resourcemanager-signalr/pom.xml b/sdk/signalr/azure-resourcemanager-signalr/pom.xml index b7e5d4b3b7aad..132172d9a8c7f 100644 --- a/sdk/signalr/azure-resourcemanager-signalr/pom.xml +++ b/sdk/signalr/azure-resourcemanager-signalr/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/spring/azure-spring-boot-test-parent/pom.xml b/sdk/spring/azure-spring-boot-test-parent/pom.xml index e653dcfa8b8ae..1c77fdc4ccea0 100644 --- a/sdk/spring/azure-spring-boot-test-parent/pom.xml +++ b/sdk/spring/azure-spring-boot-test-parent/pom.xml @@ -33,7 +33,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 diff --git a/sdk/spring/azure-spring-cloud-test-parent/pom.xml b/sdk/spring/azure-spring-cloud-test-parent/pom.xml index 748affebd2965..c3abf9ba334b5 100644 --- a/sdk/spring/azure-spring-cloud-test-parent/pom.xml +++ b/sdk/spring/azure-spring-cloud-test-parent/pom.xml @@ -33,7 +33,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 diff --git a/sdk/spring/azure-spring-integration-servicebus/pom.xml b/sdk/spring/azure-spring-integration-servicebus/pom.xml index af0af1290d246..21f52efe0e35e 100644 --- a/sdk/spring/azure-spring-integration-servicebus/pom.xml +++ b/sdk/spring/azure-spring-integration-servicebus/pom.xml @@ -33,6 +33,11 @@ azure-messaging-servicebus 7.4.1 + + com.azure + azure-core + 1.21.0 + com.azure.spring azure-spring-integration-test @@ -51,7 +56,7 @@ com.azure azure-core-serializer-json-jackson - 1.2.7 + 1.2.8 test diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/pom.xml b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/pom.xml index 67e10ba010c32..5b3b104374042 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/pom.xml +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/pom.xml @@ -44,7 +44,7 @@ com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml index b3025624320b9..d43dae5322965 100644 --- a/sdk/storage/azure-storage-blob-batch/pom.xml +++ b/sdk/storage/azure-storage-blob-batch/pom.xml @@ -69,12 +69,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure @@ -103,7 +103,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -151,7 +151,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/storage/azure-storage-blob-changefeed/pom.xml b/sdk/storage/azure-storage-blob-changefeed/pom.xml index 7380cdf6500a4..ef3946fe537cf 100644 --- a/sdk/storage/azure-storage-blob-changefeed/pom.xml +++ b/sdk/storage/azure-storage-blob-changefeed/pom.xml @@ -75,12 +75,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure @@ -109,7 +109,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -163,7 +163,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/storage/azure-storage-blob-cryptography/pom.xml b/sdk/storage/azure-storage-blob-cryptography/pom.xml index 43025232fb529..ee9e3ef8a1379 100644 --- a/sdk/storage/azure-storage-blob-cryptography/pom.xml +++ b/sdk/storage/azure-storage-blob-cryptography/pom.xml @@ -52,12 +52,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure @@ -75,7 +75,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -145,7 +145,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/storage/azure-storage-blob-nio/pom.xml b/sdk/storage/azure-storage-blob-nio/pom.xml index 087675badcfa9..6205c3e3cd7b5 100644 --- a/sdk/storage/azure-storage-blob-nio/pom.xml +++ b/sdk/storage/azure-storage-blob-nio/pom.xml @@ -68,12 +68,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure @@ -92,7 +92,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -128,7 +128,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml index 3ebcaa4ef06ce..f918a1a40942b 100644 --- a/sdk/storage/azure-storage-blob/pom.xml +++ b/sdk/storage/azure-storage-blob/pom.xml @@ -75,12 +75,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure @@ -113,7 +113,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -161,7 +161,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml index a1051a5bd3b66..0fd9e9ea350d5 100644 --- a/sdk/storage/azure-storage-common/pom.xml +++ b/sdk/storage/azure-storage-common/pom.xml @@ -41,12 +41,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 + 1.7.2 test @@ -110,7 +110,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml index 08b14e443c478..73a99e25de3af 100644 --- a/sdk/storage/azure-storage-file-datalake/pom.xml +++ b/sdk/storage/azure-storage-file-datalake/pom.xml @@ -77,12 +77,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure @@ -111,7 +111,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -159,7 +159,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/storage/azure-storage-file-share/pom.xml b/sdk/storage/azure-storage-file-share/pom.xml index 7c9cda2b35de1..c4733fb948c82 100644 --- a/sdk/storage/azure-storage-file-share/pom.xml +++ b/sdk/storage/azure-storage-file-share/pom.xml @@ -57,13 +57,13 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure @@ -92,7 +92,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -134,7 +134,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/storage/azure-storage-internal-avro/pom.xml b/sdk/storage/azure-storage-internal-avro/pom.xml index 1eade21dc541d..b3f07fb74ab0b 100644 --- a/sdk/storage/azure-storage-internal-avro/pom.xml +++ b/sdk/storage/azure-storage-internal-avro/pom.xml @@ -47,12 +47,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml index 13f5b9e93420d..1f39c02932f6f 100644 --- a/sdk/storage/azure-storage-queue/pom.xml +++ b/sdk/storage/azure-storage-queue/pom.xml @@ -55,12 +55,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure @@ -78,7 +78,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -114,7 +114,7 @@ com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/storage/microsoft-azure-storage-blob/pom.xml b/sdk/storage/microsoft-azure-storage-blob/pom.xml index 3d5c780dd8b55..c626fc245ccc1 100644 --- a/sdk/storage/microsoft-azure-storage-blob/pom.xml +++ b/sdk/storage/microsoft-azure-storage-blob/pom.xml @@ -90,7 +90,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/storagecache/azure-resourcemanager-storagecache/pom.xml b/sdk/storagecache/azure-resourcemanager-storagecache/pom.xml index 8e3e9fd74b7b3..bc65ebacc29f1 100644 --- a/sdk/storagecache/azure-resourcemanager-storagecache/pom.xml +++ b/sdk/storagecache/azure-resourcemanager-storagecache/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/storageimportexport/azure-resourcemanager-storageimportexport/pom.xml b/sdk/storageimportexport/azure-resourcemanager-storageimportexport/pom.xml index 42793ebf2249d..af04086ec4f7a 100644 --- a/sdk/storageimportexport/azure-resourcemanager-storageimportexport/pom.xml +++ b/sdk/storageimportexport/azure-resourcemanager-storageimportexport/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/streamanalytics/azure-resourcemanager-streamanalytics/pom.xml b/sdk/streamanalytics/azure-resourcemanager-streamanalytics/pom.xml index 14f41bff80536..c5b3209c813dc 100644 --- a/sdk/streamanalytics/azure-resourcemanager-streamanalytics/pom.xml +++ b/sdk/streamanalytics/azure-resourcemanager-streamanalytics/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/subscription/azure-resourcemanager-subscription/pom.xml b/sdk/subscription/azure-resourcemanager-subscription/pom.xml index e8adee72d17f3..5e53135c67d77 100644 --- a/sdk/subscription/azure-resourcemanager-subscription/pom.xml +++ b/sdk/subscription/azure-resourcemanager-subscription/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/support/azure-resourcemanager-support/pom.xml b/sdk/support/azure-resourcemanager-support/pom.xml index 2328c81d94092..b10879d6e4581 100644 --- a/sdk/support/azure-resourcemanager-support/pom.xml +++ b/sdk/support/azure-resourcemanager-support/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/synapse/azure-analytics-synapse-accesscontrol/pom.xml b/sdk/synapse/azure-analytics-synapse-accesscontrol/pom.xml index ae32f1878faa4..59c0a69257c54 100644 --- a/sdk/synapse/azure-analytics-synapse-accesscontrol/pom.xml +++ b/sdk/synapse/azure-analytics-synapse-accesscontrol/pom.xml @@ -41,25 +41,25 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/synapse/azure-analytics-synapse-artifacts/pom.xml b/sdk/synapse/azure-analytics-synapse-artifacts/pom.xml index 6b12a01fddc94..f0927824733cf 100644 --- a/sdk/synapse/azure-analytics-synapse-artifacts/pom.xml +++ b/sdk/synapse/azure-analytics-synapse-artifacts/pom.xml @@ -41,25 +41,25 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/synapse/azure-analytics-synapse-managedprivateendpoints/pom.xml b/sdk/synapse/azure-analytics-synapse-managedprivateendpoints/pom.xml index f9401acad3733..1598dbfc4fffd 100644 --- a/sdk/synapse/azure-analytics-synapse-managedprivateendpoints/pom.xml +++ b/sdk/synapse/azure-analytics-synapse-managedprivateendpoints/pom.xml @@ -41,25 +41,25 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/synapse/azure-analytics-synapse-monitoring/pom.xml b/sdk/synapse/azure-analytics-synapse-monitoring/pom.xml index 1ad7f198c461c..07f17a551ae02 100644 --- a/sdk/synapse/azure-analytics-synapse-monitoring/pom.xml +++ b/sdk/synapse/azure-analytics-synapse-monitoring/pom.xml @@ -41,25 +41,25 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/synapse/azure-analytics-synapse-spark/pom.xml b/sdk/synapse/azure-analytics-synapse-spark/pom.xml index 9f95806c5ef4c..9e409379f5307 100644 --- a/sdk/synapse/azure-analytics-synapse-spark/pom.xml +++ b/sdk/synapse/azure-analytics-synapse-spark/pom.xml @@ -41,25 +41,25 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.azure azure-core-test - 1.7.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/synapse/azure-resourcemanager-synapse/pom.xml b/sdk/synapse/azure-resourcemanager-synapse/pom.xml index a288352318b67..52394cee93f9c 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/pom.xml +++ b/sdk/synapse/azure-resourcemanager-synapse/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/tables/azure-data-tables-perf/pom.xml b/sdk/tables/azure-data-tables-perf/pom.xml index 703501fb92b5f..36840d0abf3ce 100644 --- a/sdk/tables/azure-data-tables-perf/pom.xml +++ b/sdk/tables/azure-data-tables-perf/pom.xml @@ -32,7 +32,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 com.azure diff --git a/sdk/tables/azure-data-tables/pom.xml b/sdk/tables/azure-data-tables/pom.xml index c583e712c4897..b635561459be2 100644 --- a/sdk/tables/azure-data-tables/pom.xml +++ b/sdk/tables/azure-data-tables/pom.xml @@ -46,12 +46,12 @@ Licensed under the MIT License. com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 org.junit.jupiter @@ -80,7 +80,7 @@ Licensed under the MIT License. com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml index de38461c8d06c..7d542b727bb7e 100644 --- a/sdk/template/azure-sdk-template/pom.xml +++ b/sdk/template/azure-sdk-template/pom.xml @@ -41,7 +41,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 org.junit.jupiter diff --git a/sdk/textanalytics/azure-ai-textanalytics/pom.xml b/sdk/textanalytics/azure-ai-textanalytics/pom.xml index 4efc47eb7b870..430b13c3b9084 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/pom.xml +++ b/sdk/textanalytics/azure-ai-textanalytics/pom.xml @@ -45,12 +45,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 + 1.7.2 test com.azure azure-core-http-okhttp - 1.7.3 + 1.7.4 test diff --git a/sdk/timeseriesinsights/azure-resourcemanager-timeseriesinsights/pom.xml b/sdk/timeseriesinsights/azure-resourcemanager-timeseriesinsights/pom.xml index ee0defa0fa48d..b491af76f013b 100644 --- a/sdk/timeseriesinsights/azure-resourcemanager-timeseriesinsights/pom.xml +++ b/sdk/timeseriesinsights/azure-resourcemanager-timeseriesinsights/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/translation/azure-ai-documenttranslator/pom.xml b/sdk/translation/azure-ai-documenttranslator/pom.xml index c76ba51285d24..3e772c49cfffe 100644 --- a/sdk/translation/azure-ai-documenttranslator/pom.xml +++ b/sdk/translation/azure-ai-documenttranslator/pom.xml @@ -41,17 +41,17 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-experimental - 1.0.0-beta.18 + 1.0.0-beta.19 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 @@ -76,7 +76,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test @@ -100,7 +100,7 @@ com.azure azure-core-serializer-json-jackson - 1.2.7 + 1.2.8 test diff --git a/sdk/videoanalyzer/azure-media-videoanalyzer-edge/pom.xml b/sdk/videoanalyzer/azure-media-videoanalyzer-edge/pom.xml index 5368e3253c718..65753911288c2 100644 --- a/sdk/videoanalyzer/azure-media-videoanalyzer-edge/pom.xml +++ b/sdk/videoanalyzer/azure-media-videoanalyzer-edge/pom.xml @@ -35,7 +35,7 @@ com.azure azure-core - 1.20.0 + 1.21.0 org.junit.jupiter @@ -58,7 +58,7 @@ com.azure azure-core-serializer-json-jackson - 1.2.7 + 1.2.8 test diff --git a/sdk/videoanalyzer/azure-resourcemanager-videoanalyzer/pom.xml b/sdk/videoanalyzer/azure-resourcemanager-videoanalyzer/pom.xml index 89ae3eff419f2..b4ac2991b1911 100644 --- a/sdk/videoanalyzer/azure-resourcemanager-videoanalyzer/pom.xml +++ b/sdk/videoanalyzer/azure-resourcemanager-videoanalyzer/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/vmwarecloudsimple/azure-resourcemanager-vmwarecloudsimple/pom.xml b/sdk/vmwarecloudsimple/azure-resourcemanager-vmwarecloudsimple/pom.xml index f334463a0005e..5bbf8c9bd3c2b 100644 --- a/sdk/vmwarecloudsimple/azure-resourcemanager-vmwarecloudsimple/pom.xml +++ b/sdk/vmwarecloudsimple/azure-resourcemanager-vmwarecloudsimple/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 diff --git a/sdk/webpubsub/azure-messaging-webpubsub/pom.xml b/sdk/webpubsub/azure-messaging-webpubsub/pom.xml index 55973008640a5..9d87c2481ea52 100644 --- a/sdk/webpubsub/azure-messaging-webpubsub/pom.xml +++ b/sdk/webpubsub/azure-messaging-webpubsub/pom.xml @@ -46,12 +46,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-http-netty - 1.11.0 + 1.11.1 com.nimbusds @@ -63,7 +63,7 @@ com.azure azure-core-test - 1.7.1 + 1.7.2 test diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/pom.xml b/sdk/webpubsub/azure-resourcemanager-webpubsub/pom.xml index 503a83307cd56..878809b568be6 100644 --- a/sdk/webpubsub/azure-resourcemanager-webpubsub/pom.xml +++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.20.0 + 1.21.0 com.azure azure-core-management - 1.4.1 + 1.4.2 From 72b460da5628eaae84196f7a5587ed37b572711d Mon Sep 17 00:00:00 2001 From: "Christian Whitehead (MSFT)" <35080559+chrwhit@users.noreply.github.com> Date: Mon, 4 Oct 2021 10:08:56 -0700 Subject: [PATCH 06/10] fix(*): use library RedirectPolicy now that it is available (#24502) --- .../CallingServerClientBuilder.java | 2 +- .../implementation/RedirectPolicy.java | 70 ------------------- .../implementation/RedirectPolicyTests.java | 30 ++++---- 3 files changed, 18 insertions(+), 84 deletions(-) delete mode 100644 sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/RedirectPolicy.java diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClientBuilder.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClientBuilder.java index f4698ae9d9f69..85d823dbe2b09 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClientBuilder.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClientBuilder.java @@ -5,7 +5,6 @@ import com.azure.communication.callingserver.implementation.AzureCommunicationCallingServerServiceImpl; import com.azure.communication.callingserver.implementation.AzureCommunicationCallingServerServiceImplBuilder; -import com.azure.communication.callingserver.implementation.RedirectPolicy; import com.azure.communication.common.implementation.CommunicationConnectionString; import com.azure.communication.common.implementation.HmacAuthenticationPolicy; import com.azure.core.annotation.ServiceClientBuilder; @@ -19,6 +18,7 @@ import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.http.policy.HttpLoggingPolicy; import com.azure.core.http.policy.HttpPipelinePolicy; +import com.azure.core.http.policy.RedirectPolicy; import com.azure.core.http.policy.RequestIdPolicy; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.http.policy.UserAgentPolicy; diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/RedirectPolicy.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/RedirectPolicy.java deleted file mode 100644 index 53a763b5e069c..0000000000000 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/RedirectPolicy.java +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -package com.azure.communication.callingserver.implementation; - -import com.azure.core.http.HttpPipelineCallContext; -import com.azure.core.http.HttpPipelineNextPolicy; -import com.azure.core.http.HttpRequest; -import com.azure.core.http.HttpResponse; -import com.azure.core.http.policy.HttpPipelinePolicy; -import com.azure.core.util.logging.ClientLogger; -import reactor.core.publisher.Mono; - -import java.util.HashSet; -import java.util.Set; - -/** - * HttpPipelinePolicy to redirect requests when a redirect response (Http codes 301 or 302) is received to the - * new location marked by the Location header. - */ -public final class RedirectPolicy implements HttpPipelinePolicy { - private static final int MAX_REDIRECTS = 10; - private static final String LOCATION_HEADER_NAME = "Location"; - private static final int SC_MOVED_PERMANENTLY = 301; - private static final int SC_MOVED_TEMPORARILY = 302; - - private final ClientLogger logger = new ClientLogger(RedirectPolicy.class); - - @Override - public Mono process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) { - return attemptRedirection(context, next, 0, new HashSet<>()); - } - - private Mono attemptRedirection(HttpPipelineCallContext context, HttpPipelineNextPolicy next, - int redirectNumber, Set attemptedRedirectLocations) { - return next.clone().process().flatMap(httpResponse -> { - if (isRedirectResponse(httpResponse) - && shouldRedirect(httpResponse, context, redirectNumber, attemptedRedirectLocations)) { - String newLocation = httpResponse.getHeaderValue(LOCATION_HEADER_NAME); - attemptedRedirectLocations.add(newLocation); - - HttpRequest newRequest = context.getHttpRequest().copy(); - newRequest.setUrl(newLocation); - context.setHttpRequest(newRequest); - - return attemptRedirection(context, next, redirectNumber + 1, attemptedRedirectLocations); - } - return Mono.just(httpResponse); - }); - } - - private boolean isRedirectResponse(HttpResponse response) { - return response.getStatusCode() == SC_MOVED_TEMPORARILY || response.getStatusCode() == SC_MOVED_PERMANENTLY; - } - - private boolean shouldRedirect(HttpResponse response, HttpPipelineCallContext context, int retryCount, - Set attemptedRedirectLocations) { - if (retryCount > MAX_REDIRECTS) { - logger.error(String.format("Request to %s has been redirected more than %s times.", - context.getHttpRequest().getUrl(), MAX_REDIRECTS)); - return false; - } - if (attemptedRedirectLocations.contains(response.getHeaderValue(LOCATION_HEADER_NAME))) { - logger.error(String.format("Request to %s was redirected more than once to: %s", - context.getHttpRequest().getUrl(), response.getHeaderValue(LOCATION_HEADER_NAME))); - return false; - } - return true; - } - -} diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/implementation/RedirectPolicyTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/implementation/RedirectPolicyTests.java index 0322ae31546ef..f1359ec9e70d6 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/implementation/RedirectPolicyTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/implementation/RedirectPolicyTests.java @@ -4,11 +4,14 @@ package com.azure.communication.callingserver.implementation; import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; import com.azure.core.http.HttpMethod; import com.azure.core.http.HttpPipeline; import com.azure.core.http.HttpPipelineBuilder; import com.azure.core.http.HttpRequest; import com.azure.core.http.HttpResponse; +import com.azure.core.http.policy.RedirectPolicy; +import com.azure.core.test.http.MockHttpResponse; import com.azure.core.util.Context; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -19,6 +22,8 @@ import java.net.MalformedURLException; import java.net.URL; +import java.util.HashMap; +import java.util.Map; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.is; @@ -26,7 +31,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.when; public class RedirectPolicyTests { static final String ORIGINAL_LOCATION = "https://localhost.com"; @@ -38,25 +42,24 @@ public class RedirectPolicyTests { @Mock HttpClient httpClient; - @Mock - HttpResponse response200; - - @Mock - HttpResponse response302; + MockHttpResponse response200; + MockHttpResponse response302; @BeforeEach public void setup() throws MalformedURLException { - MockitoAnnotations.openMocks(this); - when(response200.getStatusCode()).thenReturn(200); - when(response302.getStatusCode()).thenReturn(302); - when(response302.getHeaderValue("Location")).thenReturn(REDIRECT_LOCATION); + Map headers = new HashMap<>(); + headers.put("Location", REDIRECT_LOCATION); + HttpHeaders redirectHeaders = new HttpHeaders(headers); + + MockitoAnnotations.openMocks(this); + request = new HttpRequest(HttpMethod.GET, new URL(ORIGINAL_LOCATION)); + response200 = new MockHttpResponse(request, 200); + response302 = new MockHttpResponse(request, 302, redirectHeaders); pipeline = new HttpPipelineBuilder() .httpClient(httpClient) .policies(REDIRECT_POLICY) .build(); - - request = new HttpRequest(HttpMethod.GET, new URL(ORIGINAL_LOCATION)); } @Test @@ -81,8 +84,9 @@ public void sameLocationUsedShortCircuitTest() { } @Test - public void sameLocationUsedInDifferentRequestsSuccessTest() { + public void sameLocationUsedInDifferentRequestsSuccessTest() throws MalformedURLException { for (int i = 0; i < 3; i++) { + request = new HttpRequest(HttpMethod.GET, new URL(ORIGINAL_LOCATION)); setRedirectSuccessMockResponses(); verifyCorrectness(response200); } From 15789cd01a26c2afdcffa23e7ed7f7f6cdbc28fb Mon Sep 17 00:00:00 2001 From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com> Date: Mon, 4 Oct 2021 10:46:11 -0700 Subject: [PATCH 07/10] Fix azure-core-http-jdk-httpclient Tests (#24511) Fix azure-core-http-jdk-httpclient Tests --- .../azure/core/http/jdk/httpclient/JdkAsyncHttpClient.java | 5 ++--- .../com/azure/core/http/jdk/httpclient/JdkHttpResponse.java | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sdk/core/azure-core-http-jdk-httpclient/src/main/java/com/azure/core/http/jdk/httpclient/JdkAsyncHttpClient.java b/sdk/core/azure-core-http-jdk-httpclient/src/main/java/com/azure/core/http/jdk/httpclient/JdkAsyncHttpClient.java index 7b869646711db..bc91fe9a0cedb 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/src/main/java/com/azure/core/http/jdk/httpclient/JdkAsyncHttpClient.java +++ b/sdk/core/azure-core-http-jdk-httpclient/src/main/java/com/azure/core/http/jdk/httpclient/JdkAsyncHttpClient.java @@ -96,8 +96,7 @@ private Mono toJdkHttpRequest(HttpRequest request) { for (HttpHeader header : headers) { final String headerName = header.getName(); if (!restrictedHeaders.contains(headerName)) { - final String headerValue = header.getValue(); - builder.setHeader(headerName, headerValue); + header.getValuesList().forEach(headerValue -> builder.header(headerName, headerValue)); } else { logger.warning("The header '" + headerName + "' is restricted by default in JDK HttpClient 12 " + "and above. This header can be added to allow list in JAVA_HOME/conf/net.properties " @@ -135,7 +134,7 @@ private static BodyPublisher toBodyPublisher(Flux bbPublisher, Strin } else { long contentLengthLong = Long.parseLong(contentLength); if (contentLengthLong < 1) { - return fromPublisher(bbFlowPublisher); + return noBody(); } else { return fromPublisher(bbFlowPublisher, contentLengthLong); } diff --git a/sdk/core/azure-core-http-jdk-httpclient/src/main/java/com/azure/core/http/jdk/httpclient/JdkHttpResponse.java b/sdk/core/azure-core-http-jdk-httpclient/src/main/java/com/azure/core/http/jdk/httpclient/JdkHttpResponse.java index 76d4a091d922e..290c04c2398cb 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/src/main/java/com/azure/core/http/jdk/httpclient/JdkHttpResponse.java +++ b/sdk/core/azure-core-http-jdk-httpclient/src/main/java/com/azure/core/http/jdk/httpclient/JdkHttpResponse.java @@ -33,7 +33,11 @@ public Flux getBody() { @Override public Mono getBodyAsByteArray() { - return FluxUtil.collectBytesFromNetworkResponse(getBody(), getHeaders()); + return FluxUtil.collectBytesFromNetworkResponse(getBody(), getHeaders()) + // Map empty byte[] into Mono.empty, this matches how the other HttpResponse implementations handle this. + .flatMap(bytes -> (bytes == null || bytes.length == 0) + ? Mono.empty() + : Mono.just(bytes)); } @Override From 885c08d6a5ebd1f7d1fb2c1eeeffd907bb08f387 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Mon, 4 Oct 2021 10:55:34 -0700 Subject: [PATCH 08/10] Add Form recognizer migration guide (#24472) --- .../azure-ai-formrecognizer/README.md | 6 +- .../migration-guide.md | 591 ++++++++++++++++++ .../AnalyzeCustomDocumentFromUrl.java | 4 +- .../ai/formrecognizer/ReadmeSamples.java | 70 +++ 4 files changed, 666 insertions(+), 5 deletions(-) create mode 100644 sdk/formrecognizer/azure-ai-formrecognizer/migration-guide.md diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/README.md b/sdk/formrecognizer/azure-ai-formrecognizer/README.md index e24664d848640..a7e4b4cd8114e 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/README.md +++ b/sdk/formrecognizer/azure-ai-formrecognizer/README.md @@ -473,7 +473,7 @@ for (int i = 0; i < tables.size(); i++) { ### Manage your models Manage the models in your Form Recognizer account. - + ```java AtomicReference modelId = new AtomicReference<>(); @@ -515,7 +515,7 @@ to provide an invalid file source URL an `HttpResponseException` would be raised In the following code snippet, the error is handled gracefully by catching the exception and display the additional information about the error. - + ```java try { documentAnalysisClient.beginAnalyzeDocumentFromUrl("prebuilt-receipt", "invalidSourceUrl"); @@ -554,7 +554,7 @@ These code samples show common scenario operations with the Azure Form Recognize #### Async APIs All the examples shown so far have been using synchronous APIs, but we provide full support for async APIs as well. You'll need to use `DocumentAnalysisAsyncClient` - + ```java DocumentAnalysisAsyncClient documentAnalysisAsyncClient = new DocumentAnalysisClientBuilder() .credential(new AzureKeyCredential("{key}")) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/migration-guide.md b/sdk/formrecognizer/azure-ai-formrecognizer/migration-guide.md new file mode 100644 index 0000000000000..e5cd72672ec15 --- /dev/null +++ b/sdk/formrecognizer/azure-ai-formrecognizer/migration-guide.md @@ -0,0 +1,591 @@ +# Guide for migrating to `azure-ai-formrecognizer (4.0.0-beta.1 - above)` from `azure-ai-formrecognizer (3.1.x - below)` + +This guide is intended to assist in the migration to `azure-ai-formrecognizer (4.0.0-beta.1 - above)` from `azure-ai-formrecognizer (3.1.x - below)`. It will focus on side-by-side comparisons for similar operations between the two package versions. + +We assume that you are familiar with the previous SDK `azure-ai-formrecognizer (3.1.x - below)`. If you are new to this library, please refer to the SDK README for [azure-ai-formrecognizer][README] directly rather than this migration guide. + +## Table of contents +- [Migration benefits](#migration-benefits) +- [Important changes](#important-changes) + - [Instantiating clients](#instantiating-clients) + - [Analyze documents](#analyze-documents) + - [Using a prebuilt Model](#using-a-prebuilt-model) + - [Using a layout model](#using-a-layout-model) + - [Using custom model](#using-a-custom-model) + - [Manage models](#manage-models) +- [Additional samples](#additional-samples) + +## Migration benefits + +A natural question to ask when considering whether to adopt a new version of the library is what the benefits of +doing so would be. As Azure Form Recognizer has matured and been embraced by a more diverse group of developers, +we have been focused on learning the patterns and practices to best support developer productivity and add value to our +customers. + +To improve the development experience and address the consistent feedback across the Form Recognizer SDK, this new +version of the library replaces the previously existing clients `FormRecognizerClient` and `FormTrainingClient` with +`DocumentAnalysisClient` and the `DocumentModelAdministrationClient` that provide unified methods for +analyzing documents and provide support for the new features added by the service in +API version `2021-09-30-preview` and later. + +The below table describes the relationship of each client and its supported API version(s): + +|API version|Supported clients +|-|- +|2021-09-30-preview | DocumentAnalysisClient and DocumentModelAdministrationClient +|2.1 | FormRecognizerClient and FormTrainingClient +|2.0 | FormRecognizerClient and FormTrainingClient + +The newer Form Recognizer client library also provides the ability to share in some improvements made to the Azure development experience, such as: + +- A unified method, `beginAnalyzeDocument` and `beginAnalyzeDocumentFromUrl`, for analyzing text and structured data from documents. +This method uses a `modelId` parameter for specifying the type of analysis to perform. +The newly introduced method return type `AnalyzeResult` removes hierarchical dependencies between the previously known `FormElements` +and move them to a more top level and easily accessible position such as `AnalyzeResult.tables` instead of `RecognizedForm.pages.tables`. +The service has further matured to define cross-page elements by using the `BoundingRegion` model and by specifying the content and span information on document fields. +- A unified return type `DocumentModel` indicating the document types the model can analyze and the specific fields it can analyze along with the estimated confidence for each field. +- Specifying a modelId instead of the generated GUID when creating models, copying or composing models along with an optional description. See [here][service_supported_models], for the supported model types. +- Modified `Generate Copy Authorization operation` response to return the target resource information so that it could be used directly when copying custom models method instead of needed to be provided by the user. +- List Models operation now returns a paged list of prebuilt in addition to custom models that are built successfully. +Also, when using the `getModel()` model, users can get the field schema (field names and types that the model can extract) for the model they specified, including for prebuilt models. +- Added methods for getting/listing operations of the past 24 hours, useful to track the status of model creation/copying operations and any resulting errors. + +Please refer to the [README][README] for more information on these new clients. + +## Important changes + +#### Instantiating clients + +In 3.x.x, the `FormRecognizerClient` and the `FormRecognizerAsyncClient` is instantiated via the `FormRecognizerClientBuilder`. + +In 4.x.x, the `FormRecognizerClient` and the `FormRecognizerAsyncClient`, has been replaced by the `DocumentAnalysisClient` and the `DocumentAnalysisAsyncClient` respectively and is instantiated via the [DocumentAnalysisClientBuilder][DocumentAnalysisClientBuilder]. +The sync and async operations are separated to [DocumentAnalysisClient][DocumentAnalysisClient] and [DocumentAnalysisAsyncClient][DocumentAnalysisAsyncClient]. + +Instantiating FormRecognizerClient client with 3.x.x: +```java +FormRecognizerClient formRecognizerClient = new FormRecognizerClientBuilder() + .credential(new AzureKeyCredential("{key}")) + .endpoint("{endpoint}") + .buildClient(); +``` + +Instantiating DocumentAnalysisClient client with 4.x.x: + +```java +DocumentAnalysisClient documentAnalysisClient = new DocumentAnalysisClientBuilder() + .credential(new AzureKeyCredential("{key}")) + .endpoint("{endpoint}") + .buildClient(); +``` +Similarly, with 4.x.x, the `FormTrainingClient` and `FormTrainingAsyncClient` has been replaced by the `DocumentModelAdministrationClient` +and `DocumentModelAdministrationAsyncClient`, instantiated via the [DocumentModelAdministrationClientBuilder][DocumentModelAdministrationClientBuilder]. +The sync and async operations are separated to [DocumentModelAdministrationClient][DocumentModelAdministrationClient] and [DocumentModelAdministrationAsyncClient][DocumentModelAdministrationAsyncClient]. + +Instantiating FormRecognizerClient client with 3.x.x: +```java +FormTrainingClient formTrainingClient = new FormTrainingClientBuilder() + .credential(new AzureKeyCredential("{key}")) + .endpoint("{endpoint}") + .buildClient(); +``` + +Instantiating DocumentModelAdministrationClient client with 4.x.x: + +```java +DocumentModelAdministrationClient documentModelAdminClient = new DocumentModelAdministrationClientBuilder() + .credential(new AzureKeyCredential("{key}")) + .endpoint("{endpoint}") + .buildClient(); +``` + +#### Analyze documents + +With 4.x.x, the unified method, `beginAnalyzeDocument` and `beginAnalyzeDocumentFromUrl`: +- accepts a string type `modelId` to be any of the prebuilt model IDs or a custom model ID. +- returns the `AnalyzeResult` model now exposes document elements, such as key-value pairs, entities, tables, + document fields and values at the top level of the returned model. As compared to the previously returned model + `RecognizedForm` which included hierarchical relationships between `FormElements` for instance tables were an element + of a `FormPage` and not a top-level element. +- provides the functionality of `beginRecognizeCustomForms`, `beginRecognizeContent`, `beginRecognizeReceipt`, + `beginRecognizeReceipts`, `beginRecognizeInvoices` `beginRecognizeIdentityDocuments` and `beginRecognizeBusinessCards` from the previous (azure-ai-formrecognizer 3.1.X - below) package versions. +- accepts unified `AnalyzeDocumentOptions` to specify pages and locale information for the outgoing request +- the `includeFieldElements` parameter is not supported with the `DocumentAnalysisClient`, text details are automatically included with API version `2021-09-30-preview` and later. +- the `readingOrder` parameter does not exist as the service uses `natural` reading order for the returned data. + +#### Using a prebuilt model +- In 3.x.x, `beginRecognizeReceipts` and `beginRecognizeReceiptsFromUrl` method was used to analyze receipts. +- In 4.x.x, `beginRecognizeReceipts` and `beginRecognizeReceiptsFromUrl` has been replaced with `beginAnalyzeDocument` and `beginAnalyzeDocumentFromUrl` respectively. +>NOTE: The `beginAnalyzeMethod` and `beginAnalyzeDocumentFromUrl` applies to all prebuilt models listed [here][service_supported_models]. + +Analyze receipt using 3.x.x `beginRecognizeReceipts`: +```java +String receiptUrl = "https://docs.microsoft.com/azure/cognitive-services/form-recognizer/media" + + "/contoso-allinone.jpg"; +SyncPoller> syncPoller = + formRecognizerClient.beginRecognizeReceiptsFromUrl(receiptUrl); +List receiptPageResults = syncPoller.getFinalResult(); + +for (int i = 0; i < receiptPageResults.size(); i++) { + RecognizedForm recognizedForm = receiptPageResults.get(i); + Map recognizedFields = recognizedForm.getFields(); + System.out.printf("----------- Recognizing receipt info for page %d -----------%n", i); + FormField merchantNameField = recognizedFields.get("MerchantName"); + if (merchantNameField != null) { + if (FieldValueType.STRING == merchantNameField.getValue().getValueType()) { + String merchantName = merchantNameField.getValue().asString(); + System.out.printf("Merchant Name: %s, confidence: %.2f%n", + merchantName, merchantNameField.getConfidence()); + } + } + + FormField merchantPhoneNumberField = recognizedFields.get("MerchantPhoneNumber"); + if (merchantPhoneNumberField != null) { + if (FieldValueType.PHONE_NUMBER == merchantPhoneNumberField.getValue().getValueType()) { + String merchantAddress = merchantPhoneNumberField.getValue().asPhoneNumber(); + System.out.printf("Merchant Phone number: %s, confidence: %.2f%n", + merchantAddress, merchantPhoneNumberField.getConfidence()); + } + } + + FormField transactionDateField = recognizedFields.get("TransactionDate"); + if (transactionDateField != null) { + if (FieldValueType.DATE == transactionDateField.getValue().getValueType()) { + LocalDate transactionDate = transactionDateField.getValue().asDate(); + System.out.printf("Transaction Date: %s, confidence: %.2f%n", + transactionDate, transactionDateField.getConfidence()); + } + } + + FormField receiptItemsField = recognizedFields.get("Items"); + if (receiptItemsField != null) { + System.out.printf("Receipt Items: %n"); + if (FieldValueType.LIST == receiptItemsField.getValue().getValueType()) { + List receiptItems = receiptItemsField.getValue().asList(); + receiptItems.stream() + .filter(receiptItem -> FieldValueType.MAP == receiptItem.getValue().getValueType()) + .map(formField -> formField.getValue().asMap()) + .forEach(formFieldMap -> formFieldMap.forEach((key, formField) -> { + if ("Quantity".equals(key)) { + if (FieldValueType.FLOAT == formField.getValue().getValueType()) { + Float quantity = formField.getValue().asFloat(); + System.out.printf("Quantity: %f, confidence: %.2f%n", + quantity, formField.getConfidence()); + } + } + })); + } + } +} +``` + +Analyze receipt data using 4.x.x `beginAnalyzeDocumentFromUrl`: + +```java +String receiptUrl = "https://raw.githubusercontent.com/Azure/azure-sdk-for-java/main/sdk/formrecognizer" + + "/azure-ai-formrecognizer/src/samples/resources/sample-documents/receipts/contoso-allinone.jpg"; + +SyncPoller analyzeReceiptPoller = + documentAnalysisClient.beginAnalyzeDocumentFromUrl("prebuilt-receipt", receiptUrl); + +AnalyzeResult receiptResults = analyzeReceiptPoller.getFinalResult(); + +for (int i = 0; i < receiptResults.getDocuments().size(); i++) { + AnalyzedDocument analyzedReceipt = receiptResults.getDocuments().get(i); + Map receiptFields = analyzedReceipt.getFields(); + System.out.printf("----------- Analyzing receipt info %d -----------%n", i); + DocumentField merchantNameField = receiptFields.get("MerchantName"); + if (merchantNameField != null) { + if (DocumentFieldType.STRING == merchantNameField.getType()) { + String merchantName = merchantNameField.getValueString(); + System.out.printf("Merchant Name: %s, confidence: %.2f%n", + merchantName, merchantNameField.getConfidence()); + } + } + + DocumentField merchantPhoneNumberField = receiptFields.get("MerchantPhoneNumber"); + if (merchantPhoneNumberField != null) { + if (DocumentFieldType.PHONE_NUMBER == merchantPhoneNumberField.getType()) { + String merchantAddress = merchantPhoneNumberField.getValuePhoneNumber(); + System.out.printf("Merchant Phone number: %s, confidence: %.2f%n", + merchantAddress, merchantPhoneNumberField.getConfidence()); + } + } + + DocumentField transactionDateField = receiptFields.get("TransactionDate"); + if (transactionDateField != null) { + if (DocumentFieldType.DATE == transactionDateField.getType()) { + LocalDate transactionDate = transactionDateField.getValueDate(); + System.out.printf("Transaction Date: %s, confidence: %.2f%n", + transactionDate, transactionDateField.getConfidence()); + } + } + + DocumentField receiptItemsField = receiptFields.get("Items"); + if (receiptItemsField != null) { + System.out.printf("Receipt Items: %n"); + if (DocumentFieldType.LIST == receiptItemsField.getType()) { + List receiptItems = receiptItemsField.getValueList(); + receiptItems.stream() + .filter(receiptItem -> DocumentFieldType.MAP == receiptItem.getType()) + .map(documentField -> documentField.getValueMap()) + .forEach(documentFieldMap -> documentFieldMap.forEach((key, documentField) -> { + if ("Name".equals(key)) { + if (DocumentFieldType.STRING == documentField.getType()) { + String name = documentField.getValueString(); + System.out.printf("Name: %s, confidence: %.2fs%n", + name, documentField.getConfidence()); + } + } + if ("Quantity".equals(key)) { + if (DocumentFieldType.FLOAT == documentField.getType()) { + Float quantity = documentField.getValueFloat(); + System.out.printf("Quantity: %f, confidence: %.2f%n", + quantity, documentField.getConfidence()); + } + } + })); + } + } +} +``` +#### Using a layout model +Analyze layout using 3.x.x `beginRecognizeContent`: +```java +// recognize form content using file input stream +File form = new File("local/file_path/filename.png"); +byte[] fileContent = Files.readAllBytes(form.toPath()); +InputStream inputStream = new ByteArrayInputStream(fileContent); + +SyncPoller> recognizeContentPoller = + formRecognizerClient.beginRecognizeContent(inputStream, form.length()); + +List contentPageResults = recognizeContentPoller.getFinalResult(); + +for (int i = 0; i < contentPageResults.size(); i++) { + FormPage formPage = contentPageResults.get(i); + System.out.printf("----Recognizing content info for page %d ----%n", i); + // Table information + System.out.printf("Has width: %f and height: %f, measured with unit: %s.%n", formPage.getWidth(), + formPage.getHeight(), + formPage.getUnit()); + formPage.getTables().forEach(formTable -> { + System.out.printf("Table has %d rows and %d columns.%n", formTable.getRowCount(), + formTable.getColumnCount()); + formTable.getCells().forEach(formTableCell -> + System.out.printf("Cell has text %s.%n", formTableCell.getText())); + }); + // Selection Mark + formPage.getSelectionMarks().forEach(selectionMark -> System.out.printf( + "Page: %s, Selection mark is %s within bounding box %s has a confidence score %.2f.%n", + selectionMark.getPageNumber(), selectionMark.getState(), selectionMark.getBoundingBox().toString(), + selectionMark.getConfidence())); +} +``` + +Analyze layout using 4.x.x `beginAnalyzeDocument`: + +```java +// analyze document layout using file input stream +File layoutDocument = new File("local/file_path/filename.png"); +byte[] fileContent = Files.readAllBytes(layoutDocument.toPath()); +InputStream fileStream = new ByteArrayInputStream(fileContent); + +SyncPoller analyzeLayoutResultPoller = + documentAnalysisClient.beginAnalyzeDocument("prebuilt-layout", fileStream, layoutDocument.length()); + +AnalyzeResult analyzeLayoutResult = analyzeLayoutResultPoller.getFinalResult(); + +// pages +analyzeLayoutResult.getPages().forEach(documentPage -> { + System.out.printf("Page has width: %.2f and height: %.2f, measured with unit: %s%n", + documentPage.getWidth(), + documentPage.getHeight(), + documentPage.getUnit()); + + // lines + documentPage.getLines().forEach(documentLine -> + System.out.printf("Line %s is within a bounding box %s.%n", + documentLine.getContent(), + documentLine.getBoundingBox().toString())); + + // selection marks + documentPage.getSelectionMarks().forEach(documentSelectionMark -> + System.out.printf("Selection mark is %s and is within a bounding box %s with confidence %.2f.%n", + documentSelectionMark.getState().toString(), + documentSelectionMark.getBoundingBox().toString(), + documentSelectionMark.getConfidence())); +}); + +// tables +List tables = analyzeLayoutResult.getTables(); +for (int i = 0; i < tables.size(); i++) { + DocumentTable documentTable = tables.get(i); + System.out.printf("Table %d has %d rows and %d columns.%n", i, documentTable.getRowCount(), + documentTable.getColumnCount()); + documentTable.getCells().forEach(documentTableCell -> { + System.out.printf("Cell '%s', has row index %d and column index %d.%n", documentTableCell.getContent(), + documentTableCell.getRowIndex(), documentTableCell.getColumnIndex()); + }); + System.out.println(); +} +``` + +#### Using a custom model +Analyze custom document using 3.x.x `beginRecognizeCustomFormsFromUrl`: +```java +String formUrl = "{form_url}"; +String modelId = "{custom_trained_model_id}"; +SyncPoller> recognizeFormPoller = + formRecognizerClient.beginRecognizeCustomFormsFromUrl(modelId, formUrl); + +List recognizedForms = recognizeFormPoller.getFinalResult(); + +for (int i = 0; i < recognizedForms.size(); i++) { + RecognizedForm form = recognizedForms.get(i); + System.out.printf("----------- Recognized custom form info for page %d -----------%n", i); + System.out.printf("Form type: %s%n", form.getFormType()); + System.out.printf("Form type confidence: %.2f%n", form.getFormTypeConfidence()); + form.getFields().forEach((label, formField) -> + System.out.printf("Field %s has value %s with confidence score of %f.%n", label, + formField.getValueData().getText(), + formField.getConfidence()) + ); +} +``` + +Analyze custom document using 4.x.x `beginAnalyzeDocumentFromUrl` + +```java +String documentUrl = "{document-url}"; +String modelId = "{custom-built-model-ID}"; +SyncPoller analyzeDocumentPoller = + documentAnalysisClient.beginAnalyzeDocumentFromUrl(modelId, documentUrl); + +AnalyzeResult analyzeResult = analyzeDocumentPoller.getFinalResult(); + +for (int i = 0; i < analyzeResult.getDocuments().size(); i++) { + final AnalyzedDocument analyzedDocument = analyzeResult.getDocuments().get(i); + System.out.printf("----------- Analyzing custom document %d -----------%n", i); + System.out.printf("Analyzed document has doc type %s with confidence : %.2f%n", + analyzedDocument.getDocType(), analyzedDocument.getConfidence()); + analyzedDocument.getFields().forEach((key, documentField) -> { + System.out.printf("Document Field content: %s%n", documentField.getContent()); + System.out.printf("Document Field confidence: %.2f%n", documentField.getConfidence()); + System.out.printf("Document Field Type: %.2f%n", documentField.getType().toString()); + System.out.printf("Document Field found within bounding region: %s%n", + documentField.getBoundingRegions().toString()); + }); +} + +analyzeResult.getPages().forEach(documentPage -> { + System.out.printf("Page has width: %.2f and height: %.2f, measured with unit: %s%n", + documentPage.getWidth(), + documentPage.getHeight(), + documentPage.getUnit()); + + // lines + documentPage.getLines().forEach(documentLine -> + System.out.printf("Line %s is within a bounding box %s.%n", + documentLine.getContent(), + documentLine.getBoundingBox().toString())); + + // words + documentPage.getWords().forEach(documentWord -> + System.out.printf("Word %s has a confidence score of %.2f%n.", + documentWord.getContent(), + documentWord.getConfidence())); +}); + +// tables +List tables = analyzeResult.getTables(); +for (int i = 0; i < tables.size(); i++) { + DocumentTable documentTable = tables.get(i); + System.out.printf("Table %d has %d rows and %d columns.%n", i, documentTable.getRowCount(), + documentTable.getColumnCount()); + documentTable.getCells().forEach(documentTableCell -> { + System.out.printf("Cell '%s', has row index %d and column index %d.%n", + documentTableCell.getContent(), + documentTableCell.getRowIndex(), documentTableCell.getColumnIndex()); + }); + System.out.println(); +} +``` + +Analyzing general prebuilt document types with 4.x.x: +> NOTE: Analyzing a document with the prebuilt-document model replaces training without labels in version 3.1.x of the library. + +```java +String documentUrl = "{document-url}"; +String modelId = "prebuilt-document"; +SyncPoller analyzeDocumentPoller = + documentAnalysisClient.beginAnalyzeDocumentFromUrl(modelId, documentUrl); + +AnalyzeResult analyzeResult = analyzeDocumentPoller.getFinalResult(); + +for (int i = 0; i < analyzeResult.getDocuments().size(); i++) { + final AnalyzedDocument analyzedDocument = analyzeResult.getDocuments().get(i); + System.out.printf("----------- Analyzing document %d -----------%n", i); + System.out.printf("Analyzed document has doc type %s with confidence : %.2f%n", + analyzedDocument.getDocType(), analyzedDocument.getConfidence()); +} + +analyzeResult.getPages().forEach(documentPage -> { + System.out.printf("Page has width: %.2f and height: %.2f, measured with unit: %s%n", + documentPage.getWidth(), + documentPage.getHeight(), + documentPage.getUnit()); + + // lines + documentPage.getLines().forEach(documentLine -> + System.out.printf("Line %s is within a bounding box %s.%n", + documentLine.getContent(), + documentLine.getBoundingBox().toString())); + + // words + documentPage.getWords().forEach(documentWord -> + System.out.printf("Word %s has a confidence score of %.2f%n.", + documentWord.getContent(), + documentWord.getConfidence())); +}); + +// tables +List tables = analyzeResult.getTables(); +for (int i = 0; i < tables.size(); i++) { + DocumentTable documentTable = tables.get(i); + System.out.printf("Table %d has %d rows and %d columns.%n", i, documentTable.getRowCount(), + documentTable.getColumnCount()); + documentTable.getCells().forEach(documentTableCell -> { + System.out.printf("Cell '%s', has row index %d and column index %d.%n", + documentTableCell.getContent(), + documentTableCell.getRowIndex(), documentTableCell.getColumnIndex()); + }); + System.out.println(); +} + +// Entities +analyzeResult.getEntities().forEach(documentEntity -> { + System.out.printf("Entity category : %s, sub-category %s%n: ", + documentEntity.getCategory(), documentEntity.getSubCategory()); + System.out.printf("Entity content: %s%n: ", documentEntity.getContent()); + System.out.printf("Entity confidence: %.2f%n", documentEntity.getConfidence()); +}); + +// Key-value +analyzeResult.getKeyValuePairs().forEach(documentKeyValuePair -> { + System.out.printf("Key content: %s%n", documentKeyValuePair.getKey().getContent()); + System.out.printf("Key content bounding region: %s%n", + documentKeyValuePair.getKey().getBoundingRegions().toString()); + + System.out.printf("Value content: %s%n", documentKeyValuePair.getValue().getContent()); + System.out.printf("Value content bounding region: %s%n", documentKeyValuePair.getValue().getBoundingRegions().toString()); +}); +``` + +#### Build a custom document analysis model +- In 3.x.x, creating a custom model required specifying `useTrainingLabels` to indicate whether to use labeled data when creating the custom model with the `beginTraining` method. +- In 4.x.x, we introduced the new general document model (prebuilt-document) to replace the train without labels +functionality from 3.x.x which extracts entities, key-value pairs, and layout from a document with the `beginBuildModel` method. +In 4.x.x the `beginBuildModel` always returns labeled data otherwise. + +Train a custom model using 3.x.x `beginTraining`: +```java +String trainingFilesUrl = "{SAS_URL_of_your_container_in_blob_storage}"; +SyncPoller trainingPoller = + formTrainingClient.beginTraining(trainingFilesUrl, + false, + new TrainingOptions() + .setModelName("my model trained without labels"), + Context.NONE); + +CustomFormModel customFormModel = trainingPoller.getFinalResult(); + +// Model Info +System.out.printf("Model Id: %s%n", customFormModel.getModelId()); +System.out.printf("Model name given by user: %s%n", customFormModel.getModelName()); +System.out.printf("Model Status: %s%n", customFormModel.getModelStatus()); +System.out.printf("Training started on: %s%n", customFormModel.getTrainingStartedOn()); +System.out.printf("Training completed on: %s%n%n", customFormModel.getTrainingCompletedOn()); + +System.out.println("Recognized Fields:"); +// looping through the subModels, which contains the fields they were trained on +// Since the given training documents are unlabeled we still group them but, they do not have a label. +customFormModel.getSubmodels().forEach(customFormSubmodel -> { + System.out.printf("Submodel Id: %s%n: ", customFormSubmodel.getModelId()); + // Since the training data is unlabeled, we are unable to return the accuracy of this model + customFormSubmodel.getFields().forEach((field, customFormModelField) -> + System.out.printf("Field: %s Field Label: %s%n", + field, customFormModelField.getLabel())); +}); + +System.out.println(); +customFormModel.getTrainingDocuments().forEach(trainingDocumentInfo -> { + System.out.printf("Document name: %s%n", trainingDocumentInfo.getName()); + System.out.printf("Document status: %s%n", trainingDocumentInfo.getStatus()); + System.out.printf("Document page count: %d%n", trainingDocumentInfo.getPageCount()); + if (!trainingDocumentInfo.getErrors().isEmpty()) { + System.out.println("Document Errors:"); + trainingDocumentInfo.getErrors().forEach(formRecognizerError -> + System.out.printf("Error code %s, Error message: %s%n", formRecognizerError.getErrorCode(), + formRecognizerError.getMessage())); + } +}); +``` + +Build a custom document model using 4.x.x `beginBuildModel`: + +```java +// Build custom document analysis model +String trainingFilesUrl = "{SAS_URL_of_your_container_in_blob_storage}"; +// The shared access signature (SAS) Url of your Azure Blob Storage container with your forms. +SyncPoller buildOperationPoller = + documentModelAdminClient.beginBuildModel(trainingFilesUrl, + "my-build-model", + new BuildModelOptions().setDescription("model desc"), + Context.NONE); + +DocumentModel documentModel = buildOperationPoller.getFinalResult(); + +// Model Info +System.out.printf("Model ID: %s%n", documentModel.getModelId()); +System.out.printf("Model Description: %s%n", documentModel.getDescription()); +System.out.printf("Model created on: %s%n%n", documentModel.getCreatedOn()); +documentModel.getDocTypes().forEach((key, docTypeInfo) -> { + System.out.printf("Document type: %s%n", key); + docTypeInfo.getFieldSchema().forEach((name, documentFieldSchema) -> { + System.out.printf("Document field: %s%n", name); + System.out.printf("Document field type: %s%n", documentFieldSchema.getType().toString()); + System.out.printf("Document field confidence: %.2f%n", docTypeInfo.getFieldConfidence().get(name)); + }); +}); +``` + +### Manage models +In 3.x.x, listing models returned only the custom trained models using the `listCustomModel` method. + +With 4.x.x, list Models operation `listModels`: +- returns a paged list of prebuilt in addition to custom models. +- no longer includes submodels, instead a model can analyze different document types. +- Only returns custom models that are built successfully. +Unsuccessful model operations can be viewed with the get and list operation methods (note that document model operation data persists for only 24 hours). +- In version `3.1.x` of the library, models that had not succeeded were still created, had to be deleted by the user, +and were returned in the list models response. + +## Additional samples + +For additional samples please take a look at the [Form Recognizer samples][README-Samples] + + +[DocumentAnalysisClientBuilder]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/formrecognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/DocumentAnalysisClientBuilder.java +[DocumentAnalysisClient]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/formrecognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/DocumentAnalysisClient.java +[DocumentAnalysisAsyncClient]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/formrecognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/DocumentAnalysisAsyncClient.java +[DocumentModelAdministrationClientBuilder]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/formrecognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/administration/DocumentModelAdministrationClientBuilder.java +[DocumentModelAdministrationClient]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/formrecognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/administration/DocumentModelAdministrationClient.java +[DocumentModelAdministrationAsyncClient]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/formrecognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/administration/DocumentModelAdministrationAsyncClient.java +[Guidelines]: https://azure.github.io/azure-sdk/general_introduction.html +[GuidelinesJava]: https://azure.github.io/azure-sdk/java_introduction.html +[GuidelinesJavaDesign]: https://azure.github.io/azure-sdk/java_introduction.html#namespaces +[README-Samples]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/README.md +[README]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/formrecognizer/azure-ai-formrecognizer/README.md + + +![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%2Fformrecognizer%2Fazure-ai-formrecognizer%2Fmigration-guide.png) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/AnalyzeCustomDocumentFromUrl.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/AnalyzeCustomDocumentFromUrl.java index 62b2e72aed2c8..0c3e83917977b 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/AnalyzeCustomDocumentFromUrl.java +++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/AnalyzeCustomDocumentFromUrl.java @@ -30,10 +30,10 @@ public static void main(String[] args) { .endpoint("https://{endpoint}.cognitiveservices.azure.com/") .buildClient(); - String formUrl = "{document-url}"; + String documentUrl = "{document-url}"; String modelId = "{custom-built-model-ID}"; SyncPoller analyzeDocumentPoller = - client.beginAnalyzeDocumentFromUrl(modelId, formUrl); + client.beginAnalyzeDocumentFromUrl(modelId, documentUrl); AnalyzeResult analyzeResult = analyzeDocumentPoller.getFinalResult(); diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ReadmeSamples.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ReadmeSamples.java index b5cc16e2eb834..6184fe1041b5e 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ReadmeSamples.java +++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/ReadmeSamples.java @@ -287,6 +287,76 @@ public void analyzeCustomDocument() { } } + /** + * Code snippet for analyzing general documents using "prebuilt-document" models. + */ + public void analyzePrebuiltDocument() { + String documentUrl = "{document-url}"; + String modelId = "prebuilt-document"; + SyncPoller analyzeDocumentPoller = + documentAnalysisClient.beginAnalyzeDocumentFromUrl(modelId, documentUrl); + + AnalyzeResult analyzeResult = analyzeDocumentPoller.getFinalResult(); + + for (int i = 0; i < analyzeResult.getDocuments().size(); i++) { + final AnalyzedDocument analyzedDocument = analyzeResult.getDocuments().get(i); + System.out.printf("----------- Analyzing document %d -----------%n", i); + System.out.printf("Analyzed document has doc type %s with confidence : %.2f%n", + analyzedDocument.getDocType(), analyzedDocument.getConfidence()); + } + + analyzeResult.getPages().forEach(documentPage -> { + System.out.printf("Page has width: %.2f and height: %.2f, measured with unit: %s%n", + documentPage.getWidth(), + documentPage.getHeight(), + documentPage.getUnit()); + + // lines + documentPage.getLines().forEach(documentLine -> + System.out.printf("Line %s is within a bounding box %s.%n", + documentLine.getContent(), + documentLine.getBoundingBox().toString())); + + // words + documentPage.getWords().forEach(documentWord -> + System.out.printf("Word %s has a confidence score of %.2f%n.", + documentWord.getContent(), + documentWord.getConfidence())); + }); + + // tables + List tables = analyzeResult.getTables(); + for (int i = 0; i < tables.size(); i++) { + DocumentTable documentTable = tables.get(i); + System.out.printf("Table %d has %d rows and %d columns.%n", i, documentTable.getRowCount(), + documentTable.getColumnCount()); + documentTable.getCells().forEach(documentTableCell -> { + System.out.printf("Cell '%s', has row index %d and column index %d.%n", + documentTableCell.getContent(), + documentTableCell.getRowIndex(), documentTableCell.getColumnIndex()); + }); + System.out.println(); + } + + // Entities + analyzeResult.getEntities().forEach(documentEntity -> { + System.out.printf("Entity category : %s, sub-category %s%n: ", + documentEntity.getCategory(), documentEntity.getSubCategory()); + System.out.printf("Entity content: %s%n: ", documentEntity.getContent()); + System.out.printf("Entity confidence: %.2f%n", documentEntity.getConfidence()); + }); + + // Key-value + analyzeResult.getKeyValuePairs().forEach(documentKeyValuePair -> { + System.out.printf("Key content: %s%n", documentKeyValuePair.getKey().getContent()); + System.out.printf("Key content bounding region: %s%n", + documentKeyValuePair.getKey().getBoundingRegions().toString()); + + System.out.printf("Value content: %s%n", documentKeyValuePair.getValue().getContent()); + System.out.printf("Value content bounding region: %s%n", documentKeyValuePair.getValue().getBoundingRegions().toString()); + }); + } + /** * Code snippet for managing models in form recognizer account. */ From 0eae708df19580e1fe0c942e31cd262773fe6154 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Mon, 4 Oct 2021 11:26:53 -0700 Subject: [PATCH 09/10] [Form Recognizer] Add changelog updates (#24501) --- .../azure-ai-formrecognizer/CHANGELOG.md | 19 ++++++++++++++---- .../azure-ai-formrecognizer/README.md | 3 ++- ...nalysisAsyncClientJavaDocCodeSnippets.java | 20 +++++++++---------- ...mentAnalysisClientJavaDocCodeSnippets.java | 12 +++++------ 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md b/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md index df8c58278637d..f64dc5f6fe5ec 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md +++ b/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md @@ -1,6 +1,13 @@ # Release History -## 4.0.0-beta.1 (Unreleased) +## 4.0.0-beta.1 (2021-10-06) +This version of the SDK defaults to the latest supported API version, which currently is 2021-09-30-preview. + +> Note: Starting with version 2021-09-30-preview, a new set of clients were introduced to leverage the newest features +of the Form Recognizer service. Please see the +[Migration Guide](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/formrecognizer/azure-ai-formrecognizer/migration-guide.md) +for detailed instructions on how to update application code from client library version 3.1.X or lower to the latest version. +Also, please refer to the [README](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/formrecognizer/azure-ai-formrecognizer/README.md) for more information about the library. ### Features Added - Added new DocumentAnalysisClient with beginAnalyzeDocument and beginAnalyzeDocumentFromUrl methods. @@ -9,13 +16,17 @@ Use these methods with the latest Form Recognizer API version to analyze documen DocumentEntity, DocumentField, DocumentKeyValuePair, DocumentKeyValueElement, DocumentLine, DocumentPage, DocumentSelectionMark, DocumentSpan, DocumentStyle, DocumentTable, DocumentTableCell, DocumentWord, DocumentOperationResult. - Added a new model `DocumentAnalysisServiceVersion` that supports Azure Form Recognizer service version "2021-09-30-preview" and onwards. -- Added new DocumentModelAdministrationClient with methods: beginBuildModel, beginCreateComposedModel, getCopyAuthorization, +- Added new `DocumentModelAdministrationClient` and `DocumentModelAdministrationAsyncClient` with methods: beginBuildModel, beginCreateComposedModel, getCopyAuthorization, deleteModel, getAccountProperties, beginCopyModel, listModels, getModel, getOperation, listOperations. -- Added new models to use with the new DocumentTrainingClient: DocumentModel, DocTypeInfo, DocumentFieldSchema, -AccountProperties, CopyAuthorization, BuildModelOptions, CopyAuthorizationOptions, CreateComposedModelOptions, +- Added new models to use with the new `DocumentModelAdministrationClient`: DocumentModel, DocTypeInfo, DocumentFieldSchema, +AccountProperties, CopyAuthorization, BuildModelOptions, CopyAuthorizationOptions, CreateComposedModelOptions, DocumentAnalysisException, FormRecognizerError, InnerError, DocumentModelInfo, ModelOperation, ModelOperationInfo, ModelOperationStatus, ModelOperationKind. ### Breaking Changes +- This package targets Azure Form Recognizer service API version 2021-09-30-preview and newer. It is not compatible with the older Form Recognizer service API versions (2.0 and 2.1). +To continue to use Form Recognizer API version 2.1, please use major version 3 of the client package (azure-ai-form-recognizer 3.1.X). +- `FormRecognizerClient` and `FormRecognizerAsyncClient` has been replaced by `DocumentAnalysisClient` and `DocumentAnalysisAsyncClient` respectively. +- `FormTrainingClient` and `FormTrainingAsyncClient` has been replaced by `DocumentModelAdministrationClient` and `DocumentModelAdministrationAsyncClient` respectively. ### Bugs Fixed diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/README.md b/sdk/formrecognizer/azure-ai-formrecognizer/README.md index a7e4b4cd8114e..669c1baf3a455 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/README.md +++ b/sdk/formrecognizer/azure-ai-formrecognizer/README.md @@ -71,7 +71,7 @@ This table shows the relationship between SDK versions and supported API version |4.0.0-beta.1 - Latest beta release| 2021-09-30-preview (default) > Note: Starting with version 2021-09-30-preview, a new set of clients were introduced to leverage the newest features -> of the Form Recognizer service. Please see the Migration Guide for detailed instructions on how to update application +> of the Form Recognizer service. Please see the [Migration Guide][migration_guide] for detailed instructions on how to update application > code from client library version 3.1.X or lower to the latest version. Additionally, see the [Changelog][changelog] for more detailed information. > The below table describes the relationship of each client and its supported API version(s): @@ -616,6 +616,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m [fr_build_training_set]: https://aka.ms/azsdk/formrecognizer/buildtrainingset [sample_examples]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/formrecognizer/azure-ai-formrecognizer/src/samples#examples [sample_readme]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/formrecognizer/azure-ai-formrecognizer/src/samples#readme +[migration_guide]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/formrecognizer/azure-ai-formrecognizer/migration-guide.md [create_composed_model]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/administration/CreateComposedModel.java [create_composed_model_async]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/administration/CreateComposedModelAsync.java diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/DocumentAnalysisAsyncClientJavaDocCodeSnippets.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/DocumentAnalysisAsyncClientJavaDocCodeSnippets.java index c36eba95ccb55..6446fe70a8330 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/DocumentAnalysisAsyncClientJavaDocCodeSnippets.java +++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/DocumentAnalysisAsyncClientJavaDocCodeSnippets.java @@ -113,20 +113,20 @@ public void beginAnalyzeDocumentFromUrlWithOptions() { */ public void beginAnalyzeDocument() throws IOException { // BEGIN: com.azure.ai.formrecognizer.DocumentAnalysisAsyncClient.beginAnalyzeDocument#string-Flux-long - File form = new File("{local/file_path/fileName.jpg}"); + File document = new File("{local/file_path/fileName.jpg}"); String modelId = "{model_id}"; // Utility method to convert input stream to Byte buffer Flux buffer = - Utility.toFluxByteBuffer(new ByteArrayInputStream(Files.readAllBytes(form.toPath()))); + Utility.toFluxByteBuffer(new ByteArrayInputStream(Files.readAllBytes(document.toPath()))); - documentAnalysisAsyncClient.beginAnalyzeDocument(modelId, buffer, form.length()) + documentAnalysisAsyncClient.beginAnalyzeDocument(modelId, buffer, document.length()) // if polling operation completed, retrieve the final result. .flatMap(AsyncPollResponse::getFinalResult) .subscribe(analyzeResult -> analyzeResult.getDocuments() .stream() - .forEach(document -> - document.getFields() + .forEach(analyzedDocument -> + analyzedDocument.getFields() .forEach((key, documentField) -> { System.out.printf("Field text: %s%n", key); System.out.printf("Field value data content: %s%n", documentField.getContent()); @@ -144,14 +144,14 @@ public void beginAnalyzeDocument() throws IOException { */ public void beginAnalyzeDocumentWithOptions() throws IOException { // BEGIN: com.azure.ai.formrecognizer.DocumentAnalysisAsyncClient.beginAnalyzeDocument#string-Flux-long-AnalyzeDocumentOptions - File form = new File("{local/file_path/fileName.jpg}"); + File document = new File("{local/file_path/fileName.jpg}"); String modelId = "{model_id}"; // Utility method to convert input stream to Byte buffer Flux buffer = - Utility.toFluxByteBuffer(new ByteArrayInputStream(Files.readAllBytes(form.toPath()))); + Utility.toFluxByteBuffer(new ByteArrayInputStream(Files.readAllBytes(document.toPath()))); - documentAnalysisAsyncClient.beginAnalyzeDocument(modelId, buffer, form.length(), + documentAnalysisAsyncClient.beginAnalyzeDocument(modelId, buffer, document.length(), new AnalyzeDocumentOptions().setPages(Arrays.asList("1", "3"))) // if polling operation completed, retrieve the final result. .flatMap(AsyncPollResponse::getFinalResult) @@ -159,8 +159,8 @@ public void beginAnalyzeDocumentWithOptions() throws IOException { System.out.println(analyzeResult.getModelId()); analyzeResult.getDocuments() .stream() - .forEach(document -> - document.getFields() + .forEach(analyzedDocument -> + analyzedDocument.getFields() .forEach((key, documentField) -> { System.out.printf("Field text: %s%n", key); System.out.printf("Field value data content: %s%n", documentField.getContent()); diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/DocumentAnalysisClientJavaDocCodeSnippets.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/DocumentAnalysisClientJavaDocCodeSnippets.java index 904423dd50159..9250e2d9a4a8c 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/DocumentAnalysisClientJavaDocCodeSnippets.java +++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/DocumentAnalysisClientJavaDocCodeSnippets.java @@ -104,12 +104,12 @@ public void beginAnalyzeDocumentFromUrlWithOptions() { */ public void beginAnalyzeDocument() throws IOException { // BEGIN: com.azure.ai.formrecognizer.DocumentAnalysisClient.beginAnalyzeDocument#string-InputStream-long - File form = new File("{local/file_path/fileName.jpg}"); + File document = new File("{local/file_path/fileName.jpg}"); String modelId = "{custom_trained_model_id}"; - byte[] fileContent = Files.readAllBytes(form.toPath()); + byte[] fileContent = Files.readAllBytes(document.toPath()); try (InputStream targetStream = new ByteArrayInputStream(fileContent)) { - documentAnalysisClient.beginAnalyzeDocument(modelId, targetStream, form.length()) + documentAnalysisClient.beginAnalyzeDocument(modelId, targetStream, document.length()) .getFinalResult() .getDocuments().stream() .map(AnalyzedDocument::getFields) @@ -130,12 +130,12 @@ public void beginAnalyzeDocument() throws IOException { */ public void beginAnalyzeDocumentWithOptions() throws IOException { // BEGIN: com.azure.ai.formrecognizer.DocumentAnalysisClient.beginAnalyzeDocument#string-InputStream-long-AnalyzeDocumentOptions-Context - File form = new File("{local/file_path/fileName.jpg}"); + File document = new File("{local/file_path/fileName.jpg}"); String modelId = "{custom_trained_model_id}"; - byte[] fileContent = Files.readAllBytes(form.toPath()); + byte[] fileContent = Files.readAllBytes(document.toPath()); try (InputStream targetStream = new ByteArrayInputStream(fileContent)) { - documentAnalysisClient.beginAnalyzeDocument(modelId, targetStream, form.length(), + documentAnalysisClient.beginAnalyzeDocument(modelId, targetStream, document.length(), new AnalyzeDocumentOptions().setPages(Arrays.asList("1", "3")), Context.NONE) .getFinalResult() .getDocuments().stream() From edfedd946d8e79d39aeeb9f1ba992a6fbc437999 Mon Sep 17 00:00:00 2001 From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com> Date: Mon, 4 Oct 2021 12:05:47 -0700 Subject: [PATCH 10/10] Add Javac Suppressions Needed for Java 17 (#24513) --- .../directconnectivity/rntbd/RntbdThreadFactory.java | 1 + .../com/azure/security/keyvault/jca/KeyVaultJcaProvider.java | 1 + .../keyvault/jca/KeyVaultTrustManagerFactoryProvider.java | 1 + .../keyvault/jca/implementation/JREKeyStoreFactory.java | 1 + .../com/azure/resourcemanager/test/ResourceManagerTestBase.java | 2 ++ .../src/test/java/com/azure/search/documents/TestHelpers.java | 1 + 6 files changed, 7 insertions(+) diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdThreadFactory.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdThreadFactory.java index ee2e9a10b9c72..36fd22219d953 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdThreadFactory.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdThreadFactory.java @@ -21,6 +21,7 @@ class RntbdThreadFactory implements ThreadFactory { private final ThreadGroup threadGroup; private final AtomicInteger threadCount; + @SuppressWarnings("removal") RntbdThreadFactory(final String name, final boolean daemon, final int priority) { final SecurityManager securityManager = System.getSecurityManager(); diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultJcaProvider.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultJcaProvider.java index c173d5f797a71..479fd1c936112 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultJcaProvider.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultJcaProvider.java @@ -53,6 +53,7 @@ public KeyVaultJcaProvider() { /** * Initialize the provider. */ + @SuppressWarnings("removal") private void initialize() { AccessController.doPrivileged((PrivilegedAction) () -> { putService( diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultTrustManagerFactoryProvider.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultTrustManagerFactoryProvider.java index d9217ceeff9c8..768885006e52f 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultTrustManagerFactoryProvider.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultTrustManagerFactoryProvider.java @@ -43,6 +43,7 @@ public KeyVaultTrustManagerFactoryProvider() { /** * Initialize the provider. */ + @SuppressWarnings("removal") private void initialize() { AccessController.doPrivileged((PrivilegedAction) () -> { putService( diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/implementation/JREKeyStoreFactory.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/implementation/JREKeyStoreFactory.java index 3d99fb5143dce..f4475e5c70583 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/implementation/JREKeyStoreFactory.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/implementation/JREKeyStoreFactory.java @@ -83,6 +83,7 @@ private static Path getConfiguredKeyStorePath() { .orElse(null); } + @SuppressWarnings("removal") private static String privilegedGetProperty(String theProp, String defaultVal) { return AccessController.doPrivileged( (PrivilegedAction) () -> { diff --git a/sdk/resourcemanager/azure-resourcemanager-test/src/main/java/com/azure/resourcemanager/test/ResourceManagerTestBase.java b/sdk/resourcemanager/azure-resourcemanager-test/src/main/java/com/azure/resourcemanager/test/ResourceManagerTestBase.java index b2a9e6af06450..8b2dd607c62da 100644 --- a/sdk/resourcemanager/azure-resourcemanager-test/src/main/java/com/azure/resourcemanager/test/ResourceManagerTestBase.java +++ b/sdk/resourcemanager/azure-resourcemanager-test/src/main/java/com/azure/resourcemanager/test/ResourceManagerTestBase.java @@ -355,6 +355,7 @@ protected void setInternalContext(T internalContext, Object... objects) { } } + @SuppressWarnings("removal") private void setAccessible(final Field field) { AccessController.doPrivileged((PrivilegedAction) () -> { field.setAccessible(true); @@ -372,6 +373,7 @@ private void setAccessible(final Field field) { * @return the manager instance * @throws RuntimeException when field cannot be found or set. */ + @SuppressWarnings("removal") protected T buildManager(Class manager, HttpPipeline httpPipeline, AzureProfile profile) { try { Constructor constructor = manager.getDeclaredConstructor(httpPipeline.getClass(), profile.getClass()); diff --git a/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/TestHelpers.java b/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/TestHelpers.java index 6682d54ed27a2..384942d4997ed 100644 --- a/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/TestHelpers.java +++ b/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/TestHelpers.java @@ -315,6 +315,7 @@ public static T convertMapToValue(Map value, Class clazz) } } + @SuppressWarnings("removal") public static SearchIndexClient setupSharedIndex(String indexName) { InputStream stream = Objects.requireNonNull(AutocompleteSyncTests.class .getClassLoader()