You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2015/03/12 11:39:22 UTC
[04/10] jclouds-labs git commit: White noise: formatting
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/domain/OSImage.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/OSImage.java b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/OSImage.java
index eac4b1e..a72ba6b 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/OSImage.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/OSImage.java
@@ -33,18 +33,28 @@ import com.google.auto.value.AutoValue;
public abstract class OSImage {
public enum Type {
- LINUX, WINDOWS;
+
+ LINUX,
+ WINDOWS;
+
}
- OSImage() {} // For AutoValue only!
+ OSImage() {
+ } // For AutoValue only!
public abstract String name();
- /** The geo-locations of the image, if the image is not associated with an affinity group. */
- @Nullable public abstract String location();
+ /**
+ * The geo-locations of the image, if the image is not associated with an affinity group.
+ */
+ @Nullable
+ public abstract String location();
- /** The affinity group with which this image is associated, if any. */
- @Nullable public abstract String affinityGroup();
+ /**
+ * The affinity group with which this image is associated, if any.
+ */
+ @Nullable
+ public abstract String affinityGroup();
/**
* The name can be up to 100 characters in length. The name can be used identify the storage account for your
@@ -52,41 +62,50 @@ public abstract class OSImage {
*/
public abstract String label();
- @Nullable public abstract String description();
+ @Nullable
+ public abstract String description();
/**
- * The repository classification of image. All user images have the category "User", but
- * categories for other images could be, for example "Canonical"
+ * The repository classification of image. All user images have the category "User", but categories for other images
+ * could be, for example "Canonical"
*/
- @Nullable public abstract String category();
+ @Nullable
+ public abstract String category();
- /** The operating system type of the OS image. */
+ /**
+ * The operating system type of the OS image.
+ */
public abstract Type os();
-
//The name of the publisher of the image. All user images have a publisher name of User.
- @Nullable public abstract String publisherName();
+ @Nullable
+ public abstract String publisherName();
+
/**
- * The locations of the blob in the blob store in which the media for the image is located. The
- * blob locations belongs to a storage account in the subscription specified by the
+ * The locations of the blob in the blob store in which the media for the image is located. The blob locations
+ * belongs to a storage account in the subscription specified by the
* <subscription-id> value in the operation call.
*
* Example:
*
* http://example.blob.core.windows.net/disks/myimage.vhd
*/
- @Nullable public abstract URI mediaLink();
+ @Nullable
+ public abstract URI mediaLink();
public abstract int logicalSizeInGB();
- /** The eulas for the image, if available. */
+ /**
+ * The eulas for the image, if available.
+ */
// Not URI as some providers put non-uri data in, such as riverbed.
public abstract List<String> eula();
+ public static OSImage create(final String name, final String location, final String affinityGroup, final String label,
+ final String description, final String category, final Type os, final String publisherName,
+ final URI mediaLink, final int logicalSizeInGB, final List<String> eula) {
- public static OSImage create(String name, String location, String affinityGroup, String label,
- String description, String category, Type os, String publisherName, URI mediaLink, int logicalSizeInGB, List<String> eula) {
- return new AutoValue_OSImage(name, location, affinityGroup, label, description, category, os, publisherName, mediaLink,
- logicalSizeInGB, copyOf(eula));
+ return new AutoValue_OSImage(name, location, affinityGroup, label, description, category, os, publisherName,
+ mediaLink, logicalSizeInGB, copyOf(eula));
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/domain/OSImageParams.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/OSImageParams.java b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/OSImageParams.java
index ed2b623..6c85696 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/OSImageParams.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/OSImageParams.java
@@ -20,22 +20,33 @@ import java.net.URI;
import com.google.auto.value.AutoValue;
-/** To create a new operating system image. */
+/**
+ * To create a new operating system image.
+ */
@AutoValue
public abstract class OSImageParams {
- OSImageParams() {} // For AutoValue only!
+ OSImageParams() {
+ } // For AutoValue only!
- /** Specifies a name that is used to identify the image when you create a Virtual Machine. */
+ /**
+ * Specifies a name that is used to identify the image when you create a Virtual Machine.
+ */
public abstract String name();
- /** Specifies the friendly name of the image. */
+ /**
+ * Specifies the friendly name of the image.
+ */
public abstract String label();
- /** Specifies the location of the vhd file for the image. */
+ /**
+ * Specifies the location of the vhd file for the image.
+ */
public abstract URI mediaLink();
- /** {@link OSImage#os() Os type} of the image. */
+ /**
+ * {@link OSImage#os() Os type} of the image.
+ */
public abstract OSImage.Type os();
public Builder toBuilder() {
@@ -47,27 +58,31 @@ public abstract class OSImageParams {
}
public static final class Builder {
+
private String name;
+
private String label;
+
private URI mediaLink;
+
private OSImage.Type os;
- public Builder name(String name) {
+ public Builder name(final String name) {
this.name = name;
return this;
}
- public Builder label(String label) {
+ public Builder label(final String label) {
this.label = label;
return this;
}
- public Builder mediaLink(URI mediaLink) {
+ public Builder mediaLink(final URI mediaLink) {
this.mediaLink = mediaLink;
return this;
}
- public Builder os(OSImage.Type os) {
+ public Builder os(final OSImage.Type os) {
this.os = os;
return this;
}
@@ -76,15 +91,17 @@ public abstract class OSImageParams {
return OSImageParams.create(name, label, mediaLink, os);
}
- public Builder fromImageParams(OSImageParams in) {
+ public Builder fromImageParams(final OSImageParams in) {
return name(in.name())
- .label(in.label())
- .mediaLink(in.mediaLink())
- .os(in.os());
+ .label(in.label())
+ .mediaLink(in.mediaLink())
+ .os(in.os());
}
}
- private static OSImageParams create(String name, String label, URI mediaLink, OSImage.Type os) {
+ private static OSImageParams create(
+ final String name, final String label, final URI mediaLink, final OSImage.Type os) {
+
return new AutoValue_OSImageParams(name, label, mediaLink, os);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Operation.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Operation.java b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Operation.java
index a74a1e1..0fba3f4 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Operation.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Operation.java
@@ -30,22 +30,33 @@ import com.google.auto.value.AutoValue;
public abstract class Operation {
public enum Status {
- IN_PROGRESS, SUCCEEDED, FAILED,
+
+ IN_PROGRESS,
+ SUCCEEDED,
+ FAILED,
UNRECOGNIZED;
+
}
- Operation() {} // For AutoValue only!
+ Operation() {
+ } // For AutoValue only!
public abstract String id();
public abstract Status status();
- @Nullable public abstract Integer httpStatusCode();
+ @Nullable
+ public abstract Integer httpStatusCode();
+
+ /**
+ * Present when the operation {@link Status#FAILED failed}.
+ */
+ @Nullable
+ public abstract Error error();
- /** Present when the operation {@link Status#FAILED failed}. */
- @Nullable public abstract Error error();
+ public static Operation create(
+ final String id, final Status status, final Integer httpStatusCode, final Error error) {
- public static Operation create(String id, Status status, Integer httpStatusCode, Error error) {
return new AutoValue_Operation(id, status, httpStatusCode, error);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Role.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Role.java b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Role.java
index 5aa94fe..268811b 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Role.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Role.java
@@ -48,7 +48,7 @@ public abstract class Role {
LoadBalancerProbe() { // For AutoValue only!
}
- public static LoadBalancerProbe create(String path, int port, String protocol) {
+ public static LoadBalancerProbe create(final String path, final int port, final String protocol) {
return new AutoValue_Role_ConfigurationSet_InputEndpoint_LoadBalancerProbe(path, port, protocol);
}
}
@@ -66,18 +66,23 @@ public abstract class Role {
public abstract Boolean enableDirectServerReturn();
- @Nullable public abstract String loadBalancerName();
+ @Nullable
+ public abstract String loadBalancerName();
- @Nullable public abstract LoadBalancerProbe loadBalancerProbe();
+ @Nullable
+ public abstract LoadBalancerProbe loadBalancerProbe();
- @Nullable public abstract Integer idleTimeoutInMinutes();
+ @Nullable
+ public abstract Integer idleTimeoutInMinutes();
InputEndpoint() { // For AutoValue only!
}
- public static InputEndpoint create(String name, String protocol, int localPort, int port,
- String vip, boolean enableDirectServerReturn, String loadBalancerName,
- LoadBalancerProbe loadBalancerProbe, Integer idleTimeoutInMinutes) {
+ public static InputEndpoint create(
+ final String name, final String protocol, final int localPort, final int port,
+ final String vip, final boolean enableDirectServerReturn, final String loadBalancerName,
+ final LoadBalancerProbe loadBalancerProbe, final Integer idleTimeoutInMinutes) {
+
return new AutoValue_Role_ConfigurationSet_InputEndpoint(localPort, name, port, protocol, vip,
enableDirectServerReturn, loadBalancerName, loadBalancerProbe, idleTimeoutInMinutes);
}
@@ -86,12 +91,13 @@ public abstract class Role {
@AutoValue
public abstract static class SubnetName {
- @Nullable public abstract String name();
+ @Nullable
+ public abstract String name();
SubnetName() { // For AutoValue only!
}
- public static SubnetName create(String name) {
+ public static SubnetName create(final String name) {
return new AutoValue_Role_ConfigurationSet_SubnetName(name);
}
}
@@ -106,7 +112,7 @@ public abstract class Role {
PublicIP() { // For AutoValue only!
}
- public static PublicIP create(String name, int idleTimeoutInMinutes) {
+ public static PublicIP create(final String name, final int idleTimeoutInMinutes) {
return new AutoValue_Role_ConfigurationSet_PublicIP(name, idleTimeoutInMinutes);
}
}
@@ -115,20 +121,26 @@ public abstract class Role {
public abstract List<InputEndpoint> inputEndpoints();
- @Nullable public abstract List<SubnetName> subnetNames();
+ @Nullable
+ public abstract List<SubnetName> subnetNames();
- @Nullable public abstract String staticVirtualNetworkIPAddress();
+ @Nullable
+ public abstract String staticVirtualNetworkIPAddress();
- @Nullable public abstract List<PublicIP> publicIPs();
+ @Nullable
+ public abstract List<PublicIP> publicIPs();
- @Nullable public abstract String networkSecurityGroup();
+ @Nullable
+ public abstract String networkSecurityGroup();
ConfigurationSet() { // For AutoValue only!
}
- public static ConfigurationSet create(String configurationSetType, List<InputEndpoint> inputEndpoints,
- List<SubnetName> subnetNames, String staticVirtualNetworkIPAddress,
- List<PublicIP> publicIPs, String networkSecurityGroup) {
+ public static ConfigurationSet create(
+ final String configurationSetType, final List<InputEndpoint> inputEndpoints,
+ final List<SubnetName> subnetNames, final String staticVirtualNetworkIPAddress,
+ final List<PublicIP> publicIPs, final String networkSecurityGroup) {
+
return new AutoValue_Role_ConfigurationSet(configurationSetType, inputEndpoints, subnetNames,
staticVirtualNetworkIPAddress, publicIPs, networkSecurityGroup);
}
@@ -149,7 +161,9 @@ public abstract class Role {
ResourceExtensionParameterValue() { // For AutoValue only!
}
- public static ResourceExtensionParameterValue create(String key, String value, String type) {
+ public static ResourceExtensionParameterValue create(
+ final String key, final String value, final String type) {
+
return new AutoValue_Role_ResourceExtensionReference_ResourceExtensionParameterValue(key, value, type);
}
}
@@ -162,15 +176,18 @@ public abstract class Role {
public abstract String version();
- @Nullable public abstract List<ResourceExtensionParameterValue> resourceExtensionParameterValues();
+ @Nullable
+ public abstract List<ResourceExtensionParameterValue> resourceExtensionParameterValues();
public abstract String state();
ResourceExtensionReference() { // For AutoValue only!
}
- public static ResourceExtensionReference create(String referenceName, String publisher, String name, String
- version, List<ResourceExtensionParameterValue> resourceExtensionParameterValues, String state) {
+ public static ResourceExtensionReference create(
+ final String referenceName, final String publisher, final String name, final String version,
+ final List<ResourceExtensionParameterValue> resourceExtensionParameterValues, final String state) {
+
return new AutoValue_Role_ResourceExtensionReference(referenceName, publisher, name, version,
resourceExtensionParameterValues, state);
}
@@ -183,9 +200,11 @@ public abstract class Role {
public abstract String diskName();
- @Nullable public abstract Integer lun();
+ @Nullable
+ public abstract Integer lun();
- @Nullable public abstract Integer logicalDiskSizeInGB();
+ @Nullable
+ public abstract Integer logicalDiskSizeInGB();
public abstract URI mediaLink();
@@ -196,8 +215,12 @@ public abstract class Role {
OSVirtualHardDisk() { // For AutoValue only!
}
- public static OSVirtualHardDisk create(String hostCaching, String diskName, Integer lun, Integer logicalDiskSizeInGB, URI mediaLink, String sourceImageName, OSImage.Type os) {
- return new AutoValue_Role_OSVirtualHardDisk(hostCaching, diskName, lun, logicalDiskSizeInGB, mediaLink, sourceImageName, os);
+ public static OSVirtualHardDisk create(final String hostCaching, final String diskName, final Integer lun,
+ final Integer logicalDiskSizeInGB, final URI mediaLink, final String sourceImageName,
+ final OSImage.Type os) {
+
+ return new AutoValue_Role_OSVirtualHardDisk(hostCaching, diskName, lun, logicalDiskSizeInGB, mediaLink,
+ sourceImageName, os);
}
}
@@ -214,12 +237,14 @@ public abstract class Role {
/**
* Specifies the name of the VM Image that was used to create the Virtual Machine.
*/
- @Nullable public abstract String vmImage();
+ @Nullable
+ public abstract String vmImage();
/**
* Specifies the path to the VHD files that are associated with the VM Image.
*/
- @Nullable public abstract String mediaLocation();
+ @Nullable
+ public abstract String mediaLocation();
/**
* Contains a collection of configuration sets that define system and application settings.
@@ -227,20 +252,24 @@ public abstract class Role {
public abstract List<ConfigurationSet> configurationSets();
/**
- * Optional. Contains a collection of resource extensions that are installed on the Virtual Machine. This element is used if ProvisionGuestAgent is set to true.
+ * Optional. Contains a collection of resource extensions that are installed on the Virtual Machine. This element is
+ * used if ProvisionGuestAgent is set to true.
*/
- @Nullable public abstract List<ResourceExtensionReference> resourceExtensionReferences();
+ @Nullable
+ public abstract List<ResourceExtensionReference> resourceExtensionReferences();
/**
- * Specifies the name of a collection of Virtual Machines.
- * Virtual Machines specified in the same availability set are allocated to different nodes to maximize availability.
+ * Specifies the name of a collection of Virtual Machines. Virtual Machines specified in the same availability set
+ * are allocated to different nodes to maximize availability.
*/
- @Nullable public abstract String availabilitySetName();
+ @Nullable
+ public abstract String availabilitySetName();
/**
* Contains the parameters that were used to add a data disk to a Virtual Machine.
*/
- @Nullable public abstract List<DataVirtualHardDisk> dataVirtualHardDisks();
+ @Nullable
+ public abstract List<DataVirtualHardDisk> dataVirtualHardDisks();
/**
* Contains the parameters that were used to create the operating system disk for a Virtual Machine.
@@ -253,23 +282,29 @@ public abstract class Role {
public abstract RoleSize.Type roleSize();
/**
- * Optional. Indicates whether the VM Agent is installed on the Virtual Machine.
- * To run a resource extension in a Virtual Machine, this service must be installed.
+ * Optional. Indicates whether the VM Agent is installed on the Virtual Machine. To run a resource extension in a
+ * Virtual Machine, this service must be installed.
+ *
* @return true or false
*/
- @Nullable public abstract Boolean provisionGuestAgent();
+ @Nullable
+ public abstract Boolean provisionGuestAgent();
/**
* Specifies the read-only thumbprint of the certificate that is used with the HTTPS listener for WinRM.
*/
- @Nullable public abstract String defaultWinRmCertificateThumbprint();
-
- public static Role create(String roleName, String roleType, String vmImage, String mediaLocation,
- List<ConfigurationSet> configurationSets, List<ResourceExtensionReference> resourceExtensionReferences,
- String availabilitySetName, List<DataVirtualHardDisk> dataVirtualHardDisks,
- OSVirtualHardDisk osVirtualHardDisk, RoleSize.Type roleSize, Boolean provisionGuestAgent,
- String defaultWinRmCertificateThumbprint) {
- return new AutoValue_Role(roleName, roleType, vmImage, mediaLocation, copyOf(configurationSets), copyOf(resourceExtensionReferences),
- availabilitySetName, copyOf(dataVirtualHardDisks), osVirtualHardDisk, roleSize, provisionGuestAgent, defaultWinRmCertificateThumbprint);
+ @Nullable
+ public abstract String defaultWinRmCertificateThumbprint();
+
+ public static Role create(final String roleName, final String roleType, final String vmImage,
+ final String mediaLocation, final List<ConfigurationSet> configurationSets,
+ final List<ResourceExtensionReference> resourceExtensionReferences,
+ final String availabilitySetName, final List<DataVirtualHardDisk> dataVirtualHardDisks,
+ final OSVirtualHardDisk osVirtualHardDisk, final RoleSize.Type roleSize, final Boolean provisionGuestAgent,
+ final String defaultWinRmCertificateThumbprint) {
+
+ return new AutoValue_Role(roleName, roleType, vmImage, mediaLocation, copyOf(configurationSets),
+ copyOf(resourceExtensionReferences), availabilitySetName, copyOf(dataVirtualHardDisks),
+ osVirtualHardDisk, roleSize, provisionGuestAgent, defaultWinRmCertificateThumbprint);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/domain/RoleSize.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/RoleSize.java b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/RoleSize.java
index 30ea00f..ff2d856 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/RoleSize.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/RoleSize.java
@@ -29,26 +29,55 @@ import com.google.auto.value.AutoValue;
public abstract class RoleSize {
public enum Type {
- BASIC_A0 ("Basic_A0"), BASIC_A1 ("Basic_A1"), BASIC_A2 ("Basic_A2"), BASIC_A3 ("Basic_A3"), BASIC_A4 ("Basic_A4"),
- A0 ("A0"), A1 ("A1"), A2 ("A2"), A3 ("A3"), A4 ("A4"), A5 ("A5"), A6 ("A6"), A7 ("A7"), A8 ("A8"), A9 ("A9"),
- STANDARD_A0 ("Standard_A0"), STANDARD_A1 ("Standard_A1"), STANDARD_A2 ("Standard_A2"), STANDARD_A3
- ("Standard_A3"),
- STANDARD_A4 ("Standard_A4"), STANDARD_A5 ("Standard_A5"), STANDARD_A6 ("Standard_A6"),
- STANDARD_A7 ("Standard_A7"),
- STANDARD_A8 ("Standard_A8"), STANDARD_A9 ("Standard_A9"),
- STANDARD_D1 ("Standard_D1"), STANDARD_D2 ("Standard_D2"), STANDARD_D3 ("Standard_D3"), STANDARD_D4
- ("Standard_D4"),
- STANDARD_D11 ("Standard_D11"),
- STANDARD_D12 ("Standard_D12"), STANDARD_D13 ("Standard_D13"),
- STANDARD_D14 ("Standard_D14"),
- STANDARD_G1 ("Standard_G1"), STANDARD_G2 ("Standard_G2"), STANDARD_G3 ("Standard_G3"),
- STANDARD_G4 ("Standard_G4"), STANDARD_G5 ("Standard_G5"),
- EXTRASMALL ("ExtraSmall"), SMALL ("Small"), MEDIUM ("Medium"), LARGE ("Large"), EXTRALARGE ("ExtraLarge"),
- UNRECOGNIZED ("UNRECOGNIZED");
+
+ BASIC_A0("Basic_A0"),
+ BASIC_A1("Basic_A1"),
+ BASIC_A2("Basic_A2"),
+ BASIC_A3("Basic_A3"),
+ BASIC_A4("Basic_A4"),
+ A0("A0"),
+ A1("A1"),
+ A2("A2"),
+ A3("A3"),
+ A4("A4"),
+ A5("A5"),
+ A6("A6"),
+ A7("A7"),
+ A8("A8"),
+ A9("A9"),
+ STANDARD_A0("Standard_A0"),
+ STANDARD_A1("Standard_A1"),
+ STANDARD_A2("Standard_A2"),
+ STANDARD_A3("Standard_A3"),
+ STANDARD_A4("Standard_A4"),
+ STANDARD_A5("Standard_A5"),
+ STANDARD_A6("Standard_A6"),
+ STANDARD_A7("Standard_A7"),
+ STANDARD_A8("Standard_A8"),
+ STANDARD_A9("Standard_A9"),
+ STANDARD_D1("Standard_D1"),
+ STANDARD_D2("Standard_D2"),
+ STANDARD_D3("Standard_D3"),
+ STANDARD_D4("Standard_D4"),
+ STANDARD_D11("Standard_D11"),
+ STANDARD_D12("Standard_D12"),
+ STANDARD_D13("Standard_D13"),
+ STANDARD_D14("Standard_D14"),
+ STANDARD_G1("Standard_G1"),
+ STANDARD_G2("Standard_G2"),
+ STANDARD_G3("Standard_G3"),
+ STANDARD_G4("Standard_G4"),
+ STANDARD_G5("Standard_G5"),
+ EXTRASMALL("ExtraSmall"),
+ SMALL("Small"),
+ MEDIUM("Medium"),
+ LARGE("Large"),
+ EXTRALARGE("ExtraLarge"),
+ UNRECOGNIZED("UNRECOGNIZED");
private String text;
- Type(String text) {
+ Type(final String text) {
this.text = text;
}
@@ -56,7 +85,7 @@ public abstract class RoleSize {
return this.text;
}
- public static Type fromString(String text) {
+ public static Type fromString(final String text) {
if (text != null) {
for (Type b : Type.values()) {
if (text.equalsIgnoreCase(b.text)) {
@@ -68,7 +97,8 @@ public abstract class RoleSize {
}
}
- RoleSize() {} // For AutoValue only!
+ RoleSize() {
+ } // For AutoValue only!
/**
* The name of the role size.
@@ -116,9 +146,14 @@ public abstract class RoleSize {
*/
public abstract Integer virtualMachineResourceDiskSizeInMb();
- public static RoleSize create(Type name, String label, Integer cores, Integer memoryInMb, Boolean
- supportedByWebWorkerRoles, Boolean supportedByVirtualMachines, Integer maxDataDiskCount, Integer webWorkerResourceDiskSizeInMb, Integer virtualMachineResourceDiskSizeInMb) {
- return new AutoValue_RoleSize(name, label, cores, memoryInMb, supportedByWebWorkerRoles, supportedByVirtualMachines, maxDataDiskCount, webWorkerResourceDiskSizeInMb, virtualMachineResourceDiskSizeInMb);
+ public static RoleSize create(final Type name, final String label, final Integer cores,
+ final Integer memoryInMb, final Boolean supportedByWebWorkerRoles,
+ final Boolean supportedByVirtualMachines, final Integer maxDataDiskCount,
+ final Integer webWorkerResourceDiskSizeInMb, final Integer virtualMachineResourceDiskSizeInMb) {
+
+ return new AutoValue_RoleSize(name, label, cores, memoryInMb,
+ supportedByWebWorkerRoles, supportedByVirtualMachines, maxDataDiskCount, webWorkerResourceDiskSizeInMb,
+ virtualMachineResourceDiskSizeInMb);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Rule.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Rule.java b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Rule.java
index 825417a..1d81c14 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Rule.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/Rule.java
@@ -43,13 +43,16 @@ public abstract class Rule {
public abstract String state();
- @Nullable public abstract Boolean isDefault();
+ @Nullable
+ public abstract Boolean isDefault();
- Rule() {} // For AutoValue only!
+ Rule() {
+ } // For AutoValue only!
+
+ public static Rule create(final String name, final String type, final String priority, final String action,
+ final String sourceAddressPrefix, final String sourcePortRange, final String destinationAddressPrefix,
+ final String destinationPortRange, final String protocol, final String state, final Boolean isDefault) {
- public static Rule create(String name, String type, String priority, String action, String sourceAddressPrefix,
- String sourcePortRange, String destinationAddressPrefix, String destinationPortRange,
- String protocol, String state, Boolean isDefault) {
return new AutoValue_Rule(name, type, priority, action, sourceAddressPrefix, sourcePortRange,
destinationAddressPrefix, destinationPortRange, protocol, state, isDefault);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/domain/StorageService.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/StorageService.java b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/StorageService.java
index f8e2dbd..adb04d9 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/StorageService.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/StorageService.java
@@ -28,9 +28,11 @@ public abstract class StorageService {
@AutoValue
public abstract static class StorageServiceProperties {
- StorageServiceProperties() {} // For AutoValue only!
+ StorageServiceProperties() {
+ } // For AutoValue only!
- @Nullable public abstract String description();
+ @Nullable
+ public abstract String description();
public abstract String status();
@@ -38,12 +40,15 @@ public abstract class StorageService {
public abstract String accountType();
- public static StorageServiceProperties create(String description, String status, String location, String accountType) {
+ public static StorageServiceProperties create(final String description, final String status,
+ final String location, final String accountType) {
+
return new AutoValue_StorageService_StorageServiceProperties(description, status, location, accountType);
}
}
- StorageService() {} // For AutoValue only!
+ StorageService() {
+ } // For AutoValue only!
public abstract URL url();
@@ -51,7 +56,9 @@ public abstract class StorageService {
public abstract StorageServiceProperties storageServiceProperties();
- public static StorageService create(URL url, String serviceName, StorageServiceProperties storageServiceProperties) {
+ public static StorageService create(final URL url, final String serviceName,
+ final StorageServiceProperties storageServiceProperties) {
+
return new AutoValue_StorageService(url, serviceName, storageServiceProperties);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/domain/StorageServiceParams.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/StorageServiceParams.java b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/StorageServiceParams.java
index 86d92c9..dfb38fe 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/domain/StorageServiceParams.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/domain/StorageServiceParams.java
@@ -23,12 +23,21 @@ import com.google.auto.value.AutoValue;
public abstract class StorageServiceParams {
public enum Type {
- Standard_LRS, Standard_ZRS, Standard_GRS, Standard_RAGRS, Premium_LRS;
+
+ Standard_LRS,
+ Standard_ZRS,
+ Standard_GRS,
+ Standard_RAGRS,
+ Premium_LRS;
+
}
- StorageServiceParams() {} // For AutoValue only!
+ StorageServiceParams() {
+ } // For AutoValue only!
- /** The user-supplied name for this deployment. */
+ /**
+ * The user-supplied name for this deployment.
+ */
public abstract String name();
public abstract String label();
@@ -46,27 +55,31 @@ public abstract class StorageServiceParams {
}
public static final class Builder {
+
private String name;
+
private String label;
+
private String location;
+
private Type accountType;
- public Builder name(String name) {
+ public Builder name(final String name) {
this.name = name;
return this;
}
- public Builder label(String label) {
+ public Builder label(final String label) {
this.label = label;
return this;
}
- public Builder location(String location) {
+ public Builder location(final String location) {
this.location = location;
return this;
}
- public Builder accountType(Type accountType) {
+ public Builder accountType(final Type accountType) {
this.accountType = accountType;
return this;
}
@@ -75,15 +88,17 @@ public abstract class StorageServiceParams {
return StorageServiceParams.create(name, label, location, accountType);
}
- public Builder fromStorageServiceParams(StorageServiceParams in) {
- return name(in.name())
- .label(in.label())
- .location(in.location())
- .accountType(in.accountType());
+ public Builder fromStorageServiceParams(final StorageServiceParams storageServiceParams) {
+ return name(storageServiceParams.name())
+ .label(storageServiceParams.label())
+ .location(storageServiceParams.location())
+ .accountType(storageServiceParams.accountType());
}
}
- private static StorageServiceParams create(String name, String label, String location, Type accountType) {
+ private static StorageServiceParams create(
+ final String name, final String label, final String location, final Type accountType) {
+
return new AutoValue_StorageServiceParams(name, label, location, accountType);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/features/CloudServiceApi.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/CloudServiceApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/CloudServiceApi.java
index 9cc8b5e..94d203f 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/CloudServiceApi.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/CloudServiceApi.java
@@ -47,8 +47,7 @@ import org.jclouds.rest.annotations.ResponseParser;
import org.jclouds.rest.annotations.XMLResponseParser;
/**
- * The Service Management API includes operations for managing the cloud services beneath your
- * subscription.
+ * The Service Management API includes operations for managing the cloud services beneath your subscription.
*
* @see <a href="http://msdn.microsoft.com/en-us/library/ee460812">docs</a>
*/
@@ -58,8 +57,7 @@ import org.jclouds.rest.annotations.XMLResponseParser;
public interface CloudServiceApi {
/**
- * The List Cloud Services operation lists the cloud services available under the current
- * subscription.
+ * The List Cloud Services operation lists the cloud services available under the current subscription.
*
* @return the response object
*/
@@ -73,16 +71,13 @@ public interface CloudServiceApi {
/**
* The Create Cloud Service operation creates a new cloud service in Windows Azure.
*
- * @param name
- * A name for the cloud service that is unique within Windows Azure. This name is the
- * DNS prefix name and can be used to access the cloud service.
+ * @param name A name for the cloud service that is unique within Windows Azure. This name is the DNS prefix name and
+ * can be used to access the cloud service.
*
- * For example: http://name.cloudapp.net//
- * @param label
- * The name can be used identify the storage account for your tracking purposes. The
- * name can be up to 100 characters in length.
- * @param location
- * The location where the cloud service will be created.
+ * For example: http://name.cloudapp.net//
+ * @param label The name can be used identify the storage account for your tracking purposes. The name can be up to
+ * 100 characters in length.
+ * @param location The location where the cloud service will be created.
* @return the requestId to track this async request progress
*
* @see <a href="http://msdn.microsoft.com/en-us/library/ee460812">docs</a>
@@ -91,19 +86,19 @@ public interface CloudServiceApi {
@POST
@Produces(APPLICATION_XML)
@ResponseParser(ParseRequestIdHeader.class)
- @Payload("<CreateHostedService xmlns=\"http://schemas.microsoft.com/windowsazure\"><ServiceName>{name}</ServiceName><Label>{label}</Label><Location>{location}</Location></CreateHostedService>")
+ @Payload("<CreateHostedService xmlns=\"http://schemas.microsoft.com/windowsazure\">"
+ + "<ServiceName>{name}</ServiceName><Label>{label}</Label>"
+ + "<Location>{location}</Location></CreateHostedService>")
String createWithLabelInLocation(@PayloadParam("name") String name,
- @PayloadParam("label") @ParamParser(Base64EncodeLabel.class) String label,
- @PayloadParam("location") String location);
+ @PayloadParam("label") @ParamParser(Base64EncodeLabel.class) String label,
+ @PayloadParam("location") String location);
/**
- * The Get Cloud Service Properties operation retrieves system properties for the specified
- * cloud service. These properties include the service name and service type; the name of the
- * affinity group to which the service belongs, or its location if it is not part of an affinity
- * group.
+ * The Get Cloud Service Properties operation retrieves system properties for the specified cloud service. These
+ * properties include the service name and service type; the name of the affinity group to which the service belongs,
+ * or its location if it is not part of an affinity group.
*
- * @param name
- * the unique DNS Prefix value in the Windows Azure Management Portal
+ * @param name the unique DNS Prefix value in the Windows Azure Management Portal
*/
@Named("GetCloudServiceProperties")
@GET
@@ -111,13 +106,13 @@ public interface CloudServiceApi {
@QueryParams(keys = "embed-detail", values = "true")
@XMLResponseParser(CloudServiceHandler.class)
@Fallback(NullOnNotFoundOr404.class)
- @Nullable CloudService get(@PathParam("name") String name);
+ @Nullable
+ CloudService get(@PathParam("name") String name);
/**
* The Delete Cloud Service operation deletes the specified cloud service from Windows Azure.
*
- * @param name
- * the unique DNS Prefix value in the Windows Azure Management Portal
+ * @param name the unique DNS Prefix value in the Windows Azure Management Portal
*
* @return request id or null, if not found
*/
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/features/DeploymentApi.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/DeploymentApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/DeploymentApi.java
index 2e771b4..053bca8 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/DeploymentApi.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/DeploymentApi.java
@@ -47,8 +47,7 @@ public interface DeploymentApi {
/**
* The Get Deployment operation returns the specified deployment from Windows Azure.
*
- * @param name
- * the unique DNS Prefix value in the Windows Azure Management Portal
+ * @param name the unique DNS Prefix value in the Windows Azure Management Portal
*/
@Named("GetDeployment")
@GET
@@ -66,8 +65,7 @@ public interface DeploymentApi {
/**
* The Delete Deployment operation deletes the specified deployment from Windows Azure.
*
- * @param name
- * the unique DNS Prefix value in the Windows Azure Management Portal
+ * @param name the unique DNS Prefix value in the Windows Azure Management Portal
*/
@Named("DeleteDeployment")
@DELETE
@@ -75,5 +73,5 @@ public interface DeploymentApi {
@Fallback(NullOnNotFoundOr404.class)
@ResponseParser(ParseRequestIdHeader.class)
String delete(@PathParam("name") String name);
-
+
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/features/DiskApi.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/DiskApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/DiskApi.java
index 4390524..ca50d06 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/DiskApi.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/DiskApi.java
@@ -57,8 +57,7 @@ public interface DiskApi {
List<Disk> list();
/**
- * The Delete Disk operation deletes the specified data or operating system disk from your image
- * repository.
+ * The Delete Disk operation deletes the specified data or operating system disk from your image repository.
*
* @return request id or null, if not found
*/
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/features/LocationApi.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/LocationApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/LocationApi.java
index 0ef5ee0..6002205 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/LocationApi.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/LocationApi.java
@@ -33,8 +33,8 @@ import org.jclouds.rest.annotations.Headers;
import org.jclouds.rest.annotations.XMLResponseParser;
/**
- * The Service Management API includes operations for listing the available data center locations
- * for a cloud service in your subscription.
+ * The Service Management API includes operations for listing the available data center locations for a cloud service in
+ * your subscription.
* <p/>
*
* @see <a href="http://msdn.microsoft.com/en-us/library/gg441299" />
@@ -45,8 +45,7 @@ import org.jclouds.rest.annotations.XMLResponseParser;
public interface LocationApi {
/**
- * The List Locations operation lists all of the data center locations that are valid for your
- * subscription.
+ * The List Locations operation lists all of the data center locations that are valid for your subscription.
*/
@Named("ListLocations")
@GET
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/features/NetworkSecurityGroupApi.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/NetworkSecurityGroupApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/NetworkSecurityGroupApi.java
index 673413c..4eede4b 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/NetworkSecurityGroupApi.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/NetworkSecurityGroupApi.java
@@ -69,9 +69,9 @@ public interface NetworkSecurityGroupApi {
String create(@BinderParam(NetworkSecurityGroupToXML.class) NetworkSecurityGroup networkSecurityGroup);
/**
- * Deletes the pecified Network Security Group from your subscription.
- * If the Network Security group is still associated with some VM/Role/Subnet, the deletion will fail.
- * In order to successfully delete the Network Security, it needs to be not used.
+ * Deletes the pecified Network Security Group from your subscription. If the Network Security group is still
+ * associated with some VM/Role/Subnet, the deletion will fail. In order to successfully delete the Network Security,
+ * it needs to be not used.
*
* @param networkSecurityGroupName
* @return request id
@@ -83,7 +83,6 @@ public interface NetworkSecurityGroupApi {
@ResponseParser(ParseRequestIdHeader.class)
String delete(@PathParam("networkSecurityGroupName") String networkSecurityGroupName);
-
/**
* Gets the Network Security Group applied to a specific subnet.
*
@@ -96,8 +95,8 @@ public interface NetworkSecurityGroupApi {
@GET
@XMLResponseParser(NetworkSecurityGroupHandler.class)
@Fallback(NullOnNotFoundOr404.class)
- NetworkSecurityGroup getNetworkSecurityGroupAppliedToSubnet(@PathParam("virtualNetworkName") String virtualNetworkName,
- @PathParam("subnetName") String subnetName);
+ NetworkSecurityGroup getNetworkSecurityGroupAppliedToSubnet(
+ @PathParam("virtualNetworkName") String virtualNetworkName, @PathParam("subnetName") String subnetName);
/**
* Gets the details for the specified Network Security Group in the subscription
@@ -114,7 +113,7 @@ public interface NetworkSecurityGroupApi {
NetworkSecurityGroup getFullDetails(@PathParam("networkSecurityGroupName") String networkSecurityGroupName);
/**
- * Adds a Network Security Group to a subnet.
+ * Adds a Network Security Group to a subnet.
*
* @param virtualNetworkName
* @return
@@ -125,8 +124,8 @@ public interface NetworkSecurityGroupApi {
@Produces(MediaType.APPLICATION_XML)
@ResponseParser(ParseRequestIdHeader.class)
String addToSubnet(@PathParam("virtualNetworkName") String virtualNetworkName,
- @PathParam("subnetName") String subnetName,
- @BinderParam(NetworkSecurityGroupToXML.class) NetworkSecurityGroup networkSecurityGroup);
+ @PathParam("subnetName") String subnetName,
+ @BinderParam(NetworkSecurityGroupToXML.class) NetworkSecurityGroup networkSecurityGroup);
/**
* Removes a Network Security Group from a subnet
@@ -137,8 +136,8 @@ public interface NetworkSecurityGroupApi {
@Produces(MediaType.APPLICATION_XML)
@ResponseParser(ParseRequestIdHeader.class)
String removeFromSubnet(@PathParam("virtualNetworkName") String virtualNetworkName,
- @PathParam("subnetName") String subnetName,
- @PathParam("networkSecurityGroupName") String networkSecurityGroupName);
+ @PathParam("subnetName") String subnetName,
+ @PathParam("networkSecurityGroupName") String networkSecurityGroupName);
/**
* Sets a new Network Security Rule to existing Network Security Group
@@ -151,7 +150,7 @@ public interface NetworkSecurityGroupApi {
@Produces(MediaType.APPLICATION_XML)
@ResponseParser(ParseRequestIdHeader.class)
String setRule(@PathParam("networkSecurityGroupName") String networkSecurityGroupName,
- @PathParam("ruleName") String ruleName, @BinderParam(RuleToXML.class) Rule rule);
+ @PathParam("ruleName") String ruleName, @BinderParam(RuleToXML.class) Rule rule);
/**
* Deletes a rule from the specified Network Security Group.
@@ -163,5 +162,5 @@ public interface NetworkSecurityGroupApi {
@Produces(MediaType.APPLICATION_XML)
@ResponseParser(ParseRequestIdHeader.class)
String deleteRule(@PathParam("networkSecurityGroupName") String networkSecurityGroupName,
- @PathParam("ruleName") String ruleName);
+ @PathParam("ruleName") String ruleName);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/features/OSImageApi.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/OSImageApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/OSImageApi.java
index a4c7c3b..e171af7 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/OSImageApi.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/OSImageApi.java
@@ -56,8 +56,7 @@ import org.jclouds.rest.annotations.XMLResponseParser;
public interface OSImageApi {
/**
- * The List Cloud Services operation lists the cloud services available under the current
- * subscription.
+ * The List Cloud Services operation lists the cloud services available under the current subscription.
*/
@Named("ListImages")
@GET
@@ -83,13 +82,12 @@ public interface OSImageApi {
@Path("/{imageName}")
@ResponseParser(ParseRequestIdHeader.class)
String update(@PathParam("imageName") @ParamParser(OSImageParamsName.class)
- @BinderParam(OSImageParamsToXML.class) OSImageParams params);
+ @BinderParam(OSImageParamsToXML.class) OSImageParams params);
/**
* The Delete Cloud Service operation deletes the specified cloud service from Windows Azure.
*
- * @param imageName
- * the unique DNS Prefix value in the Windows Azure Management Portal
+ * @param imageName the unique DNS Prefix value in the Windows Azure Management Portal
*/
@Named("DeleteImage")
@DELETE
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/features/StorageAccountApi.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/StorageAccountApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/StorageAccountApi.java
index e60cbcc..92efd1d 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/StorageAccountApi.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/StorageAccountApi.java
@@ -17,6 +17,7 @@
package org.jclouds.azurecompute.features;
import static javax.ws.rs.core.MediaType.APPLICATION_XML;
+
import java.util.List;
import javax.inject.Named;
@@ -80,7 +81,8 @@ public interface StorageAccountApi {
List<StorageService> list();
/**
- * The Check Storage Account Name Availability operation checks to see if the specified storage account name is available, or if it has already been taken.
+ * The Check Storage Account Name Availability operation checks to see if the specified storage account name is
+ * available, or if it has already been taken.
*/
@Named("CheckStorageAccountNameAvailability")
@GET
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualMachineApi.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualMachineApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualMachineApi.java
index 5db9b04..1ee93e0 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualMachineApi.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualMachineApi.java
@@ -41,8 +41,7 @@ import org.jclouds.rest.annotations.ResponseParser;
import org.jclouds.rest.annotations.XMLResponseParser;
/**
- * The Service Management API includes operations for managing the virtual
- * machines in your subscription.
+ * The Service Management API includes operations for managing the virtual machines in your subscription.
*
* @see <a href="http://msdn.microsoft.com/en-us/library/jj157206">docs</a>
*/
@@ -55,11 +54,13 @@ public interface VirtualMachineApi {
@Named("RestartRole")
@POST
// Warning : the url in the documentation is WRONG ! @see
- // http://social.msdn.microsoft.com/Forums/pl-PL/WAVirtualMachinesforWindows/thread/7ba2367b-e450-49e0-89e4-46c240e9d213
+ // http://social.msdn.microsoft.com/Forums/pl-PL/WAVirtualMachinesforWindows/thread/\
+ // 7ba2367b-e450-49e0-89e4-46c240e9d213
@Path("/roleinstances/{name}/Operations")
@Produces(MediaType.APPLICATION_XML)
@ResponseParser(ParseRequestIdHeader.class)
- @Payload(value = "<RestartRoleOperation xmlns=\"http://schemas.microsoft.com/windowsazure\"><OperationType>RestartRoleOperation</OperationType></RestartRoleOperation>")
+ @Payload(value = "<RestartRoleOperation xmlns=\"http://schemas.microsoft.com/windowsazure\">"
+ + "<OperationType>RestartRoleOperation</OperationType></RestartRoleOperation>")
String restart(@PathParam("name") String name);
/**
@@ -70,9 +71,13 @@ public interface VirtualMachineApi {
@Path("/roleinstances/{name}/Operations")
@Produces(MediaType.APPLICATION_XML)
@ResponseParser(ParseRequestIdHeader.class)
- @Payload(value = "<CaptureRoleOperation xmlns=\"http://schemas.microsoft.com/windowsazure\"><OperationType>CaptureRoleOperation</OperationType><PostCaptureAction>Delete</PostCaptureAction><TargetImageLabel>{imageLabel}</TargetImageLabel><TargetImageName>{imageName}</TargetImageName></CaptureRoleOperation>")
+ @Payload(value = "<CaptureRoleOperation xmlns=\"http://schemas.microsoft.com/windowsazure\">"
+ + "<OperationType>CaptureRoleOperation</OperationType>"
+ + "<PostCaptureAction>Delete</PostCaptureAction>"
+ + "<TargetImageLabel>{imageLabel}</TargetImageLabel>"
+ + "<TargetImageName>{imageName}</TargetImageName></CaptureRoleOperation>")
String capture(@PathParam("name") String name, @PayloadParam("imageName") String imageName,
- @PayloadParam("imageLabel") String imageLabel);
+ @PayloadParam("imageLabel") String imageLabel);
/**
* http://msdn.microsoft.com/en-us/library/jj157195
@@ -82,7 +87,8 @@ public interface VirtualMachineApi {
@Path("/roleinstances/{name}/Operations")
@Produces(MediaType.APPLICATION_XML)
@ResponseParser(ParseRequestIdHeader.class)
- @Payload(value = "<ShutdownRoleOperation xmlns=\"http://schemas.microsoft.com/windowsazure\"><OperationType>ShutdownRoleOperation</OperationType></ShutdownRoleOperation>")
+ @Payload(value = "<ShutdownRoleOperation xmlns=\"http://schemas.microsoft.com/windowsazure\">"
+ + "<OperationType>ShutdownRoleOperation</OperationType></ShutdownRoleOperation>")
String shutdown(@PathParam("name") String name);
/**
@@ -93,7 +99,8 @@ public interface VirtualMachineApi {
@Path("/roleinstances/{name}/Operations")
@Produces(MediaType.APPLICATION_XML)
@ResponseParser(ParseRequestIdHeader.class)
- @Payload(value = "<StartRoleOperation xmlns=\"http://schemas.microsoft.com/windowsazure\"><OperationType>StartRoleOperation</OperationType></StartRoleOperation>")
+ @Payload(value = "<StartRoleOperation xmlns=\"http://schemas.microsoft.com/windowsazure\">"
+ + "<OperationType>StartRoleOperation</OperationType></StartRoleOperation>")
String start(@PathParam("name") String name);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualNetworkApi.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualNetworkApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualNetworkApi.java
index e091464..9cbc897 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualNetworkApi.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualNetworkApi.java
@@ -50,7 +50,7 @@ public interface VirtualNetworkApi {
* The Get Network Configuration operation retrieves the network configuration file.
*
* @return The response body is a netcfg.cfg file.
-
+ *
*/
@Named("GetVirtualNetworkConfiguration")
@Path("/media")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/functions/Base64EncodeLabel.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/functions/Base64EncodeLabel.java b/azurecompute/src/main/java/org/jclouds/azurecompute/functions/Base64EncodeLabel.java
index a8d0513..89aa61b 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/functions/Base64EncodeLabel.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/functions/Base64EncodeLabel.java
@@ -22,7 +22,9 @@ import static com.google.common.io.BaseEncoding.base64;
import com.google.common.base.Function;
public final class Base64EncodeLabel implements Function<Object, String> {
- @Override public String apply(Object label) {
+
+ @Override
+ public String apply(final Object label) {
return base64().encode(label.toString().getBytes(UTF_8));
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/functions/OSImageParamsName.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/functions/OSImageParamsName.java b/azurecompute/src/main/java/org/jclouds/azurecompute/functions/OSImageParamsName.java
index 7b962e7..1f5fa40 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/functions/OSImageParamsName.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/functions/OSImageParamsName.java
@@ -21,7 +21,9 @@ import org.jclouds.azurecompute.domain.OSImageParams;
import com.google.common.base.Function;
public class OSImageParamsName implements Function<Object, String> {
- @Override public String apply(Object input) {
+
+ @Override
+ public String apply(final Object input) {
return OSImageParams.class.cast(input).name();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/functions/ParseRequestIdHeader.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/functions/ParseRequestIdHeader.java b/azurecompute/src/main/java/org/jclouds/azurecompute/functions/ParseRequestIdHeader.java
index db229be..17cc0bb 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/functions/ParseRequestIdHeader.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/functions/ParseRequestIdHeader.java
@@ -27,16 +27,16 @@ import com.google.common.base.Function;
/**
* Parses an x-ms-request-id the header
*
- * A value that uniquely identifies a request made against the management service. For an
- * asynchronous operation, you can call get operation status with the value of the header to
- * determine whether the operation is complete, has failed, or is still in progress.
+ * A value that uniquely identifies a request made against the management service. For an asynchronous operation, you
+ * can call get operation status with the value of the header to determine whether the operation is complete, has
+ * failed, or is still in progress.
*/
@Singleton
public class ParseRequestIdHeader implements Function<HttpResponse, String> {
- public String apply(HttpResponse from) {
+ public String apply(final HttpResponse from) {
releasePayload(from);
- String requestId = from.getFirstHeaderOrNull("x-ms-request-id");
+ final String requestId = from.getFirstHeaderOrNull("x-ms-request-id");
if (requestId != null) {
return requestId;
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/handlers/AzureComputeErrorHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/handlers/AzureComputeErrorHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/handlers/AzureComputeErrorHandler.java
index b27d8cd..23a691c 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/handlers/AzureComputeErrorHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/handlers/AzureComputeErrorHandler.java
@@ -35,27 +35,34 @@ import org.jclouds.util.Strings2;
@Singleton
public class AzureComputeErrorHandler implements HttpErrorHandler {
- public void handleError(HttpCommand command, HttpResponse response) {
+ @Override
+ public void handleError(final HttpCommand command, final HttpResponse response) {
// it is important to always read fully and close streams
String message = parseMessage(response);
- Exception exception = message != null ? new HttpResponseException(command, response, message)
- : new HttpResponseException(command, response);
+ Exception exception = message == null
+ ? new HttpResponseException(command, response)
+ : new HttpResponseException(command, response, message);
try {
- message = message != null ? message : String.format("%s -> %s", command.getCurrentRequest().getRequestLine(),
- response.getStatusLine());
+ message = message == null
+ ? String.format("%s -> %s", command.getCurrentRequest().getRequestLine(), response.getStatusLine())
+ : message;
switch (response.getStatusCode()) {
case 401:
case 403:
exception = new AuthorizationException(message, exception);
break;
+
case 404:
if (!command.getCurrentRequest().getMethod().equals("DELETE")) {
exception = new ResourceNotFoundException(message, exception);
}
break;
+
case 409:
exception = new IllegalStateException(message, exception);
break;
+
+ default:
}
} finally {
Closeables2.closeQuietly(response.getPayload());
@@ -63,9 +70,10 @@ public class AzureComputeErrorHandler implements HttpErrorHandler {
}
}
- public String parseMessage(HttpResponse response) {
- if (response.getPayload() == null)
+ public String parseMessage(final HttpResponse response) {
+ if (response.getPayload() == null) {
return null;
+ }
try {
return Strings2.toStringAndClose(response.getPayload().openStream());
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/options/AzureComputeTemplateOptions.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/options/AzureComputeTemplateOptions.java b/azurecompute/src/main/java/org/jclouds/azurecompute/options/AzureComputeTemplateOptions.java
index 3a986d9..7d4b063 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/options/AzureComputeTemplateOptions.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/options/AzureComputeTemplateOptions.java
@@ -23,15 +23,13 @@ import org.jclouds.compute.options.TemplateOptions;
import com.google.common.base.Optional;
/**
- * Contains options supported by the
- * {@link org.jclouds.compute.ComputeService#createNodesInGroup(String, int, org.jclouds.compute.options.TemplateOptions)} and
- * {@link org.jclouds.compute.ComputeService#createNodesInGroup(String, int, org.jclouds.compute.options.TemplateOptions)}
- * operations on the <em>gogrid</em> provider.
+ * Contains options supported by the null {@link org.jclouds.compute.ComputeService#createNodesInGroup(
+ * String, int, org.jclouds.compute.options.TemplateOptions)} and null {@link org.jclouds.compute.ComputeService#createNodesInGroup(
+ * String, int, org.jclouds.compute.options.TemplateOptions)} operations on the <em>gogrid</em> provider.
*
- * <h2>Usage</h2> The recommended way to instantiate a
- * {@link AzureComputeTemplateOptions} object is to statically import
- * {@code AzureComputeTemplateOptions.*} and invoke a static creation method
- * followed by an instance mutator (if needed):
+ * <h2>Usage</h2> The recommended way to instantiate a {@link AzureComputeTemplateOptions} object is to statically
+ * import {@code AzureComputeTemplateOptions.*} and invoke a static creation method followed by an instance mutator (if
+ * needed):
* <p>
*
* <pre>
@@ -45,25 +43,31 @@ import com.google.common.base.Optional;
public class AzureComputeTemplateOptions extends TemplateOptions implements Cloneable {
private Optional<String> virtualNetworkName = Optional.absent();
+
private Optional<String> addressSpaceAddressPrefix = Optional.absent();
+
private Optional<String> subnetName = Optional.absent();
+
private Optional<String> subnetAddressPrefix = Optional.absent();
+
private Optional<String> storageAccountName = Optional.absent();
+
private Optional<String> storageAccountType = Optional.absent();
+
private Optional<String> networkSecurityGroupName = Optional.absent();
@Override
public AzureComputeTemplateOptions clone() {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
copyTo(options);
return options;
}
@Override
- public void copyTo(TemplateOptions to) {
+ public void copyTo(final TemplateOptions to) {
super.copyTo(to);
if (to instanceof AzureComputeTemplateOptions) {
- AzureComputeTemplateOptions eTo = AzureComputeTemplateOptions.class.cast(to);
+ final AzureComputeTemplateOptions eTo = AzureComputeTemplateOptions.class.cast(to);
if (virtualNetworkName.isPresent()) {
eTo.virtualNetworkName(virtualNetworkName.get());
}
@@ -88,37 +92,37 @@ public class AzureComputeTemplateOptions extends TemplateOptions implements Clon
}
}
- public TemplateOptions virtualNetworkName(String virtualNetworkName) {
+ public TemplateOptions virtualNetworkName(final String virtualNetworkName) {
this.virtualNetworkName = Optional.of(virtualNetworkName);
return this;
}
- public TemplateOptions addressSpaceAddressPrefix(String addressSpaceAddressPrefix) {
+ public TemplateOptions addressSpaceAddressPrefix(final String addressSpaceAddressPrefix) {
this.addressSpaceAddressPrefix = Optional.of(addressSpaceAddressPrefix);
return this;
}
- public TemplateOptions subnetName(String subnetName) {
+ public TemplateOptions subnetName(final String subnetName) {
this.subnetName = Optional.of(subnetName);
return this;
}
- public TemplateOptions networkSecurityGroupName(String networkSecurityGroupName) {
+ public TemplateOptions networkSecurityGroupName(final String networkSecurityGroupName) {
this.networkSecurityGroupName = Optional.of(networkSecurityGroupName);
return this;
}
- public TemplateOptions subnetAddressPrefix(String subnetAddressPrefix) {
+ public TemplateOptions subnetAddressPrefix(final String subnetAddressPrefix) {
this.subnetAddressPrefix = Optional.of(subnetAddressPrefix);
return this;
}
- public TemplateOptions storageAccountName(String storageAccountName) {
+ public TemplateOptions storageAccountName(final String storageAccountName) {
this.storageAccountName = Optional.of(storageAccountName);
return this;
}
- public TemplateOptions storageAccountType(String storageAccountType) {
+ public TemplateOptions storageAccountType(final String storageAccountType) {
this.storageAccountType = Optional.of(storageAccountType);
return this;
}
@@ -131,9 +135,13 @@ public class AzureComputeTemplateOptions extends TemplateOptions implements Clon
return addressSpaceAddressPrefix;
}
- public Optional<String> getSubnetName() { return subnetName; }
+ public Optional<String> getSubnetName() {
+ return subnetName;
+ }
- public Optional<String> getSubnetAddressPrefix() { return subnetAddressPrefix; }
+ public Optional<String> getSubnetAddressPrefix() {
+ return subnetAddressPrefix;
+ }
public Optional<String> getStorageAccountName() {
return storageAccountName;
@@ -152,117 +160,115 @@ public class AzureComputeTemplateOptions extends TemplateOptions implements Clon
/**
* @see #virtualNetworkName
*/
- public static AzureComputeTemplateOptions virtualNetworkName(String virtualNetworkName) {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ public static AzureComputeTemplateOptions virtualNetworkName(final String virtualNetworkName) {
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
return AzureComputeTemplateOptions.class.cast(options.virtualNetworkName(virtualNetworkName));
}
/**
* @see #addressSpaceAddressPrefix
*/
- public static AzureComputeTemplateOptions addressSpaceAddressPrefix(String addressSpaceAddressPrefix) {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ public static AzureComputeTemplateOptions addressSpaceAddressPrefix(final String addressSpaceAddressPrefix) {
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
return AzureComputeTemplateOptions.class.cast(options.addressSpaceAddressPrefix(addressSpaceAddressPrefix));
}
/**
* @see #subnetName
*/
- public static AzureComputeTemplateOptions subnetName(String subnetName) {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ public static AzureComputeTemplateOptions subnetName(final String subnetName) {
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
return AzureComputeTemplateOptions.class.cast(options.subnetName(subnetName));
}
/**
* @see #networkSecurityGroupName
*/
- public static AzureComputeTemplateOptions networkSecurityGroupName(String networkSecurityGroupName) {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ public static AzureComputeTemplateOptions networkSecurityGroupName(final String networkSecurityGroupName) {
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
return AzureComputeTemplateOptions.class.cast(options.subnetName(networkSecurityGroupName));
}
/**
* @see #subnetAddressPrefix
*/
- public static AzureComputeTemplateOptions subnetAddressPrefix(String subnetAddressPrefix) {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ public static AzureComputeTemplateOptions subnetAddressPrefix(final String subnetAddressPrefix) {
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
return AzureComputeTemplateOptions.class.cast(options.subnetAddressPrefix(subnetAddressPrefix));
}
/**
* @see #storageAccountName
*/
- public static AzureComputeTemplateOptions storageAccountName(String storageAccountName) {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ public static AzureComputeTemplateOptions storageAccountName(final String storageAccountName) {
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
return AzureComputeTemplateOptions.class.cast(options.storageAccountName(storageAccountName));
}
/**
* @see #storageAccountType
*/
- public static AzureComputeTemplateOptions storageAccountType(String storageAccountType) {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ public static AzureComputeTemplateOptions storageAccountType(final String storageAccountType) {
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
return AzureComputeTemplateOptions.class.cast(options.storageAccountType(storageAccountType));
}
// methods that only facilitate returning the correct object type
-
/**
* @see org.jclouds.compute.options.TemplateOptions#inboundPorts(int...)
*/
- public static AzureComputeTemplateOptions inboundPorts(int... ports) {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ public static AzureComputeTemplateOptions inboundPorts(final int... ports) {
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
return AzureComputeTemplateOptions.class.cast(options.inboundPorts(ports));
}
/**
* @see org.jclouds.compute.options.TemplateOptions#blockOnPort(int, int)
*/
- public static AzureComputeTemplateOptions blockOnPort(int port, int seconds) {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ public static AzureComputeTemplateOptions blockOnPort(final int port, final int seconds) {
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
return AzureComputeTemplateOptions.class.cast(options.blockOnPort(port, seconds));
}
/**
* @see org.jclouds.compute.options.TemplateOptions#userMetadata(java.util.Map)
*/
- public static AzureComputeTemplateOptions userMetadata(Map<String, String> userMetadata) {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ public static AzureComputeTemplateOptions userMetadata(final Map<String, String> userMetadata) {
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
return AzureComputeTemplateOptions.class.cast(options.userMetadata(userMetadata));
}
/**
* @see org.jclouds.compute.options.TemplateOptions#userMetadata(String, String)
*/
- public static AzureComputeTemplateOptions userMetadata(String key, String value) {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ public static AzureComputeTemplateOptions userMetadata(final String key, final String value) {
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
return AzureComputeTemplateOptions.class.cast(options.userMetadata(key, value));
}
/**
* @see org.jclouds.compute.options.TemplateOptions#nodeNames(Iterable)
*/
- public static AzureComputeTemplateOptions nodeNames(Iterable<String> nodeNames) {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ public static AzureComputeTemplateOptions nodeNames(final Iterable<String> nodeNames) {
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
return AzureComputeTemplateOptions.class.cast(options.nodeNames(nodeNames));
}
/**
* @see org.jclouds.compute.options.TemplateOptions#networks(Iterable)
*/
- public static AzureComputeTemplateOptions networks(Iterable<String> networks) {
- AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
+ public static AzureComputeTemplateOptions networks(final Iterable<String> networks) {
+ final AzureComputeTemplateOptions options = new AzureComputeTemplateOptions();
return AzureComputeTemplateOptions.class.cast(options.networks(networks));
}
}
// methods that only facilitate returning the correct object type
-
/**
* @see org.jclouds.compute.options.TemplateOptions#blockOnPort(int, int)
*/
@Override
- public AzureComputeTemplateOptions blockOnPort(int port, int seconds) {
+ public AzureComputeTemplateOptions blockOnPort(final int port, final int seconds) {
return AzureComputeTemplateOptions.class.cast(super.blockOnPort(port, seconds));
}
@@ -270,7 +276,7 @@ public class AzureComputeTemplateOptions extends TemplateOptions implements Clon
* @see org.jclouds.compute.options.TemplateOptions#inboundPorts(int...)
*/
@Override
- public AzureComputeTemplateOptions inboundPorts(int... ports) {
+ public AzureComputeTemplateOptions inboundPorts(final int... ports) {
return AzureComputeTemplateOptions.class.cast(super.inboundPorts(ports));
}
@@ -278,7 +284,7 @@ public class AzureComputeTemplateOptions extends TemplateOptions implements Clon
* @see org.jclouds.compute.options.TemplateOptions#authorizePublicKey(String)
*/
@Override
- public AzureComputeTemplateOptions authorizePublicKey(String publicKey) {
+ public AzureComputeTemplateOptions authorizePublicKey(final String publicKey) {
return AzureComputeTemplateOptions.class.cast(super.authorizePublicKey(publicKey));
}
@@ -286,7 +292,7 @@ public class AzureComputeTemplateOptions extends TemplateOptions implements Clon
* @see org.jclouds.compute.options.TemplateOptions#installPrivateKey(String)
*/
@Override
- public AzureComputeTemplateOptions installPrivateKey(String privateKey) {
+ public AzureComputeTemplateOptions installPrivateKey(final String privateKey) {
return AzureComputeTemplateOptions.class.cast(super.installPrivateKey(privateKey));
}
@@ -294,7 +300,7 @@ public class AzureComputeTemplateOptions extends TemplateOptions implements Clon
* {@inheritDoc}
*/
@Override
- public AzureComputeTemplateOptions userMetadata(Map<String, String> userMetadata) {
+ public AzureComputeTemplateOptions userMetadata(final Map<String, String> userMetadata) {
return AzureComputeTemplateOptions.class.cast(super.userMetadata(userMetadata));
}
@@ -302,7 +308,7 @@ public class AzureComputeTemplateOptions extends TemplateOptions implements Clon
* {@inheritDoc}
*/
@Override
- public AzureComputeTemplateOptions userMetadata(String key, String value) {
+ public AzureComputeTemplateOptions userMetadata(final String key, final String value) {
return AzureComputeTemplateOptions.class.cast(super.userMetadata(key, value));
}
@@ -310,7 +316,7 @@ public class AzureComputeTemplateOptions extends TemplateOptions implements Clon
* {@inheritDoc}
*/
@Override
- public AzureComputeTemplateOptions nodeNames(Iterable<String> nodeNames) {
+ public AzureComputeTemplateOptions nodeNames(final Iterable<String> nodeNames) {
return AzureComputeTemplateOptions.class.cast(super.nodeNames(nodeNames));
}
@@ -318,7 +324,7 @@ public class AzureComputeTemplateOptions extends TemplateOptions implements Clon
* {@inheritDoc}
*/
@Override
- public AzureComputeTemplateOptions networks(Iterable<String> networks) {
+ public AzureComputeTemplateOptions networks(final Iterable<String> networks) {
return AzureComputeTemplateOptions.class.cast(super.networks(networks));
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/suppliers/KeyStoreSupplier.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/suppliers/KeyStoreSupplier.java b/azurecompute/src/main/java/org/jclouds/azurecompute/suppliers/KeyStoreSupplier.java
index d90bd16..9089f5f 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/suppliers/KeyStoreSupplier.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/suppliers/KeyStoreSupplier.java
@@ -54,7 +54,9 @@ import com.google.common.io.ByteSource;
@Deprecated
@Singleton
public class KeyStoreSupplier implements Supplier<KeyStore> {
+
private final Crypto crypto;
+
private final Supplier<Credentials> creds;
@Inject
@@ -65,16 +67,17 @@ public class KeyStoreSupplier implements Supplier<KeyStore> {
@Override
public KeyStore get() {
- Credentials currentCreds = checkNotNull(creds.get(), "credential supplier returned null");
- String cert = checkNotNull(currentCreds.identity, "credential supplier returned null identity (should be cert)");
- String keyStorePassword = checkNotNull(currentCreds.credential,
- "credential supplier returned null credential (should be keyStorePassword)");
+ final Credentials currentCreds = checkNotNull(creds.get(), "credential supplier returned null");
+ final String cert = checkNotNull(currentCreds.identity,
+ "credential supplier returned null identity (should be cert)");
+ final String keyStorePassword = checkNotNull(currentCreds.credential,
+ "credential supplier returned null credential (should be keyStorePassword)");
try {
- KeyStore keyStore = KeyStore.getInstance("PKCS12");
+ final KeyStore keyStore = KeyStore.getInstance("PKCS12");
- File certFile = new File(checkNotNull(cert));
+ final File certFile = new File(checkNotNull(cert));
if (certFile.isFile()) { // cert is path to pkcs12 file
- FileInputStream stream = new FileInputStream(certFile);
+ final FileInputStream stream = new FileInputStream(certFile);
try {
keyStore.load(stream, keyStorePassword.toCharArray());
} finally {
@@ -83,35 +86,35 @@ public class KeyStoreSupplier implements Supplier<KeyStore> {
} else { // cert is PEM encoded, containing private key and certs
// split in private key and certs
- int privateKeyBeginIdx = cert.indexOf("-----BEGIN PRIVATE KEY");
- int privateKeyEndIdx = cert.indexOf("-----END PRIVATE KEY");
- String pemPrivateKey = cert.substring(privateKeyBeginIdx, privateKeyEndIdx + 26);
+ final int privateKeyBeginIdx = cert.indexOf("-----BEGIN PRIVATE KEY");
+ final int privateKeyEndIdx = cert.indexOf("-----END PRIVATE KEY");
+ final String pemPrivateKey = cert.substring(privateKeyBeginIdx, privateKeyEndIdx + 26);
- StringBuilder pemCerts = new StringBuilder();
+ final StringBuilder pemCerts = new StringBuilder();
int certsBeginIdx = 0;
do {
certsBeginIdx = cert.indexOf("-----BEGIN CERTIFICATE", certsBeginIdx);
if (certsBeginIdx >= 0) {
- int certsEndIdx = cert.indexOf("-----END CERTIFICATE", certsBeginIdx) + 26;
+ final int certsEndIdx = cert.indexOf("-----END CERTIFICATE", certsBeginIdx) + 26;
pemCerts.append(cert.substring(certsBeginIdx, certsEndIdx));
certsBeginIdx = certsEndIdx;
}
} while (certsBeginIdx != -1);
// parse private key
- KeySpec keySpec = Pems.privateKeySpec(ByteSource.wrap(pemPrivateKey.getBytes(Charsets.UTF_8)));
- PrivateKey privateKey = crypto.rsaKeyFactory().generatePrivate(keySpec);
+ final KeySpec keySpec = Pems.privateKeySpec(ByteSource.wrap(pemPrivateKey.getBytes(Charsets.UTF_8)));
+ final PrivateKey privateKey = crypto.rsaKeyFactory().generatePrivate(keySpec);
// populate keystore with private key and certs
- CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ final CertificateFactory cf = CertificateFactory.getInstance("X.509");
@SuppressWarnings("unchecked")
- Collection<Certificate> certs = (Collection<Certificate>) cf.generateCertificates(new ByteArrayInputStream(
- pemCerts.toString().getBytes(Charsets.UTF_8)));
+ final Collection<Certificate> certs = (Collection<Certificate>) cf.generateCertificates(
+ new ByteArrayInputStream(pemCerts.toString().getBytes(Charsets.UTF_8)));
keyStore.load(null);
keyStore.setKeyEntry("dummy", privateKey, keyStorePassword.toCharArray(),
- certs.toArray(new java.security.cert.Certificate[0]));
+ certs.toArray(new java.security.cert.Certificate[0]));
}
return keyStore;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/suppliers/SSLContextWithKeysSupplier.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/suppliers/SSLContextWithKeysSupplier.java b/azurecompute/src/main/java/org/jclouds/azurecompute/suppliers/SSLContextWithKeysSupplier.java
index da9a2a3..1987792 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/suppliers/SSLContextWithKeysSupplier.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/suppliers/SSLContextWithKeysSupplier.java
@@ -46,28 +46,31 @@ import com.google.common.base.Supplier;
@Deprecated
@Singleton
public class SSLContextWithKeysSupplier implements Supplier<SSLContext> {
+
private final Supplier<KeyStore> keyStore;
+
private final TrustManager[] trustManager;
+
private final Supplier<Credentials> creds;
@Inject
SSLContextWithKeysSupplier(Supplier<KeyStore> keyStore, @Provider Supplier<Credentials> creds, HttpUtils utils,
- TrustAllCerts trustAllCerts) {
+ TrustAllCerts trustAllCerts) {
this.keyStore = keyStore;
- this.trustManager = utils.trustAllCerts() ? new TrustManager[] { trustAllCerts } : null;
+ this.trustManager = utils.trustAllCerts() ? new TrustManager[]{trustAllCerts} : null;
this.creds = creds;
}
@Override
public SSLContext get() {
- Credentials currentCreds = checkNotNull(creds.get(), "credential supplier returned null");
- String keyStorePassword = checkNotNull(currentCreds.credential,
- "credential supplier returned null credential (should be keyStorePassword)");
+ final Credentials currentCreds = checkNotNull(creds.get(), "credential supplier returned null");
+ final String keyStorePassword = checkNotNull(currentCreds.credential,
+ "credential supplier returned null credential (should be keyStorePassword)");
KeyManagerFactory kmf;
try {
kmf = KeyManagerFactory.getInstance("SunX509");
kmf.init(keyStore.get(), keyStorePassword.toCharArray());
- SSLContext sc = SSLContext.getInstance("TLS");
+ final SSLContext sc = SSLContext.getInstance("TLS");
sc.init(kmf.getKeyManagers(), trustManager, new SecureRandom());
return sc;
} catch (NoSuchAlgorithmException e) {