Issue 730: last deprecated methods scheduled for removal in 1.3

apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java

@@ -35,9 +35,9 @@ import org.yaml.snakeyaml.constructor.Constructor;
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
-import com.google.common.cache.LoadingCache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 

apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceDependenciesModule.java

@@ -56,8 +56,6 @@ import org.jclouds.ec2.domain.KeyPair;
 import org.jclouds.ec2.domain.RunningInstance;
 import org.jclouds.ec2.reference.EC2Constants;
 import org.jclouds.predicates.RetryablePredicate;
-import org.jclouds.rest.RestContext;
-import org.jclouds.rest.internal.RestContextImpl;
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;

apis/ec2/src/main/java/org/jclouds/ec2/domain/IpPermission.java

@@ -44,14 +44,6 @@ public interface IpPermission extends Comparable<IpPermission> {
     */
    int getToPort();
 
-   /**
-    * List of security group and user ID pairs.
-    * 
-    * @see #getUserIdGroupPairs
-    */
-   @Deprecated
-   Set<UserIdGroupPair> getGroups();
-
    /**
     * List of security group and user ID pairs.
     */

apis/ec2/src/main/java/org/jclouds/ec2/domain/IpPermissionImpl.java

@@ -20,7 +20,6 @@ package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.util.Map.Entry;
 import java.util.Set;
 
 import com.google.common.collect.ImmutableMultimap;
@@ -140,18 +139,6 @@ public class IpPermissionImpl implements IpPermission {
       return toPort;
    }
 
-   /**
-    * {@inheritDoc}
-    */
-   @Override
-   @Deprecated
-   public Set<UserIdGroupPair> getGroups() {
-      ImmutableSet.Builder<UserIdGroupPair> groups = ImmutableSet.<UserIdGroupPair> builder();
-      for (Entry<String, String> pair : userIdGroupPairs.entries())
-         groups.add(new UserIdGroupPair(pair.getKey(), pair.getValue()));
-      return groups.build();
-   }
-
    /**
     * {@inheritDoc}
     */

apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java

@@ -80,7 +80,7 @@ public class KeyPair implements Comparable<KeyPair> {
       }
 
       public static Builder fromKeyPair(KeyPair in) {
-         return new Builder().region(in.getRegion()).keyName(in.getKeyName()).sha1OfPrivateKey(in.getKeyFingerprint())
+         return new Builder().region(in.getRegion()).keyName(in.getKeyName()).sha1OfPrivateKey(in.getSha1OfPrivateKey())
                   .keyMaterial(in.getKeyMaterial());
       }
    }
@@ -116,14 +116,6 @@ public class KeyPair implements Comparable<KeyPair> {
       return (this == o) ? 0 : getKeyName().compareTo(o.getKeyName());
    }
 
-   /**
-    * @see #getSha1OfPrivateKey
-    */
-   @Deprecated
-   public String getKeyFingerprint() {
-      return sha1OfPrivateKey;
-   }
-
    /**
     * A SHA-1 digest of the DER encoded private key.
     * 

apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java

@@ -18,11 +18,14 @@
  */
 package org.jclouds.ec2.compute;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import com.google.common.base.Splitter;
 import org.jclouds.compute.BaseComputeServiceLiveTest;
 import org.jclouds.compute.ComputeServiceContext;
 import org.jclouds.compute.ComputeServiceContextFactory;
@@ -50,7 +53,6 @@ import org.jclouds.ec2.services.ElasticBlockStoreClient;
 import org.jclouds.ec2.services.InstanceClient;
 import org.jclouds.ec2.services.KeyPairClient;
 import org.jclouds.ec2.services.SecurityGroupClient;
-import org.jclouds.http.HttpResponseException;
 import org.jclouds.logging.log4j.config.Log4JLoggingModule;
 import org.jclouds.net.IPSocket;
 import org.jclouds.scriptbuilder.domain.Statements;
@@ -66,8 +68,6 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import com.google.inject.Module;
 
-import static org.testng.Assert.*;
-
 /**
  * 
  * @author Adrian Cole

core/src/main/resources/rest.properties.orig

@@ -1,106 +0,0 @@
-azurequeue.contextbuilder=org.jclouds.azure.storage.AzureStorageContextBuilder
-azurequeue.sync=org.jclouds.azure.storage.queue.AzureQueueClient
-azurequeue.async=org.jclouds.azure.storage.queue.AzureQueueAsyncClient
-azurequeue.propertiesbuilder=org.jclouds.azure.storage.AzureStoragePropertiesBuilder
-azurequeue.endpoint=https://{identity}.queue.core.windows.net
-
-azureblob.contextbuilder=org.jclouds.azure.storage.blob.AzureBlobContextBuilder
-azureblob.propertiesbuilder=org.jclouds.azure.storage.AzureStoragePropertiesBuilder
-azureblob.endpoint=https://{identity}.blob.core.windows.net
-
-pcs.contextbuilder=org.jclouds.mezeo.pcs2.PCSContextBuilder
-pcs.apiVersion=unknown
-
-sdn.contextbuilder=org.jclouds.nirvanix.sdn.SDNContextBuilder
-sdn.propertiesbuilder=org.jclouds.nirvanix.sdn.SDNPropertiesBuilder
-
-sqs.contextbuilder=org.jclouds.aws.sqs.SQSContextBuilder
-sqs.propertiesbuilder=org.jclouds.aws.sqs.SQSPropertiesBuilder
-
-elb.contextbuilder=org.jclouds.aws.elb.ELBContextBuilder
-elb.propertiesbuilder=org.jclouds.aws.elb.ELBPropertiesBuilder
-
-cloudwatch.contextbuilder=org.jclouds.aws.cloudwatch.CloudWatchContextBuilder
-cloudwatch.propertiesbuilder=org.jclouds.aws.cloudwatch.CloudWatchPropertiesBuilder
-
-s3.contextbuilder=org.jclouds.aws.s3.S3ContextBuilder
-s3.propertiesbuilder=org.jclouds.aws.s3.S3PropertiesBuilder
-
-ec2.contextbuilder=org.jclouds.aws.ec2.EC2ContextBuilder
-ec2.propertiesbuilder=org.jclouds.aws.ec2.EC2PropertiesBuilder
-
-rimuhosting.contextbuilder=org.jclouds.rimuhosting.miro.RimuHostingContextBuilder
-rimuhosting.propertiesbuilder=org.jclouds.rimuhosting.miro.RimuHostingPropertiesBuilder
-
-slicehost.contextbuilder=org.jclouds.slicehost.SlicehostContextBuilder
-slicehost.propertiesbuilder=org.jclouds.slicehost.SlicehostPropertiesBuilder
-
-trmk-vcloudexpress.contextbuilder=org.jclouds.vcloud.terremark.TerremarkVCloudExpressContextBuilder
-trmk-vcloudexpress.propertiesbuilder=org.jclouds.vcloud.terremark.TerremarkVCloudExpressPropertiesBuilder
-
-trmk-ecloud.contextbuilder=org.jclouds.vcloud.terremark.TerremarkECloudContextBuilder
-trmk-ecloud.propertiesbuilder=org.jclouds.vcloud.terremark.TerremarkECloudPropertiesBuilder
-
-chef.contextbuilder=org.jclouds.chef.ChefContextBuilder
-chef.propertiesbuilder=org.jclouds.chef.ChefPropertiesBuilder
-
-transientchef.contextbuilder=org.jclouds.chef.test.TransientChefContextBuilder
-transientchef.propertiesbuilder=org.jclouds.chef.ChefPropertiesBuilder
-
-opscodeplatform.contextbuilder=org.jclouds.opscodeplatform.OpscodePlatformContextBuilder
-opscodeplatform.propertiesbuilder=org.jclouds.opscodeplatform.OpscodePlatformPropertiesBuilder
-
-vcloud.contextbuilder=org.jclouds.vcloud.VCloudContextBuilder
-vcloud.propertiesbuilder=org.jclouds.vcloud.VCloudPropertiesBuilder
-
-vcloudexpress.contextbuilder=org.jclouds.vcloud.VCloudExpressContextBuilder
-vcloudexpress.propertiesbuilder=org.jclouds.vcloud.VCloudExpressPropertiesBuilder
-
-eucalyptus.contextbuilder=org.jclouds.aws.ec2.EC2ContextBuilder
-eucalyptus.propertiesbuilder=org.jclouds.aws.ec2.EucalyptusPropertiesBuilder
-
-nova.contextbuilder=org.jclouds.aws.ec2.EC2ContextBuilder
-nova.propertiesbuilder=org.jclouds.aws.ec2.NovaPropertiesBuilder
-
-cloudservers.contextbuilder=org.jclouds.rackspace.cloudservers.CloudServersContextBuilder
-cloudservers.propertiesbuilder=org.jclouds.rackspace.RackspacePropertiesBuilder
-
-bluelock-vcdirector.contextbuilder=org.jclouds.vcloud.bluelock.BlueLockVCloudDirectorContextBuilder
-bluelock-vcdirector.propertiesbuilder=org.jclouds.vcloud.bluelock.BlueLockVCloudDirectorPropertiesBuilder
-
-gogrid.propertiesbuilder=org.jclouds.gogrid.GoGridPropertiesBuilder
-gogrid.contextbuilder=org.jclouds.gogrid.GoGridContextBuilder
-
-ibmdev.propertiesbuilder=org.jclouds.ibmdev.IBMDeveloperCloudPropertiesBuilder
-ibmdev.contextbuilder=org.jclouds.ibmdev.IBMDeveloperCloudContextBuilder
-
-stub.propertiesbuilder=org.jclouds.compute.stub.StubComputeServicePropertiesBuilder
-stub.contextbuilder=org.jclouds.compute.stub.StubComputeServiceContextBuilder
-# example of where to change your endpoint
-# bluelock.endpoint=https://express3.bluelock.com/api
-
-atmosonline.contextbuilder=org.jclouds.atmosonline.saas.AtmosStorageContextBuilder
-atmosonline.endpoint=https://accesspoint.atmosonline.com
-atmosonline.apiversion=1.3.0
-
-synaptic.contextbuilder=org.jclouds.atmosonline.saas.AtmosStorageContextBuilder
-synaptic.endpoint=https://storage.synaptic.att.com
-synaptic.apiversion=1.3.0
-
-# TODO peer1 and hostedsolutions use atmos
-
-cloudfiles.contextbuilder=org.jclouds.rackspace.cloudfiles.CloudFilesContextBuilder
-cloudfiles.propertiesbuilder=org.jclouds.rackspace.cloudfiles.CloudFilesPropertiesBuilder
-
-walrus.contextbuilder=org.jclouds.aws.s3.S3ContextBuilder
-walrus.propertiesbuilder=org.jclouds.aws.s3.WalrusPropertiesBuilder
-
-googlestorage.contextbuilder=org.jclouds.aws.s3.S3ContextBuilder
-googlestorage.propertiesbuilder=org.jclouds.aws.s3.GoogleStoragePropertiesBuilder
-
-transient.contextbuilder=org.jclouds.blobstore.TransientBlobStoreContextBuilder
-transient.propertiesbuilder=org.jclouds.blobstore.TransientBlobStorePropertiesBuilder
-
-filesystem.contextbuilder=org.jclouds.filesystem.FilesystemBlobStoreContextBuilder
-filesystem.propertiesbuilder=org.jclouds.filesystem.FilesystemBlobStorePropertiesBuilder
-

providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java

@@ -29,8 +29,6 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
 import org.jclouds.aws.domain.Region;
 import org.jclouds.compute.BaseVersionedServiceLiveTest;
 import org.jclouds.compute.ComputeService;
@@ -46,9 +44,9 @@ import org.jclouds.ec2.domain.BlockDevice;
 import org.jclouds.ec2.domain.Image;
 import org.jclouds.ec2.domain.Reservation;
 import org.jclouds.ec2.domain.RootDeviceType;
-import org.jclouds.ec2.domain.Image.ImageType;
 import org.jclouds.ec2.domain.RunningInstance;
 import org.jclouds.ec2.domain.Snapshot;
+import org.jclouds.ec2.domain.Image.ImageType;
 import org.jclouds.ec2.services.AMIClient;
 import org.jclouds.logging.log4j.config.Log4JLoggingModule;
 import org.jclouds.rest.RestContext;
@@ -56,6 +54,7 @@ import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
 
+import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
@@ -63,8 +62,6 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import com.google.inject.Module;
 
-import javax.annotation.Nullable;
-
 /**
  * Tests behavior of {@code AMIClient}
  * 

providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceDependenciesModule.java

@@ -26,8 +26,6 @@ import org.jclouds.compute.ComputeServiceContext;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.NodeState;
 import org.jclouds.compute.internal.ComputeServiceContextImpl;
-import org.jclouds.rest.RestContext;
-import org.jclouds.rest.internal.RestContextImpl;
 import org.jclouds.rimuhosting.miro.RimuHostingAsyncClient;
 import org.jclouds.rimuhosting.miro.RimuHostingClient;
 import org.jclouds.rimuhosting.miro.compute.functions.ServerToNodeMetadata;

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/AuthorizeRSAPublicKey.java

@@ -1,39 +0,0 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.jclouds.scriptbuilder.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.jclouds.scriptbuilder.statements.ssh.AuthorizeRSAPublicKeys;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * 
- * @author Adrian Cole
- * @see AuthorizeRSAPublicKeys
- */
-@Deprecated
-public class AuthorizeRSAPublicKey extends AuthorizeRSAPublicKeys {
-
-   public AuthorizeRSAPublicKey(String publicKey) {
-      super(ImmutableSet.of(checkNotNull(publicKey, "publicKey")));
-   }
-
-}

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/InstallRSAPrivateKey.java

@@ -1,32 +0,0 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.jclouds.scriptbuilder.domain;
-
-/**
- * @see org.jclouds.scriptbuilder.statements.ssh.InstallRSAPrivateKey
- * @author Adrian Cole
- */
-@Deprecated
-public class InstallRSAPrivateKey extends org.jclouds.scriptbuilder.statements.ssh.InstallRSAPrivateKey {
-
-   public InstallRSAPrivateKey(String privateKey) {
-      super(privateKey);
-   }
-
-}