summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2017-09-25 07:46:38 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-25 07:46:38 +0000
commitd3b1c795e719ecd203fd146d057cc10f755f1a9a (patch)
tree3dcb27d31d5a3d97ce47eaf9ae647d70c67fd534
parent231bc997e100c502080dfb903b3e507771aa7456 (diff)
parentae5120828c0406fde599662a0cdc6336d30bea19 (diff)
Merge "REsolved below sonar issues."
-rw-r--r--glance-client/src/main/java/com/woorea/openstack/glance/Glance.java43
-rw-r--r--glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java524
-rw-r--r--glance-client/src/main/java/com/woorea/openstack/glance/SharedImagesResource.java37
3 files changed, 299 insertions, 305 deletions
diff --git a/glance-client/src/main/java/com/woorea/openstack/glance/Glance.java b/glance-client/src/main/java/com/woorea/openstack/glance/Glance.java
index 67714e7..9a574c1 100644
--- a/glance-client/src/main/java/com/woorea/openstack/glance/Glance.java
+++ b/glance-client/src/main/java/com/woorea/openstack/glance/Glance.java
@@ -4,27 +4,26 @@ import com.woorea.openstack.base.client.OpenStackClient;
import com.woorea.openstack.base.client.OpenStackClientConnector;
public class Glance extends OpenStackClient {
-
- private final ImagesResource IMAGES;
-
- private final SharedImagesResource SHARED_IMAGES;
-
- public Glance(String endpoint, OpenStackClientConnector connector) {
- super(endpoint, connector);
- IMAGES = new ImagesResource(this);
- SHARED_IMAGES = new SharedImagesResource(this);
- }
-
- public Glance(String endpoint) {
- this(endpoint, null);
- }
-
- public final ImagesResource images() {
- return IMAGES;
- }
-
- public final SharedImagesResource sharedImages() {
- return SHARED_IMAGES;
- }
+ private final ImagesResource images;
+
+ private final SharedImagesResource sharedImages;
+
+ public Glance(String endpoint, OpenStackClientConnector connector) {
+ super(endpoint, connector);
+ images = new ImagesResource(this);
+ sharedImages = new SharedImagesResource(this);
+ }
+
+ public Glance(String endpoint) {
+ this(endpoint, null);
+ }
+
+ public final ImagesResource images() {
+ return images;
+ }
+
+ public final SharedImagesResource sharedImages() {
+ return sharedImages;
+ }
}
diff --git a/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java b/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java
index ae46548..a4ad237 100644
--- a/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java
+++ b/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java
@@ -1,12 +1,5 @@
package com.woorea.openstack.glance;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codehaus.jackson.annotate.JsonProperty;
-
import com.woorea.openstack.base.client.Entity;
import com.woorea.openstack.base.client.HttpMethod;
import com.woorea.openstack.base.client.OpenStackClient;
@@ -14,267 +7,270 @@ import com.woorea.openstack.base.client.OpenStackRequest;
import com.woorea.openstack.base.client.OpenStackResponse;
import com.woorea.openstack.glance.model.Image;
import com.woorea.openstack.glance.model.ImageDownload;
-import com.woorea.openstack.glance.model.ImageUpload;
import com.woorea.openstack.glance.model.ImageMember;
import com.woorea.openstack.glance.model.ImageMembers;
+import com.woorea.openstack.glance.model.ImageUpload;
import com.woorea.openstack.glance.model.Images;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import org.codehaus.jackson.annotate.JsonProperty;
public class ImagesResource {
- private final OpenStackClient CLIENT;
-
- public ImagesResource(OpenStackClient client) {
- CLIENT = client;
- }
-
- public List list(boolean detail) {
- return new List(detail);
- }
-
- public Create create(Image image) {
- return new Create(image);
- }
-
- public Show show(String id) {
- return new Show(id);
- }
-
- public Update update(String id, Image image) {
- return new Update(id, image);
- }
-
- public Delete delete(String id) {
- return new Delete(id);
- }
-
- public Upload upload(ImageUpload image) {
- return new Upload(image);
- }
-
- public Upload upload(String id, ImageUpload image) {
- return new Upload(id, image);
- }
-
- public Download download(String id) {
- return new Download(id);
- }
-
- public ListMembers listMembers(String id) {
- return new ListMembers(id);
- }
-
- public ReplaceMembers replaceMembers(String id, Collection<ImageMember> members) {
- return new ReplaceMembers(id, members);
- }
-
- public AddMember addMember(String id, String tenantId) {
- return new AddMember(id, tenantId);
- }
-
- public AddMember removeMember(String id, String tenantId) {
- return new AddMember(id, tenantId);
- }
-
- public class List extends OpenStackRequest<Images> {
-
- public List(boolean detail) {
- super(CLIENT, HttpMethod.GET, detail ? "/images/detail" : "images", null, Images.class);
- }
-
- }
-
- public class Create extends OpenStackRequest<Image> {
-
- public Create(Image image) {
- super(CLIENT, HttpMethod.POST, "/images", null, Image.class);
- for (Map.Entry<String, String> entry : compose(image).entrySet()) {
- header(entry.getKey(), entry.getValue());
- }
- }
-
- }
-
- public class Update extends OpenStackRequest<Image> {
-
- public Update(String id, Image image) {
- super(CLIENT, HttpMethod.PUT, new StringBuilder("/images/").append(id).toString(), Entity.json(image), Image.class);
- }
-
- }
-
- public class Delete extends OpenStackRequest<Void> {
-
- public Delete(String id) {
- super(CLIENT, HttpMethod.DELETE, new StringBuilder("/images/").append(id).toString(), null, Void.class);
- }
-
- }
-
- public class Show extends OpenStackRequest<Image> {
-
- public Show(String id) {
- super(CLIENT, HttpMethod.HEAD, new StringBuilder("/images/").append(id).toString(), null, Image.class);
- }
-
- @Override
- public Image execute() {
- // custom parsing here
- return parse(CLIENT.request(this).headers());
- }
-
- }
-
- public class Upload extends OpenStackRequest<Image> {
-
- public Upload(String id, ImageUpload imageUpload) {
- super(CLIENT, HttpMethod.PUT, new StringBuilder("/images/").append(id).toString(),
- Entity.stream(imageUpload.getInputStream()), Image.class);
- }
-
- public Upload(ImageUpload imageUpload) {
- super(CLIENT, HttpMethod.POST, "/images", Entity.stream(imageUpload.getInputStream()), Image.class);
-
- for (Map.Entry<String, String> entry : compose(imageUpload.getImage()).entrySet()) {
- header(entry.getKey(), entry.getValue());
- }
-
- //file,s3,swift
- header("x-image-meta-store", imageUpload.getStore());
- }
-
- }
-
- public class Download extends OpenStackRequest<ImageDownload> {
-
- public Download(String id) {
- super(CLIENT, HttpMethod.GET, new StringBuilder("/images/").append(id).toString(), null, ImageDownload.class);
- header("Accept", "application/octet-stream");
- }
-
- @Override
- public ImageDownload execute() {
- // custom parsing here
- OpenStackResponse response = CLIENT.request(this);
- ImageDownload imageDownload = new ImageDownload();
- imageDownload.setImage(parse(response.headers()));
- imageDownload.setInputStream(response.getInputStream());
- return imageDownload;
- }
-
- }
-
- public class ListMembers extends OpenStackRequest<ImageMembers> {
-
- public ListMembers(String id) {
- super(CLIENT, HttpMethod.GET, new StringBuilder("/images/").append(id).append("/members").toString(), null, ImageMembers.class);
- }
-
- }
-
- public class ReplaceMembers extends OpenStackRequest<Void> {
-
- public ReplaceMembers(String id, Collection<ImageMember> members) {
- super(CLIENT, HttpMethod.PUT, new StringBuilder("/images/").append(id).append("/members").toString(), Entity.json(new Memberships(members)), Void.class);
- }
-
- }
-
- public class AddMember extends OpenStackRequest<ImageMember> {
-
- public AddMember(String id, String tenantId) {
- super(CLIENT, HttpMethod.PUT, new StringBuilder("/images/").append(id).append("/members").append(tenantId).toString(), null, ImageMember.class);
- }
-
- }
-
- public class RemoveMember extends OpenStackRequest<Void> {
-
- public RemoveMember(String id, String tenantId) {
- super(CLIENT, HttpMethod.DELETE, new StringBuilder("/images/").append(id).append("/members/").append(tenantId).toString(), null, Void.class);
- }
-
- }
-
- public static Map<String, String> compose(Image image) {
- Map<String, String> headers = new HashMap<String, String>();
-
- headers.put("X-Image-Meta-Name", image.getName());
- headers.put("X-Image-Meta-Disk_format", image.getDiskFormat());
- headers.put("X-Image-Meta-Container_format", image.getContainerFormat());
- headers.put("X-Image-Meta-Id", image.getId());
- headers.put("X-Image-Meta-Size", (image.getSize() != null) ? image.getSize().toString() : null);
- headers.put("X-Image-Meta-Checksum", image.getChecksum());
- headers.put("X-Image-Meta-Is_public", String.valueOf(image.isPublic()));
- headers.put("X-Image-Meta-Owner", image.getOwner());
-
- for(String key : image.getProperties().keySet()) {
- image.getProperties().put("x-image-meta-property-" + key, image.getProperties().get(key));
- }
-
- return headers;
- }
-
- public static Image parse(Map<String, String> headers) {
- Image image = new Image();
- image.setId(headers.get("X-Image-Meta-Id"));
- image.setUri(headers.get("Location"));
- image.setName(headers.get("X-Image-Meta-Name"));
- image.setDiskFormat(headers.get("X-Image-Meta-Disk_format"));
- image.setContainerFormat(headers.get("X-Image-Meta-Container_format"));
- image.setSize(asLong(headers.get("X-Image-Meta-Size")));
- image.setChecksum(headers.get("X-Image-Meta-Checksum"));
- image.setCreatedAt(asCalendar(headers.get("X-Image-Meta-Created_at")));
- image.setUpdatedAt(asCalendar(headers.get("X-Image-Meta-Updated_at")));
- image.setDeletedAt(asCalendar(headers.get("X-Image-Meta-Deleted_at")));
- image.setDeleted(asBoolean(headers.get("X-Image-Meta-Deleted")));
- image.setStatus(headers.get("X-Image-Meta-Status"));
- image.setProtected(asBoolean(headers.get("X-Image-Meta-Protected")));
- image.setPublic(asBoolean(headers.get("X-Image-Meta-Is_public")));
- image.setMinRam(asInteger(headers.get("X-Image-Meta-Min_ram")));
- image.setMinDisk(asInteger(headers.get("X-Image-Meta-Min_disk")));
- image.setOwner(headers.get("X-Image-Meta-Owner"));
- for(String key : headers.keySet()) {
- if(key.startsWith("x-image-meta-property-")) {
- image.getProperties().put(key.substring(22), headers.get(key));
- }
- }
- return image;
- }
-
- private static Calendar asCalendar(String calendarString) {
- return Calendar.getInstance();
- }
-
- private static Integer asInteger(String integerString) {
- if(integerString != null) {
- return Integer.parseInt(integerString);
- }
- return 0;
- }
-
- private static Boolean asBoolean(String booleanString) {
- if(booleanString != null) {
- return Boolean.parseBoolean(booleanString);
- }
- return Boolean.FALSE;
- }
-
- private static Long asLong(String longString) {
- if(longString != null) {
- return Long.parseLong(longString);
- }
- return 0L;
- }
-
- public static class Memberships {
-
- @JsonProperty("memberships")
- private Collection<ImageMember> memberships;
-
- public Memberships(Collection<ImageMember> memberships) {
- this.memberships = memberships;
- }
-
- }
-
+ private static final String IMAGES = "/images/";
+ private static final String MEMBERS = "/members";
+ private final OpenStackClient client;
+
+ public ImagesResource(OpenStackClient client) {
+ this.client = client;
+ }
+
+ public List list(boolean detail) {
+ return new List(detail);
+ }
+
+ public Create create(Image image) {
+ return new Create(image);
+ }
+
+ public Show show(String id) {
+ return new Show(id);
+ }
+
+ public Update update(String id, Image image) {
+ return new Update(id, image);
+ }
+
+ public Delete delete(String id) {
+ return new Delete(id);
+ }
+
+ public Upload upload(ImageUpload image) {
+ return new Upload(image);
+ }
+
+ public Upload upload(String id, ImageUpload image) {
+ return new Upload(id, image);
+ }
+
+ public Download download(String id) {
+ return new Download(id);
+ }
+
+ public ListMembers listMembers(String id) {
+ return new ListMembers(id);
+ }
+
+ public ReplaceMembers replaceMembers(String id, Collection<ImageMember> members) {
+ return new ReplaceMembers(id, members);
+ }
+
+ public AddMember addMember(String id, String tenantId) {
+ return new AddMember(id, tenantId);
+ }
+
+ public AddMember removeMember(String id, String tenantId) {
+ return new AddMember(id, tenantId);
+ }
+
+ public class List extends OpenStackRequest<Images> {
+
+ public List(boolean detail) {
+ super(client, HttpMethod.GET, detail ? IMAGES + "detail" : "images", null, Images.class);
+ }
+ }
+
+ public class Create extends OpenStackRequest<Image> {
+
+ public Create(Image image) {
+ super(client, HttpMethod.POST, "/images", null, Image.class);
+ for (Map.Entry<String, String> entry : compose(image).entrySet()) {
+ header(entry.getKey(), entry.getValue());
+ }
+ }
+ }
+
+ public class Update extends OpenStackRequest<Image> {
+
+ public Update(String id, Image image) {
+ super(client, HttpMethod.PUT, new StringBuilder(IMAGES).append(id).toString(), Entity.json(image),
+ Image.class);
+ }
+ }
+
+ public class Delete extends OpenStackRequest<Void> {
+
+ public Delete(String id) {
+ super(client, HttpMethod.DELETE, new StringBuilder(IMAGES).append(id).toString(), null, Void.class);
+ }
+ }
+
+ public class Show extends OpenStackRequest<Image> {
+
+ public Show(String id) {
+ super(client, HttpMethod.HEAD, new StringBuilder(IMAGES).append(id).toString(), null, Image.class);
+ }
+
+ @Override
+ public Image execute() {
+ // custom parsing here
+ return parse(client.request(this).headers());
+ }
+ }
+
+ public class Upload extends OpenStackRequest<Image> {
+
+ public Upload(String id, ImageUpload imageUpload) {
+ super(client, HttpMethod.PUT, new StringBuilder(IMAGES).append(id).toString(),
+ Entity.stream(imageUpload.getInputStream()), Image.class);
+ }
+
+ public Upload(ImageUpload imageUpload) {
+ super(client, HttpMethod.POST, "/images", Entity.stream(imageUpload.getInputStream()), Image.class);
+
+ for (Map.Entry<String, String> entry : compose(imageUpload.getImage()).entrySet()) {
+ header(entry.getKey(), entry.getValue());
+ }
+
+ //file,s3,swift
+ header("x-image-meta-store", imageUpload.getStore());
+ }
+ }
+
+ public class Download extends OpenStackRequest<ImageDownload> {
+
+ public Download(String id) {
+ super(client, HttpMethod.GET, new StringBuilder(IMAGES).append(id).toString(), null,
+ ImageDownload.class);
+ header("Accept", "application/octet-stream");
+ }
+
+ @Override
+ public ImageDownload execute() {
+ // custom parsing here
+ OpenStackResponse response = client.request(this);
+ ImageDownload imageDownload = new ImageDownload();
+ imageDownload.setImage(parse(response.headers()));
+ imageDownload.setInputStream(response.getInputStream());
+ return imageDownload;
+ }
+ }
+
+ public class ListMembers extends OpenStackRequest<ImageMembers> {
+
+ public ListMembers(String id) {
+ super(client, HttpMethod.GET, new StringBuilder(IMAGES).append(id).append(MEMBERS).toString(), null,
+ ImageMembers.class);
+ }
+ }
+
+ public class ReplaceMembers extends OpenStackRequest<Void> {
+
+ public ReplaceMembers(String id, Collection<ImageMember> members) {
+ super(client, HttpMethod.PUT, new StringBuilder(IMAGES).append(id).append(MEMBERS).toString(),
+ Entity.json(new Memberships(members)), Void.class);
+ }
+ }
+
+ public class AddMember extends OpenStackRequest<ImageMember> {
+
+ public AddMember(String id, String tenantId) {
+ super(client, HttpMethod.PUT,
+ new StringBuilder(IMAGES).append(id).append(MEMBERS).append(tenantId).toString(), null,
+ ImageMember.class);
+ }
+ }
+
+ public class RemoveMember extends OpenStackRequest<Void> {
+
+ public RemoveMember(String id, String tenantId) {
+ super(client, HttpMethod.DELETE,
+ new StringBuilder(IMAGES).append(id).append("/members/").append(tenantId).toString(), null,
+ Void.class);
+ }
+ }
+
+ public static Map<String, String> compose(Image image) {
+ Map<String, String> headers = new HashMap<>();
+
+ headers.put("X-Image-Meta-Name", image.getName());
+ headers.put("X-Image-Meta-Disk_format", image.getDiskFormat());
+ headers.put("X-Image-Meta-Container_format", image.getContainerFormat());
+ headers.put("X-Image-Meta-Id", image.getId());
+ headers.put("X-Image-Meta-Size", image.getSize() != null ? image.getSize().toString() : null);
+ headers.put("X-Image-Meta-Checksum", image.getChecksum());
+ headers.put("X-Image-Meta-Is_public", String.valueOf(image.isPublic()));
+ headers.put("X-Image-Meta-Owner", image.getOwner());
+
+ for (String key : image.getProperties().keySet()) {
+ image.getProperties().put("x-image-meta-property-" + key, image.getProperties().get(key));
+ }
+
+ return headers;
+ }
+
+ public static Image parse(Map<String, String> headers) {
+ Image image = new Image();
+ image.setId(headers.get("X-Image-Meta-Id"));
+ image.setUri(headers.get("Location"));
+ image.setName(headers.get("X-Image-Meta-Name"));
+ image.setDiskFormat(headers.get("X-Image-Meta-Disk_format"));
+ image.setContainerFormat(headers.get("X-Image-Meta-Container_format"));
+ image.setSize(asLong(headers.get("X-Image-Meta-Size")));
+ image.setChecksum(headers.get("X-Image-Meta-Checksum"));
+ image.setCreatedAt(asCalendar(headers.get("X-Image-Meta-Created_at")));
+ image.setUpdatedAt(asCalendar(headers.get("X-Image-Meta-Updated_at")));
+ image.setDeletedAt(asCalendar(headers.get("X-Image-Meta-Deleted_at")));
+ image.setDeleted(asBoolean(headers.get("X-Image-Meta-Deleted")));
+ image.setStatus(headers.get("X-Image-Meta-Status"));
+ image.setProtected(asBoolean(headers.get("X-Image-Meta-Protected")));
+ image.setPublic(asBoolean(headers.get("X-Image-Meta-Is_public")));
+ image.setMinRam(asInteger(headers.get("X-Image-Meta-Min_ram")));
+ image.setMinDisk(asInteger(headers.get("X-Image-Meta-Min_disk")));
+ image.setOwner(headers.get("X-Image-Meta-Owner"));
+ for (Map.Entry<String, String> entry : headers.entrySet()) {
+ String key = entry.getKey();
+ if (key.startsWith("x-image-meta-property-")) {
+ image.getProperties().put(key.substring(22), entry.getValue());
+ }
+ }
+ return image;
+ }
+
+ private static Calendar asCalendar(String calendarString) {
+ return Calendar.getInstance();
+ }
+
+ private static Integer asInteger(String integerString) {
+ if (integerString != null) {
+ return Integer.parseInt(integerString);
+ }
+ return 0;
+ }
+
+ private static Boolean asBoolean(String booleanString) {
+ if (booleanString != null) {
+ return Boolean.parseBoolean(booleanString);
+ }
+ return Boolean.FALSE;
+ }
+
+ private static Long asLong(String longString) {
+ if (longString != null) {
+ return Long.parseLong(longString);
+ }
+ return 0L;
+ }
+
+ public static class Memberships {
+
+ @JsonProperty("memberships")
+ private Collection<ImageMember> imageMembers;
+
+ public Memberships(Collection<ImageMember> imageMembers) {
+ this.imageMembers = imageMembers;
+ }
+ }
}
diff --git a/glance-client/src/main/java/com/woorea/openstack/glance/SharedImagesResource.java b/glance-client/src/main/java/com/woorea/openstack/glance/SharedImagesResource.java
index a461554..741fe80 100644
--- a/glance-client/src/main/java/com/woorea/openstack/glance/SharedImagesResource.java
+++ b/glance-client/src/main/java/com/woorea/openstack/glance/SharedImagesResource.java
@@ -4,27 +4,26 @@ package com.woorea.openstack.glance;
import com.woorea.openstack.base.client.HttpMethod;
import com.woorea.openstack.base.client.OpenStackClient;
import com.woorea.openstack.base.client.OpenStackRequest;
-import com.woorea.openstack.glance.model.Images;
import com.woorea.openstack.glance.model.SharedImages;
public class SharedImagesResource {
- private final OpenStackClient CLIENT;
-
- public SharedImagesResource(OpenStackClient client) {
- CLIENT = client;
- }
-
- public List list(String tenantId, boolean detail) {
- return new List(tenantId, detail);
- }
-
- public class List extends OpenStackRequest<SharedImages> {
-
- public List(String tenantId, boolean detail) {
- super(CLIENT, HttpMethod.GET, new StringBuffer(detail ? "/shared-images/detail" : "/shared-images/").append(tenantId).toString(), null, SharedImages.class);
- }
-
- }
-
+ private final OpenStackClient client;
+
+ public SharedImagesResource(OpenStackClient client) {
+ this.client = client;
+ }
+
+ public List list(String tenantId, boolean detail) {
+ return new List(tenantId, detail);
+ }
+
+ public class List extends OpenStackRequest<SharedImages> {
+
+ public List(String tenantId, boolean detail) {
+ super(client, HttpMethod.GET,
+ new StringBuffer(detail ? "/shared-images/detail" : "/shared-images/").append(tenantId).toString(),
+ null, SharedImages.class);
+ }
+ }
}