mirror of https://github.com/apache/jclouds.git
Moving EncodedRSAPublicKeyToBase64 (and corresponding unit test) up into EC2 so both openstack-nova-ec2 and aws-ec2 can share the same class
This commit is contained in:
parent
19390ea87d
commit
850cdc2fc8
|
@ -16,7 +16,7 @@
|
||||||
* specific language governing permissions and limitations
|
* specific language governing permissions and limitations
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
package org.jclouds.aws.ec2.functions;
|
package org.jclouds.ec2.functions;
|
||||||
|
|
||||||
import static com.google.common.base.Preconditions.checkArgument;
|
import static com.google.common.base.Preconditions.checkArgument;
|
||||||
import static com.google.common.base.Preconditions.checkNotNull;
|
import static com.google.common.base.Preconditions.checkNotNull;
|
|
@ -16,7 +16,7 @@
|
||||||
* specific language governing permissions and limitations
|
* specific language governing permissions and limitations
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
package org.jclouds.aws.ec2.functions;
|
package org.jclouds.ec2.functions;
|
||||||
|
|
||||||
import static org.testng.Assert.assertEquals;
|
import static org.testng.Assert.assertEquals;
|
||||||
|
|
|
@ -24,11 +24,10 @@ import javax.ws.rs.FormParam;
|
||||||
import javax.ws.rs.POST;
|
import javax.ws.rs.POST;
|
||||||
import javax.ws.rs.Path;
|
import javax.ws.rs.Path;
|
||||||
|
|
||||||
import org.jclouds.aws.ec2.functions.EncodedRSAPublicKeyToBase64;
|
|
||||||
import org.jclouds.aws.filters.FormSigner;
|
import org.jclouds.aws.filters.FormSigner;
|
||||||
import org.jclouds.ec2.domain.KeyPair;
|
import org.jclouds.ec2.domain.KeyPair;
|
||||||
|
import org.jclouds.ec2.functions.EncodedRSAPublicKeyToBase64;
|
||||||
import org.jclouds.ec2.services.KeyPairAsyncClient;
|
import org.jclouds.ec2.services.KeyPairAsyncClient;
|
||||||
import org.jclouds.ec2.services.KeyPairClient;
|
|
||||||
import org.jclouds.ec2.xml.KeyPairResponseHandler;
|
import org.jclouds.ec2.xml.KeyPairResponseHandler;
|
||||||
import org.jclouds.javax.annotation.Nullable;
|
import org.jclouds.javax.annotation.Nullable;
|
||||||
import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull;
|
import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull;
|
||||||
|
@ -49,7 +48,7 @@ import com.google.common.util.concurrent.ListenableFuture;
|
||||||
public interface AWSKeyPairAsyncClient extends KeyPairAsyncClient {
|
public interface AWSKeyPairAsyncClient extends KeyPairAsyncClient {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see KeyPairClient#importKeyPairInRegion
|
* @see AWSKeyPairClient#importKeyPairInRegion
|
||||||
*/
|
*/
|
||||||
@POST
|
@POST
|
||||||
@Path("/")
|
@Path("/")
|
||||||
|
|
Loading…
Reference in New Issue