Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Ready for review] Regenerated the Batch management apis as swagger is updated. #1089

Merged
merged 4 commits into from
Sep 20, 2016
Merged

[Ready for review] Regenerated the Batch management apis as swagger is updated. #1089

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89807ae
Regenerated the Batch management apis as swagger is updated.
anudeepsharma Sep 20, 2016
70994a6
Merged from master
anudeepsharma Sep 20, 2016
bf75072
Merge branch 'master' of github.com:Azure/azure-sdk-for-java into Bat…
anudeepsharma Sep 20, 2016
9ba4c43
Fixed style check error
anudeepsharma Sep 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 0 additions & 120 deletions azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/ApplicationPackage.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/BatchAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
import com.microsoft.azure.management.apigeneration.LangMethodDefinition.LangMethodType;
import com.microsoft.azure.management.batch.implementation.AccountResourceInner;
import com.microsoft.azure.management.batch.implementation.BatchAccountInner;
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;
Expand All @@ -27,13 +27,13 @@ public interface BatchAccount extends
GroupableResource,
Refreshable<BatchAccount>,
Updatable<BatchAccount.Update>,
Wrapper<AccountResourceInner> {
Wrapper<BatchAccountInner> {

/**
* @return the provisioned state of the resource. Possible values include:
* 'Invalid', 'Creating', 'Deleting', 'Succeeded', 'Failed', 'Cancelled'
*/
AccountProvisioningState provisioningState();
ProvisioningState provisioningState();

/**
* @return Get the accountEndpoint value.
Expand Down
18 changes: 9 additions & 9 deletions ...ement/batch/AccountProvisioningState.java → ...e/management/batch/ProvisioningState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
import com.fasterxml.jackson.annotation.JsonValue;

/**
* Defines values for AccountProvisioningState.
* Defines values for ProvisioningState.
*/
public enum AccountProvisioningState {
public enum ProvisioningState {
/** Enum value Invalid. */
INVALID("Invalid"),

Expand All @@ -33,23 +33,23 @@ public enum AccountProvisioningState {
/** Enum value Cancelled. */
CANCELLED("Cancelled");

/** The actual serialized value for a AccountProvisioningState instance. */
/** The actual serialized value for a ProvisioningState instance. */
private String value;

AccountProvisioningState(String value) {
ProvisioningState(String value) {
this.value = value;
}

/**
* Parses a serialized value to a AccountProvisioningState instance.
* Parses a serialized value to a ProvisioningState instance.
*
* @param value the serialized value to parse.
* @return the parsed AccountProvisioningState object, or null if unable to parse.
* @return the parsed ProvisioningState object, or null if unable to parse.
*/
@JsonCreator
public static AccountProvisioningState fromString(String value) {
AccountProvisioningState[] items = AccountProvisioningState.values();
for (AccountProvisioningState item : items) {
public static ProvisioningState fromString(String value) {
ProvisioningState[] items = ProvisioningState.values();
for (ProvisioningState item : items) {
if (item.toString().equalsIgnoreCase(value)) {
return item;
}
Expand Down
117 changes: 0 additions & 117 deletions ...com/microsoft/azure/management/batch/implementation/AddApplicationPackageResultInner.java
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions ...h/src/main/java/com/microsoft/azure/management/batch/implementation/ApplicationInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
package com.microsoft.azure.management.batch.implementation;

import java.util.List;
import com.microsoft.azure.management.batch.ApplicationPackage;

/**
* Contains information about an application in a Batch account.
Expand All @@ -28,7 +27,7 @@ public class ApplicationInner {
/**
* The list of packages under this application.
*/
private List<ApplicationPackage> packages;
private List<ApplicationPackageInner> packages;

/**
* A value indicating whether packages within the application may be
Expand Down Expand Up @@ -87,7 +86,7 @@ public ApplicationInner withDisplayName(String displayName) {
*
* @return the packages value
*/
public List<ApplicationPackage> packages() {
public List<ApplicationPackageInner> packages() {
return this.packages;
}

Expand All @@ -97,7 +96,7 @@ public List<ApplicationPackage> packages() {
* @param packages the packages value to set
* @return the ApplicationInner object itself.
*/
public ApplicationInner withPackages(List<ApplicationPackage> packages) {
public ApplicationInner withPackages(List<ApplicationPackageInner> packages) {
this.packages = packages;
return this;
}
Expand Down
Loading