You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2015/08/01 00:02:49 UTC
jclouds git commit: Correct FindBugs violations
Repository: jclouds
Updated Branches:
refs/heads/master 7e6284dd8 -> 86f47394b
Correct FindBugs violations
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/86f47394
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/86f47394
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/86f47394
Branch: refs/heads/master
Commit: 86f47394bf822cad0756a38aa078ba3a86019b83
Parents: 7e6284d
Author: Andrew Gaul <ga...@apache.org>
Authored: Fri Jul 31 14:23:52 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Jul 31 14:53:58 2015 -0700
----------------------------------------------------------------------
.../java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java | 2 +-
.../swift/v1/blobstore/RegionScopedSwiftBlobStore.java | 2 +-
.../jclouds/s3/blobstore/functions/BucketToResourceList.java | 1 -
.../java/org/jclouds/blobstore/TransientStorageStrategy.java | 2 +-
core/src/main/java/org/jclouds/functions/ExpandProperties.java | 5 +++--
.../blobstore/functions/ListBlobsResponseToResourceList.java | 1 -
6 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/86f47394/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java
index 466c8e3..b862516 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java
@@ -78,7 +78,7 @@ public class JWTBearerTokenFlow implements OAuthFilter {
// since the session interval is also the token expiration time requested to the server make the token expire a
// bit before the deadline to make sure there aren't session expiration exceptions
long cacheExpirationSeconds = tokenDuration > 30 ? tokenDuration - 30 : tokenDuration;
- this.tokenCache = CacheBuilder.newBuilder().expireAfterWrite(tokenDuration, SECONDS).build(loader);
+ this.tokenCache = CacheBuilder.newBuilder().expireAfterWrite(cacheExpirationSeconds, SECONDS).build(loader);
}
static final class AuthorizeToken extends CacheLoader<Claims, Token> {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/86f47394/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java
index fa1f41b..f63aedb 100644
--- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java
+++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java
@@ -417,7 +417,7 @@ public class RegionScopedSwiftBlobStore implements BlobStore {
private MultipartUpload initiateMultipartUpload(String container, BlobMetadata blobMetadata, long partSize) {
Long contentLength = blobMetadata.getContentMetadata().getContentLength();
String uploadId = String.format("%s/slo/%.6f/%s/%s", blobMetadata.getName(),
- System.currentTimeMillis() / 1000.0, contentLength == null ? 0 : contentLength,
+ System.currentTimeMillis() / 1000.0, contentLength == null ? Long.valueOf(0) : contentLength,
partSize);
return MultipartUpload.create(container, blobMetadata.getName(), uploadId, blobMetadata);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/86f47394/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceList.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceList.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceList.java
index 7d02aec..cd8b560 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceList.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceList.java
@@ -57,7 +57,6 @@ public class BucketToResourceList implements
SortedSet<StorageMetadata> contents = Sets.<StorageMetadata> newTreeSet(Iterables.transform(from,
object2blobMd));
- Map<String, StorageMetadata> nameToMd = Maps.uniqueIndex(contents, indexer);
for (String prefix : from.getCommonPrefixes()) {
contents.add(prefix2ResourceMd.apply(prefix));
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/86f47394/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java b/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java
index 274bcfc..7746f5f 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java
@@ -122,7 +122,7 @@ public class TransientStorageStrategy implements LocalStorageStrategy {
@Override
public void deleteContainer(final String containerName) {
containerToBlobs.remove(containerName);
- containerToBlobAccess.remove(containerToBlobAccess);
+ containerToBlobAccess.remove(containerName);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/86f47394/core/src/main/java/org/jclouds/functions/ExpandProperties.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/functions/ExpandProperties.java b/core/src/main/java/org/jclouds/functions/ExpandProperties.java
index d75dc8d..e8bb05b 100644
--- a/core/src/main/java/org/jclouds/functions/ExpandProperties.java
+++ b/core/src/main/java/org/jclouds/functions/ExpandProperties.java
@@ -84,9 +84,10 @@ public class ExpandProperties implements Function<Properties, Properties> {
private boolean resolveProperties(Map<String, String> properties, Map<String, String> variables) {
boolean anyReplacementDone = false;
- for (String key : properties.keySet()) {
+ for (Map.Entry<String, String> entry : properties.entrySet()) {
+ String key = entry.getKey();
StringBuffer sb = new StringBuffer();
- Matcher m = VAR.matcher(properties.get(key));
+ Matcher m = VAR.matcher(entry.getValue());
while (m.find()) {
String match = m.group();
// Remove the ${} from the matched variable
http://git-wip-us.apache.org/repos/asf/jclouds/blob/86f47394/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListBlobsResponseToResourceList.java
----------------------------------------------------------------------
diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListBlobsResponseToResourceList.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListBlobsResponseToResourceList.java
index 7daf022..f9ec582 100644
--- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListBlobsResponseToResourceList.java
+++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListBlobsResponseToResourceList.java
@@ -58,7 +58,6 @@ public class ListBlobsResponseToResourceList implements
SortedSet<StorageMetadata> contents = Sets.<StorageMetadata> newTreeSet(Iterables.transform(from,
object2blobMd));
- Map<String, StorageMetadata> nameToMd = Maps.uniqueIndex(contents, indexer);
for (String prefix : from.getBlobPrefixes()) {
contents.add(prefix2ResourceMd.apply(prefix));
}