bf

woorea · woorea · commit c910d96af7f5 · 2012-04-14T05:16:10.000+02:00
diff --git a/src/main/java/org/openstack/api/common/GsonProvider.java b/src/main/java/org/openstack/api/common/GsonProvider.java
@@ -6,8 +6,6 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.lang.reflect.Type;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;
@@ -19,7 +17,6 @@
 import javax.ws.rs.ext.MessageBodyWriter;
 import javax.ws.rs.ext.Provider;
 import javax.ws.rs.ext.Providers;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.commons.io.IOUtils;
 import org.openstack.model.common.JsonRootElement;
diff --git a/src/main/java/org/openstack/api/compute/AsyncServerOperation.java b/src/main/java/org/openstack/api/compute/AsyncServerOperation.java
@@ -1,15 +1,13 @@
 package org.openstack.api.compute;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
 
 import org.openstack.model.compute.Server;
-import org.openstack.model.compute.nova.NovaServer;
 import org.openstack.model.exceptions.OpenstackException;
 
 import com.google.common.collect.Lists;
diff --git a/src/main/java/org/openstack/api/compute/ConsoleResource.java b/src/main/java/org/openstack/api/compute/ConsoleResource.java
@@ -1,7 +1,5 @@
 package org.openstack.api.compute;
 
-import java.util.Map;
-
 import javax.ws.rs.client.Target;
 import javax.ws.rs.core.MediaType;
 
diff --git a/src/main/java/org/openstack/api/compute/ConsolesResource.java b/src/main/java/org/openstack/api/compute/ConsolesResource.java
@@ -1,7 +1,5 @@
 package org.openstack.api.compute;
 
-import java.util.Map;
-
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Target;
 import javax.ws.rs.core.MediaType;
diff --git a/src/main/java/org/openstack/api/compute/ExtensionResource.java b/src/main/java/org/openstack/api/compute/ExtensionResource.java
@@ -1,7 +1,5 @@
 package org.openstack.api.compute;
 
-import java.util.Map;
-
 import javax.ws.rs.client.Target;
 import javax.ws.rs.core.MediaType;
 
diff --git a/src/main/java/org/openstack/api/compute/ext/KeyPairsResource.java b/src/main/java/org/openstack/api/compute/ext/KeyPairsResource.java
@@ -1,8 +1,5 @@
 package org.openstack.api.compute.ext;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Target;
 import javax.ws.rs.core.MediaType;
diff --git a/src/main/java/org/openstack/api/compute/ext/SecurityGroupRuleResource.java b/src/main/java/org/openstack/api/compute/ext/SecurityGroupRuleResource.java
@@ -1,7 +1,5 @@
 package org.openstack.api.compute.ext;
 
-import java.util.Map;
-
 import javax.ws.rs.client.Target;
 
 import org.openstack.api.common.Resource;
diff --git a/src/main/java/org/openstack/api/storage/ContainerResource.java b/src/main/java/org/openstack/api/storage/ContainerResource.java
@@ -2,14 +2,13 @@
 
 import java.util.List;
 
-import javax.ws.rs.client.Target;
 import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.Target;
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.openstack.api.common.Resource;
-import org.openstack.model.storage.swift.SwiftContainer;
 import org.openstack.model.storage.swift.SwiftStorageObject;
 
 import com.google.common.base.Splitter;
diff --git a/src/main/java/org/openstack/model/common/package-info.java b/src/main/java/org/openstack/model/common/package-info.java
@@ -8,3 +8,4 @@
 
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlSchema;
+
diff --git a/src/main/java/org/openstack/model/compute/ConsoleList.java b/src/main/java/org/openstack/model/compute/ConsoleList.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import org.openstack.model.compute.nova.NovaConsole;
-
 public interface ConsoleList {
 
 	List<Console> getList();
diff --git a/src/main/java/org/openstack/model/compute/FloatingIp.java b/src/main/java/org/openstack/model/compute/FloatingIp.java
@@ -3,13 +3,23 @@
 public interface FloatingIp {
 
 	Integer getId();
+	
+	void setId(Integer id);
 
 	String getIp();
+	
+	void setIp(String ip);
 
 	String getPool();
+	
+	void setPool(String pool);
 
 	String getInstanceId();
+	
+	void setInstanceId(String instanceId);
 
 	String getFixedIp();
+	
+	void setFixedIp(String fixedIp);
 
 }
diff --git a/src/main/java/org/openstack/model/compute/SnapshotList.java b/src/main/java/org/openstack/model/compute/SnapshotList.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import org.openstack.model.compute.nova.snapshot.NovaSnapshot;
-
 public interface SnapshotList {
 
 	List<Snapshot> getList();
diff --git a/src/main/java/org/openstack/model/compute/Volume.java b/src/main/java/org/openstack/model/compute/Volume.java
@@ -18,7 +18,7 @@ public interface Volume {
 
 	String getDescription();
 
-	String getSnapshotId();
+	Integer getSnapshotId();
 
 	Metadata getMetadata();
 
diff --git a/src/main/java/org/openstack/model/compute/nova/NovaMetadata.java b/src/main/java/org/openstack/model/compute/nova/NovaMetadata.java
@@ -1,8 +1,6 @@
 package org.openstack.model.compute.nova;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src/main/java/org/openstack/model/compute/nova/package-info.java b/src/main/java/org/openstack/model/compute/nova/package-info.java
@@ -8,3 +8,4 @@
 
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlSchema;
+
diff --git a/src/main/java/org/openstack/model/compute/nova/server/actions/CreateBackupAction.java b/src/main/java/org/openstack/model/compute/nova/server/actions/CreateBackupAction.java
@@ -7,7 +7,6 @@
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.ws.Action;
 
 import org.openstack.model.common.JsonRootElement;
 import org.openstack.model.compute.Metadata;
diff --git a/src/main/java/org/openstack/model/compute/nova/server/actions/Output.java b/src/main/java/org/openstack/model/compute/nova/server/actions/Output.java
@@ -7,7 +7,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlValue;
 
-import org.openstack.model.common.JsonRootElement;
 import org.openstack.model.compute.ServerAction;
 
 @XmlRootElement(name="output", namespace="")
diff --git a/src/main/java/org/openstack/model/compute/nova/snapshot/NovaSnapshot.java b/src/main/java/org/openstack/model/compute/nova/snapshot/NovaSnapshot.java
@@ -45,6 +45,16 @@ public class NovaSnapshot implements Serializable, Snapshot {
 	
 	@XmlAttribute(name="volumeId")
 	private Integer volumeId;
+	
+	public NovaSnapshot() {
+		
+	}
+	
+	public NovaSnapshot(Integer id, String name, Integer volumeId) {
+		this.id = id;
+		this.name = name;
+		this.volumeId = volumeId;
+	}
 
 	/* (non-Javadoc)
 	 * @see org.openstack.model.compute.nova.snapshot.Snapshot#getId()
diff --git a/src/main/java/org/openstack/model/compute/nova/snapshot/NovaSnapshotForCreate.java b/src/main/java/org/openstack/model/compute/nova/snapshot/NovaSnapshotForCreate.java
@@ -8,7 +8,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.openstack.model.common.JsonRootElement;
-import org.openstack.model.compute.Snapshot;
 import org.openstack.model.compute.SnapshotForCreate;
 
 import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/openstack/model/compute/nova/snapshot/NovaSnapshotList.java b/src/main/java/org/openstack/model/compute/nova/snapshot/NovaSnapshotList.java
@@ -10,7 +10,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.openstack.model.common.JsonRootElement;
-import org.openstack.model.common.ListWithAtomLinks;
 import org.openstack.model.compute.Snapshot;
 import org.openstack.model.compute.SnapshotList;
 
diff --git a/src/main/java/org/openstack/model/compute/nova/volume/NovaVolume.java b/src/main/java/org/openstack/model/compute/nova/volume/NovaVolume.java
@@ -50,7 +50,7 @@ public class NovaVolume implements Serializable, Volume {
 	private String description;
 	
 	@XmlAttribute(name="snapshotId")
-	private String snapshotId;
+	private Integer snapshotId;
 	
 	@XmlElement(name="metadata")
 	private NovaMetadata metadata;
@@ -59,9 +59,10 @@ public NovaVolume() {
 		
 	}
 	
-	public NovaVolume(Integer id, String name) {
+	public NovaVolume(Integer id, String name, Integer snapshotId) {
 		this.id = id;
 		this.name = name;
+		this.snapshotId = snapshotId;
 	}
 
 	/* (non-Javadoc)
@@ -164,11 +165,11 @@ public void setDescription(String description) {
 	 * @see org.openstack.model.compute.Volume#getSnapshotId()
 	 */
 	@Override
-	public String getSnapshotId() {
+	public Integer getSnapshotId() {
 		return snapshotId;
 	}
 
-	public void setSnapshotId(String snapshotId) {
+	public void setSnapshotId(Integer snapshotId) {
 		this.snapshotId = snapshotId;
 	}
 
diff --git a/src/main/java/org/openstack/model/compute/nova/volume/NovaVolumeForCreate.java b/src/main/java/org/openstack/model/compute/nova/volume/NovaVolumeForCreate.java
@@ -5,12 +5,10 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.openstack.model.common.JsonRootElement;
 import org.openstack.model.compute.Metadata;
-import org.openstack.model.compute.Volume;
 import org.openstack.model.compute.nova.NovaMetadata;
 
 import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/openstack/model/identity/Authentication.java b/src/main/java/org/openstack/model/identity/Authentication.java
@@ -1,6 +1,5 @@
 package org.openstack.model.identity;
 
-import org.openstack.model.identity.keystone.KeystoneAuthentication;
 import org.openstack.model.identity.keystone.KeystoneAuthentication.PasswordCredentials;
 
 public interface Authentication {
diff --git a/src/main/java/org/openstack/model/identity/keystone/KeystoneAccess.java b/src/main/java/org/openstack/model/identity/keystone/KeystoneAccess.java
@@ -16,12 +16,10 @@
 import org.openstack.model.common.JsonRootElement;
 import org.openstack.model.exceptions.OpenstackException;
 import org.openstack.model.identity.Access;
-import org.openstack.model.identity.Service;
 import org.openstack.model.identity.ServiceEndpoint;
 import org.openstack.model.identity.Token;
 import org.openstack.model.identity.User;
 
-import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/openstack/model/identity/keystone/KeystoneService.java b/src/main/java/org/openstack/model/identity/keystone/KeystoneService.java
@@ -1,7 +1,6 @@
 package org.openstack.model.identity.keystone;
 
 import java.io.Serializable;
-import java.util.List;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -12,10 +11,6 @@
 import org.openstack.api.Namespaces;
 import org.openstack.model.common.JsonRootElement;
 import org.openstack.model.identity.Service;
-import org.openstack.model.identity.ServiceEndpoint;
-
-import com.google.common.collect.Lists;
-import com.google.gson.annotations.SerializedName;
 
 @XmlRootElement(name="service", namespace=Namespaces.NS_OPENSTACK_IDENTITY_ADM_1_0)
 @XmlAccessorType(XmlAccessType.NONE)
diff --git a/src/main/java/org/openstack/model/images/glance/GlanceImage.java b/src/main/java/org/openstack/model/images/glance/GlanceImage.java
@@ -7,7 +7,6 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.openstack.model.common.JsonRootElement;
diff --git a/src/main/java/org/openstack/model/storage/StorageAccount.java b/src/main/java/org/openstack/model/storage/StorageAccount.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import org.openstack.model.storage.swift.SwiftContainer;
-
 public interface StorageAccount {
 
 	List<StorageContainer> getContainers();
diff --git a/src/main/java/org/openstack/model/storage/StorageContainer.java b/src/main/java/org/openstack/model/storage/StorageContainer.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import org.openstack.model.storage.swift.SwiftStorageObject;
-
 public interface StorageContainer {
 
 	String getName();
diff --git a/src/test/java/org/openstack/client/Test.java b/src/test/java/org/openstack/client/Test.java
@@ -1,11 +1,8 @@
 package org.openstack.client;
 
 import org.openstack.api.identity.IdentityAdministrationEndpoint;
-import org.openstack.model.identity.Endpoint;
 import org.openstack.model.identity.Service;
 import org.openstack.model.identity.ServiceList;
-import org.openstack.model.identity.keystone.KeystoneEndpoint;
-import org.openstack.model.identity.keystone.KeystoneService;
 
 public class Test {
 
diff --git a/src/test/java/org/openstack/client/compute/ComputeIntegrationTest.java b/src/test/java/org/openstack/client/compute/ComputeIntegrationTest.java
@@ -1,15 +1,12 @@
 package org.openstack.client.compute;
 
-import java.util.HashMap;
 import java.util.List;
 
 import org.openstack.api.compute.TenantResource;
-import org.openstack.api.identity.IdentityAdministrationEndpoint;
 import org.openstack.client.AbstractOpenStackTest;
 import org.openstack.model.common.Extension;
 import org.openstack.model.compute.Flavor;
 import org.openstack.model.compute.Image;
-import org.openstack.model.compute.nova.NovaImage;
 import org.testng.SkipException;
 import org.testng.annotations.BeforeClass;
 
diff --git a/src/test/java/org/openstack/client/compute/ITSecurityGroups.java b/src/test/java/org/openstack/client/compute/ITSecurityGroups.java
@@ -8,7 +8,6 @@
 import org.openstack.model.compute.SecurityGroupRuleForCreate;
 import org.openstack.model.compute.nova.securitygroup.NovaSecurityGroupForCreate;
 import org.openstack.model.compute.nova.securitygroup.NovaSecurityGroupRuleForCreate;
-import org.openstack.model.compute.nova.securitygroup.NovaSecurityGroup;
 import org.openstack.model.exceptions.OpenstackException;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/openstack/client/compute/ITServers.java b/src/test/java/org/openstack/client/compute/ITServers.java
@@ -4,7 +4,6 @@
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.openstack.api.compute.ServerResource;
 import org.openstack.model.compute.Flavor;
 import org.openstack.model.compute.Image;
 import org.openstack.model.compute.Server;
diff --git a/src/test/java/org/openstack/client/storage/StorageIntegrationTest.java b/src/test/java/org/openstack/client/storage/StorageIntegrationTest.java
@@ -10,7 +10,6 @@
 import org.openstack.client.AbstractOpenStackTest;
 import org.openstack.model.storage.StorageContainer;
 import org.openstack.model.storage.swift.SwiftStorageObjectProperties;
-import org.testng.SkipException;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 

Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,4 @@`
`8`	`8`
`9`	`9`	`import javax.xml.bind.annotation.XmlNs;`
`10`	`10`	`import javax.xml.bind.annotation.XmlSchema;`
	`11`	`+`