Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream' into TA-5.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mssfang committed Aug 11, 2022
2 parents 364e863 + 3ec2094 commit c8c5bf7
Show file tree
Hide file tree
Showing 2,418 changed files with 122,111 additions and 20,980 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
<suppress checks="com.azure.tools.checkstyle.checks.ServiceClientBuilderCheck" files="com.azure.core.test.*"/>
<suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck" files="com.azure.core.test.*"/>

<!-- The variables are assigned by json creator annotation injection framework, cannot be made final. -->
<suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.ai.formrecognizer.training.models.CopyAuthorization"/>
<suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.ai.formrecognizer.models.FieldValue"/>
<!-- Suppress the v3 package name in Form Recognizer samples for V2 endpoints -->
<suppress checks="PackageName" files="com.azure.ai.formrecognizer.v3" />

<!-- Don't apply custom Checkstyle rules to files under checkstyle package. -->
<suppress checks="com\.azure\.tools\.checkstyle\.checks\..+" files=".*[/\\]tools[/\\]checkstyle[/\\].*"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1252,13 +1252,7 @@

<!-- Bug: https://github.com/Azure/azure-sdk-for-java/issues/9087 -->
<Match>
<Class name="com.azure.cosmos.implementation.changefeed.incremental.AutoCheckpointer"/>
<Field name="processedDocCount"/>
<Bug pattern="VO_VOLATILE_INCREMENT"/>
</Match>

<Match>
<Class name="com.azure.cosmos.implementation.changefeed.fullfidelity.AutoCheckpointer"/>
<Class name="com.azure.cosmos.implementation.changefeed.common.AutoCheckpointer"/>
<Field name="processedDocCount"/>
<Bug pattern="VO_VOLATILE_INCREMENT"/>
</Match>
Expand Down Expand Up @@ -1325,6 +1319,13 @@
<Bug pattern="SE_BAD_FIELD"/>
</Match>

<!-- FormRecognizerException fields re serializable -->
<Match>
<Class name="com.azure.ai.formrecognizer.models.FormRecognizerException"/>
<Field name="errorInformationList"/>
<Bug pattern="SE_BAD_FIELD"/>
</Match>

<!-- TextAnalyticsException fields re serializable -->
<Match>
<Class name="com.azure.ai.textanalytics.models.TextAnalyticsException"/>
Expand Down
8 changes: 4 additions & 4 deletions eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-communication-identity</artifactId>
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-identity;current} -->
<version>1.4.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-identity;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -88,7 +88,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-communication-sms</artifactId>
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-sms;current} -->
<version>1.1.5</version> <!-- {x-version-update;com.azure:azure-communication-sms;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -198,12 +198,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-data-schemaregistry</artifactId>
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-data-schemaregistry;current} -->
<version>1.2.3</version> <!-- {x-version-update;com.azure:azure-data-schemaregistry;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-data-schemaregistry-apacheavro</artifactId>
<version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-data-schemaregistry-apacheavro;current} -->
<version>1.0.3</version> <!-- {x-version-update;com.azure:azure-data-schemaregistry-apacheavro;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
12 changes: 6 additions & 6 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ com.azure:azure-communication-chat;1.2.4;1.3.0-beta.1
com.azure:azure-communication-callingserver;1.0.0-beta.4;1.0.0-beta.5
com.azure:azure-communication-common;1.2.0;1.3.0-beta.1
com.azure:azure-communication-common-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-communication-sms;1.1.4;1.2.0-beta.1
com.azure:azure-communication-identity;1.2.0;1.3.0-beta.1
com.azure:azure-communication-sms;1.1.4;1.1.5
com.azure:azure-communication-identity;1.3.0;1.4.0-beta.1
com.azure:azure-communication-phonenumbers;1.0.13;1.1.0-beta.9
com.azure:azure-communication-networktraversal;1.1.0-beta.2;1.1.0-beta.3
com.azure:azure-communication-rooms;1.0.0-beta.1;1.0.0-beta.1
Expand Down Expand Up @@ -94,8 +94,8 @@ com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12;4.12.2;4.13.0-beta.1
com.azure:azure-cosmos-encryption;1.4.1;1.5.0-beta.1
com.azure:azure-data-appconfiguration;1.3.5;1.4.0-beta.1
com.azure:azure-data-appconfiguration-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-data-schemaregistry;1.2.2;1.3.0-beta.1
com.azure:azure-data-schemaregistry-apacheavro;1.0.2;1.1.0-beta.1
com.azure:azure-data-schemaregistry;1.2.2;1.2.3
com.azure:azure-data-schemaregistry-apacheavro;1.0.2;1.0.3
com.azure:azure-data-tables;12.3.2;12.4.0-beta.1
com.azure:azure-data-tables-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-digitaltwins-core;1.3.0;1.4.0-beta.1
Expand All @@ -117,7 +117,7 @@ com.azure:azure-messaging-servicebus;7.10.0;7.11.0-beta.1
com.azure:azure-messaging-servicebus-track1-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-messaging-servicebus-track2-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-messaging-webpubsub;1.1.4;1.2.0-beta.1
com.azure:azure-mixedreality-authentication;1.2.4;1.3.0-beta.1
com.azure:azure-mixedreality-authentication;1.2.5;1.3.0-beta.1
com.azure:azure-mixedreality-remoterendering;1.1.9;1.2.0-beta.1
com.azure:azure-monitor-opentelemetry-exporter;1.0.0-beta.5;1.0.0-beta.6
com.azure:azure-monitor-ingestion;1.0.0-beta.1;1.0.0-beta.2
Expand Down Expand Up @@ -340,7 +340,7 @@ com.azure.resourcemanager:azure-resourcemanager-storagepool;1.0.0-beta.1;1.0.0-b
com.azure.resourcemanager:azure-resourcemanager-dataprotection;1.0.0-beta.1;1.0.0-beta.2
com.azure.resourcemanager:azure-resourcemanager-desktopvirtualization;1.0.0-beta.2;1.0.0-beta.3
com.azure.resourcemanager:azure-resourcemanager-loadtestservice;1.0.0-beta.1;1.0.0-beta.2
com.azure.resourcemanager:azure-resourcemanager-automanage;1.0.0-beta.1;1.0.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-automanage;1.0.0-beta.1;1.0.0-beta.2
com.azure.resourcemanager:azure-resourcemanager-edgeorder;1.0.0-beta.1;1.0.0-beta.2
com.azure.resourcemanager:azure-resourcemanager-securityinsights;1.0.0-beta.3;1.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-oep;1.0.0-beta.1;1.0.0-beta.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

package com.azure.aot.graalvm.samples.formrecognizer;

import com.azure.ai.formrecognizer.DocumentAnalysisClient;
import com.azure.ai.formrecognizer.DocumentAnalysisClientBuilder;
import com.azure.ai.formrecognizer.models.AnalyzeResult;
import com.azure.ai.formrecognizer.models.AnalyzedDocument;
import com.azure.ai.formrecognizer.models.DocumentField;
import com.azure.ai.formrecognizer.models.DocumentFieldType;
import com.azure.ai.formrecognizer.models.DocumentOperationResult;
import com.azure.ai.formrecognizer.documentanalysis.DocumentAnalysisClient;
import com.azure.ai.formrecognizer.documentanalysis.DocumentAnalysisClientBuilder;
import com.azure.ai.formrecognizer.documentanalysis.models.AnalyzeResult;
import com.azure.ai.formrecognizer.documentanalysis.models.AnalyzedDocument;
import com.azure.ai.formrecognizer.documentanalysis.models.DocumentField;
import com.azure.ai.formrecognizer.documentanalysis.models.DocumentFieldType;
import com.azure.ai.formrecognizer.documentanalysis.models.DocumentOperationResult;
import com.azure.core.credential.AzureKeyCredential;
import com.azure.core.util.BinaryData;
import com.azure.core.util.polling.SyncPoller;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public String getRootPackage() {
@Override
public Set<String[]> getDynamicProxies() {
return setsOf(
interfaces("com.azure.ai.formrecognizer.implementation.FormRecognizerClientImpl$FormRecognizerClientService")
interfaces("com.azure.ai.formrecognizer.documentanalysis.implementation.FormRecognizerClientImpl$FormRecognizerClientService")
);
}
}
10 changes: 10 additions & 0 deletions sdk/automanage/azure-resourcemanager-automanage/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Release History

## 1.0.0-beta.2 (Unreleased)

### Features Added

### Breaking Changes

### Bugs Fixed

### Other Changes

## 1.0.0-beta.1 (2022-08-09)

- Azure Resource Manager Automanage client library for Java. This package contains Microsoft Azure SDK for Automanage Management SDK. Automanage Client. Package tag package-2022-05. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
88 changes: 88 additions & 0 deletions sdk/automanage/azure-resourcemanager-automanage/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,94 @@ See [API design][design] for general introduction on design and key concepts on

[Code snippets and samples](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/automanage/azure-resourcemanager-automanage/SAMPLE.md)

### Create Custom Configuration Profile

```java
Map<String, String> tags = Map.of("environment", "prod");

String configuration = "{" +
"\"Antimalware/Enable\":false," +
"\"AzureSecurityCenter/Enable\":true," +
"\"Backup/Enable\":false," +
"\"BootDiagnostics/Enable\":true," +
"\"ChangeTrackingAndInventory/Enable\":true," +
"\"GuestConfiguration/Enable\":true," +
"\"LogAnalytics/Enable\":true," +
"\"UpdateManagement/Enable\":true," +
"\"VMInsights/Enable\":true" +
"}";

client
.configurationProfiles()
.define("configurationProfileName")
.withRegion("East US")
.withExistingResourceGroup("resourceGroup")
.withTags(tags)
.withProperties(
new ConfigurationProfileProperties()
.withConfiguration(
SerializerFactory
.createDefaultManagementSerializerAdapter()
.deserialize(
configuration,
Object.class,
SerializerEncoding.JSON)))
.create();
```

### Delete Custom Configuration Profile by Resource ID

```java
client.configurationProfiles().deleteById("<resource ID>");
```

### Delete Custom Configuration Profile by Resource Group

```java
client.configurationProfiles().deleteByResourceGroup("resourceGroup", "configurationProfileName");
```

### Get Custom Configuration Profile by Resource ID

```java
ConfigurationProfile profile = client.configurationProfiles().getById("<resource ID>");
System.out.println(profile.innerModel().properties().configuration());
```

### Create Best Practices Production Profile Assignment

```java
String configProfile = "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction";
client
.configurationProfileAssignments()
.define("default") // name must be default
.withExistingVirtualMachine("resourceGroup", "vmName")
.withProperties(
new ConfigurationProfileAssignmentProperties()
.withConfigurationProfile("configurationProfileName"))
.create();
```

### Create Custom Profile Assignment

```java
String configProfile = "/subscriptions/<subscription ID>/resourceGroups/resourceGroup/providers/Microsoft.Automanage/configurationProfiles/configurationProfileName";

client
.configurationProfileAssignments()
.define("default") // name must be default
.withExistingVirtualMachine("resourceGroup", "vmName")
.withProperties(
new ConfigurationProfileAssignmentProperties()
.withConfigurationProfile("configurationProfileName"))
.create();
```

### Get Profile Assignment

```java
ConfigurationProfileAssignment assignment = client.configurationProfileAssignments().get("resourceGroup", "default", "vmName"); // name must be default
```

## Troubleshooting

Expand Down
2 changes: 1 addition & 1 deletion sdk/automanage/azure-resourcemanager-automanage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-automanage</artifactId>
<version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-automanage;current} -->
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-automanage;current} -->
<packaging>jar</packaging>

<name>Microsoft Azure SDK for Automanage Management</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-communication-identity</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-communication-identity;dependency} -->
<version>1.3.0</version> <!-- {x-version-update;com.azure:azure-communication-identity;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/communication/azure-communication-chat/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-communication-identity</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-communication-identity;dependency} -->
<version>1.3.0</version> <!-- {x-version-update;com.azure:azure-communication-identity;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
11 changes: 10 additions & 1 deletion sdk/communication/azure-communication-identity/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release History

## 1.3.0-beta.1 (Unreleased)
## 1.4.0-beta.1 (Unreleased)

### Features Added

Expand All @@ -10,6 +10,15 @@

### Other Changes

## 1.3.0 (2022-08-10)

### Features Added
- Added `String getRawId()` and `static CommunicationIdentifier fromRawId(String rawId)` to `CommunicationIdentifier` to translate between a `CommunicationIdentifier` and its underlying canonical rawId representation. Developers can now use the rawId as an encoded format for identifiers to store in their databases or as stable keys in general.

#### Dependency Updates
- Upgraded `azure-core` from `1.30.0` to version `1.31.0`.
- Upgraded `azure-communication-common` from `1.1.5` to version `1.2.0`.

## 1.2.0 (2022-07-21)

### Features Added
Expand Down
2 changes: 1 addition & 1 deletion sdk/communication/azure-communication-identity/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ add the direct dependency to your project as follows.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-communication-identity</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion sdk/communication/azure-communication-identity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<groupId>com.azure</groupId>
<artifactId>azure-communication-identity</artifactId>
<packaging>jar</packaging>
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-identity;current} -->
<version>1.4.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-identity;current} -->

<name>Microsoft Azure identity client library for communication</name>
<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-communication-identity</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-communication-identity;dependency} -->
<version>1.3.0</version> <!-- {x-version-update;com.azure:azure-communication-identity;dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
11 changes: 5 additions & 6 deletions sdk/communication/azure-communication-phonenumbers/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# Release History

## 1.1.0-beta.9 (Unreleased)
## 1.1.0-beta.9 (2022-08-11)

### Features Added

### Breaking Changes
### Other Changes

### Bugs Fixed
#### Dependency Updates

### Other Changes
- Upgraded `azure-core` from `1.30.0` to version `1.31.0`
- Upgraded `azure-communication-common` from `1.1.5` to version `1.2.0`

## 1.1.0-beta.8 (2022-07-18)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ add the direct dependency to your project as follows.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-communication-phonenumbers</artifactId>
<version>1.1.0-beta.8</version>
<version>1.1.0-beta.9</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion sdk/communication/azure-communication-rooms/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Release History

## 1.0.0-beta.1 (2022-02-01)
## 1.0.0-beta.1 (2022-08-10)
This is the initial release of Azure Communication Services for rooms. For more information, please see the [README][read_me] and [documentation][documentation].
3 changes: 1 addition & 2 deletions sdk/communication/azure-communication-rooms/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Azure Communications Rooms Service client library for Java
# Azure Communications Rooms Service client library for Java

Azure Communication Rooms is used to operate on rooms.

Expand Down Expand Up @@ -40,7 +40,6 @@ are needed to create a DefaultAzureCredential object.
Alternatively, you can provide the entire connection string using the connectionString() function instead of providing the endpoint and access key.

```java readme-sample-createRoomsClientWithConnectionString

public RoomsClient createRoomsClientWithConnectionString() {
// You can find your connection string from your resource in the Azure Portal
String connectionString = "https://<resource-name>.communication.azure.com/;<access-key>";
Expand Down
2 changes: 1 addition & 1 deletion sdk/communication/azure-communication-rooms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-communication-identity</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-communication-identity;dependency} -->
<version>1.3.0</version> <!-- {x-version-update;com.azure:azure-communication-identity;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading

0 comments on commit c8c5bf7

Please sign in to comment.