eng, sync 7470 (#3118)

Author: weidongxu-microsoft

.gitignore

@@ -102,6 +102,7 @@ typespec-tests/package-lock.json
 
 # ApiView properties files
 /typespec-tests/src/main/resources/META-INF/*apiview_properties.json
+/typespec-tests/src/main/resources/META-INF/*metadata.json
 
 # typespec-extension
 /typespec-extension/src/*

core

@@ -125,8 +125,6 @@ $job = @(
     "--version=$AUTOREST_CORE_VERSION $FLUENTLITE_ARGUMENTS --regenerate-pom=false https://raw.githubusercontent.com/Azure/azure-rest-api-specs/da0cfefaa0e6c237e1e3819f1cb2e11d7606878d/specification/storage/resource-manager/readme.md --tag=package-2021-01 --java.namespace=com.azure.mgmtlitetest.storage",
     "--version=$AUTOREST_CORE_VERSION $FLUENTLITE_ARGUMENTS --regenerate-pom=false https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/advisor/resource-manager/readme.md --tag=package-2020-01 --java.namespace=com.azure.mgmtlitetest.advisor",
 
-    # pageable + LRO
-    "--version=$AUTOREST_CORE_VERSION $FLUENTLITE_ARGUMENTS --regenerate-pom=false https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/mediaservices/resource-manager/readme.md --tag=package-account-2023-01 --java.namespace=com.azure.mgmtlitetest.mediaservices",
     "--version=$AUTOREST_CORE_VERSION $FLUENTLITE_ARGUMENTS --regenerate-pom=false https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/resources/resource-manager/readme.md --tag=package-policy-2020-09 --java.namespace=com.azure.mgmtlitetest.policy",
     # UUID subscriptionId
     "--version=$AUTOREST_CORE_VERSION $FLUENTLITE_ARGUMENTS --regenerate-pom=false --input-file=https://raw.githubusercontent.com/Azure/azure-rest-api-specs/0a2eb0d14f5132fcfd30222d584acf67713332ea/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2022-12-01/containerregistry.json --namespace=com.azure.mgmtlitetest.containerregistrylite",

fluent-tests/Initialize-Tests.ps1

@@ -19,10 +19,6 @@
 import com.azure.mgmtlitetest.containerregistrylite.ContainerRegistryManager;
 import com.azure.mgmtlitetest.emptybytearrayinclients.implementation.DpsCertificatesClientImpl;
 import com.azure.mgmtlitetest.managednetworkfabric.models.CommonPostActionResponseForStateUpdate;
-import com.azure.mgmtlitetest.mediaservices.MediaServicesManager;
-import com.azure.mgmtlitetest.mediaservices.models.LiveEventStatus;
-import com.azure.mgmtlitetest.mediaservices.models.MediaService;
-import com.azure.mgmtlitetest.mediaservices.models.SyncStorageKeysInput;
 import com.azure.mgmtlitetest.pageablewithinheritance.fluent.SavingsPlansClient;
 import com.azure.mgmtlitetest.pageablewithinheritance.fluent.models.SavingsPlanModelInner;
 import com.azure.mgmtlitetest.resources.ResourceManager;
@@ -153,13 +149,6 @@ public void testConfigurable() {
                 .authenticate(new EnvironmentCredentialBuilder().build(), new AzureProfile(AzureEnvironment.AZURE));
     }
 
-    public void testMediaServices() {
-        MediaServicesManager mediaServicesManager = mock(MediaServicesManager.class);
-
-        MediaService mediaService = mediaServicesManager.mediaservices().getById(anyString());
-        mediaService.syncStorageKeys(any(SyncStorageKeysInput.class));
-    }
-
     public void testModelFlatten() {
         ExtendedProductInner extendedProduct = new ExtendedProductInner();
         extendedProduct.uri();
@@ -194,11 +183,6 @@ public void testSubscriptionIdUuid() {
         String subscriptionId = manager.serviceClient().getSubscriptionId();
     }
 
-    public void testLroPageable() {
-        MediaServicesManager manager = mock(MediaServicesManager.class);
-        PagedIterable<LiveEventStatus> eventStatuses = manager.liveEvents().listGetStatus(anyString(), anyString(), anyString());
-    }
-
     public void testModelExtendsErrorResponse() {
         CommonPostActionResponseForStateUpdate actionResponse = mock(CommonPostActionResponseForStateUpdate.class);
         ManagementError error = actionResponse.error();

fluent-tests/src/test/java/com/azure/mgmttest/LiteCompilationTests.java

@@ -14,7 +14,6 @@
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.Region;
-import com.azure.core.management.ResourceAuthorIdentityType;
 import com.azure.core.management.exception.ManagementError;
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy;
@@ -32,9 +31,6 @@
 import com.azure.mgmtlitetest.botservice.models.Site;
 import com.azure.mgmtlitetest.managednetworkfabric.fluent.models.CommonPostActionResponseForDeviceUpdateInner;
 import com.azure.mgmtlitetest.managednetworkfabric.models.ConfigurationState;
-import com.azure.mgmtlitetest.mediaservices.MediaServicesManager;
-import com.azure.mgmtlitetest.mediaservices.models.MediaService;
-import com.azure.mgmtlitetest.mediaservices.models.StorageAccountType;
 import com.azure.mgmtlitetest.resources.ResourceManager;
 import com.azure.mgmtlitetest.resources.fluent.models.GenericResourceInner;
 import com.azure.mgmtlitetest.resources.models.ResourceGroup;
@@ -81,7 +77,6 @@
 import java.lang.reflect.Modifier;
 import java.nio.file.Files;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -295,9 +290,6 @@ public void testStorage() {
             Assertions.assertTrue(blobService.deleteRetentionPolicy().enabled());
             Assertions.assertEquals(3, blobService.deleteRetentionPolicy().days());
 
-            // test media services for SystemData
-            testMediaServices(storageAccount);
-
             // test advisor as it is an extension, which requires a base resource
             // disabled as generate is async and it takes too long for a new resource
             //testAdvisor(storageAccount);
@@ -308,29 +300,6 @@ public void testStorage() {
         }
     }
 
-    private void testMediaServices(StorageAccount storageAccount) {
-        MediaServicesManager mediaservicesManager = authenticateMediaServicesManager();
-
-        String rgName = "rg1-weidxu-fluentlite";
-        String msName = "ms1weidxulite";
-
-        MediaService mediaService = mediaservicesManager.mediaservices().define(msName)
-                .withRegion(Region.US_EAST)
-                .withExistingResourceGroup(rgName)
-                .withStorageAccounts(Collections.singletonList(
-                        new com.azure.mgmtlitetest.mediaservices.models.StorageAccount()
-                                .withId(storageAccount.id())
-                                .withType(StorageAccountType.PRIMARY)))
-                .create();
-
-        Assertions.assertNotNull(mediaService.systemData());
-        Assertions.assertNotNull(mediaService.systemData().createdBy());
-        Assertions.assertNotNull(mediaService.systemData().createdAt());
-        Assertions.assertEquals(ResourceAuthorIdentityType.APPLICATION, mediaService.systemData().createdByType());
-
-        mediaservicesManager.mediaservices().deleteById(mediaService.id());
-    }
-
     private void testAdvisor(StorageAccount storageAccount) {
         AdvisorManager advisorManager = authenticateAdvisorManager();
 
@@ -408,12 +377,6 @@ private AdvisorManager authenticateAdvisorManager() {
                 .authenticate(new EnvironmentCredentialBuilder().build(), new AzureProfile(AzureEnvironment.AZURE));
     }
 
-    private MediaServicesManager authenticateMediaServicesManager() {
-        return MediaServicesManager.configure()
-                .withLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS))
-                .authenticate(new EnvironmentCredentialBuilder().build(), new AzureProfile(AzureEnvironment.AZURE));
-    }
-
     @Test
     public void testOverload() {
         // simple API

fluent-tests/src/test/java/com/azure/mgmttest/RuntimeTests.java

@@ -65,6 +65,8 @@ $generateScript = {
   } elseif ($tspFile -match "arm.tsp") {
     # for mgmt, do not generate tests due to random mock values
     $tspOptions += " --option ""@azure-tools/typespec-java.generate-tests=false"""
+    # test service-name
+    $tspOptions += " --option ""@azure-tools/typespec-java.service-name=Arm Resource Provider"""
     # also test generating from specific api-version
     $tspOptions += " --option ""@azure-tools/typespec-java.api-version=2023-11-01"""
     # exclude preview from service versions
@@ -74,10 +76,12 @@ $generateScript = {
   } elseif ($tspFile -match "arm-stream-style-serialization.tsp") {
     # for mgmt, do not generate tests due to random mock values
     $tspOptions += " --option ""@azure-tools/typespec-java.generate-tests=false"""
+    # test service-name
+    $tspOptions += " --option ""@azure-tools/typespec-java.service-name=Arm Resource Provider"""
   } elseif ($tspFile -match "subclient.tsp") {
     $tspOptions += " --option ""@azure-tools/typespec-java.enable-subclient=true"""
     # test for include-api-view-properties
-    $tspOptions += " --option ""@typespec/http-client-java.include-api-view-properties=false"""
+    $tspOptions += " --option ""@azure-tools/typespec-java.include-api-view-properties=false"""
   }
 
   # Test customization for one of the TypeSpec definitions - naming.tsp
@@ -89,25 +93,27 @@ $generateScript = {
   $tspTrace = "--trace import-resolution --trace projection --trace typespec-java"
   $tspCommand = "npx --no-install tsp compile $tspFile $tspOptions $tspTrace"
 
+  # output of "tsp compile" seems trigger powershell error or exit, hence the "2>&1"
   $timer = [Diagnostics.Stopwatch]::StartNew()
-  Invoke-Expression $tspCommand >$null 2>&1
+  $generateOutput = Invoke-Expression $tspCommand 2>&1
   $timer.Stop()
 
   $global:ExitCode = $global:ExitCode -bor $LASTEXITCODE
 
   if ($LASTEXITCODE -ne 0) {
     Write-Host "
-  ========================
-  $tspCommand
-  ========================
-  FAILED (Time elapsed: $($timer.ToString()))
+    ========================
+    $tspCommand
+    ========================
+    FAILED (Time elapsed: $($timer.ToString()))
+    $([String]::Join("`n", $generateOutput))
     "
   } else {
     Write-Host "
-  ========================
-  $tspCommand
-  ========================
-  SUCCEEDED (Time elapsed: $($timer.ToString()))
+    ========================
+    $tspCommand
+    ========================
+    SUCCEEDED (Time elapsed: $($timer.ToString()))
     "
   }
 

typespec-tests/Generate.ps1

@@ -31,8 +31,8 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import tsptest.armresourceprovider.fluent.ArmResourceProviderClient;
-import tsptest.armresourceprovider.implementation.ArmResourceProviderClientBuilder;
+import tsptest.armresourceprovider.fluent.ArmClient;
+import tsptest.armresourceprovider.implementation.ArmClientBuilder;
 import tsptest.armresourceprovider.implementation.ChildExtensionResourceInterfacesImpl;
 import tsptest.armresourceprovider.implementation.ChildResourcesInterfacesImpl;
 import tsptest.armresourceprovider.implementation.CustomTemplateResourceInterfacesImpl;
@@ -67,24 +67,24 @@ public final class ArmResourceProviderManager {
 
     private ModelInterfaceSameNames modelInterfaceSameNames;
 
-    private final ArmResourceProviderClient clientObject;
+    private final ArmClient clientObject;
 
     private ArmResourceProviderManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
         Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null.");
         Objects.requireNonNull(profile, "'profile' cannot be null.");
-        this.clientObject = new ArmResourceProviderClientBuilder().pipeline(httpPipeline)
+        this.clientObject = new ArmClientBuilder().pipeline(httpPipeline)
             .endpoint(profile.getEnvironment().getResourceManagerEndpoint())
             .subscriptionId(profile.getSubscriptionId())
             .defaultPollInterval(defaultPollInterval)
             .buildClient();
     }
 
     /**
-     * Creates an instance of ArmResourceProvider service API entry point.
+     * Creates an instance of Arm Resource Provider service API entry point.
      * 
      * @param credential the credential to use.
      * @param profile the Azure profile for client.
-     * @return the ArmResourceProvider service API instance.
+     * @return the Arm Resource Provider service API instance.
      */
     public static ArmResourceProviderManager authenticate(TokenCredential credential, AzureProfile profile) {
         Objects.requireNonNull(credential, "'credential' cannot be null.");
@@ -93,11 +93,11 @@ public static ArmResourceProviderManager authenticate(TokenCredential credential
     }
 
     /**
-     * Creates an instance of ArmResourceProvider service API entry point.
+     * Creates an instance of Arm Resource Provider service API entry point.
      * 
      * @param httpPipeline the {@link HttpPipeline} configured with Azure authentication credential.
      * @param profile the Azure profile for client.
-     * @return the ArmResourceProvider service API instance.
+     * @return the Arm Resource Provider service API instance.
      */
     public static ArmResourceProviderManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) {
         Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null.");
@@ -219,11 +219,11 @@ public Configurable withDefaultPollInterval(Duration defaultPollInterval) {
         }
 
         /**
-         * Creates an instance of ArmResourceProvider service API entry point.
+         * Creates an instance of Arm Resource Provider service API entry point.
          *
          * @param credential the credential to use.
          * @param profile the Azure profile for client.
-         * @return the ArmResourceProvider service API instance.
+         * @return the Arm Resource Provider service API instance.
          */
         public ArmResourceProviderManager authenticate(TokenCredential credential, AzureProfile profile) {
             Objects.requireNonNull(credential, "'credential' cannot be null.");
@@ -373,12 +373,12 @@ public ModelInterfaceSameNames modelInterfaceSameNames() {
     }
 
     /**
-     * Gets wrapped service client ArmResourceProviderClient providing direct access to the underlying auto-generated
-     * API implementation, based on Azure REST API.
+     * Gets wrapped service client ArmClient providing direct access to the underlying auto-generated API
+     * implementation, based on Azure REST API.
      * 
-     * @return Wrapped service client ArmResourceProviderClient.
+     * @return Wrapped service client ArmClient.
      */
-    public ArmResourceProviderClient serviceClient() {
+    public ArmClient serviceClient() {
         return this.clientObject;
     }
 }

typespec-tests/src/main/java/tsptest/armresourceprovider/ArmResourceProviderManager.java

@@ -8,9 +8,9 @@
 import java.time.Duration;
 
 /**
- * The interface for ArmResourceProviderClient class.
+ * The interface for ArmClient class.
  */
-public interface ArmResourceProviderClient {
+public interface ArmClient {
     /**
      * Gets Service host.
      * 

…er/fluent/ArmResourceProviderClient.java …rmresourceprovider/fluent/ArmClient.javatypespec-tests/src/main/java/tsptest/armresourceprovider/fluent/ArmResourceProviderClient.java renamed to typespec-tests/src/main/java/tsptest/armresourceprovider/fluent/ArmClient.java typespec-tests/src/main/java/tsptest/armresourceprovider/fluent/ArmResourceProviderClient.java renamed to typespec-tests/src/main/java/tsptest/armresourceprovider/fluent/ArmClient.java

@@ -12,7 +12,7 @@
 import com.azure.json.JsonWriter;
 import java.io.IOException;
 import java.util.Map;
-import tsptest.armresourceprovider.models.CustomTemplateResourcePropertiesAnonymousEmptyModel;
+import tsptest.armresourceprovider.models.AnonymousEmptyModel;
 import tsptest.armresourceprovider.models.Dog;
 import tsptest.armresourceprovider.models.EmptyModel;
 import tsptest.armresourceprovider.models.ManagedServiceIdentity;
@@ -206,7 +206,7 @@ public CustomTemplateResourceInner withNamedEmptyModel(EmptyModel namedEmptyMode
      * 
      * @return the anonymousEmptyModel value.
      */
-    public CustomTemplateResourcePropertiesAnonymousEmptyModel anonymousEmptyModel() {
+    public AnonymousEmptyModel anonymousEmptyModel() {
         return this.innerProperties() == null ? null : this.innerProperties().anonymousEmptyModel();
     }
 
@@ -216,8 +216,7 @@ public CustomTemplateResourcePropertiesAnonymousEmptyModel anonymousEmptyModel()
      * @param anonymousEmptyModel the anonymousEmptyModel value to set.
      * @return the CustomTemplateResourceInner object itself.
      */
-    public CustomTemplateResourceInner
-        withAnonymousEmptyModel(CustomTemplateResourcePropertiesAnonymousEmptyModel anonymousEmptyModel) {
+    public CustomTemplateResourceInner withAnonymousEmptyModel(AnonymousEmptyModel anonymousEmptyModel) {
         if (this.innerProperties() == null) {
             this.innerProperties = new CustomTemplateResourceProperties();
         }

typespec-tests/src/main/java/tsptest/armresourceprovider/fluent/models/CustomTemplateResourceInner.java

@@ -11,7 +11,7 @@
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
 import java.io.IOException;
-import tsptest.armresourceprovider.models.CustomTemplateResourcePropertiesAnonymousEmptyModel;
+import tsptest.armresourceprovider.models.AnonymousEmptyModel;
 import tsptest.armresourceprovider.models.Dog;
 import tsptest.armresourceprovider.models.EmptyModel;
 import tsptest.armresourceprovider.models.PriorityModel;
@@ -40,7 +40,7 @@ public final class CustomTemplateResourceProperties implements JsonSerializable<
     /*
      * The anonymousEmptyModel property.
      */
-    private CustomTemplateResourcePropertiesAnonymousEmptyModel anonymousEmptyModel;
+    private AnonymousEmptyModel anonymousEmptyModel;
 
     /*
      * The priority property.
@@ -107,7 +107,7 @@ public CustomTemplateResourceProperties withNamedEmptyModel(EmptyModel namedEmpt
      * 
      * @return the anonymousEmptyModel value.
      */
-    public CustomTemplateResourcePropertiesAnonymousEmptyModel anonymousEmptyModel() {
+    public AnonymousEmptyModel anonymousEmptyModel() {
         return this.anonymousEmptyModel;
     }
 
@@ -117,8 +117,7 @@ public CustomTemplateResourcePropertiesAnonymousEmptyModel anonymousEmptyModel()
      * @param anonymousEmptyModel the anonymousEmptyModel value to set.
      * @return the CustomTemplateResourceProperties object itself.
      */
-    public CustomTemplateResourceProperties
-        withAnonymousEmptyModel(CustomTemplateResourcePropertiesAnonymousEmptyModel anonymousEmptyModel) {
+    public CustomTemplateResourceProperties withAnonymousEmptyModel(AnonymousEmptyModel anonymousEmptyModel) {
         this.anonymousEmptyModel = anonymousEmptyModel;
         return this;
     }
@@ -215,7 +214,7 @@ public static CustomTemplateResourceProperties fromJson(JsonReader jsonReader) t
                     deserializedCustomTemplateResourceProperties.namedEmptyModel = EmptyModel.fromJson(reader);
                 } else if ("anonymousEmptyModel".equals(fieldName)) {
                     deserializedCustomTemplateResourceProperties.anonymousEmptyModel
-                        = CustomTemplateResourcePropertiesAnonymousEmptyModel.fromJson(reader);
+                        = AnonymousEmptyModel.fromJson(reader);
                 } else if ("priority".equals(fieldName)) {
                     deserializedCustomTemplateResourceProperties.priority = PriorityModel.fromValue(reader.getInt());
                 } else if ("provisioningState".equals(fieldName)) {