Skip to content

Commit fe35357

Browse files
wooreawoorea
committed
jackson provider to support extensions finished
1 parent 6cfe38b commit fe35357

86 files changed

Lines changed: 381 additions & 694 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,6 @@
8282
<artifactId>commons-io</artifactId>
8383
<version>2.1</version>
8484
</dependency>
85-
<dependency>
86-
<groupId>com.google.code.gson</groupId>
87-
<artifactId>gson</artifactId>
88-
<version>2.1</version>
89-
</dependency>
9085
<dependency>
9186
<groupId>org.glassfish.jersey.media</groupId>
9287
<artifactId>jersey-media-json</artifactId>

‎src/main/java/org/openstack/api/common/GsonProvider.java‎

Lines changed: 0 additions & 150 deletions
This file was deleted.

‎src/main/java/org/openstack/api/common/RestClient.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.glassfish.jersey.client.JerseyClient;
1616
import org.glassfish.jersey.client.JerseyClientFactory;
1717
import org.glassfish.jersey.media.json.JsonFeature;
18-
import org.openstack.model.common.JsonRootElement;
1918

2019
public enum RestClient {
2120

‎src/main/java/org/openstack/api/compute/ImageResource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
import org.openstack.api.common.Resource;
88
import org.openstack.model.compute.Image;
9-
import org.openstack.model.compute.Metadata;
109
import org.openstack.model.compute.nova.NovaImage;
11-
import org.openstack.model.compute.nova.NovaMetadata;
1210

1311
public class ImageResource extends Resource {
1412

@@ -24,9 +22,11 @@ public Response delete() {
2422
return target.request().delete();
2523
}
2624

25+
/*
2726
public Metadata metadata() {
2827
// /metadata
2928
return new NovaMetadata();
3029
}
30+
*/
3131

3232
}

‎src/main/java/org/openstack/model/common/Extension.java‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
package org.openstack.model.common;
22

33
import java.io.Serializable;
4+
import java.util.ArrayList;
5+
import java.util.List;
46

57
import javax.xml.bind.annotation.XmlAccessType;
68
import javax.xml.bind.annotation.XmlAccessorType;
79
import javax.xml.bind.annotation.XmlAttribute;
810
import javax.xml.bind.annotation.XmlElement;
911
import javax.xml.bind.annotation.XmlRootElement;
1012

13+
import org.codehaus.jackson.map.annotate.JsonRootName;
14+
import org.openstack.model.atom.Link;
15+
1116
@XmlRootElement
1217
@XmlAccessorType(XmlAccessType.NONE)
13-
@JsonRootElement("extension")
18+
@JsonRootName("extension")
1419
public class Extension implements Serializable {
1520

1621
@XmlAttribute
@@ -27,6 +32,8 @@ public class Extension implements Serializable {
2732

2833
@XmlElement
2934
private String description;
35+
36+
private List<Link> links = new ArrayList<Link>();
3037

3138
public String getAlias() {
3239
return alias;
@@ -68,7 +75,15 @@ public void setDescription(String description) {
6875
this.description = description;
6976
}
7077

71-
@Override
78+
public List<Link> getLinks() {
79+
return links;
80+
}
81+
82+
public void setLinks(List<Link> links) {
83+
this.links = links;
84+
}
85+
86+
@Override
7287
public String toString() {
7388
return "Extension [alias=" + alias + ", updated=" + updated + ", namespace=" + namespace + ", name=" + name + ", description=" + description + "]";
7489
}

‎src/main/java/org/openstack/model/common/ExtensionList.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.openstack.model.common;
22

3+
import java.util.ArrayList;
34
import java.util.Iterator;
45
import java.util.List;
56

@@ -8,22 +9,17 @@
89
import javax.xml.bind.annotation.XmlElement;
910
import javax.xml.bind.annotation.XmlRootElement;
1011

11-
import com.google.common.collect.Lists;
12-
import com.google.gson.annotations.SerializedName;
12+
import org.codehaus.jackson.annotate.JsonProperty;
1313

1414
@XmlRootElement(name = "extensions")
1515
@XmlAccessorType(XmlAccessType.NONE)
16-
@JsonRootElement()
1716
public class ExtensionList implements Iterable<Extension> {
1817

1918
@XmlElement(name = "extension")
20-
@SerializedName("extensions")
21-
private List<Extension> list;
19+
@JsonProperty("extensions")
20+
private List<Extension> list = new ArrayList<Extension>();
2221

2322
public List<Extension> getList() {
24-
if (list == null) {
25-
list = Lists.newArrayList();
26-
}
2723
return list;
2824
}
2925

‎src/main/java/org/openstack/model/compute/KeyPairListItem.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package org.openstack.model.compute;
22

3-
import org.openstack.model.compute.nova.keypair.NovaKeyPair;
4-
53
public interface KeyPairListItem {
64

7-
NovaKeyPair getKeypair();
5+
KeyPair getKeypair();
86

97
}

‎src/main/java/org/openstack/model/compute/Metadata.java‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/main/java/org/openstack/model/compute/Server.java‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import java.util.List;
55
import java.util.Map;
66

7-
import javax.xml.namespace.QName;
8-
97
import org.openstack.model.atom.Link;
108
import org.openstack.model.compute.nova.NovaAddressList.Network;
119

@@ -51,29 +49,10 @@ public interface Server {
5149

5250
Map<String, List<Network.Ip>> getAddresses();
5351

54-
Map<QName, String> getExtensionAttributes();
55-
56-
/*
57-
@XmlAnyAttribute
58-
public Map<QName, String> getExtensionAttributes() {
59-
Map<QName, String> transform = new HashMap<QName, String>();
60-
for(Map.Entry<String, String> entry : extensionAttributes.entrySet()) {
61-
62-
}
63-
return transform;
64-
}
65-
66-
public void setExtensionAttributes(Map<QName, String> extensionAttributes) {
67-
Map<String, String> transform = new HashMap<String, String>();
68-
for(Map.Entry<QName, String> entry : extensionAttributes.entrySet()) {
69-
70-
}
71-
this.extensionAttributes = transform;
72-
}
73-
*/
74-
7552
List<Link> getLinks();
7653

7754
Link getLink(final String rel);
55+
56+
public Map<String, String> getExtensions();
7857

7958
}

‎src/main/java/org/openstack/model/compute/Volume.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.openstack.model.compute;
22

3+
import java.util.Map;
4+
35
public interface Volume {
46

57
Integer getId();
@@ -20,6 +22,6 @@ public interface Volume {
2022

2123
Integer getSnapshotId();
2224

23-
Metadata getMetadata();
25+
Map<String, String> getMetadata();
2426

2527
}

0 commit comments

Comments
 (0)