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 2014/05/18 02:40:19 UTC
git commit: Replace deprecated calls to LoadingCache.apply
Repository: jclouds
Updated Branches:
refs/heads/master 62a684274 -> 79c289da9
Replace deprecated calls to LoadingCache.apply
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/79c289da
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/79c289da
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/79c289da
Branch: refs/heads/master
Commit: 79c289da9d630ba638646eb511542cc99305548a
Parents: 62a6842
Author: Andrew Gaul <ga...@apache.org>
Authored: Sat May 17 17:39:42 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sat May 17 17:39:42 2014 -0700
----------------------------------------------------------------------
.../compute/extensions/CloudStackSecurityGroupExtension.java | 2 +-
.../ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java | 2 +-
.../nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java | 2 +-
.../java/org/jclouds/dynect/v3/filters/SessionManagerTest.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/79c289da/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
index dd36ee5..f16bf98 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
@@ -141,7 +141,7 @@ public class CloudStackSecurityGroupExtension implements SecurityGroupExtension
.name(markerGroup)
.build();
- return groupConverter.apply(groupCreator.apply(zoneAndName));
+ return groupConverter.apply(groupCreator.getUnchecked(zoneAndName));
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/79c289da/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java
index 483a29b..b2aacba 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java
@@ -172,7 +172,7 @@ public class EC2CreateNodesInGroupThenAddToSet implements CreateNodesInGroupThen
private void populateCredentials(Set<RunningInstance> input, TemplateOptions options) {
LoginCredentials credentials = null;
for (RunningInstance instance : input) {
- credentials = instanceToCredentials.apply(instance).orNull();
+ credentials = instanceToCredentials.getUnchecked(instance).orNull();
if (credentials != null)
break;
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/79c289da/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java
index 8b36fc9..a204a39 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java
@@ -173,7 +173,7 @@ public class NovaSecurityGroupExtension implements SecurityGroupExtension {
String markerGroup = namingConvention.create().sharedNameForGroup(name);
ZoneSecurityGroupNameAndPorts zoneAndName = new ZoneSecurityGroupNameAndPorts(zone, markerGroup, ImmutableSet.<Integer> of());
- SecurityGroupInZone rawGroup = groupCreator.apply(zoneAndName);
+ SecurityGroupInZone rawGroup = groupCreator.getUnchecked(zoneAndName);
return groupConverter.apply(rawGroup);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/79c289da/providers/dynect/src/test/java/org/jclouds/dynect/v3/filters/SessionManagerTest.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/filters/SessionManagerTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/filters/SessionManagerTest.java
index f5d4176..c26c0dd 100644
--- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/filters/SessionManagerTest.java
+++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/filters/SessionManagerTest.java
@@ -67,7 +67,7 @@ public class SessionManagerTest {
expect(sessionApi.login(creds)).andReturn(session);
replay(sessionApi);
- assertSame(SessionManager.buildCache(sessionApi).apply(creds), session);
+ assertSame(SessionManager.buildCache(sessionApi).getUnchecked(creds), session);
verify(sessionApi);
}