GA Release prep for azure-core-amqp :Increased major version from 1.6.0-> 2.0.0 (In support of ServiceBus GA)

common/perf-test-core/pom.xml

@@ -78,7 +78,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.6.3</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
+      <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
     </dependency>
   </dependencies>
 </project>

eng/jacoco-test-coverage/pom.xml

@@ -79,12 +79,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
+      <version>1.12.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-amqp</artifactId>
-      <version>1.7.0-beta.3</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
+      <version>2.0.0</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -104,12 +104,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
+      <version>1.8.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-okhttp</artifactId>
-      <version>1.4.0</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;current} -->
+      <version>1.5.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -441,12 +441,12 @@
     <dependency>
       <groupId>com.azure.spring</groupId>
       <artifactId>azure-spring-integration-eventhubs</artifactId>
-      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-eventhubs;current} -->
+      <version>2.0.0-beta.2</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-eventhubs;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>
       <artifactId>azure-spring-integration-servicebus</artifactId>
-      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-servicebus;current} -->
+      <version>2.0.0-beta.2</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-servicebus;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>

eng/mgmt/automation/generate.py

@@ -64,7 +64,7 @@ def generate(
     update_version(sdk_root, service)
 
     if compile:
-        if os.system('mvn clean verify package -f {0}/pom.xml -pl {1}:{2} -am'.
+        if os.system('mvn clean verify package -q -f {0}/pom.xml -pl {1}:{2} -am'.
                      format(sdk_root, GROUP_ID, module)) != 0:
             logging.error('[GENERATE] Maven build fail')
             return False
@@ -325,6 +325,7 @@ def parse_args() -> argparse.Namespace:
         action = 'store_true',
         help = 'Do compile after generation or not',
     )
+    parser.add_argument('--suffix', help = 'Suffix for namespace and artifact')
     parser.add_argument(
         '--auto-commit-external-change',
         action = 'store_true',
@@ -340,6 +341,20 @@ def parse_args() -> argparse.Namespace:
     return parser.parse_args()
 
 
+def update_parameters(suffix):
+    # update changeable parameters in parameters.py
+    global SUFFIX, NAMESPACE_SUFFIX, ARTIFACT_SUFFIX, NAMESPACE_FORMAT, ARTIFACT_FORMAT, OUTPUT_FOLDER_FORMAT
+
+    SUFFIX = suffix
+
+    NAMESPACE_SUFFIX = '.{0}'.format(SUFFIX) if SUFFIX else ''
+    ARTIFACT_SUFFIX = '-{0}'.format(SUFFIX) if SUFFIX else ''
+    NAMESPACE_FORMAT = 'com.azure.resourcemanager.{{0}}{0}'.format(
+        NAMESPACE_SUFFIX)
+    ARTIFACT_FORMAT = 'azure-resourcemanager-{{0}}{0}'.format(ARTIFACT_SUFFIX)
+    OUTPUT_FOLDER_FORMAT = 'sdk/{{0}}/{0}'.format(ARTIFACT_FORMAT)
+
+
 def valid_service(service: str):
     return re.sub('[^a-z0-9_]', '', service.lower())
 
@@ -458,6 +473,7 @@ def sdk_automation(input_file: str, output_file: str):
 
 def main():
     args = vars(parse_args())
+    update_parameters(args.get('suffix'))
 
     if args.get('config'):
         return sdk_automation(args['config'][0], args['config'][1])

eng/mgmt/automation/generation.yml

@@ -34,7 +34,7 @@ steps:
 - bash: |
     export PATH=$JAVA_HOME_11_X64/bin:$PATH
     java -version
-    ./eng/mgmt/automation/generate.py --readme "$(README)" --tag "$(TAG)" --service "$(SERVICE)" --version "$(VERSION)" --auto-commit-external-change --user-name "azure-sdk" --user-email "azuresdk@microsoft.com"
+    ./eng/mgmt/automation/generate.py --readme "$(README)" --tag "$(TAG)" --service "$(SERVICE)" --version "$(VERSION)" --suffix "$(SUFFIX)" --auto-commit-external-change --user-name "azure-sdk" --user-email "azuresdk@microsoft.com"
   displayName: Generation
 
 - template: /eng/common/pipelines/templates/steps/create-pull-request.yml

eng/mgmt/automation/install_instruction.py

@@ -38,7 +38,7 @@ def main():
                     artifact_id,
                     artifact,
                 )  # 1.0.0-beta.0 will not be conflict with any existing one
-                output = {'full': command}
+                output = {'full': '```sh\n{0}\n```'.format(command)}
                 logging.debug('output: {0}'.format(json.dumps(output)))
                 json.dump(output, fout)
             sys.exit(0)

eng/mgmt/automation/parameters.py

@@ -1,24 +1,30 @@
 #!/usr/bin/env python3
 
+# changeable parameters
+# use update logic in generate.py#update_parameters
+# set to None first to guarantee it would be updated
+SUFFIX = None
+
+NAMESPACE_SUFFIX = None
+ARTIFACT_SUFFIX = None
+NAMESPACE_FORMAT = None
+ARTIFACT_FORMAT = None
+OUTPUT_FOLDER_FORMAT = None
+
+# Constant parameters
 SDK_ROOT = '../../../'  # related to file dir
-AUTOREST_CORE_VERSION = '3.0.6326'
-AUTOREST_JAVA = '@autorest/java@4.0.4'
+AUTOREST_CORE_VERSION = '3.0.6327'
+AUTOREST_JAVA = '@autorest/java@4.0.5'
 DEFAULT_VERSION = '1.0.0-beta.1'
-SUFFIX = 'generated'
 GROUP_ID = 'com.azure.resourcemanager'
 API_SPECS_FILE = 'api-specs.yaml'
 
-NAMESPACE_SUFFIX = '.{0}'.format(SUFFIX)
-ARTIFACT_SUFFIX = '-{0}'.format(SUFFIX)
-NAMESPACE_FORMAT = 'com.azure.resourcemanager.{{0}}{0}'.format(NAMESPACE_SUFFIX)
-ARTIFACT_FORMAT = 'azure-resourcemanager-{{0}}{0}'.format(ARTIFACT_SUFFIX)
-OUTPUT_FOLDER_FORMAT = 'sdk/{{0}}/{0}'.format(ARTIFACT_FORMAT)
 CI_FILE_FORMAT = 'sdk/{0}/ci.yml'
 POM_FILE_FORMAT = 'sdk/{0}/pom.xml'
 README_FORMAT = 'specification/{0}/resource-manager/readme.md'
 
 MODELERFOUR_ARGUMENTS = '--pipeline.modelerfour.additional-checks=false --pipeline.modelerfour.lenient-model-deduplication=true --pipeline.modelerfour.flatten-payloads=false'
-FLUENTLITE_ARGUMENTS = '--java {0} --azure-arm --payload-flattening-threshold=0 --verbose --sdk-integration --fluent=lite --java.fluent=lite --java.license-header=MICROSOFT_MIT_SMALL'.format(
+FLUENTLITE_ARGUMENTS = '--java {0} --azure-arm --verbose --sdk-integration --fluent=lite --java.fluent=lite --java.license-header=MICROSOFT_MIT_SMALL'.format(
     MODELERFOUR_ARGUMENTS)
 
 CI_HEADER = '''\

eng/versioning/external_dependencies.txt

@@ -110,6 +110,7 @@ org.springframework.kafka:spring-kafka;2.5.7.RELEASE
 org.springframework.security:spring-security-config;5.3.5.RELEASE
 org.springframework.security:spring-security-core;5.3.5.RELEASE
 org.springframework.security:spring-security-oauth2-client;5.3.5.RELEASE
+org.springframework.security:spring-security-oauth2-resource-server;5.3.5.RELEASE
 org.springframework.security:spring-security-oauth2-core;5.3.5.RELEASE
 org.springframework.security:spring-security-oauth2-jose;5.3.5.RELEASE
 org.springframework.security:spring-security-web;5.3.5.RELEASE

eng/versioning/version_client.txt

@@ -44,13 +44,13 @@ com.azure:azure-communication-chat;1.0.0-beta.3;1.0.0-beta.4
 com.azure:azure-communication-common;1.0.0-beta.3;1.0.0-beta.4
 com.azure:azure-communication-administration;1.0.0-beta.3;1.0.0-beta.4
 com.azure:azure-communication-sms;1.0.0-beta.3;1.0.0-beta.4
-com.azure:azure-core;1.10.0;1.11.0
-com.azure:azure-core-amqp;1.6.0;1.7.0-beta.3
+com.azure:azure-core;1.11.0;1.12.0-beta.1
+com.azure:azure-core-amqp;1.6.0;2.0.0
 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.8;1.0.0-beta.9
 com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-core-http-netty;1.6.3;1.7.0
-com.azure:azure-core-http-okhttp;1.3.3;1.4.0
+com.azure:azure-core-http-netty;1.7.0;1.8.0-beta.1
+com.azure:azure-core-http-okhttp;1.4.0;1.5.0-beta.1
 com.azure:azure-core-management;1.0.0;1.1.0-beta.1
 com.azure:azure-core-serializer-avro-apache;1.0.0-beta.5;1.0.0-beta.6
 com.azure:azure-core-serializer-avro-jackson;1.0.0-beta.1;1.0.0-beta.2
@@ -125,8 +125,8 @@ com.azure.spring:azure-spring-cloud-stream-binder-test;2.0.0-beta.1;2.0.0-beta.2
 com.azure.spring:azure-spring-cloud-telemetry;2.0.0-beta.1;2.0.0-beta.2
 com.azure.spring:azure-spring-data-gremlin;2.3.1-beta.1;2.3.1-beta.1
 com.azure.spring:azure-spring-integration-core;2.0.0-beta.1;2.0.0-beta.2
-com.azure.spring:azure-spring-integration-eventhubs;2.0.0-beta.1;2.0.0-beta.1
-com.azure.spring:azure-spring-integration-servicebus;2.0.0-beta.1;2.0.0-beta.1
+com.azure.spring:azure-spring-integration-eventhubs;2.0.0-beta.1;2.0.0-beta.2
+com.azure.spring:azure-spring-integration-servicebus;2.0.0-beta.1;2.0.0-beta.2
 com.azure.spring:azure-spring-integration-storage-queue;2.0.0-beta.1;2.0.0-beta.2
 com.azure.spring:azure-spring-integration-test;2.0.0-beta.1;2.0.0-beta.2
 com.azure.spring:azure-spring-cloud-appconfiguration-config-web;1.2.8-beta.1;1.2.8-beta.1
@@ -176,8 +176,7 @@ com.microsoft:microsoft-opentelemetry-exporter-azuremonitor;1.0.0-beta.1;1.0.0-b
 # Format;
 # unreleased_<groupId>:<artifactId>;dependency-version
 # note: The unreleased dependencies will not be manipulated with the automatic PR creation code.
-unreleased_com.azure:azure-core;1.11.0
-unreleased_com.azure:azure-core-amqp;1.7.0-beta.3
+unreleased_com.azure:azure-core-amqp;2.0.0
 unreleased_com.azure:azure-messaging-servicebus;7.0.0-beta.7
 
 # Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current
@@ -188,4 +187,3 @@ unreleased_com.azure:azure-messaging-servicebus;7.0.0-beta.7
 # beta_<groupId>:<artifactId>;dependency-version
 # note: Released beta versions will not be manipulated with the automatic PR creation code.
 beta_com.azure:azure-security-keyvault-keys;4.3.0-beta.1
-beta_com.azure:azure-core-amqp;1.7.0-beta.2

sdk/anomalydetector/azure-ai-anomalydetector/pom.xml

@@ -38,12 +38,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.10.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
+      <version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.6.3</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
+      <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
     </dependency>
 
     <!-- Test dependencies -->

sdk/appconfiguration/azure-data-appconfiguration/pom.xml

@@ -36,12 +36,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.10.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
+      <version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.6.3</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
+      <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
     </dependency>
 
     <!-- Test dependencies -->
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-okhttp</artifactId>
-      <version>1.3.3</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
+      <version>1.4.0</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml

@@ -57,7 +57,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.10.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
+      <version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.6.3</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
+      <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
     </dependency>
     <dependency>
       <groupId>org.hibernate.validator</groupId>

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

@@ -49,15 +49,15 @@
   <properties>
     <src.dir>src/main</src.dir>
     <test.dir>src/test</test.dir>
-    <jacoco.min.branchcoverage>0.10</jacoco.min.branchcoverage>
-    <jacoco.min.linecoverage>0.10</jacoco.min.linecoverage>
+    <jacoco.min.linecoverage>0.65</jacoco.min.linecoverage>
+    <jacoco.min.branchcoverage>0.45</jacoco.min.branchcoverage>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.10.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
+      <version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -109,7 +109,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-okhttp</artifactId>
-      <version>1.3.3</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
+      <version>1.4.0</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -122,8 +122,8 @@
         <version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
         <configuration>
           <excludes>
-            <exclude>com/azure/communication/administration/models/**/*</exclude>
-            <exclude>com/azure/communication/administration/implementation/**/*</exclude>
+            <exclude>com/azure/communication/**/models/**/*</exclude>
+            <exclude>com/azure/communication/**/implementation/**/*</exclude>
           </excludes>
         </configuration>
       </plugin>

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/CommunicationIdentityAsyncClient.java

@@ -20,6 +20,8 @@
 
 import java.time.OffsetDateTime;
 import java.util.List;
+import java.util.Objects;
+
 import reactor.core.publisher.Mono;
 
 import static com.azure.core.util.FluxUtil.monoError;
@@ -103,6 +105,7 @@ public Mono<Response<CommunicationUser>> createUser(Context context) {
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<Void> deleteUser(CommunicationUser communicationUser) {
         try {
+            Objects.requireNonNull(communicationUser);
             return withContext(context -> deleteUser(communicationUser, context)
                 .flatMap(
                     (Response<Void> res) -> {
@@ -122,6 +125,7 @@ public Mono<Void> deleteUser(CommunicationUser communicationUser) {
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<Response<Void>> deleteUserWithResponse(CommunicationUser communicationUser) {
         try {
+            Objects.requireNonNull(communicationUser);
             return withContext(context -> deleteUser(communicationUser, context));
         } catch (RuntimeException ex) {
             return monoError(logger, ex);
@@ -151,6 +155,7 @@ public Mono<Response<Void>> deleteUser(CommunicationUser communicationUser, Cont
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<Void> revokeTokens(CommunicationUser communicationUser, OffsetDateTime issuedBefore) {
         try {
+            Objects.requireNonNull(communicationUser);
             return withContext(context -> revokeTokens(communicationUser, issuedBefore, context)
                 .flatMap(
                     (Response<Void> res) -> {
@@ -172,6 +177,7 @@ public Mono<Void> revokeTokens(CommunicationUser communicationUser, OffsetDateTi
     public Mono<Response<Void>> revokeTokensWithResponse(
         CommunicationUser communicationUser, OffsetDateTime issuedBefore) {
         try {
+            Objects.requireNonNull(communicationUser);
             return withContext(context -> revokeTokens(communicationUser, issuedBefore, context));
         } catch (RuntimeException ex) {
             return monoError(logger, ex);
@@ -208,6 +214,8 @@ public Mono<Response<Void>> revokeTokens(
     public Mono<CommunicationUserToken> issueToken(
         CommunicationUser communicationUser, List<String> scopes) {
         try {
+            Objects.requireNonNull(communicationUser);
+            Objects.requireNonNull(scopes);
             return withContext(context -> issueToken(communicationUser, scopes, context)
                 .flatMap(
                     (Response<CommunicationUserToken> res) -> {
@@ -232,6 +240,8 @@ public Mono<CommunicationUserToken> issueToken(
     public Mono<Response<CommunicationUserToken>> issueTokenWithResponse(
         CommunicationUser communicationUser, List<String> scopes) {
         try {
+            Objects.requireNonNull(communicationUser);
+            Objects.requireNonNull(scopes);
             return withContext(context -> issueToken(communicationUser, scopes, context));
         } catch (RuntimeException ex) {
             return monoError(logger, ex);