diff options
author | Smokowski, Steve (ss835w) <ss835w@us.att.com> | 2019-05-02 09:42:55 -0400 |
---|---|---|
committer | Smokowski, Steve (ss835w) <ss835w@us.att.com> | 2019-05-07 10:02:17 -0400 |
commit | 3f9a0c3183480d150089c0d5a6e507c877f7d121 (patch) | |
tree | b3db04cbe2cef23f81503177a50edc5360ffa486 /swift-client/src/main/java | |
parent | e153f0adfbed711ce1e215748594a4d04fd1edaf (diff) |
Enhance Openstack Client
Update Openstack Client to support additional fields
Updat all formatting issues
Issue-ID: SO-1844
Change-Id: I1369e0c18cc25274db8df7e12855a020b8da38da
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
Diffstat (limited to 'swift-client/src/main/java')
4 files changed, 50 insertions, 53 deletions
diff --git a/swift-client/src/main/java/com/woorea/openstack/swift/Swift.java b/swift-client/src/main/java/com/woorea/openstack/swift/Swift.java index 8ae3200..1e3d498 100644 --- a/swift-client/src/main/java/com/woorea/openstack/swift/Swift.java +++ b/swift-client/src/main/java/com/woorea/openstack/swift/Swift.java @@ -23,25 +23,25 @@ import com.woorea.openstack.swift.api.AccountResource; import com.woorea.openstack.swift.api.ContainersResource; public class Swift extends OpenStackClient { - + private final AccountResource ACCOUNT; - + private final ContainersResource CONTAINERS; - + public Swift(String endpoint, OpenStackClientConnector connector) { super(endpoint, connector); CONTAINERS = new ContainersResource(this); ACCOUNT = new AccountResource(this); } - + public Swift(String endpoint) { this(endpoint, null); } - + public ContainersResource containers() { return CONTAINERS; } - + public AccountResource account() { return ACCOUNT; } diff --git a/swift-client/src/main/java/com/woorea/openstack/swift/api/AccountResource.java b/swift-client/src/main/java/com/woorea/openstack/swift/api/AccountResource.java index a860c71..7ed0ca2 100644 --- a/swift-client/src/main/java/com/woorea/openstack/swift/api/AccountResource.java +++ b/swift-client/src/main/java/com/woorea/openstack/swift/api/AccountResource.java @@ -20,9 +20,9 @@ import com.woorea.openstack.base.client.OpenStackClient; import com.woorea.openstack.base.client.OpenStackRequest; public class AccountResource { - + private final OpenStackClient CLIENT; - + public AccountResource(OpenStackClient client) { CLIENT = client; } diff --git a/swift-client/src/main/java/com/woorea/openstack/swift/api/ContainerResource.java b/swift-client/src/main/java/com/woorea/openstack/swift/api/ContainerResource.java index 5b5cc02..b0ef16b 100644 --- a/swift-client/src/main/java/com/woorea/openstack/swift/api/ContainerResource.java +++ b/swift-client/src/main/java/com/woorea/openstack/swift/api/ContainerResource.java @@ -17,8 +17,6 @@ package com.woorea.openstack.swift.api; import java.util.Map; - - import com.woorea.openstack.base.client.OpenStackClient; import com.woorea.openstack.base.client.OpenStackRequest; import com.woorea.openstack.base.client.OpenStackResponse; @@ -26,72 +24,72 @@ import com.woorea.openstack.swift.model.ObjectDownload; import com.woorea.openstack.swift.model.ObjectForUpload; public class ContainerResource { - + private final OpenStackClient CLIENT; - + private String container; - + public ContainerResource(OpenStackClient client, String container) { CLIENT = client; this.container = container; } - + public List list() { return new List(container, null); } - + public CreateDirectory createDirectory(String path) { return new CreateDirectory(container, path); } - + public Show show(String path) { return new Show(container, path); } - + public Upload upload(ObjectForUpload objectForUpload) { return new Upload(objectForUpload); } - + public Download download(String path) { return new Download(container, path); } - + public Delete delete(String path) { return new Delete(container, path); } - + public class List extends OpenStackRequest<java.util.List<Object>> { private String containerName; - + private Map<String, String> filters; - + public List(String containerName, Map<String, String> filters) { this.containerName = containerName; this.filters = filters; } - + } public class CreateDirectory extends OpenStackRequest<Void> { private String container; - + private String path; - + public CreateDirectory(String container, String path) { this.container = container; this.path = path; } - + } - + public class Show extends OpenStackRequest<Object> { private String containerName; - + private String objectName; - + public Show(String containerName, String objectName) { this.containerName = containerName; this.objectName = objectName; @@ -99,24 +97,24 @@ public class ContainerResource { } } - + public class Upload extends OpenStackRequest<OpenStackResponse> { private ObjectForUpload objectForUpload; - + public Upload(ObjectForUpload objectForUpload) { this.objectForUpload = objectForUpload; } } - + public class Download extends OpenStackRequest<ObjectDownload> { private String containerName; - + private String objectName; - + public Download(String containerName, String objectName) { this.containerName = containerName; this.objectName = objectName; @@ -124,13 +122,13 @@ public class ContainerResource { } - + public class Delete extends OpenStackRequest<Void> { private String containerName; - + private String objectName; - + public Delete(String containerName, String objectName) { this.containerName = containerName; this.objectName = objectName; diff --git a/swift-client/src/main/java/com/woorea/openstack/swift/api/ContainersResource.java b/swift-client/src/main/java/com/woorea/openstack/swift/api/ContainersResource.java index 05147bc..04d8ba4 100644 --- a/swift-client/src/main/java/com/woorea/openstack/swift/api/ContainersResource.java +++ b/swift-client/src/main/java/com/woorea/openstack/swift/api/ContainersResource.java @@ -22,68 +22,67 @@ import com.woorea.openstack.base.client.OpenStackRequest; import com.woorea.openstack.swift.model.Container; public class ContainersResource { - + private final OpenStackClient CLIENT; - + public ContainersResource(OpenStackClient client) { CLIENT = client; } - + public List list() { return new List(); } - + public Create create(String name) { return new Create(name); } - + public Show show(String name) { return new Show(name); } - + public Delete delete(String name) { return new Delete(name); } - + public ContainerResource container(String name) { return new ContainerResource(CLIENT, name); } - + public class List extends OpenStackRequest<java.util.List<Container>> { - public List() { - } + public List() {} } public class Create extends OpenStackRequest<Container> { - + public Create(String containerName) { } } - + public class Show extends OpenStackRequest<Container> { private String containerName; - + public Show(String containerName) { } } - + public class Delete extends OpenStackRequest<Void> { private String containerName; - + public Delete(String containerName) { this.containerName = containerName; } } - + } |