Repository: jclouds-labs-openstack Updated Branches: refs/heads/master ff246bae6 -> 50218e6a0
Convert fake interfaces to utility classes Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/50218e6a Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/50218e6a Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/50218e6a Branch: refs/heads/master Commit: 50218e6a0199fdbb483471869fc046ded8b82d11 Parents: ff246ba Author: Andrew Gaul <[email protected]> Authored: Sat Sep 6 11:48:09 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Sat Sep 20 18:47:07 2014 -0700 ---------------------------------------------------------------------- .../swift/v1/reference/SwiftHeaders.java | 82 ++++++++++---------- .../v1/reference/CloudFilesConstants.java | 12 ++- .../v1/reference/CloudFilesHeaders.java | 26 ++++--- 3 files changed, 66 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/50218e6a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java index bd889ec..56e7949 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java @@ -19,76 +19,80 @@ package org.jclouds.openstack.swift.v1.reference; /** * Common headers in Swift. */ -public interface SwiftHeaders { +public final class SwiftHeaders { // Common Metadata Prefixes - String ACCOUNT_METADATA_PREFIX = "X-Account-Meta-"; - String CONTAINER_METADATA_PREFIX = "X-Container-Meta-"; - String OBJECT_METADATA_PREFIX = "X-Object-Meta-"; - String USER_METADATA_PREFIX = OBJECT_METADATA_PREFIX; + public static final String ACCOUNT_METADATA_PREFIX = "X-Account-Meta-"; + public static final String CONTAINER_METADATA_PREFIX = "X-Container-Meta-"; + public static final String OBJECT_METADATA_PREFIX = "X-Object-Meta-"; + public static final String USER_METADATA_PREFIX = OBJECT_METADATA_PREFIX; // Metadata Removal Prefixes - String ACCOUNT_REMOVE_METADATA_PREFIX = "X-Remove-Account-Meta-"; - String CONTAINER_REMOVE_METADATA_PREFIX = "X-Remove-Container-Meta-"; - String OBJECT_REMOVE_METADATA_PREFIX = "X-Remove-Object-Meta-"; + public static final String ACCOUNT_REMOVE_METADATA_PREFIX = "X-Remove-Account-Meta-"; + public static final String CONTAINER_REMOVE_METADATA_PREFIX = "X-Remove-Container-Meta-"; + public static final String OBJECT_REMOVE_METADATA_PREFIX = "X-Remove-Object-Meta-"; // TempURL - String ACCOUNT_TEMPORARY_URL_KEY = ACCOUNT_METADATA_PREFIX + "Temp-Url-Key"; - String ACCOUNT_TEMPORARY_URL_KEY_2 = ACCOUNT_TEMPORARY_URL_KEY + "-2"; + public static final String ACCOUNT_TEMPORARY_URL_KEY = ACCOUNT_METADATA_PREFIX + "Temp-Url-Key"; + public static final String ACCOUNT_TEMPORARY_URL_KEY_2 = ACCOUNT_TEMPORARY_URL_KEY + "-2"; // Account Headers - String ACCOUNT_BYTES_USED = "X-Account-Bytes-Used"; - String ACCOUNT_CONTAINER_COUNT = "X-Account-Container-Count"; - String ACCOUNT_OBJECT_COUNT = "X-Account-Object-Count"; + public static final String ACCOUNT_BYTES_USED = "X-Account-Bytes-Used"; + public static final String ACCOUNT_CONTAINER_COUNT = "X-Account-Container-Count"; + public static final String ACCOUNT_OBJECT_COUNT = "X-Account-Object-Count"; // Container Headers - String CONTAINER_BYTES_USED = "X-Container-Bytes-Used"; - String CONTAINER_OBJECT_COUNT = "X-Container-Object-Count"; + public static final String CONTAINER_BYTES_USED = "X-Container-Bytes-Used"; + public static final String CONTAINER_OBJECT_COUNT = "X-Container-Object-Count"; // Public access - not supported in all Swift Impls - String CONTAINER_READ = "X-Container-Read"; - String CONTAINER_WRITE = "X-Container-Write"; - String CONTAINER_ACL_ANYBODY_READ = ".r:*,.rlistings"; + public static final String CONTAINER_READ = "X-Container-Read"; + public static final String CONTAINER_WRITE = "X-Container-Write"; + public static final String CONTAINER_ACL_ANYBODY_READ = ".r:*,.rlistings"; // CORS - String CONTAINER_ACCESS_CONTROL_ALLOW_ORIGIN = CONTAINER_METADATA_PREFIX + "Access-Control-Allow-Origin"; - String CONTAINER_ACCESS_CONTROL_MAX_AGE = CONTAINER_METADATA_PREFIX + "Access-Control-Max-Age"; - String CONTAINER_ACCESS_CONTROL_EXPOSE_HEADERS = CONTAINER_METADATA_PREFIX + "Access-Control-Expose-Headers"; + public static final String CONTAINER_ACCESS_CONTROL_ALLOW_ORIGIN = CONTAINER_METADATA_PREFIX + "Access-Control-Allow-Origin"; + public static final String CONTAINER_ACCESS_CONTROL_MAX_AGE = CONTAINER_METADATA_PREFIX + "Access-Control-Max-Age"; + public static final String CONTAINER_ACCESS_CONTROL_EXPOSE_HEADERS = CONTAINER_METADATA_PREFIX + "Access-Control-Expose-Headers"; // Container Quota - String CONTAINER_QUOTA_BYTES = CONTAINER_METADATA_PREFIX + "Quota-Bytes"; - String CONTAINER_QUOTA_COUNT = CONTAINER_METADATA_PREFIX + "Quota-Count"; + public static final String CONTAINER_QUOTA_BYTES = CONTAINER_METADATA_PREFIX + "Quota-Bytes"; + public static final String CONTAINER_QUOTA_COUNT = CONTAINER_METADATA_PREFIX + "Quota-Count"; // Container Sync - String CONTAINER_SYNC_KEY = "X-Container-Sync-Key"; - String CONTAINER_SYNC_TO = "X-Container-Sync-To"; + public static final String CONTAINER_SYNC_KEY = "X-Container-Sync-Key"; + public static final String CONTAINER_SYNC_TO = "X-Container-Sync-To"; // Versioning - String VERSIONS_LOCATION = "X-Versions-Location"; + public static final String VERSIONS_LOCATION = "X-Versions-Location"; /** * @deprecated Please use {@link #VERSIONS_LOCATION}. This field will be removed in jclouds 1.8. */ @Deprecated - String CONTAINER_VERSIONS_LOCATION = "X-Versions-Location"; + public static final String CONTAINER_VERSIONS_LOCATION = "X-Versions-Location"; // Misc functionality - String CONTAINER_WEB_MODE = "X-Web-Mode"; + public static final String CONTAINER_WEB_MODE = "X-Web-Mode"; - String OBJECT_COPY_FROM = "X-Copy-From"; - String OBJECT_DELETE_AFTER = "X-Delete-After"; - String OBJECT_DELETE_AT = "X-Delete-At"; - String OBJECT_MANIFEST = "X-Object-Manifest"; + public static final String OBJECT_COPY_FROM = "X-Copy-From"; + public static final String OBJECT_DELETE_AFTER = "X-Delete-After"; + public static final String OBJECT_DELETE_AT = "X-Delete-At"; + public static final String OBJECT_MANIFEST = "X-Object-Manifest"; /** Get the newest version of the object for GET and HEAD requests */ - String OBJECT_NEWEST = "X-Newest"; + public static final String OBJECT_NEWEST = "X-Newest"; // Static Large Object - String STATIC_LARGE_OBJECT = "X-Static-Large-Object"; + public static final String STATIC_LARGE_OBJECT = "X-Static-Large-Object"; // Static Web - String STATIC_WEB_INDEX = CONTAINER_METADATA_PREFIX + "Web-Index"; - String STATIC_WEB_DIRECTORY_TYPE = CONTAINER_METADATA_PREFIX + "Web-Directory-Type"; - String STATIC_WEB_ERROR = CONTAINER_METADATA_PREFIX + "Web-Error"; - String STATIC_WEB_LISTINGS = CONTAINER_METADATA_PREFIX + "Web-Listings"; - String STATIC_WEB_LISTINGS_CSS = CONTAINER_METADATA_PREFIX + "Web-Listings-CSS"; + public static final String STATIC_WEB_INDEX = CONTAINER_METADATA_PREFIX + "Web-Index"; + public static final String STATIC_WEB_DIRECTORY_TYPE = CONTAINER_METADATA_PREFIX + "Web-Directory-Type"; + public static final String STATIC_WEB_ERROR = CONTAINER_METADATA_PREFIX + "Web-Error"; + public static final String STATIC_WEB_LISTINGS = CONTAINER_METADATA_PREFIX + "Web-Listings"; + public static final String STATIC_WEB_LISTINGS_CSS = CONTAINER_METADATA_PREFIX + "Web-Listings-CSS"; + + private SwiftHeaders() { + throw new AssertionError("intentionally unimplemented"); + } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/50218e6a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesConstants.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesConstants.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesConstants.java index 095ea10..57ff302 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesConstants.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesConstants.java @@ -20,8 +20,12 @@ package org.jclouds.rackspace.cloudfiles.v1.reference; /** * Constants specified by Rackspace Cloud Files. */ -public interface CloudFilesConstants { - int CDN_TTL_MIN = 900; - int CDN_TTL_MAX = 31536000; - int CDN_TTL_DEFAULT = 259200; +public final class CloudFilesConstants { + public static final int CDN_TTL_MIN = 900; + public static final int CDN_TTL_MAX = 31536000; + public static final int CDN_TTL_DEFAULT = 259200; + + private CloudFilesConstants() { + throw new AssertionError("intentionally unimplemented"); + } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/50218e6a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java index e4d862b..1563c61 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java @@ -21,20 +21,24 @@ import org.jclouds.openstack.swift.v1.reference.SwiftHeaders; /** * Additional headers specified by Rackspace Cloud Files. */ -public interface CloudFilesHeaders extends SwiftHeaders { +public final class CloudFilesHeaders { // Access logs - String CONTAINER_ACCESS_LOG_DELIVERY = CONTAINER_METADATA_PREFIX + "Access-Log-Delivery"; + public static final String CONTAINER_ACCESS_LOG_DELIVERY = SwiftHeaders.CONTAINER_METADATA_PREFIX + "Access-Log-Delivery"; // Common CDN Headers - String CDN_ENABLED = "X-Cdn-Enabled"; - String CDN_LOG_RETENTION = "X-Log-Retention"; - String CDN_TTL = "X-Ttl"; - String CDN_URI = "X-Cdn-Uri"; - String CDN_SSL_URI = "X-Cdn-Ssl-Uri"; - String CDN_STREAMING_URI = "X-Cdn-Streaming-Uri"; - String CDN_IOS_URI = "X-Cdn-Ios-Uri"; + public static final String CDN_ENABLED = "X-Cdn-Enabled"; + public static final String CDN_LOG_RETENTION = "X-Log-Retention"; + public static final String CDN_TTL = "X-Ttl"; + public static final String CDN_URI = "X-Cdn-Uri"; + public static final String CDN_SSL_URI = "X-Cdn-Ssl-Uri"; + public static final String CDN_STREAMING_URI = "X-Cdn-Streaming-Uri"; + public static final String CDN_IOS_URI = "X-Cdn-Ios-Uri"; // CDN Purge - String CDN_PURGE_OBJECT_EMAIL = "X-Purge-Email"; - String CDN_PURGE_OBJECT_FAILED = "X-Purge-Failed-Reason"; + public static final String CDN_PURGE_OBJECT_EMAIL = "X-Purge-Email"; + public static final String CDN_PURGE_OBJECT_FAILED = "X-Purge-Failed-Reason"; + + private CloudFilesHeaders() { + throw new AssertionError("intentionally unimplemented"); + } }
