Repository: jclouds Updated Branches: refs/heads/master b2cb89812 -> 1b824afbf
Remove redundant modifiers from interfaces Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/1b824afb Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/1b824afb Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/1b824afb Branch: refs/heads/master Commit: 1b824afbfc9b55b6f8f23b76bebcc92ba75d4699 Parents: b2cb898 Author: Andrew Gaul <[email protected]> Authored: Tue Aug 26 12:21:41 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Tue Aug 26 17:34:13 2014 -0700 ---------------------------------------------------------------------- .../jclouds/cloudfiles/reference/CloudFilesHeaders.java | 6 +++++- apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java | 2 +- .../swift/blobstore/strategy/MultipartUpload.java | 10 +++++----- .../jclouds/openstack/swift/reference/SwiftHeaders.java | 5 ++++- .../org/jclouds/openstack/services/ServiceType.java | 6 +++++- .../main/java/org/jclouds/http/HttpErrorHandler.java | 2 +- .../main/java/org/jclouds/http/HttpRetryHandler.java | 4 ++-- .../java/org/jclouds/http/IOExceptionRetryHandler.java | 4 ++-- core/src/main/java/org/jclouds/io/ContentMetadata.java | 4 ++-- core/src/main/java/org/jclouds/logging/Logger.java | 4 ++-- .../java/org/jclouds/rest/annotations/FormParams.java | 2 +- .../java/org/jclouds/rest/annotations/PartParam.java | 4 ++-- .../org/jclouds/rest/annotations/PayloadParams.java | 2 +- .../java/org/jclouds/rest/annotations/QueryParams.java | 2 +- core/src/main/java/org/jclouds/xml/XMLParser.java | 2 +- .../aws/s3/blobstore/strategy/MultipartUpload.java | 12 ++++++------ .../blobstore/strategy/MultipartUploadStrategy.java | 4 ++-- .../reference/HPCloudObjectStorageHeaders.java | 5 ++++- .../hpcloud/services/HPExtensionServiceType.java | 5 ++++- .../java/org/jclouds/softlayer/features/AccountApi.java | 4 ++-- .../org/jclouds/softlayer/features/VirtualGuestApi.java | 2 +- .../VirtualGuestBlockDeviceTemplateGroupApi.java | 2 +- 22 files changed, 55 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/CloudFilesHeaders.java ---------------------------------------------------------------------- diff --git a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/CloudFilesHeaders.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/CloudFilesHeaders.java index 5a7e84b..1a60490 100644 --- a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/CloudFilesHeaders.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/CloudFilesHeaders.java @@ -24,7 +24,7 @@ import org.jclouds.openstack.swift.reference.SwiftHeaders; * * @see <a href="http://www.rackspacecloud.com/cf-devguide-20090311.pdf"; /> */ -public interface CloudFilesHeaders extends SwiftHeaders { +public final class CloudFilesHeaders extends SwiftHeaders { public static final String CDN_ENABLED = "X-CDN-Enabled"; public static final String CDN_LOG_RETENTION = "X-Log-Retention"; @@ -37,4 +37,8 @@ public interface CloudFilesHeaders extends SwiftHeaders { public static final String CDN_CONTAINER_PURGE_OBJECT_EMAIL = "X-Purge-Email"; public static final String CDN_WEBSITE_INDEX = "X-Container-Meta-Web-Index"; public static final String CDN_WEBSITE_ERROR = "X-Container-Meta-Web-Error"; + + private CloudFilesHeaders() { + throw new AssertionError("intentionally unimplemented"); + } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java b/apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java index a7dff35..f119461 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java +++ b/apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java @@ -109,7 +109,7 @@ import com.google.inject.Provides; @RequestFilters(RequestAuthorizeSignature.class) @BlobScope(CONTAINER) public interface S3AsyncClient extends Closeable { - static final String VERSION = "2006-03-01"; + String VERSION = "2006-03-01"; /** * Creates a default implementation of S3Object http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/MultipartUpload.java ---------------------------------------------------------------------- diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/MultipartUpload.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/MultipartUpload.java index a203370..c73a536 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/MultipartUpload.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/MultipartUpload.java @@ -19,15 +19,15 @@ package org.jclouds.openstack.swift.blobstore.strategy; public interface MultipartUpload { /* Maximum number of parts per upload */ - public static final int MAX_NUMBER_OF_PARTS = 10000; + int MAX_NUMBER_OF_PARTS = 10000; /* Maximum number of parts returned for a list parts request */ - public static final int MAX_LIST_PARTS_RETURNED = 1000; + int MAX_LIST_PARTS_RETURNED = 1000; /* Maximum number of multipart uploads returned in a list multipart uploads request */ - public static final int MAX_LIST_MPU_RETURNED = 1000; + int MAX_LIST_MPU_RETURNED = 1000; /* * part size 5 MB to 5 GB, last part can be < 5 MB */ - public static final long MIN_PART_SIZE = 5242880L; - public static final long MAX_PART_SIZE = 5368709120L; + long MIN_PART_SIZE = 5242880L; + long MAX_PART_SIZE = 5368709120L; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/apis/swift/src/main/java/org/jclouds/openstack/swift/reference/SwiftHeaders.java ---------------------------------------------------------------------- diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/reference/SwiftHeaders.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/reference/SwiftHeaders.java index 50be0ca..b2d143c 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/reference/SwiftHeaders.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/reference/SwiftHeaders.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.swift.reference; -public interface SwiftHeaders { +public class SwiftHeaders { public static final String ACCOUNT_TEMPORARY_URL_KEY = "X-Account-Meta-Temp-Url-Key"; public static final String ACCOUNT_BYTES_USED = "X-Account-Bytes-Used"; @@ -33,4 +33,7 @@ public interface SwiftHeaders { public static final String CONTAINER_READ = "X-Container-Read"; public static final String CONTAINER_WRITE = "X-Container-Write"; + protected SwiftHeaders() { + throw new AssertionError("intentionally unimplemented"); + } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/common/openstack/src/main/java/org/jclouds/openstack/services/ServiceType.java ---------------------------------------------------------------------- diff --git a/common/openstack/src/main/java/org/jclouds/openstack/services/ServiceType.java b/common/openstack/src/main/java/org/jclouds/openstack/services/ServiceType.java index 9ca9080..ff21d64 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/services/ServiceType.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/services/ServiceType.java @@ -24,7 +24,7 @@ package org.jclouds.openstack.services; * @see <a href="http://docs.openstack.org/api/openstack-typeentity-service/2.0/content/Identity-Service-Concepts-e1362.html"; * /> */ -public interface ServiceType { +public class ServiceType { /** * Object Storage (Swift) */ @@ -45,4 +45,8 @@ public interface ServiceType { * Network Service (Quantum) */ public static final String NETWORK = "network"; + + protected ServiceType() { + throw new AssertionError("intentionally unimplemented"); + } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/core/src/main/java/org/jclouds/http/HttpErrorHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/http/HttpErrorHandler.java b/core/src/main/java/org/jclouds/http/HttpErrorHandler.java index b0b88f6..3743488 100644 --- a/core/src/main/java/org/jclouds/http/HttpErrorHandler.java +++ b/core/src/main/java/org/jclouds/http/HttpErrorHandler.java @@ -21,7 +21,7 @@ package org.jclouds.http; * HttpResponse. */ public interface HttpErrorHandler { - public static final HttpErrorHandler NOOP = new HttpErrorHandler() { + HttpErrorHandler NOOP = new HttpErrorHandler() { public void handleError(HttpCommand command, HttpResponse response) { if (response.getPayload() != null) response.getPayload().release(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/core/src/main/java/org/jclouds/http/HttpRetryHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/http/HttpRetryHandler.java b/core/src/main/java/org/jclouds/http/HttpRetryHandler.java index 15a1113..cf89442 100644 --- a/core/src/main/java/org/jclouds/http/HttpRetryHandler.java +++ b/core/src/main/java/org/jclouds/http/HttpRetryHandler.java @@ -21,7 +21,7 @@ package org.jclouds.http; * 500) based on the request's replayable status and the number of attempts already performed. */ public interface HttpRetryHandler { - public static final HttpRetryHandler ALWAYS_RETRY = new HttpRetryHandler() { + HttpRetryHandler ALWAYS_RETRY = new HttpRetryHandler() { public boolean shouldRetryRequest(HttpCommand command, HttpResponse response) { return true; } @@ -32,7 +32,7 @@ public interface HttpRetryHandler { } }; - public static final HttpRetryHandler NEVER_RETRY = new HttpRetryHandler() { + HttpRetryHandler NEVER_RETRY = new HttpRetryHandler() { public boolean shouldRetryRequest(HttpCommand command, HttpResponse response) { return false; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/core/src/main/java/org/jclouds/http/IOExceptionRetryHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/http/IOExceptionRetryHandler.java b/core/src/main/java/org/jclouds/http/IOExceptionRetryHandler.java index d89b857..6914060 100644 --- a/core/src/main/java/org/jclouds/http/IOExceptionRetryHandler.java +++ b/core/src/main/java/org/jclouds/http/IOExceptionRetryHandler.java @@ -25,7 +25,7 @@ import com.google.inject.ImplementedBy; @ImplementedBy(BackoffLimitedRetryHandler.class) public interface IOExceptionRetryHandler { - public static final IOExceptionRetryHandler ALWAYS_RETRY = new IOExceptionRetryHandler() { + IOExceptionRetryHandler ALWAYS_RETRY = new IOExceptionRetryHandler() { public boolean shouldRetryRequest(HttpCommand command, IOException response) { return true; } @@ -36,7 +36,7 @@ public interface IOExceptionRetryHandler { } }; - public static final IOExceptionRetryHandler NEVER_RETRY = new IOExceptionRetryHandler() { + IOExceptionRetryHandler NEVER_RETRY = new IOExceptionRetryHandler() { public boolean shouldRetryRequest(HttpCommand command, IOException response) { return false; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/core/src/main/java/org/jclouds/io/ContentMetadata.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/io/ContentMetadata.java b/core/src/main/java/org/jclouds/io/ContentMetadata.java index da1b817..316567e 100644 --- a/core/src/main/java/org/jclouds/io/ContentMetadata.java +++ b/core/src/main/java/org/jclouds/io/ContentMetadata.java @@ -32,12 +32,12 @@ import com.google.common.hash.HashCode; import com.google.common.collect.ImmutableSet; public interface ContentMetadata { - public static final Set<String> HTTP_HEADERS = ImmutableSet.of(CONTENT_LENGTH, CONTENT_MD5, CONTENT_TYPE, + Set<String> HTTP_HEADERS = ImmutableSet.of(CONTENT_LENGTH, CONTENT_MD5, CONTENT_TYPE, CONTENT_DISPOSITION, CONTENT_ENCODING, CONTENT_LANGUAGE, EXPIRES); // See http://stackoverflow.com/questions/10584647/simpledateformat-parse-is-one-hour-out-using-rfc-1123-gmt-in-summer // for why not using "zzz" - public static final String RFC1123_DATE_PATTERN = "EEE, dd MMM yyyyy HH:mm:ss Z"; + String RFC1123_DATE_PATTERN = "EEE, dd MMM yyyyy HH:mm:ss Z"; /** * Returns the total size of the payload, or the chunk that's available. http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/core/src/main/java/org/jclouds/logging/Logger.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/logging/Logger.java b/core/src/main/java/org/jclouds/logging/Logger.java index 0929233..cbf4302 100644 --- a/core/src/main/java/org/jclouds/logging/Logger.java +++ b/core/src/main/java/org/jclouds/logging/Logger.java @@ -38,12 +38,12 @@ public interface Logger { /** * Assign to member to avoid NPE when no logging module is configured. */ - public static final Logger NULL = new NullLogger(); + Logger NULL = new NullLogger(); /** * Assign to member to avoid NPE when no logging module is configured. */ - public static final Logger CONSOLE = new ConsoleLogger(); + Logger CONSOLE = new ConsoleLogger(); String getCategory(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/core/src/main/java/org/jclouds/rest/annotations/FormParams.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/annotations/FormParams.java b/core/src/main/java/org/jclouds/rest/annotations/FormParams.java index 91952d9..79c656c 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/FormParams.java +++ b/core/src/main/java/org/jclouds/rest/annotations/FormParams.java @@ -32,7 +32,7 @@ import java.lang.annotation.Target; @Retention(RUNTIME) public @interface FormParams { - public static final String NULL = "FORM_NULL"; + String NULL = "FORM_NULL"; String[] keys(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/core/src/main/java/org/jclouds/rest/annotations/PartParam.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/annotations/PartParam.java b/core/src/main/java/org/jclouds/rest/annotations/PartParam.java index f9d429b..ccece87 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/PartParam.java +++ b/core/src/main/java/org/jclouds/rest/annotations/PartParam.java @@ -29,8 +29,8 @@ import java.lang.annotation.Target; @Retention(RUNTIME) public @interface PartParam { // hacks as nulls are not allowed as default values - public static String NO_FILENAME = "---NO_FILENAME---"; - public static String NO_CONTENT_TYPE = "---NO_CONTENT_TYPE---"; + String NO_FILENAME = "---NO_FILENAME---"; + String NO_CONTENT_TYPE = "---NO_CONTENT_TYPE---"; String name(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/core/src/main/java/org/jclouds/rest/annotations/PayloadParams.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/annotations/PayloadParams.java b/core/src/main/java/org/jclouds/rest/annotations/PayloadParams.java index 7cc70e1..178620b 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/PayloadParams.java +++ b/core/src/main/java/org/jclouds/rest/annotations/PayloadParams.java @@ -34,7 +34,7 @@ import java.lang.annotation.Target; @Retention(RUNTIME) public @interface PayloadParams { - public static final String NULL = "MAP_PAYLOAD_NULL"; + String NULL = "MAP_PAYLOAD_NULL"; String[] keys(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/core/src/main/java/org/jclouds/rest/annotations/QueryParams.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/annotations/QueryParams.java b/core/src/main/java/org/jclouds/rest/annotations/QueryParams.java index 572cd5e..f9fe315 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/QueryParams.java +++ b/core/src/main/java/org/jclouds/rest/annotations/QueryParams.java @@ -32,7 +32,7 @@ import java.lang.annotation.Target; @Retention(RUNTIME) public @interface QueryParams { - public static final String NULL = "QUERY_NULL"; + String NULL = "QUERY_NULL"; String [] keys(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/core/src/main/java/org/jclouds/xml/XMLParser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/xml/XMLParser.java b/core/src/main/java/org/jclouds/xml/XMLParser.java index 719123a..ab84bd2 100644 --- a/core/src/main/java/org/jclouds/xml/XMLParser.java +++ b/core/src/main/java/org/jclouds/xml/XMLParser.java @@ -28,7 +28,7 @@ import com.google.inject.ImplementedBy; @ImplementedBy(JAXBParser.class) public interface XMLParser { /** The default xml header. */ - static final String DEFAULT_XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"; + String DEFAULT_XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"; /** * Serialize the object into xml. http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/MultipartUpload.java ---------------------------------------------------------------------- diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/MultipartUpload.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/MultipartUpload.java index a0ea529..34aa077 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/MultipartUpload.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/MultipartUpload.java @@ -22,15 +22,15 @@ package org.jclouds.aws.s3.blobstore.strategy; public interface MultipartUpload { /* Maximum number of parts per upload */ - public static final int MAX_NUMBER_OF_PARTS = 10000; + int MAX_NUMBER_OF_PARTS = 10000; /* Maximum number of parts returned for a list parts request */ - public static final int MAX_LIST_PARTS_RETURNED = 1000; + int MAX_LIST_PARTS_RETURNED = 1000; /* Maximum number of multipart uploads returned in a list multipart uploads request */ - public static final int MAX_LIST_MPU_RETURNED = 1000; - + int MAX_LIST_MPU_RETURNED = 1000; + /* * part size 5 MB to 5 GB, last part can be < 5 MB */ - public static final long MIN_PART_SIZE = 5242880L; - public static final long MAX_PART_SIZE = 5368709120L; + long MIN_PART_SIZE = 5242880L; + long MAX_PART_SIZE = 5368709120L; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/MultipartUploadStrategy.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/MultipartUploadStrategy.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/MultipartUploadStrategy.java index 2135ea9..67458cf 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/MultipartUploadStrategy.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/MultipartUploadStrategy.java @@ -25,10 +25,10 @@ import org.jclouds.blobstore.domain.Blob; @ImplementedBy(AzureBlobBlockUploadStrategy.class) public interface MultipartUploadStrategy { /* Maximum number of blocks per upload */ - public static final int MAX_NUMBER_OF_BLOCKS = 50000; + int MAX_NUMBER_OF_BLOCKS = 50000; /* Maximum block size */ - public static final long MAX_BLOCK_SIZE = 4L * 1024 * 1024; + long MAX_BLOCK_SIZE = 4L * 1024 * 1024; String execute(String container, Blob blob); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/reference/HPCloudObjectStorageHeaders.java ---------------------------------------------------------------------- diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/reference/HPCloudObjectStorageHeaders.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/reference/HPCloudObjectStorageHeaders.java index a52319e..d3818e3 100644 --- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/reference/HPCloudObjectStorageHeaders.java +++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/reference/HPCloudObjectStorageHeaders.java @@ -24,7 +24,7 @@ import org.jclouds.openstack.swift.reference.SwiftHeaders; * * @see <a href="https://manage.hpcloud.com/pages/build/docs/objectstorage-lvs/api"; /> */ -public interface HPCloudObjectStorageHeaders extends SwiftHeaders { +public final class HPCloudObjectStorageHeaders extends SwiftHeaders { public static final String CDN_ENABLED = "X-Cdn-Enabled"; public static final String CDN_LOG_RETENTION = "X-Log-Retention"; @@ -33,4 +33,7 @@ public interface HPCloudObjectStorageHeaders extends SwiftHeaders { public static final String CDN_URI = "X-Cdn-Uri"; public static final String CDN_USER_AGENT_ACL = "X-User-Agent-ACL"; + private HPCloudObjectStorageHeaders() { + throw new AssertionError("intentionally unimplemented"); + } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/services/HPExtensionServiceType.java ---------------------------------------------------------------------- diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/services/HPExtensionServiceType.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/services/HPExtensionServiceType.java index f5118cb..2d5789f 100644 --- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/services/HPExtensionServiceType.java +++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/services/HPExtensionServiceType.java @@ -26,7 +26,7 @@ import org.jclouds.openstack.services.ServiceType; * @see <a href="http://docs.openstack.org/api/openstack-typeentity-service/2.0/content/Identity-Service-Concepts-e1362.html"; * /> */ -public interface HPExtensionServiceType extends ServiceType { +public final class HPExtensionServiceType extends ServiceType { /** * CDN */ @@ -36,4 +36,7 @@ public interface HPExtensionServiceType extends ServiceType { */ public static final String BLOCK_STORE = "hpext:block-store"; + private HPExtensionServiceType() { + throw new AssertionError("intentionally unimplemented"); + } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java index 9673106..e7dce83 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java @@ -43,8 +43,8 @@ import org.jclouds.softlayer.domain.VirtualGuestBlockDeviceTemplateGroup; @Consumes(MediaType.APPLICATION_JSON) public interface AccountApi { - public static String GUEST_MASK = "children.blockDevices.diskImage.softwareReferences.softwareDescription"; - public static String LIST_GUEST_MASK = "powerState;operatingSystem.passwords;datacenter;billingItem;blockDevices" + + String GUEST_MASK = "children.blockDevices.diskImage.softwareReferences.softwareDescription"; + String LIST_GUEST_MASK = "powerState;operatingSystem.passwords;datacenter;billingItem;blockDevices" + ".diskImage;tagReferences"; /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java index a4bb5fb..31fefd0 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java @@ -49,7 +49,7 @@ import org.jclouds.softlayer.domain.VirtualGuest; @Consumes(MediaType.APPLICATION_JSON) public interface VirtualGuestApi { - public static String GUEST_MASK = "id;hostname;domain;fullyQualifiedDomainName;powerState;maxCpu;maxMemory;" + + String GUEST_MASK = "id;hostname;domain;fullyQualifiedDomainName;powerState;maxCpu;maxMemory;" + "statusId;operatingSystem.passwords;primaryBackendIpAddress;primaryIpAddress;activeTransactionCount;" + "blockDevices.diskImage;datacenter;tagReferences"; http://git-wip-us.apache.org/repos/asf/jclouds/blob/1b824afb/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java index 8daa330..69941b7 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java @@ -42,7 +42,7 @@ import org.jclouds.softlayer.domain.VirtualGuestBlockDeviceTemplateGroup; @Consumes(MediaType.APPLICATION_JSON) public interface VirtualGuestBlockDeviceTemplateGroupApi { - public static String LIST_PUBLIC_IMAGES_MASK = "children.blockDevices.diskImage.softwareReferences.softwareDescription"; + String LIST_PUBLIC_IMAGES_MASK = "children.blockDevices.diskImage.softwareReferences.softwareDescription"; /** * @return public images
