Chrwhit/merge master three

eng/jacoco-test-coverage/pom.xml

@@ -64,22 +64,22 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-communication-common</artifactId>
-      <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
+      <version>1.0.2</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-communication-identity</artifactId>
-      <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-identity;current} -->
+      <version>1.1.1</version> <!-- {x-version-update;com.azure:azure-communication-identity;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-communication-sms</artifactId>
-      <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-sms;current} -->
+      <version>1.0.3</version> <!-- {x-version-update;com.azure:azure-communication-sms;current} -->
     </dependency>
       <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-communication-phonenumbers</artifactId>
-      <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-phonenumbers;current} -->
+      <version>1.0.3</version> <!-- {x-version-update;com.azure:azure-communication-phonenumbers;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

eng/versioning/version_client.txt

@@ -53,10 +53,10 @@ com.azure:azure-analytics-synapse-managedprivateendpoints;1.0.0-beta.3;1.0.0-bet
 com.azure:azure-analytics-synapse-monitoring;1.0.0-beta.3;1.0.0-beta.4
 com.azure:azure-communication-callingserver;1.0.0;1.0.0-beta.1
 com.azure:azure-communication-chat;1.0.0;1.1.0-beta.1
-com.azure:azure-communication-common;1.0.1;1.1.0-beta.1
-com.azure:azure-communication-sms;1.0.1;1.1.0-beta.1
-com.azure:azure-communication-identity;1.1.0;1.2.0-beta.1
-com.azure:azure-communication-phonenumbers;1.0.1;1.1.0-beta.1
+com.azure:azure-communication-common;1.0.2;1.0.2
+com.azure:azure-communication-sms;1.0.1;1.0.3
+com.azure:azure-communication-identity;1.1.0;1.1.1
+com.azure:azure-communication-phonenumbers;1.0.1;1.0.3
 com.azure:azure-containers-containerregistry;1.0.0-beta.2;1.0.0-beta.3
 com.azure:azure-core;1.16.0;1.17.0
 com.azure:azure-core-amqp;2.0.6;2.1.0-beta.1
@@ -127,7 +127,7 @@ com.azure:azure-storage-internal-avro;12.0.4;12.0.5-beta.1
 com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-storage-queue;12.9.1;12.10.0-beta.2
 com.azure:azure-template-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-media-videoanalyzer-edge;1.0.0-beta.2;1.0.0-beta.3
+com.azure:azure-media-videoanalyzer-edge;1.0.0-beta.3;1.0.0-beta.4
 com.azure:azure-verticals-agrifood-farming;1.0.0-beta.2;1.0.0-beta.3
 com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1
 com.microsoft.azure:spring-cloud-azure-appconfiguration-config-web;1.3.0;1.4.0-beta.1

sdk/communication/azure-communication-callingserver/pom.xml

@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-communication-common</artifactId>
-      <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
+      <version>1.0.2</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

sdk/communication/azure-communication-chat/pom.xml

@@ -50,12 +50,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-communication-common</artifactId>
-      <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
+      <version>1.0.2</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-communication-identity</artifactId>
-      <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-identity;current} -->
+      <version>1.1.1</version> <!-- {x-version-update;com.azure:azure-communication-identity;current} -->
       <scope>test</scope>
     </dependency>
     <dependency>

sdk/communication/azure-communication-common/CHANGELOG.md

@@ -1,6 +1,7 @@
 # Release History
 
-## 1.1.0-beta.1 (Unreleased)
+## 1.0.2 (2021-06-08)
+- Updated 'azure-communication-common' version
 
 ## 1.0.1 (2021-05-27)
 - Dependency versions updated.

sdk/communication/azure-communication-common/pom.xml

@@ -13,7 +13,7 @@
   <groupId>com.azure</groupId>
   <artifactId>azure-communication-common</artifactId>
   <packaging>jar</packaging>
-  <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
+  <version>1.0.2</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
 
   <name>Microsoft Azure common library for communication service client</name>
   <description>

sdk/communication/azure-communication-identity/CHANGELOG.md

@@ -1,6 +1,7 @@
 # Release History
 
-## 1.2.0-beta.1 (Unreleased)
+## 1.1.1 (2021-06-08)
+- Updated 'azure-communication-identity' version
 
 ## 1.1.0 (2021-05-27)
 ### Added

sdk/communication/azure-communication-identity/pom.xml

@@ -16,7 +16,7 @@
   <groupId>com.azure</groupId>
   <artifactId>azure-communication-identity</artifactId>
   <packaging>jar</packaging>
-  <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-identity;current} -->
+  <version>1.1.1</version> <!-- {x-version-update;com.azure:azure-communication-identity;current} -->
 
   <name>Microsoft Azure identity client library for communication</name>
   <description>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-communication-common</artifactId>
-      <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
+      <version>1.0.2</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

sdk/communication/azure-communication-phonenumbers/CHANGELOG.md

@@ -1,6 +1,7 @@
 # Release History
 
-## 1.1.0-beta.1 (Unreleased)
+## 1.0.3 (2021-06-08)
+- Updated 'azure-communication-phonenumbers' version
 
 ## 1.0.2 (2021-05-27)
 - Dependency versions updated.

sdk/communication/azure-communication-phonenumbers/pom.xml

@@ -16,7 +16,7 @@
   <groupId>com.azure</groupId>
   <artifactId>azure-communication-phonenumbers</artifactId>
   <packaging>jar</packaging>
-  <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-phonenumbers;current} -->
+  <version>1.0.3</version> <!-- {x-version-update;com.azure:azure-communication-phonenumbers;current} -->
 
   <name>Microsoft Azure client phone numbers library for communication</name>
   <description>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-communication-common</artifactId>
-      <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
+      <version>1.0.2</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

sdk/communication/azure-communication-sms/CHANGELOG.md

@@ -1,6 +1,7 @@
 # Release History
 
-## 1.1.0-beta.1 (Unreleased)
+## 1.0.3 (2021-06-08)
+- Updated 'azure-communication-sms' version
 
 ## 1.0.2 (2021-05-27)
 - Dependency versions updated.

sdk/communication/azure-communication-sms/pom.xml

@@ -15,7 +15,7 @@
   <groupId>com.azure</groupId>
   <artifactId>azure-communication-sms</artifactId>
   <packaging>jar</packaging>
-  <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-sms;current} -->
+  <version>1.0.3</version> <!-- {x-version-update;com.azure:azure-communication-sms;current} -->
 
   <name>Microsoft Azure library for sending SMS messages</name>
   <description>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-communication-common</artifactId>
-      <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
+      <version>1.0.2</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ManagementChannel.java

@@ -116,14 +116,13 @@ private Mono<Void> isAuthorized() {
             .next()
             .switchIfEmpty(Mono.error(new AmqpException(false, "Did not get response from tokenManager: " + entityPath, getErrorContext())))
             .handle((response, sink) -> {
-                if (response != AmqpResponseCode.ACCEPTED && response != AmqpResponseCode.OK) {
+                if (RequestResponseUtils.isSuccessful(response)) {
+                    sink.complete();
+                } else {
                     final String message = String.format("User does not have authorization to perform operation "
                         + "on entity [%s]. Response: [%s]", entityPath, response);
                     sink.error(ExceptionUtil.amqpResponseCodeToException(response.getValue(), message,
                         getErrorContext()));
-
-                } else {
-                    sink.complete();
                 }
             });
     }

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/RequestResponseUtils.java

@@ -28,6 +28,10 @@ public class RequestResponseUtils {
 
     public static boolean isSuccessful(Message message) {
         final AmqpResponseCode statusCode = getStatusCode(message);
+        return isSuccessful(statusCode);
+    }
+
+    public static boolean isSuccessful(AmqpResponseCode statusCode) {
         return statusCode == AmqpResponseCode.OK || statusCode == AmqpResponseCode.ACCEPTED;
     }
 

sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/SystemEventNames.java

@@ -24,6 +24,21 @@
 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.AgriFoodFarmingApplicationDataChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingBoundaryChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingCropChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingCropVarietyChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingFarmChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingFarmOperationDataIngestionJobStatusChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingFarmerChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingFieldChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingHarvestDataChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingPlantingDataChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingSatelliteDataIngestionJobStatusChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingSeasonChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingSeasonalFieldChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingTillageDataChangedEventData;
+import com.azure.messaging.eventgrid.systemevents.AgriFoodFarmingWeatherDataIngestionJobStatusChangedEventData;
 import com.azure.messaging.eventgrid.systemevents.AppConfigurationKeyValueDeletedEventData;
 import com.azure.messaging.eventgrid.systemevents.AppConfigurationKeyValueModifiedEventData;
 import com.azure.messaging.eventgrid.systemevents.ContainerRegistryChartDeletedEventData;
@@ -103,6 +118,7 @@
 import com.azure.messaging.eventgrid.systemevents.StorageAsyncOperationInitiatedEventData;
 import com.azure.messaging.eventgrid.systemevents.StorageBlobCreatedEventData;
 import com.azure.messaging.eventgrid.systemevents.StorageBlobDeletedEventData;
+import com.azure.messaging.eventgrid.systemevents.StorageBlobInventoryPolicyCompletedEventData;
 import com.azure.messaging.eventgrid.systemevents.StorageBlobRenamedEventData;
 import com.azure.messaging.eventgrid.systemevents.StorageBlobTierChangedEventData;
 import com.azure.messaging.eventgrid.systemevents.StorageDirectoryCreatedEventData;
@@ -406,6 +422,11 @@ public final class SystemEventNames {
      */
     public static final String STORAGE_BLOB_DELETED = "Microsoft.Storage.BlobDeleted";
 
+    /** Schema of the Data property of an EventGridEvent for an Microsoft.Storage.BlobInventoryPolicyCompleted event. */
+    public static final String STORAGE_BLOB_INVENTORY_POLICY_COMPLETED =
+        "Microsoft.Storage.BlobInventoryPolicyCompleted";
+
+
     /**
      * indicates an event of blob renaming.
      */
@@ -532,6 +553,67 @@ public final class SystemEventNames {
     public static final String POLICY_INSIGHTS_POLICY_STATE_CHANGED = "Microsoft.PolicyInsights.PolicyStateChanged";
     public static final String POLICY_INSIGHTS_POLICY_STATE_DELETED = "Microsoft.PolicyInsights.PolicyStateDeleted";
 
+    // Agriculture Food Farming
+    /** Schema of the Data property of an EventGridEvent for a Microsoft.AgFoodPlatform.ApplicationDataChanged event. */
+    public static final String AGRI_FOOD_FARMING_APPLICATION_DATA_CHANGED =
+        "Microsoft.AgFoodPlatform.ApplicationDataChanged";
+
+    /** Schema of the Data property of an EventGridEvent for a Microsoft.AgFoodPlatform.BoundaryChanged event. */
+    public static final String AGRI_FOOD_FARMING_BOUNDARY_CHANGED = "Microsoft.AgFoodPlatform.BoundaryChanged";
+
+    /** Schema of the Data property of an EventGridEvent for a Microsoft.AgFoodPlatform.CropChanged event. */
+    public static final String AGRI_FOOD_FARMING_CROP_CHANGED = "Microsoft.AgFoodPlatform.CropChanged";
+
+    /** Schema of the Data property of an EventGridEvent for a Microsoft.AgFoodPlatform.CropVarietyChanged event. */
+    public static final String AGRI_FOOD_FARMING_CROP_VARIETY_CHANGED = "Microsoft.AgFoodPlatform.CropVarietyChanged";
+
+    /** Schema of the Data property of an EventGridEvent for a Microsoft.AgFoodPlatform.FarmChanged event. */
+    public static final String AGRI_FOOD_FARMING_FARM_CHANGED = "Microsoft.AgFoodPlatform.FarmChanged";
+
+    /**
+     * Schema of the Data property of an EventGridEvent for a
+     * Microsoft.AgFoodPlatform.FarmOperationDataIngestionJobStatusChanged event.
+     */
+    public static final String AGRI_FOOD_FARMING_FARM_OPERATION_DATA_INGESTION_JOB_STATUS_CHANGED =
+        "Microsoft.AgFoodPlatform.FarmOperationDataIngestionJobStatusChanged";
+
+    /** Schema of the Data property of an EventGridEvent for a Microsoft.AgFoodPlatform.FarmerChanged event. */
+    public static final String AGRI_FOOD_FARMING_FARMER_CHANGED = "Microsoft.AgFoodPlatform.FarmerChanged";
+
+    /** Schema of the Data property of an EventGridEvent for a Microsoft.AgFoodPlatform.FieldChanged event. */
+    public static final String AGRI_FOOD_FARMING_FIELD_CHANGED = "Microsoft.AgFoodPlatform.FieldChanged";
+
+    /** Schema of the Data property of an EventGridEvent for a Microsoft.AgFoodPlatform.HarvestDataChanged event. */
+    public static final String AGRI_FOOD_FARMING_HARVEST_DATA_CHANGED = "Microsoft.AgFoodPlatform.HarvestDataChanged";
+
+    /** Schema of the Data property of an EventGridEvent for a Microsoft.AgFoodPlatform.PlantingDataChanged event. */
+    public static final String AGRI_FOOD_FARMING_PLANTING_DATA_CHANGED = "Microsoft.AgFoodPlatform.PlantingDataChanged";
+
+    /**
+     * Schema of the Data property of an EventGridEvent for a
+     * Microsoft.AgFoodPlatform.SatelliteDataIngestionJobStatusChanged event.
+     */
+    public static final String AGRI_FOOD_FARMING_SATELLITE_DATA_INGESTION_JOB_STATUS_CHANGED =
+        "Microsoft.AgFoodPlatform.SatelliteDataIngestionJobStatusChanged";
+
+    /** Schema of the Data property of an EventGridEvent for a Microsoft.AgFoodPlatform.SeasonChanged event. */
+    public static final String AGRI_FOOD_FARMING_SEASON_CHANGED = "Microsoft.AgFoodPlatform.SeasonChanged";
+
+    /** Schema of the Data property of an EventGridEvent for a Microsoft.AgFoodPlatform.SeasonalFieldChanged event. */
+    public static final String AGRI_FOOD_FARMING_SEASONAL_FIELD_CHANGED =
+        "Microsoft.AgFoodPlatform.SeasonalFieldChanged";
+
+    /** Schema of the Data property of an EventGridEvent for a Microsoft.AgFoodPlatform.TillageDataChanged event. */
+    public static final String AGRI_FOOD_FARMING_TILLAGE_DATA_CHANGED = "Microsoft.AgFoodPlatform.TillageDataChanged";
+
+    /**
+     * Schema of the Data property of an EventGridEvent for a
+     * Microsoft.AgFoodPlatform.WeatherDataIngestionJobStatusChanged event.
+     */
+    public static final String AGRI_FOOD_FARMING_WEATHER_DATA_INGESTION_JOB_STATUS_CHANGED =
+        "Microsoft.AgFoodPlatform.WeatherDataIngestionJobStatusChanged";
+
+
     private static final Map<String, Class<?>> SYSTEM_EVENT_MAPPINGS = new HashMap<String, Class<?>>() {
         {
             // AppConfiguration events.
@@ -608,6 +690,7 @@ public final class SystemEventNames {
             // Storage events.
             put(STORAGE_BLOB_CREATED, StorageBlobCreatedEventData.class);
             put(STORAGE_BLOB_DELETED, StorageBlobDeletedEventData.class);
+            put(STORAGE_BLOB_INVENTORY_POLICY_COMPLETED, StorageBlobInventoryPolicyCompletedEventData.class);
             put(STORAGE_BLOB_RENAMED, StorageBlobRenamedEventData.class);
             put(STORAGE_BLOB_TIER_CHANGED, StorageBlobTierChangedEventData.class);
             put(STORAGE_DIRECTORY_CREATED, StorageDirectoryCreatedEventData.class);
@@ -689,6 +772,31 @@ public final class SystemEventNames {
             put(POLICY_INSIGHTS_POLICY_STATE_CREATED, PolicyInsightsPolicyStateCreatedEventData.class);
             put(POLICY_INSIGHTS_POLICY_STATE_CHANGED, PolicyInsightsPolicyStateChangedEventData.class);
             put(POLICY_INSIGHTS_POLICY_STATE_DELETED, PolicyInsightsPolicyStateDeletedEventData.class);
+
+            // Agriculture Food Farming
+            put(
+                AGRI_FOOD_FARMING_APPLICATION_DATA_CHANGED,
+                AgriFoodFarmingApplicationDataChangedEventData.class);
+            put(AGRI_FOOD_FARMING_BOUNDARY_CHANGED, AgriFoodFarmingBoundaryChangedEventData.class);
+            put(AGRI_FOOD_FARMING_CROP_CHANGED, AgriFoodFarmingCropChangedEventData.class);
+            put(AGRI_FOOD_FARMING_CROP_VARIETY_CHANGED, AgriFoodFarmingCropVarietyChangedEventData.class);
+            put(AGRI_FOOD_FARMING_FARM_CHANGED, AgriFoodFarmingFarmChangedEventData.class);
+            put(
+                AGRI_FOOD_FARMING_FARM_OPERATION_DATA_INGESTION_JOB_STATUS_CHANGED,
+                AgriFoodFarmingFarmOperationDataIngestionJobStatusChangedEventData.class);
+            put(AGRI_FOOD_FARMING_FARMER_CHANGED, AgriFoodFarmingFarmerChangedEventData.class);
+            put(AGRI_FOOD_FARMING_FIELD_CHANGED, AgriFoodFarmingFieldChangedEventData.class);
+            put(AGRI_FOOD_FARMING_HARVEST_DATA_CHANGED, AgriFoodFarmingHarvestDataChangedEventData.class);
+            put(AGRI_FOOD_FARMING_PLANTING_DATA_CHANGED, AgriFoodFarmingPlantingDataChangedEventData.class);
+            put(
+                AGRI_FOOD_FARMING_SATELLITE_DATA_INGESTION_JOB_STATUS_CHANGED,
+                AgriFoodFarmingSatelliteDataIngestionJobStatusChangedEventData.class);
+            put(AGRI_FOOD_FARMING_SEASON_CHANGED, AgriFoodFarmingSeasonChangedEventData.class);
+            put(AGRI_FOOD_FARMING_SEASONAL_FIELD_CHANGED, AgriFoodFarmingSeasonalFieldChangedEventData.class);
+            put(AGRI_FOOD_FARMING_TILLAGE_DATA_CHANGED, AgriFoodFarmingTillageDataChangedEventData.class);
+            put(
+                AGRI_FOOD_FARMING_WEATHER_DATA_INGESTION_JOB_STATUS_CHANGED,
+                AgriFoodFarmingWeatherDataIngestionJobStatusChangedEventData.class);
         }
     };