Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 695: Converted optional Boolean to boolean, fixed layout(), fromVirtualMachine() and toString()

This commit is contained in:
Jason King 2011-11-17 11:40:17 +00:00
parent b81317651d
commit f7c9579019
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/VirtualMachine.java
View File

@ -64,10 +64,10 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
private VirtualMachineStatus status; private VirtualMachineStatus status;
private Layout layout; private Layout layout;
private Boolean poweredOn; private boolean poweredOn;
private ToolsStatus toolsStatus; private ToolsStatus toolsStatus;
private VirtualMachineMediaStatus mediaStatus; private VirtualMachineMediaStatus mediaStatus;
private Boolean customizationPending; private boolean customizationPending;
private OperatingSystem operatingSystem; private OperatingSystem operatingSystem;
private HardwareConfiguration hardwareConfiguration; private HardwareConfiguration hardwareConfiguration;
@ -110,7 +110,7 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
/** /**
* @see VirtualMachine#getLayout() * @see VirtualMachine#getLayout()
*/ */
public Builder description(Layout layout) { public Builder layout(Layout layout) {
this.layout = layout; this.layout = layout;
return this; return this;
} }
@ -126,7 +126,7 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
/** /**
* @see VirtualMachine#isCustomizationPending() * @see VirtualMachine#isCustomizationPending()
*/ */
public Builder customizationPending(Boolean customizationPending) { public Builder customizationPending(boolean customizationPending) {
this.customizationPending = customizationPending; this.customizationPending = customizationPending;
return this; return this;
} }
@ -158,7 +158,7 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
/** /**
* @see VirtualMachine#isPoweredOn() * @see VirtualMachine#isPoweredOn()
*/ */
public Builder poweredOn(Boolean poweredOn) { public Builder poweredOn(boolean poweredOn) {
this.poweredOn = poweredOn; this.poweredOn = poweredOn;
return this; return this;
} }
@ -192,6 +192,7 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
.tasks(in.getTasks()) .tasks(in.getTasks())
.actions(in.getActions()) .actions(in.getActions())
.description(in.getDescription()) .description(in.getDescription())
.layout(in.getLayout())
.status(in.getStatus()) .status(in.getStatus())
.poweredOn(in.isPoweredOn()) .poweredOn(in.isPoweredOn())
.toolsStatus(in.getToolsStatus()) .toolsStatus(in.getToolsStatus())
@ -271,7 +272,7 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
private VirtualMachineStatus status; private VirtualMachineStatus status;
@XmlElement(name = "PoweredOn", required = false) @XmlElement(name = "PoweredOn", required = false)
private Boolean poweredOn; private boolean poweredOn;
@XmlElement(name = "ToolsStatus", required = false) @XmlElement(name = "ToolsStatus", required = false)
private ToolsStatus toolsStatus; private ToolsStatus toolsStatus;
@ -280,7 +281,7 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
private VirtualMachineMediaStatus mediaStatus; private VirtualMachineMediaStatus mediaStatus;
@XmlElement(name = "CustomizationPending", required = false) @XmlElement(name = "CustomizationPending", required = false)
private Boolean customizationPending; private boolean customizationPending;
@XmlElement(name = "OperatingSystem", required = false) @XmlElement(name = "OperatingSystem", required = false)
private OperatingSystem operatingSystem; private OperatingSystem operatingSystem;
@ -289,7 +290,7 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
private HardwareConfiguration hardwareConfiguation; private HardwareConfiguration hardwareConfiguation;
public VirtualMachine(URI href, String type, String name, Tasks tasks, Actions actions, Links links, String description, @Nullable Layout layout, public VirtualMachine(URI href, String type, String name, Tasks tasks, Actions actions, Links links, String description, @Nullable Layout layout,
VirtualMachineStatus status, @Nullable Boolean poweredOn, @Nullable ToolsStatus toolsStatus, @Nullable VirtualMachineMediaStatus mediaStatus, @Nullable Boolean customizationPending, VirtualMachineStatus status, boolean poweredOn, @Nullable ToolsStatus toolsStatus, @Nullable VirtualMachineMediaStatus mediaStatus, boolean customizationPending,
@Nullable OperatingSystem operatingSystem, @Nullable HardwareConfiguration hardwareConfiguration ) { @Nullable OperatingSystem operatingSystem, @Nullable HardwareConfiguration hardwareConfiguration ) {
super(href, type, name); super(href, type, name);
this.description = checkNotNull(description, "description"); this.description = checkNotNull(description, "description");
@ -342,10 +343,7 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
return layout; return layout;
} }
/** public boolean isPoweredOn() {
* Is optional, so may return null
*/
public Boolean isPoweredOn() {
return poweredOn; return poweredOn;
} }
@ -370,10 +368,7 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
return hardwareConfiguation; return hardwareConfiguation;
} }
/** public boolean isCustomizationPending() {
* Is optional, so may return null
*/
public Boolean isCustomizationPending() {
return customizationPending; return customizationPending;
} }
@ -392,9 +387,9 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
VirtualMachine that = (VirtualMachine) o; VirtualMachine that = (VirtualMachine) o;
if (customizationPending != that.customizationPending) return false;
if (poweredOn != that.poweredOn) return false;
if (!actions.equals(that.actions)) return false; if (!actions.equals(that.actions)) return false;
if (customizationPending != null ? !customizationPending.equals(that.customizationPending) : that.customizationPending != null)
return false;
if (!description.equals(that.description)) return false; if (!description.equals(that.description)) return false;
if (hardwareConfiguation != null ? !hardwareConfiguation.equals(that.hardwareConfiguation) : that.hardwareConfiguation != null) if (hardwareConfiguation != null ? !hardwareConfiguation.equals(that.hardwareConfiguation) : that.hardwareConfiguation != null)
return false; return false;
@ -404,8 +399,6 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
if (mediaStatus != that.mediaStatus) return false; if (mediaStatus != that.mediaStatus) return false;
if (operatingSystem != null ? !operatingSystem.equals(that.operatingSystem) : that.operatingSystem != null) if (operatingSystem != null ? !operatingSystem.equals(that.operatingSystem) : that.operatingSystem != null)
return false; return false;
if (poweredOn != null ? !poweredOn.equals(that.poweredOn) : that.poweredOn != null)
return false;
if (status != that.status) return false; if (status != that.status) return false;
if (!tasks.equals(that.tasks)) return false; if (!tasks.equals(that.tasks)) return false;
if (toolsStatus != that.toolsStatus) return false; if (toolsStatus != that.toolsStatus) return false;
@ -422,10 +415,10 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
result = 31 * result + description.hashCode(); result = 31 * result + description.hashCode();
result = 31 * result + (layout != null ? layout.hashCode() : 0); result = 31 * result + (layout != null ? layout.hashCode() : 0);
result = 31 * result + status.hashCode(); result = 31 * result + status.hashCode();
result = 31 * result + (poweredOn != null ? poweredOn.hashCode() : 0); result = 31 * result + (poweredOn ? 1 : 0);
result = 31 * result + (toolsStatus != null ? toolsStatus.hashCode() : 0); result = 31 * result + (toolsStatus != null ? toolsStatus.hashCode() : 0);
result = 31 * result + (mediaStatus != null ? mediaStatus.hashCode() : 0); result = 31 * result + (mediaStatus != null ? mediaStatus.hashCode() : 0);
result = 31 * result + (customizationPending != null ? customizationPending.hashCode() : 0); result = 31 * result + (customizationPending ? 1 : 0);
result = 31 * result + (operatingSystem != null ? operatingSystem.hashCode() : 0); result = 31 * result + (operatingSystem != null ? operatingSystem.hashCode() : 0);
result = 31 * result + (hardwareConfiguation != null ? hardwareConfiguation.hashCode() : 0); result = 31 * result + (hardwareConfiguation != null ? hardwareConfiguation.hashCode() : 0);
return result; return result;
@ -435,7 +428,7 @@ public class VirtualMachine extends BaseNamedResource<VirtualMachine> {
public String string() { public String string() {
return super.string()+", links="+links+", tasks="+tasks+", actions="+actions+", description="+description+", layout="+layout+ return super.string()+", links="+links+", tasks="+tasks+", actions="+actions+", description="+description+", layout="+layout+
", status="+status+", poweredOn="+poweredOn+", toolsStatus="+toolsStatus+", mediaStatus="+mediaStatus+ ", status="+status+", poweredOn="+poweredOn+", toolsStatus="+toolsStatus+", mediaStatus="+mediaStatus+
", operatingSystem="+operatingSystem+", hardwareConfiguration="+hardwareConfiguation; ", customizationPending="+customizationPending+", operatingSystem="+operatingSystem+", hardwareConfiguration="+hardwareConfiguation;
} }
@XmlEnum @XmlEnum