From 3f5993a2d8a67828e60e1a2a0a715cbb93fd9d1e Mon Sep 17 00:00:00 2001 From: Adam Lowe Date: Tue, 3 Jul 2012 14:53:59 +0100 Subject: [PATCH] openstack: replacing SerializedName with Named --- .../openstack/nova/v2_0/options/CreateServerOptions.java | 5 ++--- .../src/main/java/org/jclouds/openstack/domain/Link.java | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java index 63c0346674..893ad42c22 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java @@ -30,6 +30,7 @@ import java.util.Map.Entry; import java.util.Set; import javax.inject.Inject; +import javax.inject.Named; import org.jclouds.encryption.internal.Base64; import org.jclouds.http.HttpRequest; @@ -46,7 +47,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.google.gson.annotations.SerializedName; /** * @@ -152,7 +152,6 @@ public class CreateServerOptions implements MapBinder { return string().toString(); } - @SuppressWarnings("unused") private class ServerRequest { final String name; final String imageRef; @@ -161,7 +160,7 @@ public class CreateServerOptions implements MapBinder { Map metadata; List personality; String key_name; - @SerializedName(value = "security_groups") + @Named("security_groups") Set securityGroupNames; String user_data; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java b/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java index 8206bfb55f..7d4df5c54e 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java @@ -31,7 +31,6 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Objects; -import com.google.gson.annotations.SerializedName; /** * For convenience, resources contain links to themselves. This allows a client to easily obtain a