Fix VolumeAttachment serialization

fdangtran · fdangtran · commit 019d7240c087 · 2013-07-11T17:20:42.000+02:00
The anonymous class based on VolumeAttachment ignores Jackson annotation
diff --git a/nova-client/src/main/java/com/woorea/openstack/nova/api/ServersResource.java b/nova-client/src/main/java/com/woorea/openstack/nova/api/ServersResource.java
@@ -421,11 +421,8 @@ public DisassociateFloatingIp disassociateFloatingIp(String serverId, String flo
 	
 	public  class AttachVolume extends OpenStackRequest<Void> {
 		
-		public AttachVolume(String serverId, final String volumeId, final String device) {
-			super(CLIENT, HttpMethod.POST, new StringBuilder("/servers/").append(serverId).append("/os-volume_attachments"), Entity.json(new VolumeAttachment() {{
-				setVolumeId(volumeId);
-				setDevice(device);
-			}}), Void.class);
+		public AttachVolume(String serverId, final VolumeAttachment volumeAttachment) { 
+			super(CLIENT, HttpMethod.POST, new StringBuilder("/servers/").append(serverId).append("/os-volume_attachments"), Entity.json(volumeAttachment), Void.class);
 		}
 
 	}
@@ -442,8 +439,11 @@ public DetachVolume(String serverId, String volumeId) {
 
 	}
 
-	public AttachVolume attachVolume(String serverId, String volumeId, String device) {
-		return new AttachVolume(serverId, volumeId, device);
+	public AttachVolume attachVolume(String serverId, String volumeId, String device) { 
+		VolumeAttachment volumeAttachment = new VolumeAttachment();
+		volumeAttachment.setVolumeId(volumeId);
+		volumeAttachment.setDevice(device);
+		return new AttachVolume(serverId, volumeAttachment);
 	}
 	
 	public DetachVolume detachVolume(String serverId, String volumeId) {

Original file line number	Diff line number	Diff line change
`@@ -421,11 +421,8 @@ public DisassociateFloatingIp disassociateFloatingIp(String serverId, String flo`
`421`	`421`
`422`	`422`	`public class AttachVolume extends OpenStackRequest<Void> {`
`423`	`423`
`424`		`- public AttachVolume(String serverId, final String volumeId, final String device) {`
`425`		`- super(CLIENT, HttpMethod.POST, new StringBuilder("/servers/").append(serverId).append("/os-volume_attachments"), Entity.json(new VolumeAttachment() {{`
`426`		`- setVolumeId(volumeId);`
`427`		`- setDevice(device);`
`428`		`- }}), Void.class);`
	`424`	`+ public AttachVolume(String serverId, final VolumeAttachment volumeAttachment) {`
	`425`	`+ super(CLIENT, HttpMethod.POST, new StringBuilder("/servers/").append(serverId).append("/os-volume_attachments"), Entity.json(volumeAttachment), Void.class);`
`429`	`426`	`}`
`430`	`427`
`431`	`428`	`}`
`@@ -442,8 +439,11 @@ public DetachVolume(String serverId, String volumeId) {`
`442`	`439`
`443`	`440`	`}`
`444`	`441`
`445`		`- public AttachVolume attachVolume(String serverId, String volumeId, String device) {`
`446`		`- return new AttachVolume(serverId, volumeId, device);`
	`442`	`+ public AttachVolume attachVolume(String serverId, String volumeId, String device) {`
	`443`	`+ VolumeAttachment volumeAttachment = new VolumeAttachment();`
	`444`	`+ volumeAttachment.setVolumeId(volumeId);`
	`445`	`+ volumeAttachment.setDevice(device);`
	`446`	`+ return new AttachVolume(serverId, volumeAttachment);`
`447`	`447`	`}`
`448`	`448`
`449`	`449`	`public DetachVolume detachVolume(String serverId, String volumeId) {`