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:21 UTC
[03/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/util/NetworkSecurityGroups.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/util/NetworkSecurityGroups.java b/azurecompute/src/main/java/org/jclouds/azurecompute/util/NetworkSecurityGroups.java
index 4d81754..7035d70 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/util/NetworkSecurityGroups.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/util/NetworkSecurityGroups.java
@@ -29,35 +29,35 @@ import com.google.common.collect.FluentIterable;
public class NetworkSecurityGroups {
- public static List<Rule> getCustomRules(NetworkSecurityGroup networkSecurityGroup) {
+ public static List<Rule> getCustomRules(final NetworkSecurityGroup networkSecurityGroup) {
final List<Rule> rules = networkSecurityGroup.rules();
return FluentIterable.from(rules)
.filter(Predicates.notNull())
.filter(new Predicate<Rule>() {
@Override
- public boolean apply(Rule rule) {
+ public boolean apply(final Rule rule) {
return rule.isDefault() == null || !rule.isDefault();
}
})
.toSortedList(new Comparator<Rule>() {
@Override
- public int compare(Rule r1, Rule r2) {
- int p1 = Integer.parseInt(r1.priority());
- int p2 = Integer.parseInt(r2.priority());
+ public int compare(final Rule r1, final Rule r2) {
+ final int p1 = Integer.parseInt(r1.priority());
+ final int p2 = Integer.parseInt(r2.priority());
return p1 < p2 ? -1 : p1 == p2 ? 0 : 1;
}
});
}
- public static int getFirstAvailablePriority(List<Rule> rules) {
+ public static int getFirstAvailablePriority(final List<Rule> rules) {
int priority;
if (rules.isEmpty()) {
priority = 100;
} else {
priority = Integer.parseInt(Collections.max(rules, new Comparator<Rule>() {
@Override
- public int compare(Rule rule1, Rule rule2) {
+ public int compare(final Rule rule1, final Rule rule2) {
return Integer.valueOf(rule1.priority()).compareTo(Integer.valueOf(rule2.priority()));
}
}).priority()) + 1;
@@ -65,7 +65,7 @@ public class NetworkSecurityGroups {
return priority;
}
- public static String createRuleName(String format, int fromPort, int toPort) {
+ public static String createRuleName(final String format, final int fromPort, final int toPort) {
return String.format(format, fromPort, toPort);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AddressSpaceHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AddressSpaceHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AddressSpaceHandler.java
index ddcc10b..af4f4fd 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AddressSpaceHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AddressSpaceHandler.java
@@ -23,14 +23,17 @@ import org.jclouds.http.functions.ParseSax;
import org.xml.sax.Attributes;
public class AddressSpaceHandler extends ParseSax.HandlerForGeneratedRequestWithResult<AddressSpace> {
+
private String addressPrefix;
private StringBuilder currentText = new StringBuilder();
- @Override public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ @Override
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) {
}
- @Override public AddressSpace getResult() {
+ @Override
+ public AddressSpace getResult() {
AddressSpace result = AddressSpace.create(addressPrefix);
resetState(); // handler is called in a loop.
return result;
@@ -40,14 +43,16 @@ public class AddressSpaceHandler extends ParseSax.HandlerForGeneratedRequestWith
addressPrefix = null;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(final String ignoredUri, final String ignoredName, final String qName) {
if (qName.equals("AddressPrefix")) {
addressPrefix = currentOrNull(currentText);
}
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(final char ch[], final int start, final int length) {
currentText.append(ch, start, length);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AttachmentHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AttachmentHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AttachmentHandler.java
index ccbe9c8..c5bfb09 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AttachmentHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AttachmentHandler.java
@@ -25,19 +25,24 @@ import org.jclouds.http.functions.ParseSax;
* @see <a href="http://msdn.microsoft.com/en-us/library/jj157176" >api</a>
*/
final class AttachmentHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Attachment> {
+
private String hostedService;
+
private String deployment;
+
private String virtualMachine;
private final StringBuilder currentText = new StringBuilder();
- @Override public Attachment getResult() {
- Attachment result = Attachment.create(hostedService, deployment, virtualMachine);
+ @Override
+ public Attachment getResult() {
+ final Attachment result = Attachment.create(hostedService, deployment, virtualMachine);
hostedService = deployment = virtualMachine = null; // handler could be called in a loop.
return result;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(final String ignoredUri, final String ignoredName, final String qName) {
if (qName.equals("HostedServiceName")) {
hostedService = currentOrNull(currentText);
} else if (qName.equals("DeploymentName")) {
@@ -48,7 +53,8 @@ final class AttachmentHandler extends ParseSax.HandlerForGeneratedRequestWithRes
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(final char ch[], final int start, final int length) {
currentText.append(ch, start, length);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AvailabilityHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AvailabilityHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AvailabilityHandler.java
index 3c22ac5..80faa71 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AvailabilityHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AvailabilityHandler.java
@@ -22,16 +22,20 @@ import org.jclouds.azurecompute.domain.Availability;
import org.jclouds.http.functions.ParseSax;
public class AvailabilityHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Availability> {
+
private Boolean result;
+
private String reason;
private final StringBuilder currentText = new StringBuilder();
- @Override public Availability getResult() {
+ @Override
+ public Availability getResult() {
return Availability.create(result, reason);
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("Result")) {
String resultText = currentOrNull(currentText);
if (resultText != null) {
@@ -43,7 +47,8 @@ public class AvailabilityHandler extends ParseSax.HandlerForGeneratedRequestWith
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
currentText.append(ch, start, length);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/CloudServiceHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/CloudServiceHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/CloudServiceHandler.java
index f7e1833..6b46981 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/CloudServiceHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/CloudServiceHandler.java
@@ -39,28 +39,42 @@ import com.google.common.collect.Maps;
* @see <a href="http://msdn.microsoft.com/en-us/library/gg441293" >Response body description</a>
*/
public final class CloudServiceHandler extends ParseSax.HandlerForGeneratedRequestWithResult<CloudService> {
+
private String name;
+
private String location;
+
private String affinityGroup;
+
private String label;
+
private String description;
+
private CloudService.Status status;
+
private Date created;
+
private Date lastModified;
+
private Map<String, String> extendedProperties = Maps.newLinkedHashMap();
private boolean inHostedServiceProperties;
+
private String propertyName;
+
private StringBuilder currentText = new StringBuilder();
+
private final DateService dateService;
- @Inject CloudServiceHandler(DateService dateService) {
+ @Inject
+ CloudServiceHandler(DateService dateService) {
this.dateService = dateService;
}
- @Override public CloudService getResult() {
+ @Override
+ public CloudService getResult() {
CloudService result = CloudService.create(name, location, affinityGroup, label, description, status, created, //
- lastModified, ImmutableMap.copyOf(extendedProperties));
+ lastModified, ImmutableMap.copyOf(extendedProperties));
resetState(); // handler is called in a loop.
return result;
}
@@ -74,13 +88,15 @@ public final class CloudServiceHandler extends ParseSax.HandlerForGeneratedReque
propertyName = null;
}
- @Override public void startElement(String ignoredUri, String ignoredLocalName, String qName, Attributes ignoredAttributes) {
+ @Override
+ public void startElement(String ignoredUri, String ignoredLocalName, String qName, Attributes ignoredAttributes) {
if (qName.equals("HostedServiceProperties")) {
inHostedServiceProperties = true;
}
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("HostedServiceProperties")) {
inHostedServiceProperties = false;
} else if (inHostedServiceProperties) {
@@ -113,7 +129,8 @@ public final class CloudServiceHandler extends ParseSax.HandlerForGeneratedReque
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
currentText.append(ch, start, length);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ConfigurationSetHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ConfigurationSetHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ConfigurationSetHandler.java
index 8a2fb57..2f29abe 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ConfigurationSetHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ConfigurationSetHandler.java
@@ -30,21 +30,31 @@ import com.google.common.collect.Lists;
import com.google.inject.Inject;
public class ConfigurationSetHandler extends ParseSax.HandlerForGeneratedRequestWithResult<ConfigurationSet> {
+
private String configurationSetType;
+
private List<InputEndpoint> inputEndpoint = Lists.newArrayList();
+
private List<SubnetName> subnetNames = Lists.newArrayList();
+
private String staticVirtualNetworkIPAddress;
+
private List<PublicIP> publicIPs = Lists.newArrayList();
+
private String networkSecurityGroup;
private boolean inInputEndpoint;
+
private boolean inSubnetNames;
private final InputEndpointHandler inputEndpointHandler;
+
private final SubnetNameHandler subnetNameHandler;
+
private final StringBuilder currentText = new StringBuilder();
- @Inject ConfigurationSetHandler(InputEndpointHandler inputEndpointHandler, SubnetNameHandler subnetNameHandler) {
+ @Inject
+ ConfigurationSetHandler(InputEndpointHandler inputEndpointHandler, SubnetNameHandler subnetNameHandler) {
this.inputEndpointHandler = inputEndpointHandler;
this.subnetNameHandler = subnetNameHandler;
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DataVirtualHardDiskHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DataVirtualHardDiskHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DataVirtualHardDiskHandler.java
index acfaabe..73c39e1 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DataVirtualHardDiskHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DataVirtualHardDiskHandler.java
@@ -31,25 +31,32 @@ import org.xml.sax.Attributes;
final class DataVirtualHardDiskHandler extends ParseSax.HandlerForGeneratedRequestWithResult<DataVirtualHardDisk> {
private DataVirtualHardDisk.Caching hostCaching;
+
private String diskName;
+
private Integer lun;
+
private Integer logicalDiskSizeInGB;
+
private URI mediaLink;
+
private String ioType;
private final StringBuilder currentText = new StringBuilder();
- @Override public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes attributes) {
}
@Override
public DataVirtualHardDisk getResult() {
DataVirtualHardDisk result = DataVirtualHardDisk
- .create(hostCaching, diskName, lun, logicalDiskSizeInGB, mediaLink, ioType);
+ .create(hostCaching, diskName, lun, logicalDiskSizeInGB, mediaLink, ioType);
return result;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("HostCaching")) {
String hostCachingText = currentOrNull(currentText);
@@ -87,7 +94,8 @@ final class DataVirtualHardDiskHandler extends ParseSax.HandlerForGeneratedReque
}
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
currentText.append(ch, start, length);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DeploymentHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DeploymentHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DeploymentHandler.java
index e8dd075..941f94b 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DeploymentHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DeploymentHandler.java
@@ -41,37 +41,56 @@ import com.google.inject.Inject;
* @see <a href="http://msdn.microsoft.com/en-us/library/ee460804" >Response body description</a>.
*/
public final class DeploymentHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Deployment> {
+
private String name;
+
private Slot slot;
+
private Status status;
+
private String label;
+
private String instanceStateDetails;
+
private String virtualNetworkName;
+
private List<Deployment.VirtualIP> virtualIPs = Lists.newArrayList();
+
private List<Deployment.RoleInstance> roleInstanceList = Lists.newArrayList();
+
private List<Role> roleList = Lists.newArrayList();
+
private String instanceErrorCode;
private boolean inRoleInstanceList;
+
private boolean inRoleList;
+
private boolean inListVirtualIPs;
+
private final VirtualIPHandler virtualIPHandler;
+
private final RoleInstanceHandler roleInstanceHandler;
+
private final RoleHandler roleHandler;
+
private final StringBuilder currentText = new StringBuilder();
- @Inject DeploymentHandler(VirtualIPHandler virtualIPHandler, RoleInstanceHandler roleInstanceHandler, RoleHandler roleHandler) {
+ @Inject
+ DeploymentHandler(VirtualIPHandler virtualIPHandler, RoleInstanceHandler roleInstanceHandler, RoleHandler roleHandler) {
this.virtualIPHandler = virtualIPHandler;
this.roleInstanceHandler = roleInstanceHandler;
this.roleHandler = roleHandler;
}
- @Override public Deployment getResult() { // Fields don't need to be reset as this isn't used in a loop.
+ @Override
+ public Deployment getResult() { // Fields don't need to be reset as this isn't used in a loop.
return Deployment.create(name, slot, status, label, //
- instanceStateDetails, instanceErrorCode, virtualIPs, roleInstanceList, roleList, virtualNetworkName);
+ instanceStateDetails, instanceErrorCode, virtualIPs, roleInstanceList, roleList, virtualNetworkName);
}
- @Override public void startElement(String url, String name, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String url, String name, String qName, Attributes attributes) {
if (qName.equals("VirtualIPs")) {
inListVirtualIPs = true;
} else if (qName.equals("RoleInstanceList")) {
@@ -87,7 +106,8 @@ public final class DeploymentHandler extends ParseSax.HandlerForGeneratedRequest
}
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("RoleInstanceList")) {
inRoleInstanceList = false;
} else if (qName.equals("RoleInstance")) {
@@ -133,7 +153,8 @@ public final class DeploymentHandler extends ParseSax.HandlerForGeneratedRequest
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
if (inListVirtualIPs) {
virtualIPHandler.characters(ch, start, length);
} else if (inRoleInstanceList) {
@@ -161,7 +182,8 @@ public final class DeploymentHandler extends ParseSax.HandlerForGeneratedRequest
}
}
- @VisibleForTesting static InstanceStatus parseInstanceStatus(String instanceStatus) {
+ @VisibleForTesting
+ static InstanceStatus parseInstanceStatus(String instanceStatus) {
try {
// Azure isn't exactly upper-camel, as some states end in VM, not Vm.
return InstanceStatus.valueOf(UPPER_CAMEL.to(UPPER_UNDERSCORE, instanceStatus).replace("V_M", "VM"));
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DiskHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DiskHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DiskHandler.java
index eb00d72..dd00974 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DiskHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/DiskHandler.java
@@ -30,23 +30,35 @@ import org.xml.sax.Attributes;
* @see <a href="http://msdn.microsoft.com/en-us/library/jj157176" >api</a>
*/
final class DiskHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Disk> {
+
private String name;
+
private String location;
+
private String affinityGroup;
+
private String description;
+
private OSImage.Type os;
+
private URI mediaLink;
+
private Integer logicalSizeInGB;
+
private Attachment attachedTo;
+
private String sourceImage;
private boolean inAttachment;
+
private final AttachmentHandler attachmentHandler = new AttachmentHandler();
+
private final StringBuilder currentText = new StringBuilder();
- @Override public Disk getResult() {
+ @Override
+ public Disk getResult() {
Disk result = Disk.create(name, location, affinityGroup, description, os, mediaLink, logicalSizeInGB, attachedTo,
- sourceImage);
+ sourceImage);
resetState(); // handler is called in a loop.
return result;
}
@@ -59,13 +71,15 @@ final class DiskHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Di
attachedTo = null;
}
- @Override public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes attributes) {
if (qName.equals("AttachedTo")) {
inAttachment = true;
}
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("AttachedTo")) {
attachedTo = attachmentHandler.getResult();
inAttachment = false;
@@ -100,7 +114,8 @@ final class DiskHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Di
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
if (inAttachment) {
attachmentHandler.characters(ch, start, length);
} else {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ErrorHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ErrorHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ErrorHandler.java
index 001e856..ff80c87 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ErrorHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ErrorHandler.java
@@ -28,16 +28,20 @@ import org.jclouds.http.functions.ParseSax;
* @see <a href="http://msdn.microsoft.com/en-us/library/ee460801" >api</a>
*/
public final class ErrorHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Error> {
+
private Code code;
+
private String message;
private StringBuilder currentText = new StringBuilder();
- @Override public Error getResult() {
+ @Override
+ public Error getResult() {
return Error.create(code, message);
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("Code")) {
String codeText = currentOrNull(currentText);
code = parseCode(codeText);
@@ -47,7 +51,8 @@ public final class ErrorHandler extends ParseSax.HandlerForGeneratedRequestWithR
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
currentText.append(ch, start, length);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/InputEndpointHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/InputEndpointHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/InputEndpointHandler.java
index 88c0102..2151760 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/InputEndpointHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/InputEndpointHandler.java
@@ -24,14 +24,23 @@ import org.jclouds.http.functions.ParseSax;
import org.xml.sax.Attributes;
public class InputEndpointHandler extends ParseSax.HandlerForGeneratedRequestWithResult<InputEndpoint> {
+
private Integer localPort;
+
private String name;
+
private Integer port;
+
private String protocol;
+
private Boolean enableDirectServerReturn;
+
private String vip;
+
private String loadBalancerName;
+
private LoadBalancerProbe loadBalancerProbe;
+
private Integer idleTimeoutInMinutes;
private StringBuilder currentText = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/InstanceEndpointHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/InstanceEndpointHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/InstanceEndpointHandler.java
index 6092428..0ca821c 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/InstanceEndpointHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/InstanceEndpointHandler.java
@@ -23,18 +23,25 @@ import org.jclouds.http.functions.ParseSax;
import org.xml.sax.Attributes;
public class InstanceEndpointHandler extends ParseSax.HandlerForGeneratedRequestWithResult<InstanceEndpoint> {
+
private String name;
+
private String vip;
+
private Integer publicPort;
+
private Integer localPort;
+
private String protocol;
private StringBuilder currentText = new StringBuilder();
- @Override public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes attributes) {
}
- @Override public InstanceEndpoint getResult() {
+ @Override
+ public InstanceEndpoint getResult() {
InstanceEndpoint result = InstanceEndpoint.create(name, vip, publicPort, localPort, protocol);
resetState(); // handler is called in a loop.
return result;
@@ -45,19 +52,20 @@ public class InstanceEndpointHandler extends ParseSax.HandlerForGeneratedRequest
publicPort = localPort = null;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("Name")) {
name = currentOrNull(currentText);
} else if (qName.equals("Vip")) {
vip = currentOrNull(currentText);
} else if (qName.equals("PublicPort")) {
String publicPortText = currentOrNull(currentText);
- if (publicPortText != null){
+ if (publicPortText != null) {
publicPort = Integer.parseInt(publicPortText);
}
} else if (qName.equals("LocalPort")) {
String localPortText = currentOrNull(currentText);
- if (localPortText != null){
+ if (localPortText != null) {
localPort = Integer.parseInt(localPortText);
}
} else if (qName.equals("Protocol")) {
@@ -66,7 +74,8 @@ public class InstanceEndpointHandler extends ParseSax.HandlerForGeneratedRequest
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
currentText.append(ch, start, length);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListCloudServicesHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListCloudServicesHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListCloudServicesHandler.java
index 48152d7..3f5fe08 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListCloudServicesHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListCloudServicesHandler.java
@@ -31,19 +31,25 @@ import com.google.common.collect.ImmutableList.Builder;
* @see <a href="http://msdn.microsoft.com/en-us/library/ee460781">Response body description</a>
*/
public final class ListCloudServicesHandler extends ParseSax.HandlerForGeneratedRequestWithResult<List<CloudService>> {
+
private boolean inHostedService;
+
private final CloudServiceHandler cloudServiceHandler;
+
private final Builder<CloudService> hostedServices = ImmutableList.builder();
- @Inject ListCloudServicesHandler(CloudServiceHandler cloudServiceHandler) {
+ @Inject
+ ListCloudServicesHandler(CloudServiceHandler cloudServiceHandler) {
this.cloudServiceHandler = cloudServiceHandler;
}
- @Override public List<CloudService> getResult() {
+ @Override
+ public List<CloudService> getResult() {
return hostedServices.build();
}
- @Override public void startElement(String url, String name, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String url, String name, String qName, Attributes attributes) {
if (qName.equals("HostedService")) {
inHostedService = true;
}
@@ -52,7 +58,8 @@ public final class ListCloudServicesHandler extends ParseSax.HandlerForGenerated
}
}
- @Override public void endElement(String uri, String name, String qName) {
+ @Override
+ public void endElement(String uri, String name, String qName) {
if (qName.equals("HostedService")) {
inHostedService = false;
hostedServices.add(cloudServiceHandler.getResult());
@@ -61,7 +68,8 @@ public final class ListCloudServicesHandler extends ParseSax.HandlerForGenerated
}
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
if (inHostedService) {
cloudServiceHandler.characters(ch, start, length);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListDataVirtualHardDisksHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListDataVirtualHardDisksHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListDataVirtualHardDisksHandler.java
index 47a1b20..1da76e4 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListDataVirtualHardDisksHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListDataVirtualHardDisksHandler.java
@@ -26,12 +26,16 @@ import org.xml.sax.Attributes;
import java.util.List;
public final class ListDataVirtualHardDisksHandler
- extends ParseSax.HandlerForGeneratedRequestWithResult<List<DataVirtualHardDisk>> {
+ extends ParseSax.HandlerForGeneratedRequestWithResult<List<DataVirtualHardDisk>> {
+
private boolean inDataVHD;
+
private final DataVirtualHardDiskHandler dataVirtualHardDiskHandler;
+
private final Builder<DataVirtualHardDisk> VHDs = ImmutableList.builder();
- @Inject ListDataVirtualHardDisksHandler(DataVirtualHardDiskHandler dataVirtualHardDiskHandler) {
+ @Inject
+ ListDataVirtualHardDisksHandler(DataVirtualHardDiskHandler dataVirtualHardDiskHandler) {
this.dataVirtualHardDiskHandler = dataVirtualHardDiskHandler;
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListDisksHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListDisksHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListDisksHandler.java
index c23c6d0..c64e995 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListDisksHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListDisksHandler.java
@@ -27,19 +27,25 @@ import com.google.common.collect.ImmutableList.Builder;
import com.google.inject.Inject;
public final class ListDisksHandler extends ParseSax.HandlerForGeneratedRequestWithResult<List<Disk>> {
+
private boolean inDisk;
+
private final DiskHandler diskHandler;
+
private final Builder<Disk> disks = ImmutableList.builder();
- @Inject ListDisksHandler(DiskHandler diskHandler) {
+ @Inject
+ ListDisksHandler(DiskHandler diskHandler) {
this.diskHandler = diskHandler;
}
- @Override public List<Disk> getResult() {
+ @Override
+ public List<Disk> getResult() {
return disks.build();
}
- @Override public void startElement(String url, String name, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String url, String name, String qName, Attributes attributes) {
if (qName.equals("Disk")) {
inDisk = true;
}
@@ -48,7 +54,8 @@ public final class ListDisksHandler extends ParseSax.HandlerForGeneratedRequestW
}
}
- @Override public void endElement(String uri, String name, String qName) {
+ @Override
+ public void endElement(String uri, String name, String qName) {
if (qName.equals("Disk")) {
inDisk = false;
disks.add(diskHandler.getResult());
@@ -57,7 +64,8 @@ public final class ListDisksHandler extends ParseSax.HandlerForGeneratedRequestW
}
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
if (inDisk) {
diskHandler.characters(ch, start, length);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListLocationsHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListLocationsHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListLocationsHandler.java
index dd37e32..9e457e0 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListLocationsHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListLocationsHandler.java
@@ -27,25 +27,32 @@ import com.google.common.collect.ImmutableList.Builder;
import com.google.inject.Inject;
public final class ListLocationsHandler extends ParseSax.HandlerForGeneratedRequestWithResult<List<Location>> {
+
private boolean inLocation;
+
private final LocationHandler locationHandler;
+
private final Builder<Location> locations = ImmutableList.builder();
- @Inject ListLocationsHandler(LocationHandler locationHandler) {
+ @Inject
+ ListLocationsHandler(LocationHandler locationHandler) {
this.locationHandler = locationHandler;
}
- @Override public List<Location> getResult() {
+ @Override
+ public List<Location> getResult() {
return locations.build();
}
- @Override public void startElement(String url, String name, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String url, String name, String qName, Attributes attributes) {
if (qName.equals("Location")) {
inLocation = true;
}
}
- @Override public void endElement(String uri, String name, String qName) {
+ @Override
+ public void endElement(String uri, String name, String qName) {
if (qName.equals("Location")) {
inLocation = false;
locations.add(locationHandler.getResult());
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListNetworkSecurityGroupsHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListNetworkSecurityGroupsHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListNetworkSecurityGroupsHandler.java
index 9916fe6..e2e3a6f 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListNetworkSecurityGroupsHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListNetworkSecurityGroupsHandler.java
@@ -28,24 +28,30 @@ import com.google.inject.Inject;
public class ListNetworkSecurityGroupsHandler extends ParseSax.HandlerForGeneratedRequestWithResult<List<NetworkSecurityGroup>> {
private boolean inNetworkSecurityGroup;
+
private final NetworkSecurityGroupHandler networkSecurityGroupHandler;
+
private final ImmutableList.Builder<NetworkSecurityGroup> networkSecurityGroups = ImmutableList.builder();
- @Inject ListNetworkSecurityGroupsHandler(NetworkSecurityGroupHandler networkSecurityGroupHandler) {
+ @Inject
+ ListNetworkSecurityGroupsHandler(NetworkSecurityGroupHandler networkSecurityGroupHandler) {
this.networkSecurityGroupHandler = networkSecurityGroupHandler;
}
- @Override public List<NetworkSecurityGroup> getResult() {
+ @Override
+ public List<NetworkSecurityGroup> getResult() {
return networkSecurityGroups.build();
}
- @Override public void startElement(String url, String name, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String url, String name, String qName, Attributes attributes) {
if (qName.equals("NetworkSecurityGroup")) {
inNetworkSecurityGroup = true;
}
}
- @Override public void endElement(String uri, String name, String qName) {
+ @Override
+ public void endElement(String uri, String name, String qName) {
if (qName.equals("NetworkSecurityGroup")) {
inNetworkSecurityGroup = false;
networkSecurityGroups.add(networkSecurityGroupHandler.getResult());
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListOSImagesHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListOSImagesHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListOSImagesHandler.java
index b3ce14a..5e9f4e8 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListOSImagesHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListOSImagesHandler.java
@@ -27,11 +27,15 @@ import com.google.common.collect.ImmutableList.Builder;
import com.google.inject.Inject;
public final class ListOSImagesHandler extends ParseSax.HandlerForGeneratedRequestWithResult<List<OSImage>> {
+
private boolean inOSImage;
+
private final OSImageHandler osImageHandler;
+
private final Builder<OSImage> images = ImmutableList.builder();
- @Inject ListOSImagesHandler(OSImageHandler osImageHandler) {
+ @Inject
+ ListOSImagesHandler(OSImageHandler osImageHandler) {
this.osImageHandler = osImageHandler;
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListRoleSizesHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListRoleSizesHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListRoleSizesHandler.java
index 107418f..bb01212 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListRoleSizesHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListRoleSizesHandler.java
@@ -26,11 +26,15 @@ import com.google.common.collect.ImmutableList;
import com.google.inject.Inject;
public final class ListRoleSizesHandler extends ParseSax.HandlerForGeneratedRequestWithResult<List<RoleSize>> {
+
private boolean inRoleSize;
+
private final RoleSizeHandler roleSizeHandler;
+
private final ImmutableList.Builder<RoleSize> roleSizes = ImmutableList.builder();
- @Inject ListRoleSizesHandler(RoleSizeHandler roleSizeHandler) {
+ @Inject
+ ListRoleSizesHandler(RoleSizeHandler roleSizeHandler) {
this.roleSizeHandler = roleSizeHandler;
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListStorageServicesHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListStorageServicesHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListStorageServicesHandler.java
index aa993c6..e8b5785 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListStorageServicesHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListStorageServicesHandler.java
@@ -28,10 +28,13 @@ import com.google.inject.Inject;
public class ListStorageServicesHandler extends ParseSax.HandlerForGeneratedRequestWithResult<List<StorageService>> {
private boolean inStorageService;
+
private final StorageServiceHandler storageServiceHandler;
+
private final ImmutableList.Builder<StorageService> storageAccounts = ImmutableList.builder();
- @Inject ListStorageServicesHandler(StorageServiceHandler storageServiceHandler) {
+ @Inject
+ ListStorageServicesHandler(StorageServiceHandler storageServiceHandler) {
this.storageServiceHandler = storageServiceHandler;
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListVirtualNetworkSitesHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListVirtualNetworkSitesHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListVirtualNetworkSitesHandler.java
index 134c102..a459ecb 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListVirtualNetworkSitesHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListVirtualNetworkSitesHandler.java
@@ -28,18 +28,23 @@ import com.google.inject.Inject;
public class ListVirtualNetworkSitesHandler extends ParseSax.HandlerForGeneratedRequestWithResult<List<VirtualNetworkSite>> {
private boolean inVirtualNetworkSite;
+
private final VirtualNetworkSiteHandler virtualNetworkSiteHandler;
+
private final ImmutableList.Builder<VirtualNetworkSite> virtualNetworkSites = ImmutableList.builder();
- @Inject ListVirtualNetworkSitesHandler(VirtualNetworkSiteHandler virtualNetworkSiteHandler) {
+ @Inject
+ ListVirtualNetworkSitesHandler(VirtualNetworkSiteHandler virtualNetworkSiteHandler) {
this.virtualNetworkSiteHandler = virtualNetworkSiteHandler;
}
- @Override public List<VirtualNetworkSite> getResult() {
+ @Override
+ public List<VirtualNetworkSite> getResult() {
return virtualNetworkSites.build();
}
- @Override public void startElement(String url, String name, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String url, String name, String qName, Attributes attributes) {
if (qName.equals("VirtualNetworkSite")) {
inVirtualNetworkSite = true;
}
@@ -48,7 +53,8 @@ public class ListVirtualNetworkSitesHandler extends ParseSax.HandlerForGenerated
}
}
- @Override public void endElement(String uri, String name, String qName) {
+ @Override
+ public void endElement(String uri, String name, String qName) {
if (qName.equals("VirtualNetworkSite")) {
inVirtualNetworkSite = false;
virtualNetworkSites.add(virtualNetworkSiteHandler.getResult());
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/LocationHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/LocationHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/LocationHandler.java
index a16505a..1b0ca51 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/LocationHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/LocationHandler.java
@@ -30,20 +30,25 @@ import com.google.common.collect.Lists;
* @see <a href="http://msdn.microsoft.com/en-us/library/gg441293" >api</a>
*/
final class LocationHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Location> {
+
private String name;
+
private String displayName;
+
private final List<String> availableServices = Lists.newArrayList();
private final StringBuilder currentText = new StringBuilder();
- @Override public Location getResult() {
+ @Override
+ public Location getResult() {
Location result = Location.create(name, displayName, ImmutableList.copyOf(availableServices));
name = displayName = null; // handler is called in a loop.
availableServices.clear();
return result;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("Name")) {
name = currentOrNull(currentText);
} else if (qName.equals("DisplayName")) {
@@ -54,7 +59,8 @@ final class LocationHandler extends ParseSax.HandlerForGeneratedRequestWithResul
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
currentText.append(ch, start, length);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/NetworkConfigurationHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/NetworkConfigurationHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/NetworkConfigurationHandler.java
index 648ddc0..f39b92e 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/NetworkConfigurationHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/NetworkConfigurationHandler.java
@@ -28,6 +28,7 @@ public class NetworkConfigurationHandler extends ParseSax.HandlerForGeneratedReq
private VirtualNetworkConfiguration virtualNetworkConfiguration;
private boolean inVirtualNetworkConfiguration;
+
private final VirtualNetworkConfigurationHandler virtualNetworkConfigurationHandler;
@Inject
@@ -37,7 +38,8 @@ public class NetworkConfigurationHandler extends ParseSax.HandlerForGeneratedReq
private final StringBuilder currentText = new StringBuilder();
- @Override public void startElement(String url, String name, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String url, String name, String qName, Attributes attributes) {
if (qName.equals("VirtualNetworkConfiguration")) {
inVirtualNetworkConfiguration = true;
}
@@ -61,10 +63,12 @@ public class NetworkConfigurationHandler extends ParseSax.HandlerForGeneratedReq
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
if (inVirtualNetworkConfiguration) {
virtualNetworkConfigurationHandler.characters(ch, start, length);
- } else
+ } else {
currentText.append(ch, start, length);
}
+ }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/NetworkSecurityGroupHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/NetworkSecurityGroupHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/NetworkSecurityGroupHandler.java
index 6ee7aee..f893ac5 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/NetworkSecurityGroupHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/NetworkSecurityGroupHandler.java
@@ -27,12 +27,17 @@ import org.xml.sax.Attributes;
import com.google.common.collect.Lists;
public class NetworkSecurityGroupHandler extends ParseSax.HandlerForGeneratedRequestWithResult<NetworkSecurityGroup> {
+
private String name;
+
private String label;
+
private String location;
+
private List<Rule> rules = Lists.newArrayList();
private boolean inRule;
+
private final RuleHandler ruleHandler = new RuleHandler();
private final StringBuilder currentText = new StringBuilder();
@@ -44,14 +49,16 @@ public class NetworkSecurityGroupHandler extends ParseSax.HandlerForGeneratedReq
}
}
- @Override public NetworkSecurityGroup getResult() {
+ @Override
+ public NetworkSecurityGroup getResult() {
NetworkSecurityGroup result = NetworkSecurityGroup.create(name, label, location, rules);
name = label = location = null; // handler is called in a loop.
rules = Lists.newArrayList();
return result;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("Rule")) {
inRule = false;
rules.add(ruleHandler.getResult());
@@ -63,11 +70,12 @@ public class NetworkSecurityGroupHandler extends ParseSax.HandlerForGeneratedReq
label = currentOrNull(currentText);
} else if (qName.equals("Location")) {
location = currentOrNull(currentText);
- }
+ }
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
if (inRule) {
ruleHandler.characters(ch, start, length);
} else {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OSImageHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OSImageHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OSImageHandler.java
index 1150ffb..69992cf 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OSImageHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OSImageHandler.java
@@ -37,24 +37,43 @@ import com.google.common.collect.Lists;
final class OSImageHandler extends ParseSax.HandlerForGeneratedRequestWithResult<OSImage> {
private String name;
+
private String location;
+
private String affinityGroup;
+
private String label;
+
private String category;
+
private String description;
+
private OSImage.Type os;
+
private URI mediaLink;
+
private Integer logicalSizeInGB;
+
private final List<String> eulas = Lists.newArrayList();
+
private String imageFamily;
+
private Date publishedDate;
+
private String iconUri;
+
private String smallIconUri;
+
private URI privacyUri;
+
private URI pricingDetailLink;
+
private String recommendedVMSize;
+
private Boolean isPremium;
+
private Boolean showInGui;
+
private String publisherName;
private final StringBuilder currentText = new StringBuilder();
@@ -62,8 +81,8 @@ final class OSImageHandler extends ParseSax.HandlerForGeneratedRequestWithResult
@Override
public OSImage getResult() {
OSImage result = OSImage
- .create(name, location, affinityGroup, label, description, category, os, publisherName, mediaLink,
- logicalSizeInGB, ImmutableList.copyOf(eulas));
+ .create(name, location, affinityGroup, label, description, category, os, publisherName, mediaLink,
+ logicalSizeInGB, ImmutableList.copyOf(eulas));
resetState(); // handler is called in a loop.
return result;
}
@@ -83,7 +102,8 @@ final class OSImageHandler extends ParseSax.HandlerForGeneratedRequestWithResult
location = null;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("OS")) {
String osText = currentOrNull(currentText);
if (osText != null) {
@@ -162,7 +182,8 @@ final class OSImageHandler extends ParseSax.HandlerForGeneratedRequestWithResult
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
currentText.append(ch, start, length);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OSVirtualHardDiskHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OSVirtualHardDiskHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OSVirtualHardDiskHandler.java
index d2f7332..ff210c9 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OSVirtualHardDiskHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OSVirtualHardDiskHandler.java
@@ -24,21 +24,30 @@ import org.jclouds.azurecompute.domain.Role;
import org.jclouds.http.functions.ParseSax;
public class OSVirtualHardDiskHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Role.OSVirtualHardDisk> {
+
private String hostCaching;
+
private String diskName;
+
private URI mediaLink;
+
private String sourceImageName;
+
private OSImage.Type os;
+
private Integer lun;
+
private Integer logicalDiskSizeInGB;
private final StringBuilder currentText = new StringBuilder();
- @Override public Role.OSVirtualHardDisk getResult() {
+ @Override
+ public Role.OSVirtualHardDisk getResult() {
return Role.OSVirtualHardDisk.create(hostCaching, diskName, lun, logicalDiskSizeInGB, mediaLink, sourceImageName, os);
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("HostCaching")) {
hostCaching = currentOrNull(currentText);
} else if (qName.equals("DiskName")) {
@@ -59,8 +68,9 @@ public class OSVirtualHardDiskHandler extends ParseSax.HandlerForGeneratedReques
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
- currentText.append(ch, start, length);
+ @Override
+ public void characters(char ch[], int start, int length) {
+ currentText.append(ch, start, length);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OperationHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OperationHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OperationHandler.java
index e417be1..779beb2 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OperationHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/OperationHandler.java
@@ -30,26 +30,35 @@ import org.xml.sax.Attributes;
* @see <a href="http://msdn.microsoft.com/en-us/library/ee460783" >api</a>
*/
public final class OperationHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Operation> {
+
private String id;
+
private Status status;
+
private Integer httpStatusCode;
+
private Error error;
private boolean inError;
+
private final ErrorHandler errorHandler = new ErrorHandler();
+
private final StringBuilder currentText = new StringBuilder();
- @Override public Operation getResult() {
+ @Override
+ public Operation getResult() {
return Operation.create(id, status, httpStatusCode, error);
}
- @Override public void startElement(String url, String name, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String url, String name, String qName, Attributes attributes) {
if (qName.equals("Error")) {
inError = true;
}
}
- @Override public void endElement(String uri, String name, String qName) {
+ @Override
+ public void endElement(String uri, String name, String qName) {
if (qName.equals("Error")) {
error = errorHandler.getResult();
inError = false;
@@ -66,7 +75,8 @@ public final class OperationHandler extends ParseSax.HandlerForGeneratedRequestW
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
if (inError) {
errorHandler.characters(ch, start, length);
} else {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ResourceExtensionParameterValueHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ResourceExtensionParameterValueHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ResourceExtensionParameterValueHandler.java
index 2ad6c14..0f7b8b7 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ResourceExtensionParameterValueHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ResourceExtensionParameterValueHandler.java
@@ -23,16 +23,21 @@ import org.jclouds.http.functions.ParseSax;
import org.xml.sax.Attributes;
public final class ResourceExtensionParameterValueHandler extends ParseSax.HandlerForGeneratedRequestWithResult<ResourceExtensionParameterValue> {
+
private String key;
+
private String value;
+
private String type;
private StringBuilder currentText = new StringBuilder();
- @Override public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes attributes) {
}
- @Override public ResourceExtensionParameterValue getResult() {
+ @Override
+ public ResourceExtensionParameterValue getResult() {
ResourceExtensionParameterValue result = ResourceExtensionParameterValue.create(key, value, type);
resetState(); // handler is called in a loop.
return result;
@@ -42,7 +47,8 @@ public final class ResourceExtensionParameterValueHandler extends ParseSax.Handl
key = value = type = null;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("Key")) {
key = currentOrNull(currentText);
} else if (qName.equals("Value")) {
@@ -53,7 +59,8 @@ public final class ResourceExtensionParameterValueHandler extends ParseSax.Handl
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
currentText.append(ch, start, length);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ResourceExtensionReferenceHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ResourceExtensionReferenceHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ResourceExtensionReferenceHandler.java
index aafaf60..1d73e00 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ResourceExtensionReferenceHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ResourceExtensionReferenceHandler.java
@@ -30,14 +30,21 @@ import com.google.inject.Inject;
public class ResourceExtensionReferenceHandler extends ParseSax.HandlerForGeneratedRequestWithResult<ResourceExtensionReference> {
private String referenceName;
+
private String publisher;
+
private String name;
+
private String version;
+
private List<ResourceExtensionParameterValue> resourceExtensionParameterValues = Lists.newArrayList();
+
private String state;
private final ResourceExtensionParameterValueHandler resourceExtensionParameterValueHandler;
+
private boolean inResourceExtensionParameterValue = false;
+
private final StringBuilder currentText = new StringBuilder();
@Inject
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleHandler.java
index e51955e..96a0095 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleHandler.java
@@ -33,31 +33,48 @@ import com.google.inject.Inject;
public class RoleHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Role> {
private String roleName;
+
private String roleType;
+
private String vmImage;
+
private String mediaLocation;
+
private List<ConfigurationSet> configurationSets = Lists.newArrayList();
+
private List<ResourceExtensionReference> resourceExtensionReferences = Lists.newArrayList();
+
private String availabilitySetName;
+
private List<DataVirtualHardDisk> dataVirtualHardDisks = Lists.newArrayList();
+
private Role.OSVirtualHardDisk osVirtualHardDisk;
+
private RoleSize.Type roleSize;
+
private Boolean provisionGuestAgent;
+
private String defaultWinRmCertificateThumbprint;
private boolean inConfigurationSets;
+
private boolean inOSVirtualHardDisk;
+
private boolean inDataVirtualHardDisks;
+
private boolean inResourceExtensionReference;
private final ConfigurationSetHandler configurationSetHandler;
+
private final OSVirtualHardDiskHandler osVirtualDiskHandler;
+
private final DataVirtualHardDiskHandler dataVirtualHardDiskHandler;
+
private final ResourceExtensionReferenceHandler resourceExtensionReferenceHandler;
@Inject
RoleHandler(ConfigurationSetHandler configurationSetHandler, OSVirtualHardDiskHandler osVirtualDiskHandler,
- DataVirtualHardDiskHandler dataVirtualHardDiskHandler, ResourceExtensionReferenceHandler resourceExtensionReferenceHandler) {
+ DataVirtualHardDiskHandler dataVirtualHardDiskHandler, ResourceExtensionReferenceHandler resourceExtensionReferenceHandler) {
this.configurationSetHandler = configurationSetHandler;
this.osVirtualDiskHandler = osVirtualDiskHandler;
this.dataVirtualHardDiskHandler = dataVirtualHardDiskHandler;
@@ -66,7 +83,8 @@ public class RoleHandler extends ParseSax.HandlerForGeneratedRequestWithResult<R
private StringBuilder currentText = new StringBuilder();
- @Override public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes attributes) {
if (qName.equals("ConfigurationSets")) {
inConfigurationSets = true;
}
@@ -111,7 +129,8 @@ public class RoleHandler extends ParseSax.HandlerForGeneratedRequestWithResult<R
return result;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("DataVirtualHardDisks")) {
inDataVirtualHardDisks = false;
} else if (qName.equals("ConfigurationSet")) {
@@ -157,7 +176,8 @@ public class RoleHandler extends ParseSax.HandlerForGeneratedRequestWithResult<R
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
if (inConfigurationSets) {
configurationSetHandler.characters(ch, start, length);
} else if (inOSVirtualHardDisk) {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleInstanceHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleInstanceHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleInstanceHandler.java
index fa6d2b5..dd69b55 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleInstanceHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleInstanceHandler.java
@@ -33,20 +33,29 @@ import com.google.common.collect.Lists;
public class RoleInstanceHandler extends ParseSax.HandlerForGeneratedRequestWithResult<RoleInstance> {
private String roleName;
+
private String instanceName;
+
private InstanceStatus instanceStatus;
+
private Integer instanceUpgradeDomain;
+
private Integer instanceFaultDomain;
+
private RoleSize.Type instanceSize;
+
private String ipAddress;
+
private String hostname;
private boolean inInstanceEndpoints;
+
private final InstanceEndpointHandler instanceEndpointHandler = new InstanceEndpointHandler();
private List<InstanceEndpoint> instanceEndpoints = Lists.newArrayList();
- @Override public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes attributes) {
if (qName.equals("InstanceEndpoints")) {
inInstanceEndpoints = true;
}
@@ -64,6 +73,7 @@ public class RoleInstanceHandler extends ParseSax.HandlerForGeneratedRequestWith
}
private StringBuilder currentText = new StringBuilder();
+
@Override
public RoleInstance getResult() {
RoleInstance result = RoleInstance.create(roleName, instanceName, instanceStatus, instanceUpgradeDomain,
@@ -72,7 +82,8 @@ public class RoleInstanceHandler extends ParseSax.HandlerForGeneratedRequestWith
return result;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("InstanceEndpoints")) {
inInstanceEndpoints = false;
} else if (qName.equals("InstanceEndpoint")) {
@@ -111,7 +122,8 @@ public class RoleInstanceHandler extends ParseSax.HandlerForGeneratedRequestWith
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
if (inInstanceEndpoints) {
instanceEndpointHandler.characters(ch, start, length);
} else {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleSizeHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleSizeHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleSizeHandler.java
index 271a57e..9c24c38 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleSizeHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RoleSizeHandler.java
@@ -24,14 +24,23 @@ import org.jclouds.http.functions.ParseSax;
* @see <a href="http://msdn.microsoft.com/en-us/library/dn469422.aspx" >api</a>
*/
final class RoleSizeHandler extends ParseSax.HandlerForGeneratedRequestWithResult<RoleSize> {
+
private RoleSize.Type name;
+
private String label;
+
private Integer cores;
+
private Integer memoryInMb;
+
private Boolean supportedByWebWorkerRoles;
+
private Boolean supportedByVirtualMachines;
+
private Integer maxDataDiskCount;
+
private Integer webWorkerResourceDiskSizeInMb;
+
private Integer virtualMachineResourceDiskSizeInMb;
private final StringBuilder currentText = new StringBuilder();
@@ -91,7 +100,8 @@ final class RoleSizeHandler extends ParseSax.HandlerForGeneratedRequestWithResul
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
currentText.append(ch, start, length);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RuleHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RuleHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RuleHandler.java
index 9e7243c..7dc43f6 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RuleHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/RuleHandler.java
@@ -24,29 +24,41 @@ import org.jclouds.http.functions.ParseSax;
final class RuleHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Rule> {
private String name;
+
private String type;
+
private String priority;
+
private String action;
+
private String sourceAddressPrefix;
+
private String sourcePortRange;
+
private String destinationAddressPrefix;
+
private String destinationPortRange;
+
private String protocol;
+
private String state;
+
private Boolean isDefault;
private final StringBuilder currentText = new StringBuilder();
- @Override public Rule getResult() {
+ @Override
+ public Rule getResult() {
Rule result = Rule.create(name, type, priority, action, sourceAddressPrefix, sourcePortRange,
destinationAddressPrefix, destinationPortRange, protocol, state, isDefault);
- name = type = priority = action = sourceAddressPrefix = sourcePortRange = destinationAddressPrefix =
- destinationPortRange = protocol = state = null; // handler is called in a loop.
- isDefault = false;
+ name = type = priority = action = sourceAddressPrefix = sourcePortRange = destinationAddressPrefix
+ = destinationPortRange = protocol = state = null; // handler is called in a loop.
+ isDefault = false;
return result;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("Name")) {
name = currentOrNull(currentText);
} else if (qName.equals("Type")) {
@@ -76,7 +88,8 @@ final class RuleHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Ru
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
currentText.append(ch, start, length);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/StorageServiceHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/StorageServiceHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/StorageServiceHandler.java
index d9474a1..0ea9445 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/StorageServiceHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/StorageServiceHandler.java
@@ -31,12 +31,17 @@ import com.google.common.base.Throwables;
* @see <a href="http://msdn.microsoft.com/en-us/library/ee460787.aspx" >api</a>
*/
public class StorageServiceHandler extends ParseSax.HandlerForGeneratedRequestWithResult<StorageService> {
+
private URL url;
+
private String serviceName;
+
private StorageService.StorageServiceProperties storageServiceProperties;
private boolean inStorageServiceProperties;
+
private final StorageServicePropertiesHandler storageServicePropertiesHandler = new StorageServicePropertiesHandler();
+
private final StringBuilder currentText = new StringBuilder();
@Override
@@ -52,7 +57,8 @@ public class StorageServiceHandler extends ParseSax.HandlerForGeneratedRequestWi
storageServiceProperties = null;
}
- @Override public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes attributes) {
if (qName.equals("StorageServiceProperties")) {
inStorageServiceProperties = true;
}
@@ -80,7 +86,8 @@ public class StorageServiceHandler extends ParseSax.HandlerForGeneratedRequestWi
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
if (inStorageServiceProperties) {
storageServicePropertiesHandler.characters(ch, start, length);
} else {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/StorageServicePropertiesHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/StorageServicePropertiesHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/StorageServicePropertiesHandler.java
index 9e5e600..f1bcd92 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/StorageServicePropertiesHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/StorageServicePropertiesHandler.java
@@ -22,20 +22,26 @@ import org.jclouds.azurecompute.domain.StorageService;
import org.jclouds.http.functions.ParseSax;
public class StorageServicePropertiesHandler extends ParseSax.HandlerForGeneratedRequestWithResult<StorageService.StorageServiceProperties> {
+
private String description;
+
private String status;
+
private String location;
+
private String accountType;
private final StringBuilder currentText = new StringBuilder();
- @Override public StorageService.StorageServiceProperties getResult() {
+ @Override
+ public StorageService.StorageServiceProperties getResult() {
StorageService.StorageServiceProperties result = StorageService.StorageServiceProperties.create(description, status, location, accountType);
description = status = location = accountType = null; // handler could be called in a loop.
return result;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("Description")) {
description = currentOrNull(currentText);
} else if (qName.equals("Status")) {
@@ -48,7 +54,8 @@ public class StorageServicePropertiesHandler extends ParseSax.HandlerForGenerate
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
currentText.append(ch, start, length);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetHandler.java
index d2e33df..aca28be 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetHandler.java
@@ -25,18 +25,22 @@ import org.xml.sax.Attributes;
public class SubnetHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Subnet> {
private String name;
+
private String addressPrefix;
+
private String networkSecurityGroup;
private StringBuilder currentText = new StringBuilder();
- @Override public void startElement(String uri, String localName, String qName, Attributes attributes) {
- if (qName.equalsIgnoreCase("Subnet")){
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ if (qName.equalsIgnoreCase("Subnet")) {
name = attributes.getValue("name");
}
}
- @Override public Subnet getResult() {
+ @Override
+ public Subnet getResult() {
Subnet result = Subnet.create(name, addressPrefix, networkSecurityGroup);
resetState(); // handler is called in a loop.
return result;
@@ -46,7 +50,8 @@ public class SubnetHandler extends ParseSax.HandlerForGeneratedRequestWithResult
name = addressPrefix = null;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("Name")) {
name = currentOrNull(currentText);
} else if (qName.equals("AddressPrefix")) {
@@ -57,7 +62,8 @@ public class SubnetHandler extends ParseSax.HandlerForGeneratedRequestWithResult
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
currentText.append(ch, start, length);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetNameHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetNameHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetNameHandler.java
index 8bab972..3b4f112 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetNameHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetNameHandler.java
@@ -23,6 +23,7 @@ import org.jclouds.http.functions.ParseSax;
import org.xml.sax.Attributes;
public class SubnetNameHandler extends ParseSax.HandlerForGeneratedRequestWithResult<Role.ConfigurationSet.SubnetName> {
+
private String name;
private StringBuilder currentText = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualIPHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualIPHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualIPHandler.java
index e1dff77..d948868 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualIPHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualIPHandler.java
@@ -23,16 +23,21 @@ import org.jclouds.http.functions.ParseSax;
import org.xml.sax.Attributes;
public final class VirtualIPHandler extends ParseSax.HandlerForGeneratedRequestWithResult<VirtualIP> {
+
private String address;
+
private Boolean isDnsProgrammed;
+
private String name;
private StringBuilder currentText = new StringBuilder();
- @Override public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes attributes) {
}
- @Override public VirtualIP getResult() {
+ @Override
+ public VirtualIP getResult() {
VirtualIP result = VirtualIP.create(address, isDnsProgrammed, name);
resetState(); // handler is called in a loop.
return result;
@@ -43,7 +48,8 @@ public final class VirtualIPHandler extends ParseSax.HandlerForGeneratedRequestW
isDnsProgrammed = null;
}
- @Override public void endElement(String ignoredUri, String ignoredName, String qName) {
+ @Override
+ public void endElement(String ignoredUri, String ignoredName, String qName) {
if (qName.equals("Address")) {
address = currentOrNull(currentText);
} else if (qName.equals("IsDnsProgrammed")) {
@@ -52,12 +58,13 @@ public final class VirtualIPHandler extends ParseSax.HandlerForGeneratedRequestW
isDnsProgrammed = Boolean.valueOf(dnsProgrammed);
}
} else if (qName.equals("Name")) {
- name = currentOrNull(currentText);
+ name = currentOrNull(currentText);
}
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
currentText.append(ch, start, length);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualNetworkConfigurationHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualNetworkConfigurationHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualNetworkConfigurationHandler.java
index 6dd7443..cf2e417 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualNetworkConfigurationHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualNetworkConfigurationHandler.java
@@ -29,14 +29,17 @@ import com.google.common.collect.Lists;
public class VirtualNetworkConfigurationHandler extends ParseSax.HandlerForGeneratedRequestWithResult<VirtualNetworkConfiguration> {
private String dns;
+
private List<NetworkConfiguration.VirtualNetworkSite> virtualNetworkSites = Lists.newArrayList();
private boolean inVirtualNetworkSite;
+
private final VirtualNetworkSiteHandler virtualNetworkSiteHandler = new VirtualNetworkSiteHandler();
private final StringBuilder currentText = new StringBuilder();
- @Override public void startElement(String url, String name, String qName, Attributes attributes) {
+ @Override
+ public void startElement(String url, String name, String qName, Attributes attributes) {
if (qName.equals("VirtualNetworkSite")) {
inVirtualNetworkSite = true;
}
@@ -64,10 +67,12 @@ public class VirtualNetworkConfigurationHandler extends ParseSax.HandlerForGener
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
if (inVirtualNetworkSite) {
virtualNetworkSiteHandler.characters(ch, start, length);
- } else
+ } else {
currentText.append(ch, start, length);
}
+ }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2af28926/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualNetworkSiteHandler.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualNetworkSiteHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualNetworkSiteHandler.java
index 99e48fe..d699fe4 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualNetworkSiteHandler.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/VirtualNetworkSiteHandler.java
@@ -30,21 +30,28 @@ import com.google.common.collect.Lists;
public class VirtualNetworkSiteHandler extends ParseSax.HandlerForGeneratedRequestWithResult<VirtualNetworkSite> {
private String id;
+
private String name;
+
private String location;
+
private AddressSpace addressSpace;
+
private List<Subnet> subnets = Lists.newArrayList();
private boolean inSubnet;
+
private boolean inAddressSpace;
+
private final SubnetHandler subnetHandler = new SubnetHandler();
+
private final AddressSpaceHandler addressSpaceHandler = new AddressSpaceHandler();
private StringBuilder currentText = new StringBuilder();
@Override
public void startElement(String uri, String localName, String qName, Attributes attributes) {
- if (qName.equalsIgnoreCase("VirtualNetworkSite")){
+ if (qName.equalsIgnoreCase("VirtualNetworkSite")) {
name = attributes.getValue("name");
location = attributes.getValue("Location");
}
@@ -97,7 +104,8 @@ public class VirtualNetworkSiteHandler extends ParseSax.HandlerForGeneratedReque
currentText.setLength(0);
}
- @Override public void characters(char ch[], int start, int length) {
+ @Override
+ public void characters(char ch[], int start, int length) {
if (inAddressSpace) {
addressSpaceHandler.characters(ch, start, length);
} else if (inSubnet) {