[Automation] Generate Fluent Lite from botservice#package-preview-2021-05 (Azure#29548)

Author: azure-sdk

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

@@ -1,14 +1,22 @@
 # Release History
 
-## 1.0.0-beta.5 (Unreleased)
+## 1.0.0-beta.5 (2022-06-20)
+
+- Azure Resource Manager BotService client library for Java. This package contains Microsoft Azure SDK for BotService Management SDK. Azure Bot Service is a platform for creating smart conversational agents. Package tag package-preview-2021-05. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ### Features Added
 
-### Breaking Changes
+#### `models.Bot` was modified
+
+* `resourceGroupName()` was added
 
-### Bugs Fixed
+#### `models.SlackChannelProperties` was modified
+
+* `withRegisterBeforeOAuthFlow(java.lang.Boolean)` was added
+
+#### `models.ConnectionSetting` was modified
 
-### Other Changes
+* `resourceGroupName()` was added
 
 ## 1.0.0-beta.4 (2022-04-21)
 

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

@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-botservice</artifactId>
-    <version>1.0.0-beta.4</version>
+    <version>1.0.0-beta.5</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

sdk/botservice/azure-resourcemanager-botservice/src/main/java/com/azure/resourcemanager/botservice/BotServiceManager.java

@@ -235,7 +235,7 @@ public BotServiceManager authenticate(TokenCredential credential, AzureProfile p
                 .append("-")
                 .append("com.azure.resourcemanager.botservice")
                 .append("/")
-                .append("1.0.0-beta.4");
+                .append("1.0.0-beta.5");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder
                     .append(" (")
@@ -292,63 +292,95 @@ public BotServiceManager authenticate(TokenCredential credential, AzureProfile p
         }
     }
 
-    /** @return Resource collection API of Bots. */
+    /**
+     * Gets the resource collection API of Bots. It manages Bot.
+     *
+     * @return Resource collection API of Bots.
+     */
     public Bots bots() {
         if (this.bots == null) {
             this.bots = new BotsImpl(clientObject.getBots(), this);
         }
         return bots;
     }
 
-    /** @return Resource collection API of Channels. */
+    /**
+     * Gets the resource collection API of Channels.
+     *
+     * @return Resource collection API of Channels.
+     */
     public Channels channels() {
         if (this.channels == null) {
             this.channels = new ChannelsImpl(clientObject.getChannels(), this);
         }
         return channels;
     }
 
-    /** @return Resource collection API of DirectLines. */
+    /**
+     * Gets the resource collection API of DirectLines.
+     *
+     * @return Resource collection API of DirectLines.
+     */
     public DirectLines directLines() {
         if (this.directLines == null) {
             this.directLines = new DirectLinesImpl(clientObject.getDirectLines(), this);
         }
         return directLines;
     }
 
-    /** @return Resource collection API of Operations. */
+    /**
+     * Gets the resource collection API of Operations.
+     *
+     * @return Resource collection API of Operations.
+     */
     public Operations operations() {
         if (this.operations == null) {
             this.operations = new OperationsImpl(clientObject.getOperations(), this);
         }
         return operations;
     }
 
-    /** @return Resource collection API of BotConnections. */
+    /**
+     * Gets the resource collection API of BotConnections. It manages ConnectionSetting.
+     *
+     * @return Resource collection API of BotConnections.
+     */
     public BotConnections botConnections() {
         if (this.botConnections == null) {
             this.botConnections = new BotConnectionsImpl(clientObject.getBotConnections(), this);
         }
         return botConnections;
     }
 
-    /** @return Resource collection API of HostSettings. */
+    /**
+     * Gets the resource collection API of HostSettings.
+     *
+     * @return Resource collection API of HostSettings.
+     */
     public HostSettings hostSettings() {
         if (this.hostSettings == null) {
             this.hostSettings = new HostSettingsImpl(clientObject.getHostSettings(), this);
         }
         return hostSettings;
     }
 
-    /** @return Resource collection API of OperationResults. */
+    /**
+     * Gets the resource collection API of OperationResults.
+     *
+     * @return Resource collection API of OperationResults.
+     */
     public OperationResults operationResults() {
         if (this.operationResults == null) {
             this.operationResults = new OperationResultsImpl(clientObject.getOperationResults(), this);
         }
         return operationResults;
     }
 
-    /** @return Resource collection API of PrivateEndpointConnections. */
+    /**
+     * Gets the resource collection API of PrivateEndpointConnections. It manages PrivateEndpointConnection.
+     *
+     * @return Resource collection API of PrivateEndpointConnections.
+     */
     public PrivateEndpointConnections privateEndpointConnections() {
         if (this.privateEndpointConnections == null) {
             this.privateEndpointConnections =
@@ -357,7 +389,11 @@ public PrivateEndpointConnections privateEndpointConnections() {
         return privateEndpointConnections;
     }
 
-    /** @return Resource collection API of PrivateLinkResources. */
+    /**
+     * Gets the resource collection API of PrivateLinkResources.
+     *
+     * @return Resource collection API of PrivateLinkResources.
+     */
     public PrivateLinkResources privateLinkResources() {
         if (this.privateLinkResources == null) {
             this.privateLinkResources = new PrivateLinkResourcesImpl(clientObject.getPrivateLinkResources(), this);

sdk/botservice/azure-resourcemanager-botservice/src/main/java/com/azure/resourcemanager/botservice/implementation/AzureBotServiceImpl.java

@@ -15,6 +15,7 @@
 import com.azure.core.management.polling.PollResult;
 import com.azure.core.management.polling.PollerFactory;
 import com.azure.core.util.Context;
+import com.azure.core.util.CoreUtils;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.AsyncPollResponse;
 import com.azure.core.util.polling.LongRunningOperationStatus;
@@ -37,7 +38,6 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
-import java.util.Map;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -274,10 +274,7 @@ public Context getContext() {
      * @return the merged context.
      */
     public Context mergeContext(Context context) {
-        for (Map.Entry<Object, Object> entry : this.getContext().getValues().entrySet()) {
-            context = context.addData(entry.getKey(), entry.getValue());
-        }
-        return context;
+        return CoreUtils.mergeContexts(this.getContext(), context);
     }
 
     /**

sdk/botservice/azure-resourcemanager-botservice/src/main/java/com/azure/resourcemanager/botservice/implementation/BotConnectionsClientImpl.java

@@ -261,15 +261,7 @@ private Mono<Response<ServiceProviderResponseListInner>> listServiceProvidersWit
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ServiceProviderResponseListInner> listServiceProvidersAsync() {
-        return listServiceProvidersWithResponseAsync()
-            .flatMap(
-                (Response<ServiceProviderResponseListInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+        return listServiceProvidersWithResponseAsync().flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -419,14 +411,7 @@ private Mono<Response<ConnectionSettingInner>> listWithSecretsWithResponseAsync(
     private Mono<ConnectionSettingInner> listWithSecretsAsync(
         String resourceGroupName, String resourceName, String connectionName) {
         return listWithSecretsWithResponseAsync(resourceGroupName, resourceName, connectionName)
-            .flatMap(
-                (Response<ConnectionSettingInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -602,14 +587,7 @@ private Mono<Response<ConnectionSettingInner>> createWithResponseAsync(
     private Mono<ConnectionSettingInner> createAsync(
         String resourceGroupName, String resourceName, String connectionName, ConnectionSettingInner parameters) {
         return createWithResponseAsync(resourceGroupName, resourceName, connectionName, parameters)
-            .flatMap(
-                (Response<ConnectionSettingInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -791,14 +769,7 @@ private Mono<Response<ConnectionSettingInner>> updateWithResponseAsync(
     private Mono<ConnectionSettingInner> updateAsync(
         String resourceGroupName, String resourceName, String connectionName, ConnectionSettingInner parameters) {
         return updateWithResponseAsync(resourceGroupName, resourceName, connectionName, parameters)
-            .flatMap(
-                (Response<ConnectionSettingInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -963,14 +934,7 @@ private Mono<Response<ConnectionSettingInner>> getWithResponseAsync(
     private Mono<ConnectionSettingInner> getAsync(
         String resourceGroupName, String resourceName, String connectionName) {
         return getWithResponseAsync(resourceGroupName, resourceName, connectionName)
-            .flatMap(
-                (Response<ConnectionSettingInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -1125,7 +1089,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String connectionName) {
         return deleteWithResponseAsync(resourceGroupName, resourceName, connectionName)
-            .flatMap((Response<Void> res) -> Mono.empty());
+            .flatMap(ignored -> Mono.empty());
     }
 
     /**

sdk/botservice/azure-resourcemanager-botservice/src/main/java/com/azure/resourcemanager/botservice/implementation/BotImpl.java

@@ -78,6 +78,10 @@ public String regionName() {
         return this.location();
     }
 
+    public String resourceGroupName() {
+        return resourceGroupName;
+    }
+
     public BotInner innerModel() {
         return this.innerObject;
     }

sdk/botservice/azure-resourcemanager-botservice/src/main/java/com/azure/resourcemanager/botservice/implementation/BotsClientImpl.java

@@ -303,14 +303,7 @@ private Mono<Response<BotInner>> createWithResponseAsync(
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<BotInner> createAsync(String resourceGroupName, String resourceName, BotInner parameters) {
         return createWithResponseAsync(resourceGroupName, resourceName, parameters)
-            .flatMap(
-                (Response<BotInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -469,14 +462,7 @@ private Mono<Response<BotInner>> updateWithResponseAsync(
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<BotInner> updateAsync(String resourceGroupName, String resourceName, BotInner parameters) {
         return updateWithResponseAsync(resourceGroupName, resourceName, parameters)
-            .flatMap(
-                (Response<BotInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -618,7 +604,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(String resourceGroupName, String resourceName) {
-        return deleteWithResponseAsync(resourceGroupName, resourceName).flatMap((Response<Void> res) -> Mono.empty());
+        return deleteWithResponseAsync(resourceGroupName, resourceName).flatMap(ignored -> Mono.empty());
     }
 
     /**
@@ -758,14 +744,7 @@ private Mono<Response<BotInner>> getByResourceGroupWithResponseAsync(
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<BotInner> getByResourceGroupAsync(String resourceGroupName, String resourceName) {
         return getByResourceGroupWithResponseAsync(resourceGroupName, resourceName)
-            .flatMap(
-                (Response<BotInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -1186,15 +1165,7 @@ private Mono<Response<CheckNameAvailabilityResponseBodyInner>> getCheckNameAvail
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<CheckNameAvailabilityResponseBodyInner> getCheckNameAvailabilityAsync(
         CheckNameAvailabilityRequestBody parameters) {
-        return getCheckNameAvailabilityWithResponseAsync(parameters)
-            .flatMap(
-                (Response<CheckNameAvailabilityResponseBodyInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+        return getCheckNameAvailabilityWithResponseAsync(parameters).flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**