Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1344 from maginatics/findbugs 

Address FindBugs complaints
This commit is contained in:
Adrian Cole 2013-02-22 12:19:09 -08:00
parent 9e159200b5 ec4cdfda05
commit 86d5d69128
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobBuilderImpl.java
View File

@ -115,7 +115,7 @@ public class BlobBuilderImpl implements BlobBuilder {
return blob; return blob;
} }
public class PayloadBlobBuilderImpl implements PayloadBlobBuilder { public static class PayloadBlobBuilderImpl implements PayloadBlobBuilder {
private final BlobBuilder builder; private final BlobBuilder builder;
private final Payload payload; private final Payload payload;

8
blobstore/src/main/java/org/jclouds/blobstore/reference/BlobStoreConstants.java
View File

@ -18,6 +18,10 @@
*/ */
package org.jclouds.blobstore.reference; package org.jclouds.blobstore.reference;
import java.util.Collection;
import com.google.common.collect.ImmutableList;
/** /**
* Configuration properties and constants used in BlobStore connections. * Configuration properties and constants used in BlobStore connections.
* *
@ -38,8 +42,8 @@ public interface BlobStoreConstants {
*/ */
public static final String DIRECTORY_SUFFIX_ROOT = "/"; public static final String DIRECTORY_SUFFIX_ROOT = "/";
public static final String DIRECTORY_SUFFIX_FOLDER = "_$folder$"; public static final String DIRECTORY_SUFFIX_FOLDER = "_$folder$";
public static final String[] DIRECTORY_SUFFIXES = { DIRECTORY_SUFFIX_FOLDER, public static final Collection<String> DIRECTORY_SUFFIXES =
DIRECTORY_SUFFIX_ROOT }; ImmutableList.of(DIRECTORY_SUFFIX_FOLDER, DIRECTORY_SUFFIX_ROOT);
/** /**
* Key-value implementations of BlobStore, such as S3, do not have directories. We use an empty * Key-value implementations of BlobStore, such as S3, do not have directories. We use an empty

2
core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java
View File

@ -79,7 +79,7 @@ import com.google.inject.Inject;
@Singleton @Singleton
public class BackoffLimitedRetryHandler implements HttpRetryHandler, IOExceptionRetryHandler { public class BackoffLimitedRetryHandler implements HttpRetryHandler, IOExceptionRetryHandler {
public static BackoffLimitedRetryHandler INSTANCE = new BackoffLimitedRetryHandler(); public static final BackoffLimitedRetryHandler INSTANCE = new BackoffLimitedRetryHandler();
@Inject(optional = true) @Inject(optional = true)
@Named(Constants.PROPERTY_MAX_RETRIES) @Named(Constants.PROPERTY_MAX_RETRIES)

2
core/src/main/java/org/jclouds/suppliers/SupplyKeyMatchingValueOrNull.java
View File

@ -56,8 +56,8 @@ public class SupplyKeyMatchingValueOrNull<K, V> implements Supplier<K> {
Map<K, V> map = Maps.transformValues(supplier.get(), Suppliers.<V> supplierFunction()); Map<K, V> map = Maps.transformValues(supplier.get(), Suppliers.<V> supplierFunction());
K region = ImmutableBiMap.copyOf(map).inverse().get(uri); K region = ImmutableBiMap.copyOf(map).inverse().get(uri);
if (region == null && map.size() > 0) { if (region == null && map.size() > 0) {
logger.warn("failed to find key for value %s in %s; choosing first: %s", uri, map, region);
region = Iterables.get(map.keySet(), 0); region = Iterables.get(map.keySet(), 0);
logger.warn("failed to find key for value %s in %s; choosing first: %s", uri, map, region);
} }
return region; return region;
} }