test-repo-billy · openapi-sdkautomation · Aug 7, 2019 · Aug 7, 2019 · Aug 7, 2019 · Aug 8, 2019
diff --git a/.github/pull.yml b/.github/pull.yml
@@ -0,0 +1,7 @@
+# https://github.com/wei/pull#advanced-setup-with-config
+version: "1"
+rules:
+  - base: master
+    upstream: Azure:master
+    mergeMethod: rebase
+label: "AutoPull"
@@ -75,6 +75,9 @@ known_content_issues:
   - ['sdk/cosmos/changelog/README.md', '#3113']
   - ['sdk/cosmos/microsoft-azure-cosmos-benchmark/README.md', '#3113']
   - ['sdk/cosmos/README.md', '#3113']
+  - ['sdk/storage/azure-storage-blob/swagger/README.md', '#3113']
+  - ['sdk/storage/azure-storage-queue/swagger/README.md', '#3113']
+  - ['sdk/storage/azure-storage-file/swagger/README.md', '#3113']
 package_indexing_exclusion_list:
   - azure-loganalytics-sample
   - azure-applicationinsights-query-sample
diff --git a/...rc/main/java/com/azure/tools/checkstyle/checks/OnlyFinalFieldsForImmutableClassCheck.java b/...rc/main/java/com/azure/tools/checkstyle/checks/OnlyFinalFieldsForImmutableClassCheck.java
@@ -1,5 +1,5 @@
-// Licensed under the MIT License.
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.azure.tools.checkstyle.checks;
 
@@ -19,8 +19,8 @@
  */
 public class OnlyFinalFieldsForImmutableClassCheck extends AbstractCheck {
     private static final String IMMUTABLE_NOTATION = "Immutable";
-    private static final String ERROR_MSG = "The variable field ''%s'' should be final." +
-        "Classes annotated with @Immutable are supposed to be immutable.";
+    private static final String ERROR_MSG = "The variable field ''%s'' should be final."
+        + "Classes annotated with @Immutable are supposed to be immutable.";
 
     private boolean hasImmutableAnnotation;
 

diff --git a/...ty-reports/src/main/java/com/azure/tools/checkstyle/checks/ServiceClientBuilderCheck.java b/...ty-reports/src/main/java/com/azure/tools/checkstyle/checks/ServiceClientBuilderCheck.java
@@ -90,7 +90,7 @@ public void visitToken(DetailAST token) {
                 // method name has prefix 'build' but not 'build*Client' or 'build*AsyncClient'
                 if (!methodName.endsWith("Client")) {
                     log(token, String.format(
-                        "@ServiceClientBuilder class should not have a method name, ''%s'' starting with ''build'' but not ending with ''Client''." , methodName));
+                        "@ServiceClientBuilder class should not have a method name, ''%s'' starting with ''build'' but not ending with ''Client''.", methodName));
                 }
                 break;
             default:

diff --git a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/Utils.java b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/Utils.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.tools.checkstyle.checks;
 
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
@@ -39,7 +42,7 @@ protected static boolean hasIllegalCombination(DetailAST modifiers) {
         Optional<DetailAST> illegalCombination = TokenUtil.findFirstTokenByPredicate(modifiers, (node) -> {
             final int type = node.getType();
             return INVALID_FINAL_COMBINATION.contains(node.getType()) || (TokenTypes.ANNOTATION == type
-            && INVALID_FINAL_ANNOTATIONS.contains(node.findFirstToken(TokenTypes.IDENT).getText()));
+                && INVALID_FINAL_ANNOTATIONS.contains(node.findFirstToken(TokenTypes.IDENT).getText()));
         });
 
         return illegalCombination.isPresent();

diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -112,6 +112,9 @@
   <suppress checks="com.azure.tools.checkstyle.checks.ExternalDependencyExposedCheck" files=".*[/\\]samples[/\\].*\.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.HttpPipelinePolicyCheck" files=".*[/\\]samples[/\\].*\.java"/>
 
+  <!-- Don't apply custom Checkstyle rules to files under checkstyle package. -->
+  <suppress checks="com\.azure\.tools\.checkstyle\.checks\..+" files=".*[/\\]tools[/\\]checkstyle[/\\].*"/>
+
   <!-- JavaPackage suppression -->
   <suppress checks="JavadocPackage" files=".*[/\\]samples[/\\].*\.java"/>
 

diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
@@ -65,6 +65,8 @@
     <Or>
       <Class name="com.microsoft.azure.keyvault.authentication.KeyVaultCredentials"/>
       <Class name="com.azure.storage.blob.implementation.AzureBlobStorageBuilder"/>
+      <Class name="com.azure.storage.file.implementation.AzureFileStorageBuilder"/>
+      <Class name="com.azure.storage.queue.implementation.AzureQueueStorageBuilder"/>
     </Or>
     <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
   </Match>

@@ -56,6 +56,9 @@ jobs:
           JavaVersion: '1.11'
 
     steps:
+      - checkout: self
+        fetchDepth: 1
+
       - script: |
           echo "##vso[build.addbuildtag]Scheduled"
         displayName: 'Tag scheduled builds'
@@ -87,6 +90,9 @@ jobs:
       vmImage: 'ubuntu-16.04'
 
     steps:
+      - checkout: self
+        fetchDepth: 1
+
       - task: UsePythonVersion@0
         displayName: 'Use Python 3.6'
         inputs:
@@ -222,12 +228,16 @@ jobs:
       vmImage: $(OSVmImage)
 
     steps:
+      - checkout: self
+        fetchDepth: 1
+
       - template: ../steps/verify-agent-os.yml
         parameters:
           OSName: $(OSName)
 
       - task: Maven@3
         displayName: 'Start Jetty'
+        condition: ne(variables['SdkType'], 'client')
         inputs:
           mavenPomFile: pom.client.xml
           options: '$(DefaultOptions) $(ProfileFlag)'

diff --git a/pom.client.xml b/pom.client.xml
@@ -1,7 +1,7 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved.
      Licensed under the MIT License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.azure</groupId>
   <artifactId>azure-client-sdk-parent</artifactId>
@@ -164,12 +164,13 @@
           </dependency>
         </dependencies>
         <configuration>
-          <effort>Max</effort>
+          <effort>max</effort>
           <threshold>Low</threshold>
           <xmlOutput>true</xmlOutput>
           <spotbugsXmlOutputDirectory>${project.build.directory}/spotbugs</spotbugsXmlOutputDirectory>
           <excludeFilterFile>spotbugs/spotbugs-exclude.xml</excludeFilterFile>
           <failOnError>true</failOnError>
+          <fork>false</fork>
         </configuration>
         <executions>
           <execution>
@@ -341,7 +342,6 @@
             </footer>
             <linksource>false</linksource>
             <excludePackageNames>
-              com.microsoft.azure.template:
               *.impl*:
               *.implementation*:
               com.azure.tools.checkstyle*
@@ -401,6 +401,10 @@
                 <title>Azure Storage - Queues</title>
                 <packages>com.azure.storage.queue*</packages>
               </group>
+              <group>
+                <title>Azure Telemetry</title>
+                <packages>com.azure.tracing.opentelemetry*</packages>
+              </group>
             </groups>
             <links>
               <link>https://docs.oracle.com/javase/8/docs/api/</link>
@@ -438,12 +442,13 @@
             </dependency>
           </dependencies>
           <configuration>
-            <effort>Max</effort>
+            <effort>max</effort>
             <threshold>Low</threshold>
             <xmlOutput>true</xmlOutput>
             <spotbugsXmlOutputDirectory>${project.build.directory}/spotbugs</spotbugsXmlOutputDirectory>
             <excludeFilterFile>spotbugs/spotbugs-exclude.xml</excludeFilterFile>
             <failOnError>true</failOnError>
+            <fork>false</fork>
           </configuration>
         </plugin>
 
@@ -511,12 +516,13 @@
         <artifactId>spotbugs-maven-plugin</artifactId>
         <version>${spotbugs.maven.version}</version>
         <configuration>
-          <effort>Max</effort>
+          <effort>max</effort>
           <threshold>Low</threshold>
           <xmlOutput>true</xmlOutput>
           <spotbugsXmlOutputDirectory>${project.build.directory}/spotbugs</spotbugsXmlOutputDirectory>
           <excludeFilterFile>eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml</excludeFilterFile>
           <failOnError>true</failOnError>
+          <fork>false</fork>
         </configuration>
       </plugin>
       <plugin>
@@ -724,12 +730,13 @@
         <module>./eng/jacoco-test-coverage</module>
       </modules>
     </profile>
-
+    
     <profile>
       <id>template-module</id>
       <activation>
         <property>
-          <name>include-template</name>
+          <name>env.ENABLETEMPLATEDOCS</name>
+          <value>true</value>
         </property>
       </activation>
       <modules>

diff --git a/pom.data.xml b/pom.data.xml
@@ -545,7 +545,7 @@
     <module>./sdk/cosmos</module>
     <module>./sdk/eventhubs/pom.data.xml</module>
     <module>./sdk/keyvault/pom.data.xml</module>
-    <module>./sdk/servicebus/azure-servicebus</module>
+    <module>./sdk/servicebus/microsoft-azure-servicebus</module>
     <module>./sdk/storage/microsoft-azure-storage-blob</module>
   </modules>
 </project>
diff --git a/recoveryservices.backup/resource-manager/v2016_08_10/pom.xml b/recoveryservices.backup/resource-manager/v2016_08_10/pom.xml
@@ -3,16 +3,18 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.microsoft.azure.recoveryservices.backup.v2016_08_10</groupId>
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.1.0</version>
-        <relativePath>../../../pom.management.xml</relativePath>
+        <version>0.0.3-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-recoveryservices</artifactId>
     <version>1.0.0-beta</version>
@@ -71,8 +73,6 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
-            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/...icrosoft/azure/management/recoveryservices/backup/v2016_08_10/ClientDiscoveryDisplay.java b/...icrosoft/azure/management/recoveryservices/backup/v2016_08_10/ClientDiscoveryDisplay.java
@@ -3,7 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 package com.microsoft.azure.management.recoveryservices.backup.v2016_08_10;

diff --git a/...re/management/recoveryservices/backup/v2016_08_10/ClientDiscoveryForLogSpecification.java b/...re/management/recoveryservices/backup/v2016_08_10/ClientDiscoveryForLogSpecification.java
@@ -3,7 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 package com.microsoft.azure.management.recoveryservices.backup.v2016_08_10;

diff --git a/...ft/azure/management/recoveryservices/backup/v2016_08_10/ClientDiscoveryForProperties.java b/...ft/azure/management/recoveryservices/backup/v2016_08_10/ClientDiscoveryForProperties.java
@@ -3,7 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 package com.microsoft.azure.management.recoveryservices.backup.v2016_08_10;

diff --git a/...anagement/recoveryservices/backup/v2016_08_10/ClientDiscoveryForServiceSpecification.java b/...anagement/recoveryservices/backup/v2016_08_10/ClientDiscoveryForServiceSpecification.java
@@ -3,7 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 package com.microsoft.azure.management.recoveryservices.backup.v2016_08_10;

diff --git a/...zure/management/recoveryservices/backup/v2016_08_10/ClientDiscoveryValueForSingleApi.java b/...zure/management/recoveryservices/backup/v2016_08_10/ClientDiscoveryValueForSingleApi.java
@@ -3,7 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 package com.microsoft.azure.management.recoveryservices.backup.v2016_08_10;

diff --git a/...n/java/com/microsoft/azure/management/recoveryservices/backup/v2016_08_10/Operations.java b/...n/java/com/microsoft/azure/management/recoveryservices/backup/v2016_08_10/Operations.java
@@ -3,7 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 package com.microsoft.azure.management.recoveryservices.backup.v2016_08_10;

diff --git a/...overyservices/backup/v2016_08_10/implementation/ClientDiscoveryValueForSingleApiImpl.java b/...overyservices/backup/v2016_08_10/implementation/ClientDiscoveryValueForSingleApiImpl.java
@@ -3,7 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 package com.microsoft.azure.management.recoveryservices.backup.v2016_08_10.implementation;

diff --git a/...veryservices/backup/v2016_08_10/implementation/ClientDiscoveryValueForSingleApiInner.java b/...veryservices/backup/v2016_08_10/implementation/ClientDiscoveryValueForSingleApiInner.java
@@ -3,7 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 package com.microsoft.azure.management.recoveryservices.backup.v2016_08_10.implementation;

diff --git a/...t/azure/management/recoveryservices/backup/v2016_08_10/implementation/IdParsingUtils.java b/...t/azure/management/recoveryservices/backup/v2016_08_10/implementation/IdParsingUtils.java
@@ -3,7 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 package com.microsoft.azure.management.recoveryservices.backup.v2016_08_10.implementation;

diff --git a/...t/azure/management/recoveryservices/backup/v2016_08_10/implementation/OperationsImpl.java b/...t/azure/management/recoveryservices/backup/v2016_08_10/implementation/OperationsImpl.java
@@ -3,7 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  * abc
  */
 

diff --git a/.../azure/management/recoveryservices/backup/v2016_08_10/implementation/OperationsInner.java b/.../azure/management/recoveryservices/backup/v2016_08_10/implementation/OperationsInner.java
@@ -3,7 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 package com.microsoft.azure.management.recoveryservices.backup.v2016_08_10.implementation;

diff --git a/...crosoft/azure/management/recoveryservices/backup/v2016_08_10/implementation/PageImpl.java b/...crosoft/azure/management/recoveryservices/backup/v2016_08_10/implementation/PageImpl.java
@@ -3,7 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 package com.microsoft.azure.management.recoveryservices.backup.v2016_08_10.implementation;

diff --git a/.../recoveryservices/backup/v2016_08_10/implementation/RecoveryServicesBackupClientImpl.java b/.../recoveryservices/backup/v2016_08_10/implementation/RecoveryServicesBackupClientImpl.java
@@ -3,7 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  *
- * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 package com.microsoft.azure.management.recoveryservices.backup.v2016_08_10.implementation;