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

Use Map.entrySet where possible 

Improves run-time efficiency and addresses FindBugs warnings.
This commit is contained in:
Andrew Gaul 2013-01-21 22:18:18 -08:00
parent b890e1d36b
commit af963df92d
27 changed files with 115 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java
View File

@ -127,10 +127,10 @@ public class DeployVirtualMachineOptions extends AccountInDomainOptions {
*/
public DeployVirtualMachineOptions ipsToNetworks(Map<String, String> ipsToNetworks) {
int count = 0;
for (String ip : ipsToNetworks.keySet()) {
this.queryParameters.replaceValues(String.format("iptonetworklist[%d].ip", count), ImmutableSet.of(ip));
for (Map.Entry<String, String> entry : ipsToNetworks.entrySet()) {
this.queryParameters.replaceValues(String.format("iptonetworklist[%d].ip", count), ImmutableSet.of(entry.getKey()));
this.queryParameters.replaceValues(String.format("iptonetworklist[%d].networkid", count),
ImmutableSet.of("" + ipsToNetworks.get(ip)));
ImmutableSet.of(entry.getValue()));
count += 1;
}
return this;

5
apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java
View File

@ -169,7 +169,10 @@ public class EC2ComputeService extends BaseComputeService {
Map<String, ? extends NodeMetadata> instancesById = Maps.uniqueIndex(input, instanceId);
ImmutableSet.Builder<NodeMetadata> builder = ImmutableSet.<NodeMetadata> builder();
if (generateInstanceNames && !common.containsKey("Name")) {
for (String id : instancesById.keySet()) {
for (Map.Entry<String, ? extends NodeMetadata> entry : instancesById.entrySet()) {
String id = entry.getKey();
NodeMetadata instance = entry.getValue();
Map<String, String> tags = ImmutableMap.<String, String> builder().putAll(common)
.put("Name", id.replaceAll(".*-", group + "-")).build();
logger.debug(">> applying tags %s to instance %s in region %s", tags, id, region);

6
apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PresentInstances.java
View File

@ -27,6 +27,7 @@ import static org.jclouds.ec2.compute.domain.RegionAndName.nameFunction;
import static org.jclouds.ec2.compute.domain.RegionAndName.regionFunction;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
@ -68,8 +69,9 @@ public class PresentInstances implements Function<Set<RegionAndName>, Set<Runnin
Builder<RunningInstance> builder = ImmutableSet.<RunningInstance> builder();
Multimap<String, String> regionToInstanceIds = transformValues(index(regionAndIds, regionFunction()),
nameFunction());
for (String region : regionToInstanceIds.keySet()) {
Collection<String> instanceIds = regionToInstanceIds.get(region);
for (Map.Entry<String, Collection<String>> entry : regionToInstanceIds.asMap().entrySet()) {
String region = entry.getKey();
Collection<String> instanceIds = entry.getValue();
logger.trace("looking for instances %s in region %s", instanceIds, region);
builder.addAll(concat(client.getInstanceServices().describeInstancesInRegion(region,
toArray(instanceIds, String.class))));

6
apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java
View File

@ -188,14 +188,16 @@ public class EC2CreateNodesInGroupThenAddToSet implements CreateNodesInGroupThen
private void blockUntilRunningAndAssignElasticIpsToInstancesOrPutIntoBadMap(Set<RunningInstance> input,
Map<NodeMetadata, Exception> badNodes) {
Map<RegionAndName, RunningInstance> instancesById = Maps.uniqueIndex(input, instanceToRegionAndName);
for (RegionAndName id : instancesById.keySet()) {
for (Map.Entry<RegionAndName, RunningInstance> entry : instancesById.entrySet()) {
RegionAndName id = entry.getKey();
RunningInstance instance = entry.getValue();
try {
logger.debug("<< allocating elastic IP instance(%s)", id);
String ip = client.getElasticIPAddressServices().allocateAddressInRegion(id.getRegion());
// block until instance is running
logger.debug(">> awaiting status running instance(%s)", id);
AtomicReference<NodeMetadata> node = newReference(runningInstanceToNodeMetadata
.apply(instancesById.get(id)));
.apply(instance));
nodeRunning.apply(node);
logger.trace("<< running instance(%s)", id);
logger.debug(">> associating elastic IP %s to instance %s", ip, id);

10
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java
View File

@ -125,8 +125,9 @@ public class LocationIdToURIFromAccessForTypeAndVersion implements Supplier<Map<
@VisibleForTesting
Map<String, Endpoint> firstEndpointInLocation(Multimap<String, Endpoint> locationToEndpoints) {
Builder<String, Endpoint> locationToEndpointBuilder = ImmutableMap.<String, Endpoint> builder();
for (String locationId : locationToEndpoints.keySet()) {
Collection<Endpoint> endpoints = locationToEndpoints.get(locationId);
for (Map.Entry<String, Collection<Endpoint>> entry : locationToEndpoints.asMap().entrySet()) {
String locationId = entry.getKey();
Collection<Endpoint> endpoints = entry.getValue();
switch (endpoints.size()) {
case 0:
logNoEndpointsInLocation(locationId);
@ -141,8 +142,9 @@ public class LocationIdToURIFromAccessForTypeAndVersion implements Supplier<Map<
@VisibleForTesting
Map<String, Endpoint> refineToVersionSpecificEndpoint(Multimap<String, Endpoint> locationToEndpoints) {
Builder<String, Endpoint> locationToEndpointBuilder = ImmutableMap.<String, Endpoint> builder();
for (String locationId : locationToEndpoints.keySet()) {
Collection<Endpoint> endpoints = locationToEndpoints.get(locationId);
for (Map.Entry<String, Collection<Endpoint>> entry : locationToEndpoints.asMap().entrySet()) {
String locationId = entry.getKey();
Collection<Endpoint> endpoints = entry.getValue();
switch (endpoints.size()) {
case 0:
logNoEndpointsInLocation(locationId);

5
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeService.java
View File

@ -23,6 +23,7 @@ import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_S
import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_TERMINATED;
import static org.jclouds.openstack.nova.v2_0.predicates.KeyPairPredicates.nameMatches;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
@ -124,8 +125,8 @@ public class NovaComputeService extends BaseComputeService {
@Override
protected void cleanUpIncidentalResourcesOfDeadNodes(Set<? extends NodeMetadata> deadNodes) {
Multimap<String, String> zoneToZoneAndGroupNames = orphanedGroupsByZoneId.apply(deadNodes);
for (String zoneId : zoneToZoneAndGroupNames.keySet()) {
cleanOrphanedGroupsInZone(ImmutableSet.copyOf(zoneToZoneAndGroupNames.get(zoneId)), zoneId);
for (Map.Entry<String, Collection<String>> entry : zoneToZoneAndGroupNames.asMap().entrySet()) {
cleanOrphanedGroupsInZone(ImmutableSet.copyOf(entry.getValue()), entry.getKey());
}
}

8
apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiLiveTest.java
View File

@ -105,14 +105,14 @@ public class HostAggregateApiLiveTest extends BaseNovaApiLiveTest {
HostAggregate details = api.setMetadata(testAggregate.getId(), theMetaData);
// bug in openstack - metadata values are never removed, so we just checking what we've set
for (String key : theMetaData.keySet()) {
assertEquals(details.getMetadata().get(key), theMetaData.get(key));
for (Map.Entry<String, String> entry : theMetaData.entrySet()) {
assertEquals(details.getMetadata().get(entry.getKey()), entry.getValue());
}
// Re-fetch to double-check
details = api.get(testAggregate.getId());
for (String key : theMetaData.keySet()) {
assertEquals(details.getMetadata().get(key), theMetaData.get(key));
for (Map.Entry<String, String> entry : theMetaData.entrySet()) {
assertEquals(details.getMetadata().get(entry.getKey()), entry.getValue());
}
}
}

6
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/binders/BindMetadataToJsonPayload.java
View File

@ -58,10 +58,10 @@ public class BindMetadataToJsonPayload implements Binder {
Map<String, String> metadata = (Map<String, String>) input;
List<Map<String, String>> clbMetadata = Lists.newArrayList();
for (String key: metadata.keySet()) {
for (Map.Entry<String, String> entry : metadata.entrySet()) {
clbMetadata.add(ImmutableMap.<String, String> of(
"key", key,
"value", metadata.get(key)));
"key", entry.getKey(),
"value", entry.getValue()));
}
String json = jsonBinder.toJson(ImmutableMap.of("metadata", clbMetadata));

8
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Metadata.java
View File

@ -59,12 +59,6 @@ public class Metadata extends ForwardingMap<String, String> {
}
public Iterable<Integer> getIds() {
Set<Integer> ids = Sets.newHashSet();
for (String key: keyToId.keySet()) {
ids.add(keyToId.get(key));
}
return ids;
return Sets.newHashSet(keyToId.values());
}
}

6
apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiLiveTest.java
View File

@ -72,7 +72,9 @@ public class NodeApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
@Test(dependsOnMethods = "testCreateLoadBalancers")
public void testAddNodes() throws Exception {
for (LoadBalancer lb : nodes.keySet()) {
for (Map.Entry<LoadBalancer, Set<Node>> entry : nodes.entrySet()) {
LoadBalancer lb = entry.getKey();
Set<Node> nodeSet = entry.getValue();
String region = lb.getRegion();
Logger.getAnonymousLogger().info("starting node on loadbalancer " + lb.getId() + " in region " + region);
Set<Node> newNodes = clbApi.getNodeApiForZoneAndLoadBalancer(region, lb.getId()).add(
@ -80,7 +82,7 @@ public class NodeApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
for (Node n : newNodes) {
assertEquals(n.getStatus(), Node.Status.ONLINE);
nodes.get(lb).add(n);
nodeSet.add(n);
assertEquals(clbApi.getNodeApiForZoneAndLoadBalancer(region, lb.getId()).get(n.getId()).getStatus(),
Node.Status.ONLINE);
}

5
apis/s3/src/main/java/org/jclouds/s3/options/CopyObjectOptions.java
View File

@ -260,8 +260,9 @@ public class CopyObjectOptions extends BaseHttpRequestOptions {
}
if (metadata != null) {
returnVal.put(METADATA_DIRECTIVE.replace(DEFAULT_AMAZON_HEADERTAG, headerTag), "REPLACE");
for (String key : metadata.keySet()) {
returnVal.put(key.startsWith(metadataPrefix) ? key : metadataPrefix + key, metadata.get(key));
for (Map.Entry<String, String> entry : metadata.entrySet()) {
String key = entry.getKey();
returnVal.put(key.startsWith(metadataPrefix) ? key : metadataPrefix + key, entry.getValue());
}
}
return returnVal.build();

6
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobMapIntegrationTest.java
View File

@ -23,6 +23,7 @@ import static org.jclouds.blobstore.options.ListContainerOptions.Builder.inDirec
import static org.jclouds.blobstore.options.ListContainerOptions.Builder.maxResults;
import static org.testng.Assert.assertEquals;
import java.io.InputStream;
import java.io.IOException;
import java.util.Collection;
import java.util.Map;
@ -204,10 +205,11 @@ public abstract class BaseBlobMapIntegrationTest extends BaseMapIntegrationTest<
try {
Map<String, Blob> map = createMap(view, bucketName);
ImmutableMap.Builder<String, Blob> newMap = ImmutableMap.builder();
for (String key : fiveInputs.keySet()) {
for (Map.Entry<String, InputStream> entry : fiveInputs.entrySet()) {
String key = entry.getKey();
newMap.put(
key,
view.getBlobStore().blobBuilder(key).payload(fiveInputs.get(key))
view.getBlobStore().blobBuilder(key).payload(entry.getValue())
.contentLength((long) fiveBytes.get(key).length).build());
}
map.putAll(newMap.build());

16
common/aws/src/main/java/org/jclouds/aws/util/AWSUtils.java
View File

@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG;
import java.util.Collection;
import java.util.Map;
import javax.annotation.Resource;
@ -169,10 +170,10 @@ public class AWSUtils {
Multimap<Object, Object> map = (Multimap<Object, Object>) input;
Builder<String, String> builder = ImmutableMultimap.builder();
int i = 1;
for (Object k : map.keySet()) {
builder.put(prefix + "." + i + "." + keySuffix, checkNotNull(k.toString(), keySuffix.toLowerCase() + "s[" + i + "]"));
for (Map.Entry<Object, Collection<Object>> entry : map.asMap().entrySet()) {
builder.put(prefix + "." + i + "." + keySuffix, checkNotNull(entry.getKey().toString(), keySuffix.toLowerCase() + "s[" + i + "]"));
int j = 1;
for (Object v : map.get(k)) {
for (Object v : entry.getValue()) {
builder.put(prefix + "." + i + "." + valueSuffix + "." + j, v.toString());
j++;
}
@ -187,11 +188,12 @@ public class AWSUtils {
Map<Object, Iterable<Object>> map = (Map<Object, Iterable<Object>>) input;
Builder<String, String> builder = ImmutableMultimap.builder();
int i = 1;
for (Object k : map.keySet()) {
builder.put(prefix + "." + i + "." + keySuffix, checkNotNull(k.toString(), keySuffix.toLowerCase() + "s[" + i + "]"));
if (!Iterables.isEmpty(map.get(k))) {
for (Map.Entry<Object, Iterable<Object>> entry : map.entrySet()) {
builder.put(prefix + "." + i + "." + keySuffix, checkNotNull(entry.getKey().toString(), keySuffix.toLowerCase() + "s[" + i + "]"));
Iterable<Object> iterable = entry.getValue();
if (!Iterables.isEmpty(iterable)) {
int j = 1;
for (Object v : map.get(k)) {
for (Object v : iterable) {
builder.put(prefix + "." + i + "." + valueSuffix + "." + j, v.toString());
j++;
}

5
core/src/main/java/org/jclouds/http/HttpRequest.java
View File

@ -25,6 +25,7 @@ import static org.jclouds.http.utils.Queries.queryParser;
import static org.jclouds.io.Payloads.newUrlEncodedFormPayload;
import java.net.URI;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@ -188,8 +189,8 @@ public class HttpRequest extends HttpMessage {
checkNotNull(endpoint, "endpoint");
Multimap<String, String> map = payload != null ? queryParser().apply(payload.getRawContent().toString())
: LinkedHashMultimap.<String, String> create();
for (String key : parameters.keySet()) {
map.replaceValues(key, parameters.get(key));
for (Map.Entry<String, Collection<String>> entry : parameters.asMap().entrySet()) {
map.replaceValues(entry.getKey(), entry.getValue());
}
payload = newUrlEncodedFormPayload(map);
return self();

5
core/src/main/java/org/jclouds/location/suppliers/all/ZoneToRegionToProviderOrJustProvider.java
View File

@ -84,8 +84,9 @@ public class ZoneToRegionToProviderOrJustProvider implements LocationsSupplier {
Builder<Location> locations = ImmutableSet.builder();
if (!Iterables.all(regionsOrJustProvider, LocationPredicates.isProvider()))
locations.addAll(regionsOrJustProvider);
for (String zoneId : zoneIdToParent.keySet()) {
Location parent = zoneIdToParent.get(zoneId);
for (Map.Entry<String, Location> entry : zoneIdToParent.entrySet()) {
String zoneId = entry.getKey();
Location parent = entry.getValue();
LocationBuilder builder = new LocationBuilder().scope(LocationScope.ZONE).id(zoneId).description(zoneId)
.parent(parent);
if (isoCodesById.containsKey(zoneId))

4
core/src/main/java/org/jclouds/rest/config/RestModule.java
View File

@ -94,8 +94,8 @@ public class RestModule extends AbstractModule {
static Cache<Invokable<?, ?>, Invokable<?, ?>> seedKnownSync2AsyncInvokables(Map<Class<?>, Class<?>> sync2Async) {
Cache<Invokable<?, ?>, Invokable<?, ?>> sync2AsyncBuilder = CacheBuilder.newBuilder().build();
putInvokables(HttpClient.class, HttpAsyncClient.class, sync2AsyncBuilder);
for (Class<?> s : sync2Async.keySet()) {
putInvokables(s, sync2Async.get(s), sync2AsyncBuilder);
for (Map.Entry<Class<?>, Class<?>> entry : sync2Async.entrySet()) {
putInvokables(entry.getKey(), entry.getValue(), sync2AsyncBuilder);
}
return sync2AsyncBuilder;
}

5
core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java
View File

@ -440,10 +440,11 @@ public abstract class BaseRestApiExpectTest<S> {
public HttpResponse apply(HttpRequest input) {
HttpRequest matchedRequest = null;
HttpResponse response = null;
for (HttpRequest request : requestToResponse.keySet()) {
for (Map.Entry<HttpRequest, HttpResponse> entry : requestToResponse.entrySet()) {
HttpRequest request = entry.getKey();
if (httpRequestsAreEqual(input, request)) {
matchedRequest = request;
response = requestToResponse.get(request);
response = entry.getValue();
}
}

10
drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java
View File

@ -122,11 +122,11 @@ public class ApacheHCUtils {
apacheRequest.addHeader(HttpHeaders.CONTENT_LENGTH, "0");
}
for (String header : request.getHeaders().keySet()) {
for (String value : request.getHeaders().get(header))
// apache automatically tries to add content length header
if (!header.equals(HttpHeaders.CONTENT_LENGTH))
apacheRequest.addHeader(header, value);
for (Map.Entry<String, String> entry : request.getHeaders().entries()) {
String header = entry.getKey();
// apache automatically tries to add content length header
if (!header.equals(HttpHeaders.CONTENT_LENGTH))
apacheRequest.addHeader(header, entry.getValue());
}
apacheRequest.addHeader(HttpHeaders.USER_AGENT, USER_AGENT);
return apacheRequest;

10
drivers/gae/src/main/java/org/jclouds/gae/ConvertToGaeRequest.java
View File

@ -25,6 +25,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
@ -87,11 +88,10 @@ public class ConvertToGaeRequest implements Function<HttpRequest, HTTPRequest> {
HTTPRequest gaeRequest = new HTTPRequest(url, HTTPMethod.valueOf(request.getMethod().toString()), options);
for (String header : request.getHeaders().keySet()) {
for (String value : request.getHeaders().get(header)) {
if (!prohibitedHeaders.contains(header))
gaeRequest.addHeader(new HTTPHeader(header, value));
}
for (Entry<String, String> entry : request.getHeaders().entries()) {
String header = entry.getKey();
if (!prohibitedHeaders.contains(header))
gaeRequest.addHeader(new HTTPHeader(header, entry.getValue()));
}
gaeRequest.addHeader(new HTTPHeader(HttpHeaders.USER_AGENT, USER_AGENT));
/**

7
labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java
View File

@ -192,10 +192,9 @@ public class CDMIObject {
userMetaDataIn = Maps.newHashMap();
systemMetaDataIn = Maps.newHashMap();
aclMetaDataIn = Lists.newArrayList();
Iterator<String> keys = metadata.keySet().iterator();
while (keys.hasNext()) {
String key = keys.next();
JsonBall value = metadata.get(key);
for (Map.Entry<String, JsonBall> entry : metadata.entrySet()) {
String key = entry.getKey();
JsonBall value = entry.getValue();
if (key.startsWith("cdmi")) {
if (key.matches("cdmi_acl")) {
String[] cdmi_acl_array = value.toString().split("[{}]");

37
labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/ContainerApiLiveTest.java
View File

@ -48,7 +48,6 @@ public class ContainerApiLiveTest extends BaseCDMIApiLiveTest {
public void testCreateContainer() throws Exception {
String pContainerName = "MyContainer" + System.currentTimeMillis() + "/";
Map<String, String> pContainerMetaDataIn = Maps.newHashMap();
Iterator<String> keys;
pContainerMetaDataIn.put("containerkey1", "value1");
pContainerMetaDataIn.put("containerkey2", "value2");
pContainerMetaDataIn.put("containerkey3", "value3");
@ -76,19 +75,15 @@ public class ContainerApiLiveTest extends BaseCDMIApiLiveTest {
System.out.println("Children: " + container.getChildren());
assertNotNull(container.getMetadata());
System.out.println("Raw metadata: " + container.getMetadata());
keys = container.getMetadata().keySet().iterator();
while (keys.hasNext()) {
String key = keys.next();
JsonBall value = container.getMetadata().get(key);
System.out.println(key + ":" + value);
for (Map.Entry<String, JsonBall> entry : container.getMetadata().entrySet()) {
System.out.println(entry.getKey() + ":" + entry.getValue());
}
assertNotNull(container.getUserMetadata());
Map<String, String> pContainerMetaDataOut = container.getUserMetadata();
keys = pContainerMetaDataIn.keySet().iterator();
while (keys.hasNext()) {
String key = keys.next();
for (Map.Entry<String, String> entry : pContainerMetaDataIn.entrySet()) {
String key = entry.getKey();
assertEquals(pContainerMetaDataOut.containsKey(key), true);
assertEquals(pContainerMetaDataOut.get(key), pContainerMetaDataIn.get(key));
assertEquals(pContainerMetaDataOut.get(key), entry.getValue());
}
System.out.println("UserMetaData: " + container.getUserMetadata());
assertNotNull(container.getSystemMetadata());
@ -136,7 +131,6 @@ public class ContainerApiLiveTest extends BaseCDMIApiLiveTest {
public void testGetContainer() throws Exception {
String pContainerName = "MyContainer" + System.currentTimeMillis() + "/";
Map<String, String> pContainerMetaDataIn = Maps.newHashMap();
Iterator<String> keys;
pContainerMetaDataIn.put("containerkey1", "value1");
pContainerMetaDataIn.put("containerkey2", "value2");
pContainerMetaDataIn.put("containerkey3", "value3");
@ -163,19 +157,15 @@ public class ContainerApiLiveTest extends BaseCDMIApiLiveTest {
System.out.println("Children: " + container.getChildren());
assertNotNull(container.getMetadata());
System.out.println("Raw metadata: " + container.getMetadata());
keys = container.getMetadata().keySet().iterator();
while (keys.hasNext()) {
String key = keys.next();
JsonBall value = container.getMetadata().get(key);
System.out.println(key + ":" + value);
for (Map.Entry<String, JsonBall> entry : container.getMetadata().entrySet()) {
System.out.println(entry.getKey() + ":" + entry.getValue());
}
assertNotNull(container.getUserMetadata());
Map<String, String> pContainerMetaDataOut = container.getUserMetadata();
keys = pContainerMetaDataIn.keySet().iterator();
while (keys.hasNext()) {
String key = keys.next();
for (Map.Entry<String, String> entry : pContainerMetaDataIn.entrySet()) {
String key = entry.getKey();
assertEquals(pContainerMetaDataOut.containsKey(key), true);
assertEquals(pContainerMetaDataOut.get(key), pContainerMetaDataIn.get(key));
assertEquals(pContainerMetaDataOut.get(key), entry.getValue());
}
System.out.println("UserMetaData: " + container.getUserMetadata());
assertNotNull(container.getSystemMetadata());
@ -202,11 +192,10 @@ public class ContainerApiLiveTest extends BaseCDMIApiLiveTest {
container = api.get(pContainerName, ContainerQueryParams.Builder.metadata());
assertNotNull(container);
pContainerMetaDataOut = container.getUserMetadata();
keys = pContainerMetaDataIn.keySet().iterator();
while (keys.hasNext()) {
String key = keys.next();
for (Map.Entry<String, String> entry : pContainerMetaDataIn.entrySet()) {
String key = entry.getKey();
assertEquals(pContainerMetaDataOut.containsKey(key), true);
assertEquals(pContainerMetaDataOut.get(key), pContainerMetaDataIn.get(key));
assertEquals(pContainerMetaDataOut.get(key), entry.getValue());
}
System.out.println(container);

30
labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataApiLiveTest.java
View File

@ -66,7 +66,6 @@ public class DataApiLiveTest extends BaseCDMIApiLiveTest {
CreateDataObjectOptions pCreateDataObjectOptions;
DataObject dataObject;
Iterator<String> keys;
Map<String, String> dataObjectMetaDataOut;
Map<String, String> pContainerMetaDataIn = Maps.newHashMap();
Map<String, String> pDataObjectMetaDataIn = Maps.newLinkedHashMap();
@ -101,11 +100,10 @@ public class DataApiLiveTest extends BaseCDMIApiLiveTest {
assertEquals(dataObject.getValueAsString(), value);
dataObjectMetaDataOut = dataObject.getUserMetadata();
assertNotNull(dataObjectMetaDataOut);
keys = pDataObjectMetaDataIn.keySet().iterator();
while (keys.hasNext()) {
String key = keys.next();
for (Map.Entry<String, String> entry : pDataObjectMetaDataIn.entrySet()) {
String key = entry.getKey();
assertEquals(dataObjectMetaDataOut.containsKey(key), true);
assertEquals(dataObjectMetaDataOut.get(key), pDataObjectMetaDataIn.get(key));
assertEquals(dataObjectMetaDataOut.get(key), entry.getValue());
}
assertEquals(Integer.parseInt(dataObject.getSystemMetadata().get("cdmi_size")), value.length());
assertEquals(dataObject.getObjectName(), dataObjectNameIn);
@ -130,11 +128,10 @@ public class DataApiLiveTest extends BaseCDMIApiLiveTest {
assertEquals(dataObject.getValueAsString(), value);
dataObjectMetaDataOut = dataObject.getUserMetadata();
assertNotNull(dataObjectMetaDataOut);
keys = pDataObjectMetaDataIn.keySet().iterator();
while (keys.hasNext()) {
String key = keys.next();
for (Map.Entry<String, String> entry : pDataObjectMetaDataIn.entrySet()) {
String key = entry.getKey();
assertEquals(dataObjectMetaDataOut.containsKey(key), true);
assertEquals(dataObjectMetaDataOut.get(key), pDataObjectMetaDataIn.get(key));
assertEquals(dataObjectMetaDataOut.get(key), entry.getValue());
}
assertEquals(Integer.parseInt(dataObject.getSystemMetadata().get("cdmi_size")), value.length());
assertEquals(dataObject.getObjectName(), dataObjectNameIn);
@ -484,7 +481,6 @@ public class DataApiLiveTest extends BaseCDMIApiLiveTest {
CreateDataObjectOptions pCreateDataObjectOptions;
DataObject dataObject;
Iterator<String> keys;
Map<String, String> dataObjectMetaDataOut;
Map<String, String> pContainerMetaDataIn = Maps.newHashMap();
Map<String, String> pDataObjectMetaDataIn = Maps.newLinkedHashMap();
@ -519,11 +515,10 @@ public class DataApiLiveTest extends BaseCDMIApiLiveTest {
assertEquals(dataObject.getValueAsString(), value);
dataObjectMetaDataOut = dataObject.getUserMetadata();
assertNotNull(dataObjectMetaDataOut);
keys = pDataObjectMetaDataIn.keySet().iterator();
while (keys.hasNext()) {
String key = keys.next();
for (Map.Entry<String, String> entry : pDataObjectMetaDataIn.entrySet()) {
String key = entry.getKey();
assertEquals(dataObjectMetaDataOut.containsKey(key), true);
assertEquals(dataObjectMetaDataOut.get(key), pDataObjectMetaDataIn.get(key));
assertEquals(dataObjectMetaDataOut.get(key), entry.getValue());
}
assertEquals(Integer.parseInt(dataObject.getSystemMetadata().get("cdmi_size")), value.length());
assertEquals(dataObject.getObjectName(), dataObjectNameIn);
@ -560,11 +555,10 @@ public class DataApiLiveTest extends BaseCDMIApiLiveTest {
assertEquals(dataObject.getMimetype(), "text/plain");
dataObjectMetaDataOut = dataObject.getUserMetadata();
assertNotNull(dataObjectMetaDataOut);
keys = pDataObjectMetaDataIn.keySet().iterator();
while (keys.hasNext()) {
String key = keys.next();
for (Map.Entry<String, String> entry : pDataObjectMetaDataIn.entrySet()) {
String key = entry.getKey();
assertEquals(dataObjectMetaDataOut.containsKey(key), true);
assertEquals(dataObjectMetaDataOut.get(key), pDataObjectMetaDataIn.get(key));
assertEquals(dataObjectMetaDataOut.get(key), entry.getValue());
}
assertEquals(Integer.parseInt(dataObject.getSystemMetadata().get("cdmi_size")), value.length());

5
labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeService.java
View File

@ -23,6 +23,7 @@ import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_R
import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_SUSPENDED;
import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_TERMINATED;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
@ -119,8 +120,8 @@ public class JoyentCloudComputeService extends BaseComputeService {
@Override
protected void cleanUpIncidentalResourcesOfDeadNodes(Set<? extends NodeMetadata> deadNodes) {
Multimap<String, String> zoneToZoneAndGroupNames = orphanedGroupsByDatacenterId.apply(deadNodes);
for (String datacenterId : zoneToZoneAndGroupNames.keySet()) {
cleanupOrphanedKeysInZone(ImmutableSet.copyOf(zoneToZoneAndGroupNames.get(datacenterId)), datacenterId);
for (Map.Entry<String, Collection<String>> entry : zoneToZoneAndGroupNames.asMap().entrySet()) {
cleanupOrphanedKeysInZone(ImmutableSet.copyOf(entry.getValue()), entry.getKey());
}
}

6
providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/functions/PresentSpotRequestsAndInstances.java
View File

@ -30,6 +30,7 @@ import static org.jclouds.ec2.compute.domain.RegionAndName.nameFunction;
import static org.jclouds.ec2.compute.domain.RegionAndName.regionFunction;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
import javax.inject.Singleton;
@ -79,8 +80,9 @@ public class PresentSpotRequestsAndInstances extends PresentInstances {
protected Set<RunningInstance> getSpots(Set<RegionAndName> regionAndIds) {
Builder<RunningInstance> builder = ImmutableSet.<RunningInstance> builder();
Multimap<String, String> regionToSpotIds = transformValues(index(regionAndIds, regionFunction()), nameFunction());
for (String region : regionToSpotIds.keySet()) {
Collection<String> spotIds = regionToSpotIds.get(region);
for (Map.Entry<String, Collection<String>> entry : regionToSpotIds.asMap().entrySet()) {
String region = entry.getKey();
Collection<String> spotIds = entry.getValue();
logger.trace("looking for spots %s in region %s", spotIds, region);
builder.addAll(transform(
client.getSpotInstanceServices().describeSpotInstanceRequestsInRegion(region,

3
providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java
View File

@ -50,7 +50,8 @@ public class CreateServerOptions implements MapBinder {
"this binder is only valid for GeneratedHttpRequests!");
GeneratedHttpRequest gRequest = (GeneratedHttpRequest) request;
ImmutableMultimap.Builder<String, String> formParams = ImmutableMultimap.builder();
for(String key : postParams.keySet()) formParams.put(key, (String) postParams.get(key));
for (Map.Entry<String, Object> entry : postParams.entrySet())
formParams.put(entry.getKey(), (String) entry.getValue());
ServerSpec serverSpec = ServerSpec.class.cast(find(gRequest.getInvocation().getArgs(),
instanceOf(ServerSpec.class)));
formParams.put("datacenter", serverSpec.getDatacenter());

8
sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java
View File

@ -51,12 +51,10 @@ public class BindAttributesToIndexedFormParams implements Binder {
Builder<String, String> builder = ImmutableMultimap.builder();
int amazonOneBasedIndex = 1; // according to docs, counters must start with 1
for (String itemName : attributeMap.getAttributes().keySet()) {
for (Map.Entry<String, Collection<AttributePair>> entry : attributeMap.getAttributes().entrySet());
String itemName = entry.getKey();
Collection<AttributePair> c = attributeMap.getAttributes().get(itemName);
Iterator<AttributePair> it = c.iterator();
while (it.hasNext()) {
AttributePair attr = it.next();
for (AttributePair attr : = entry.getValue()) {
// not null by contract
String value = attr.getValue();

6
sandbox-drivers/asynchttpclient/src/main/java/org/jclouds/http/ning/NingHttpCommandExecutorService.java
View File

@ -156,10 +156,8 @@ public class NingHttpCommandExecutorService implements HttpCommandExecutorServic
}
builder.addHeader(HttpHeaders.USER_AGENT, USER_AGENT);
for (String header : request.getHeaders().keySet()) {
for (String value : request.getHeaders().get(header)) {
builder.addHeader(header, value);
}
for (Map<String, String> entry : request.getHeaders().entries()) {
builder.addHeader(entry.getKey(), entry.getValue());
}
return builder.build();