move PollerFactory to polling package; remove AzureHost

eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml

@@ -395,7 +395,7 @@
 
   <!-- Don't enforce non-static ClientLogger instances in azure-core-mgmt PollerFactory and PollingState types-->
   <suppress checks="com\.azure\.tools\.checkstyle\.checks\.(ThrowFromClientLoggerCheck|GoodLoggingCheck)"
-            files="com.azure.core.management.implementation.polling.PollerFactory.java"/>
+            files="com.azure.core.management.implementation.polling.PollOperation.java"/>
   <suppress checks="com\.azure\.tools\.checkstyle\.checks\.(ThrowFromClientLoggerCheck|GoodLoggingCheck)"
             files="com.azure.core.management.implementation.polling.PollingState.java"/>
 

eng/versioning/version_client.txt

@@ -11,7 +11,7 @@ com.azure:azure-core-amqp;1.1.2;1.2.0-beta.1
 com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-core-http-netty;1.5.1;1.6.0-beta.1
 com.azure:azure-core-http-okhttp;1.2.2;1.3.0-beta.1
-com.azure:azure-core-management;1.0.0-beta.8;1.0.0-beta.8
+com.azure:azure-management-core;1.0.0-beta.8;1.0.0-beta.8
 com.azure:azure-core-serializer-json-gson;1.0.0-beta.1;1.0.0-beta.2
 com.azure:azure-core-serializer-json-jackson;1.0.0-beta.1;1.0.0-beta.2
 com.azure:azure-core-test;1.2.1;1.3.0-beta.1

sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/FunctionApp.java

@@ -9,8 +9,9 @@
 import com.azure.management.resources.fluentcore.model.Creatable;
 import com.azure.management.resources.fluentcore.model.Refreshable;
 import com.azure.management.resources.fluentcore.model.Updatable;
-import com.azure.management.storage.StorageAccount;
-import com.azure.management.storage.StorageAccountSkuType;
+import com.azure.management.storage.models.SkuName;
+import com.azure.management.storage.models.StorageAccount;
+import com.azure.management.storage.models.StorageAccountSkuType;
 import java.util.Map;
 import reactor.core.publisher.Mono;
 
@@ -314,7 +315,7 @@ interface WithStorageAccount {
              * @return the next stage of the definition
              */
             @Deprecated
-            WithCreate withNewStorageAccount(String name, com.azure.management.storage.SkuName sku);
+            WithCreate withNewStorageAccount(String name, SkuName sku);
 
             /**
              * Creates a new storage account to use for the function app.
@@ -646,7 +647,7 @@ interface WithStorageAccount {
              * @return the next stage of the function app update
              */
             @Deprecated
-            Update withNewStorageAccount(String name, com.azure.management.storage.SkuName sku);
+            Update withNewStorageAccount(String name, SkuName sku);
 
             /**
              * Creates a new storage account to use for the function app.

sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ManagedServiceIdentity.java

@@ -112,11 +112,7 @@ public ManagedServiceIdentity withUserAssignedIdentities(
      */
     public void validate() {
         if (userAssignedIdentities() != null) {
-            userAssignedIdentities().values().forEach(e -> {
-                if (e != null) {
-                    e.validate();
-                }
-            });
+            userAssignedIdentities().values().forEach(e -> { if (e != null) { e.validate(); } });
         }
     }
 }

sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppImpl.java

@@ -38,9 +38,9 @@
 import com.azure.management.appservice.models.SiteLogsConfigInner;
 import com.azure.management.resources.fluentcore.model.Creatable;
 import com.azure.management.resources.fluentcore.model.Indexable;
-import com.azure.management.storage.StorageAccount;
-import com.azure.management.storage.StorageAccountKey;
-import com.azure.management.storage.StorageAccountSkuType;
+import com.azure.management.storage.models.StorageAccount;
+import com.azure.management.storage.models.StorageAccountKey;
+import com.azure.management.storage.models.StorageAccountSkuType;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.File;
 import java.io.IOException;
@@ -297,7 +297,7 @@ private FunctionAppImpl autoSetAlwaysOn(PricingTier pricingTier) {
     }
 
     @Override
-    public FunctionAppImpl withNewStorageAccount(String name, com.azure.management.storage.SkuName sku) {
+    public FunctionAppImpl withNewStorageAccount(String name, com.azure.management.storage.models.SkuName sku) {
         StorageAccount.DefinitionStages.WithGroup storageDefine =
             manager().storageManager().storageAccounts().define(name).withRegion(regionName());
         if (super.creatableGroup != null && isInCreateMode()) {
@@ -632,7 +632,7 @@ public Flux<Indexable> createAsync() {
             if (currentStorageAccount == null && storageAccountToSet == null && storageAccountCreatable == null) {
                 withNewStorageAccount(
                     this.manager().getSdkContext().randomResourceName(name(), 20),
-                    com.azure.management.storage.SkuName.STANDARD_GRS);
+                    com.azure.management.storage.models.SkuName.STANDARD_GRS);
             }
         }
         return super.createAsync();

sdk/appservice/mgmt/src/test/java/com/azure/management/appservice/FunctionAppsTests.java

@@ -10,8 +10,8 @@
 import com.azure.management.resources.fluentcore.arm.Region;
 import com.azure.management.resources.fluentcore.profile.AzureProfile;
 import com.azure.management.resources.fluentcore.utils.SdkContext;
-import com.azure.management.storage.StorageAccount;
-import com.azure.management.storage.StorageAccountSkuType;
+import com.azure.management.storage.models.StorageAccount;
+import com.azure.management.storage.models.StorageAccountSkuType;
 import com.azure.management.storage.implementation.StorageManager;
 import java.io.ByteArrayOutputStream;
 import java.io.File;

sdk/core/azure-core-management/pom.xml

@@ -12,8 +12,8 @@
   </parent>
 
   <groupId>com.azure</groupId>
-  <artifactId>azure-core-management</artifactId>
-  <version>1.0.0-beta.8</version> <!-- {x-version-update;com.azure:azure-core-management;current} -->
+  <artifactId>azure-management-core</artifactId>
+  <version>1.0.0-beta.8</version> <!-- {x-version-update;com.azure:azure-management-core;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure Management Java Core Library</name>

sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/polling/PollerFactory.java → sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/polling/PollOperation.java

@@ -7,142 +7,28 @@
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpRequest;
 import com.azure.core.http.HttpResponse;
-import com.azure.core.http.rest.Response;
 import com.azure.core.management.polling.PollResult;
-import com.azure.core.util.FluxUtil;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.LongRunningOperationStatus;
 import com.azure.core.util.polling.PollResponse;
-import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.PollingContext;
 import com.azure.core.util.serializer.SerializerAdapter;
 import com.azure.core.util.serializer.SerializerEncoding;
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
 /**
- * Factory to create PollerFlux for Azure resource manager (ARM) long-running-operation (LRO).
+ * Poll operation for Azure resource manager (ARM) long-running-operation (LRO).
  */
-public final class PollerFactory {
-    private static final ClientLogger LOGGER = new ClientLogger(PollerFactory.class);
+public final class PollOperation {
+    private static final ClientLogger LOGGER = new ClientLogger(PollOperation.class);
     private static final LongRunningOperationStatus LRO_CANCELLED = LongRunningOperationStatus.fromString("Cancelled",
         true);
 
-    /**
-     * Creates a PollerFlux with default ARM LRO init operation.
-     *
-     * @param serializerAdapter the serializer for any encoding and decoding
-     * @param pipeline the HttpPipeline for making any Http request (e.g. poll)
-     * @param pollResultType the type of the poll result, if no result is expecting then this should be Void.class
-     * @param finalResultType the type of the final result, if no result is expecting then this should be Void.class
-     * @param defaultPollInterval the default poll interval to use if service does not return retry-after
-     * @param lroInitMono the Mono on subscribe send the service request to initiate the long-running-operation
-     * @param <T> the type of poll result
-     * @param <U> the type of final result
-     * @return PollerFlux
-     */
-    public static <T, U> PollerFlux<PollResult<T>, U> create(
-        SerializerAdapter serializerAdapter,
-        HttpPipeline pipeline,
-        Type pollResultType,
-        Type finalResultType,
-        Duration defaultPollInterval,
-        Mono<Response<Flux<ByteBuffer>>> lroInitMono) {
-        Objects.requireNonNull(serializerAdapter, "'serializerAdapter' cannot be null.");
-        Objects.requireNonNull(pipeline, "'pipeline' cannot be null.");
-        Objects.requireNonNull(pollResultType, "'pollResultType' cannot be null.");
-        Objects.requireNonNull(finalResultType, "'finalResultType' cannot be null.");
-        Objects.requireNonNull(defaultPollInterval, "'defaultPollInterval' cannot be null.");
-        Objects.requireNonNull(lroInitMono, "'lroInitMono' cannot be null.");
-        Function<PollingContext<PollResult<T>>, Mono<PollResponse<PollResult<T>>>> defaultLroInitOperation =
-            context -> lroInitMono.flatMap(response -> FluxUtil.collectBytesInByteBufferStream(response.getValue())
-                .map(contentBytes -> {
-                    String content = new String(contentBytes, StandardCharsets.UTF_8);
-                    PollingState state = PollingState.create(serializerAdapter,
-                        response.getRequest(),
-                        response.getStatusCode(),
-                        response.getHeaders(),
-                        content);
-                    state.store(context);
-                    T result = deserialize(serializerAdapter, content, pollResultType);
-                    return new PollResponse<>(state.getOperationStatus(), new PollResult<>(result));
-                }));
-        return PollerFlux.create(defaultPollInterval,
-            defaultLroInitOperation,
-            pollFunction(serializerAdapter, pipeline, pollResultType),
-            cancelFunction(),
-            fetchResultFunction(serializerAdapter, pipeline, finalResultType));
-    }
-
-    /**
-     * Creates a PollerFlux.
-     *
-     * @param serializerAdapter the serializer for any encoding and decoding
-     * @param pipeline the HttpPipeline for making any Http request (e.g. poll)
-     * @param pollResultType the type of the poll result, if no result is expecting then this should be Void.class
-     * @param finalResultType the type of the final result, if no result is expecting then this should be Void.class
-     * @param defaultPollInterval the default poll interval to use if service does not return retry-after
-     * @param lroInitOperation the function upon invoking should initiate the long-running-operation
-     * @param <T> the type of poll result
-     * @param <U> the type of final result
-     * @return PollerFlux
-     */
-    public static <T, U> PollerFlux<PollResult<T>, U> create(
-        SerializerAdapter serializerAdapter,
-        HttpPipeline pipeline,
-        Type pollResultType,
-        Type finalResultType,
-        Duration defaultPollInterval,
-        Function<PollingContext<PollResult<T>>, Mono<PollResult<T>>> lroInitOperation) {
-        Objects.requireNonNull(serializerAdapter, "'serializerAdapter' cannot be null.");
-        Objects.requireNonNull(pipeline, "'pipeline' cannot be null.");
-        Objects.requireNonNull(pollResultType, "'pollResultType' cannot be null.");
-        Objects.requireNonNull(finalResultType, "'finalResultType' cannot be null.");
-        Objects.requireNonNull(defaultPollInterval, "'defaultPollInterval' cannot be null.");
-        Objects.requireNonNull(lroInitOperation, "'lroInitOperation' cannot be null.");
-
-        return new PollerFlux<>(defaultPollInterval,
-            lroInitOperation,
-            pollFunction(serializerAdapter, pipeline, pollResultType),
-            cancelFunction(),
-            fetchResultFunction(serializerAdapter, pipeline, finalResultType));
-    }
-
-    /**
-     * Dehydrate a PollerFlux from a string.
-     *
-     * @param serializerAdapter the serializer for any encoding and decoding
-     * @param pipeline the HttpPipeline for making any Http request (e.g. poll)
-     * @param pollResultType the type of the poll result, if no result is expecting then this should be Void.class
-     * @param finalResultType the type of the final result, if no result is expecting then this should be Void.class
-     * @param defaultPollInterval the default poll interval to use if service does not return retry-after
-     * @param pollingStateStr the string to dehydrate PollerFlux from
-     * @param <T> the type of poll result
-     * @param <U> the type of final result
-     * @return PollerFlux
-     */
-    public static <T, U> PollerFlux<PollResult<T>, U> create(SerializerAdapter serializerAdapter,
-                                                             HttpPipeline pipeline,
-                                                             Type pollResultType,
-                                                             Type finalResultType,
-                                                             Duration defaultPollInterval,
-                                                             String pollingStateStr) {
-        return create(serializerAdapter, pipeline, pollResultType, finalResultType, defaultPollInterval,
-            context -> {
-                PollingState.from(serializerAdapter, pollingStateStr).store(context);
-                return Mono.empty();
-            });
-    }
-
     /**
      * Get a Function that polls provisioning state of ARM resource.
      *
@@ -152,7 +38,7 @@ public static <T, U> PollerFlux<PollResult<T>, U> create(SerializerAdapter seria
      * @param <T> the type of poll result type
      * @return the ARM poll function
      */
-    private static <T> Function<PollingContext<PollResult<T>>, Mono<PollResponse<PollResult<T>>>> pollFunction(
+    public static <T> Function<PollingContext<PollResult<T>>, Mono<PollResponse<PollResult<T>>>> pollFunction(
         SerializerAdapter serializerAdapter,
         HttpPipeline pipeline,
         Type pollResultType) {
@@ -198,7 +84,7 @@ private static <T> Function<PollingContext<PollResult<T>>, Mono<PollResponse<Pol
      * @param <T> the type of poll result type
      * @return cancel Function
      */
-    private static <T>
+    public static <T>
         BiFunction<PollingContext<PollResult<T>>, PollResponse<PollResult<T>>, Mono<PollResult<T>>> cancelFunction() {
         return new BiFunction<PollingContext<PollResult<T>>, PollResponse<PollResult<T>>, Mono<PollResult<T>>>() {
             @Override
@@ -219,7 +105,7 @@ public Mono<PollResult<T>> apply(PollingContext<PollResult<T>> context,
      * @param <U> the poll result type
      * @return retrieve final LRO result Function
      */
-    private static <T, U> Function<PollingContext<PollResult<T>>, Mono<U>> fetchResultFunction(
+    public static <T, U> Function<PollingContext<PollResult<T>>, Mono<U>> fetchResultFunction(
         SerializerAdapter serializerAdapter,
         HttpPipeline pipeline,
         Type finalResultType) {
@@ -307,7 +193,7 @@ private static Mono<PollingState> doSinglePoll(HttpPipeline pipeline, PollingSta
      * @return decoded value
      */
     @SuppressWarnings("unchecked")
-    private static <U> U deserialize(SerializerAdapter serializerAdapter, String value, Type type) {
+    public static <U> U deserialize(SerializerAdapter serializerAdapter, String value, Type type) {
         if (value == null || value.equalsIgnoreCase("")) {
             LOGGER.info("Ignoring decoding of null or empty value to:" + type.getTypeName());
             return null;

sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/polling/PollingState.java

@@ -170,7 +170,7 @@ public <T> void store(PollingContext<T> context) {
     /**
      * @return the current status of the long-running-operation.
      */
-    LongRunningOperationStatus getOperationStatus() {
+    public LongRunningOperationStatus getOperationStatus() {
         switch (this.pollingType) {
             case AZURE_ASYNC_OPERATION_POLL:
                 return toLongRunningOperationStatus(this.azureAsyncOperationData.getProvisioningState());

sdk/core/azure-core-management/src/main/java/com/azure/core/management/polling/PollResult.java

@@ -38,7 +38,7 @@ public PollResult(Error error) {
      *
      * @return the value
      */
-    public T value() {
+    public T getValue() {
         return this.value;
     }
 
@@ -47,7 +47,7 @@ public T value() {
      *
      * @return the error
      */
-    public Error error() {
+    public Error getError() {
         return this.error;
     }