[AutoPR azure-resourcemanager-healthcareapis] [test delete link] Update healthcare-apis.json

sdk/healthcareapis/azure-resourcemanager-healthcareapis/CHANGELOG.md

@@ -1,6 +1,8 @@
 # Release History
 
-## 1.1.0-beta.1 (Unreleased)
+## 1.0.0-beta.1 (2024-04-08)
+
+- Azure Resource Manager HealthcareApis client library for Java. This package contains Microsoft Azure SDK for HealthcareApis Management SDK. Azure Healthcare APIs Client. Package tag package-2024-03. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ### Features Added
 

sdk/healthcareapis/azure-resourcemanager-healthcareapis/README.md

@@ -2,7 +2,7 @@
 
 Azure Resource Manager HealthcareApis client library for Java.
 
-This package contains Microsoft Azure SDK for HealthcareApis Management SDK. Azure Healthcare APIs Client. Package tag package-2023-11. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for HealthcareApis Management SDK. Azure Healthcare APIs Client. Package tag package-2024-03. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-healthcareapis</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

sdk/healthcareapis/azure-resourcemanager-healthcareapis/pom.xml

@@ -18,7 +18,7 @@
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for HealthcareApis Management</name>
-  <description>This package contains Microsoft Azure SDK for HealthcareApis Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Azure Healthcare APIs Client. Package tag package-2023-11.</description>
+  <description>This package contains Microsoft Azure SDK for HealthcareApis Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Azure Healthcare APIs Client. Package tag package-2024-03.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>
@@ -45,6 +45,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jacoco.min.linecoverage>0</jacoco.min.linecoverage>
     <jacoco.min.branchcoverage>0</jacoco.min.branchcoverage>
+    <revapi.skip>true</revapi.skip>
   </properties>
   <dependencies>
     <dependency>
@@ -93,8 +94,6 @@
       <version>4.11.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
       <scope>test</scope>
     </dependency>
-    <!-- bytebuddy dependencies are required for mockito 4.11.0 to work with Java 21. Mockito 4.11.0 is the last release -->
-    <!-- of Mockito supporting Java 8 as a baseline. -->
     <dependency>
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy</artifactId>

sdk/healthcareapis/azure-resourcemanager-healthcareapis/src/main/java/com/azure/resourcemanager/healthcareapis/HealthcareApisManager.java

@@ -248,7 +248,7 @@ public HealthcareApisManager authenticate(TokenCredential credential, AzureProfi
 
             StringBuilder userAgentBuilder = new StringBuilder();
             userAgentBuilder.append("azsdk-java").append("-").append("com.azure.resourcemanager.healthcareapis")
-                .append("/").append("1.0.0");
+                .append("/").append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder.append(" (").append(Configuration.getGlobalConfiguration().get("java.version"))
                     .append("; ").append(Configuration.getGlobalConfiguration().get("os.name")).append("; ")
@@ -288,7 +288,7 @@ public HealthcareApisManager authenticate(TokenCredential credential, AzureProfi
     }
 
     /**
-     * Gets the resource collection API of Services. It manages ServicesDescription.
+     * Gets the resource collection API of Services.
      * 
      * @return Resource collection API of Services.
      */

sdk/healthcareapis/azure-resourcemanager-healthcareapis/src/main/java/com/azure/resourcemanager/healthcareapis/fluent/ServicesClient.java

@@ -48,68 +48,6 @@ Response<ServicesDescriptionInner> getByResourceGroupWithResponse(String resourc
     @ServiceMethod(returns = ReturnType.SINGLE)
     ServicesDescriptionInner getByResourceGroup(String resourceGroupName, String resourceName);
 
-    /**
-     * Create or update the metadata of a service instance.
-     * 
-     * @param resourceGroupName The name of the resource group that contains the service instance.
-     * @param resourceName The name of the service instance.
-     * @param serviceDescription The service instance metadata.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link SyncPoller} for polling of the description of the service.
-     */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    SyncPoller<PollResult<ServicesDescriptionInner>, ServicesDescriptionInner>
-        beginCreateOrUpdate(String resourceGroupName, String resourceName, ServicesDescriptionInner serviceDescription);
-
-    /**
-     * Create or update the metadata of a service instance.
-     * 
-     * @param resourceGroupName The name of the resource group that contains the service instance.
-     * @param resourceName The name of the service instance.
-     * @param serviceDescription The service instance metadata.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link SyncPoller} for polling of the description of the service.
-     */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    SyncPoller<PollResult<ServicesDescriptionInner>, ServicesDescriptionInner> beginCreateOrUpdate(
-        String resourceGroupName, String resourceName, ServicesDescriptionInner serviceDescription, Context context);
-
-    /**
-     * Create or update the metadata of a service instance.
-     * 
-     * @param resourceGroupName The name of the resource group that contains the service instance.
-     * @param resourceName The name of the service instance.
-     * @param serviceDescription The service instance metadata.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the description of the service.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    ServicesDescriptionInner createOrUpdate(String resourceGroupName, String resourceName,
-        ServicesDescriptionInner serviceDescription);
-
-    /**
-     * Create or update the metadata of a service instance.
-     * 
-     * @param resourceGroupName The name of the resource group that contains the service instance.
-     * @param resourceName The name of the service instance.
-     * @param serviceDescription The service instance metadata.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the description of the service.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    ServicesDescriptionInner createOrUpdate(String resourceGroupName, String resourceName,
-        ServicesDescriptionInner serviceDescription, Context context);
-
     /**
      * Update the metadata of a service instance.
      * 

sdk/healthcareapis/azure-resourcemanager-healthcareapis/src/main/java/com/azure/resourcemanager/healthcareapis/fluent/models/DicomServiceInner.java

@@ -14,6 +14,7 @@
 import com.azure.resourcemanager.healthcareapis.models.PublicNetworkAccess;
 import com.azure.resourcemanager.healthcareapis.models.ServiceEventState;
 import com.azure.resourcemanager.healthcareapis.models.ServiceManagedIdentityIdentity;
+import com.azure.resourcemanager.healthcareapis.models.StorageConfiguration;
 import com.azure.resourcemanager.healthcareapis.models.TaggedResource;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
@@ -245,6 +246,29 @@ public DicomServiceInner withEncryption(Encryption encryption) {
         return this;
     }
 
+    /**
+     * Get the storageConfiguration property: The configuration of external storage account.
+     * 
+     * @return the storageConfiguration value.
+     */
+    public StorageConfiguration storageConfiguration() {
+        return this.innerProperties() == null ? null : this.innerProperties().storageConfiguration();
+    }
+
+    /**
+     * Set the storageConfiguration property: The configuration of external storage account.
+     * 
+     * @param storageConfiguration the storageConfiguration value to set.
+     * @return the DicomServiceInner object itself.
+     */
+    public DicomServiceInner withStorageConfiguration(StorageConfiguration storageConfiguration) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new DicomServiceProperties();
+        }
+        this.innerProperties().withStorageConfiguration(storageConfiguration);
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 

sdk/healthcareapis/azure-resourcemanager-healthcareapis/src/main/java/com/azure/resourcemanager/healthcareapis/fluent/models/DicomServiceProperties.java

@@ -12,6 +12,7 @@
 import com.azure.resourcemanager.healthcareapis.models.ProvisioningState;
 import com.azure.resourcemanager.healthcareapis.models.PublicNetworkAccess;
 import com.azure.resourcemanager.healthcareapis.models.ServiceEventState;
+import com.azure.resourcemanager.healthcareapis.models.StorageConfiguration;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 
@@ -68,6 +69,12 @@ public final class DicomServiceProperties {
     @JsonProperty(value = "encryption")
     private Encryption encryption;
 
+    /*
+     * The configuration of external storage account
+     */
+    @JsonProperty(value = "storageConfiguration")
+    private StorageConfiguration storageConfiguration;
+
     /**
      * Creates an instance of DicomServiceProperties class.
      */
@@ -194,6 +201,26 @@ public DicomServiceProperties withEncryption(Encryption encryption) {
         return this;
     }
 
+    /**
+     * Get the storageConfiguration property: The configuration of external storage account.
+     * 
+     * @return the storageConfiguration value.
+     */
+    public StorageConfiguration storageConfiguration() {
+        return this.storageConfiguration;
+    }
+
+    /**
+     * Set the storageConfiguration property: The configuration of external storage account.
+     * 
+     * @param storageConfiguration the storageConfiguration value to set.
+     * @return the DicomServiceProperties object itself.
+     */
+    public DicomServiceProperties withStorageConfiguration(StorageConfiguration storageConfiguration) {
+        this.storageConfiguration = storageConfiguration;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -212,5 +239,8 @@ public void validate() {
         if (encryption() != null) {
             encryption().validate();
         }
+        if (storageConfiguration() != null) {
+            storageConfiguration().validate();
+        }
     }
 }

sdk/healthcareapis/azure-resourcemanager-healthcareapis/src/main/java/com/azure/resourcemanager/healthcareapis/implementation/DicomServiceImpl.java

@@ -18,6 +18,7 @@
 import com.azure.resourcemanager.healthcareapis.models.PublicNetworkAccess;
 import com.azure.resourcemanager.healthcareapis.models.ServiceEventState;
 import com.azure.resourcemanager.healthcareapis.models.ServiceManagedIdentityIdentity;
+import com.azure.resourcemanager.healthcareapis.models.StorageConfiguration;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -101,6 +102,10 @@ public Encryption encryption() {
         return this.innerModel().encryption();
     }
 
+    public StorageConfiguration storageConfiguration() {
+        return this.innerModel().storageConfiguration();
+    }
+
     public Region region() {
         return Region.fromName(this.regionName());
     }
@@ -174,9 +179,9 @@ public DicomService apply(Context context) {
         com.azure.resourcemanager.healthcareapis.HealthcareApisManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
-        this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups");
-        this.dicomServiceName = Utils.getValueFromIdByName(innerObject.id(), "dicomservices");
-        this.workspaceName = Utils.getValueFromIdByName(innerObject.id(), "workspaces");
+        this.resourceGroupName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "resourceGroups");
+        this.dicomServiceName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "dicomservices");
+        this.workspaceName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "workspaces");
     }
 
     public DicomService refresh() {
@@ -247,6 +252,11 @@ public DicomServiceImpl withEncryption(Encryption encryption) {
         return this;
     }
 
+    public DicomServiceImpl withStorageConfiguration(StorageConfiguration storageConfiguration) {
+        this.innerModel().withStorageConfiguration(storageConfiguration);
+        return this;
+    }
+
     private boolean isInCreateMode() {
         return this.innerModel().id() == null;
     }

sdk/healthcareapis/azure-resourcemanager-healthcareapis/src/main/java/com/azure/resourcemanager/healthcareapis/implementation/DicomServicesImpl.java

@@ -29,14 +29,14 @@ public DicomServicesImpl(DicomServicesClient innerClient,
 
     public PagedIterable<DicomService> listByWorkspace(String resourceGroupName, String workspaceName) {
         PagedIterable<DicomServiceInner> inner = this.serviceClient().listByWorkspace(resourceGroupName, workspaceName);
-        return Utils.mapPage(inner, inner1 -> new DicomServiceImpl(inner1, this.manager()));
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new DicomServiceImpl(inner1, this.manager()));
     }
 
     public PagedIterable<DicomService> listByWorkspace(String resourceGroupName, String workspaceName,
         Context context) {
         PagedIterable<DicomServiceInner> inner
             = this.serviceClient().listByWorkspace(resourceGroupName, workspaceName, context);
-        return Utils.mapPage(inner, inner1 -> new DicomServiceImpl(inner1, this.manager()));
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new DicomServiceImpl(inner1, this.manager()));
     }
 
     public Response<DicomService> getWithResponse(String resourceGroupName, String workspaceName,
@@ -69,17 +69,17 @@ public void delete(String resourceGroupName, String dicomServiceName, String wor
     }
 
     public DicomService getById(String id) {
-        String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
             throw LOGGER.logExceptionAsError(new IllegalArgumentException(
                 String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
         }
-        String workspaceName = Utils.getValueFromIdByName(id, "workspaces");
+        String workspaceName = ResourceManagerUtils.getValueFromIdByName(id, "workspaces");
         if (workspaceName == null) {
             throw LOGGER.logExceptionAsError(new IllegalArgumentException(
                 String.format("The resource ID '%s' is not valid. Missing path segment 'workspaces'.", id)));
         }
-        String dicomServiceName = Utils.getValueFromIdByName(id, "dicomservices");
+        String dicomServiceName = ResourceManagerUtils.getValueFromIdByName(id, "dicomservices");
         if (dicomServiceName == null) {
             throw LOGGER.logExceptionAsError(new IllegalArgumentException(
                 String.format("The resource ID '%s' is not valid. Missing path segment 'dicomservices'.", id)));
@@ -88,17 +88,17 @@ public DicomService getById(String id) {
     }
 
     public Response<DicomService> getByIdWithResponse(String id, Context context) {
-        String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
             throw LOGGER.logExceptionAsError(new IllegalArgumentException(
                 String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
         }
-        String workspaceName = Utils.getValueFromIdByName(id, "workspaces");
+        String workspaceName = ResourceManagerUtils.getValueFromIdByName(id, "workspaces");
         if (workspaceName == null) {
             throw LOGGER.logExceptionAsError(new IllegalArgumentException(
                 String.format("The resource ID '%s' is not valid. Missing path segment 'workspaces'.", id)));
         }
-        String dicomServiceName = Utils.getValueFromIdByName(id, "dicomservices");
+        String dicomServiceName = ResourceManagerUtils.getValueFromIdByName(id, "dicomservices");
         if (dicomServiceName == null) {
             throw LOGGER.logExceptionAsError(new IllegalArgumentException(
                 String.format("The resource ID '%s' is not valid. Missing path segment 'dicomservices'.", id)));
@@ -107,17 +107,17 @@ public Response<DicomService> getByIdWithResponse(String id, Context context) {
     }
 
     public void deleteById(String id) {
-        String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
             throw LOGGER.logExceptionAsError(new IllegalArgumentException(
                 String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
         }
-        String dicomServiceName = Utils.getValueFromIdByName(id, "dicomservices");
+        String dicomServiceName = ResourceManagerUtils.getValueFromIdByName(id, "dicomservices");
         if (dicomServiceName == null) {
             throw LOGGER.logExceptionAsError(new IllegalArgumentException(
                 String.format("The resource ID '%s' is not valid. Missing path segment 'dicomservices'.", id)));
         }
-        String workspaceName = Utils.getValueFromIdByName(id, "workspaces");
+        String workspaceName = ResourceManagerUtils.getValueFromIdByName(id, "workspaces");
         if (workspaceName == null) {
             throw LOGGER.logExceptionAsError(new IllegalArgumentException(
                 String.format("The resource ID '%s' is not valid. Missing path segment 'workspaces'.", id)));
@@ -126,17 +126,17 @@ public void deleteById(String id) {
     }
 
     public void deleteByIdWithResponse(String id, Context context) {
-        String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
             throw LOGGER.logExceptionAsError(new IllegalArgumentException(
                 String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
         }
-        String dicomServiceName = Utils.getValueFromIdByName(id, "dicomservices");
+        String dicomServiceName = ResourceManagerUtils.getValueFromIdByName(id, "dicomservices");
         if (dicomServiceName == null) {
             throw LOGGER.logExceptionAsError(new IllegalArgumentException(
                 String.format("The resource ID '%s' is not valid. Missing path segment 'dicomservices'.", id)));
         }
-        String workspaceName = Utils.getValueFromIdByName(id, "workspaces");
+        String workspaceName = ResourceManagerUtils.getValueFromIdByName(id, "workspaces");
         if (workspaceName == null) {
             throw LOGGER.logExceptionAsError(new IllegalArgumentException(
                 String.format("The resource ID '%s' is not valid. Missing path segment 'workspaces'.", id)));