From 78573da3d04e12ea5b74d0f0a762c495a6576fb8 Mon Sep 17 00:00:00 2001 From: "adrian.f.cole" Date: Thu, 16 Jul 2009 19:46:20 +0000 Subject: [PATCH] fixed case on RackSpace should be Rackspace git-svn-id: http://jclouds.googlecode.com/svn/trunk@1629 3d8758e0-26b5-11de-8745-db77d3ebf521 --- .../reference/CloudFilesConstants.java | 4 ++-- .../filters/AuthenticateRequest.java | 4 ++-- ...tion.java => RackspaceAuthentication.java} | 8 +++---- .../rackspace/RackspaceContextBuilder.java | 4 ++-- .../config/RackspaceAuthenticationModule.java | 12 +++++----- ...arseAuthenticationResponseFromHeaders.java | 10 ++++---- ...Constants.java => RackspaceConstants.java} | 4 ++-- ...paceHeaders.java => RackspaceHeaders.java} | 2 +- ...a => RackspaceAuthenticationLiveTest.java} | 24 +++++++++---------- ....java => RackspaceAuthenticationTest.java} | 16 ++++++------- 10 files changed, 44 insertions(+), 44 deletions(-) rename rackspace/core/src/main/java/org/jclouds/rackspace/{RackSpaceAuthentication.java => RackspaceAuthentication.java} (89%) mode change 100755 => 100644 rename rackspace/core/src/main/java/org/jclouds/rackspace/reference/{RackSpaceConstants.java => RackspaceConstants.java} (92%) rename rackspace/core/src/main/java/org/jclouds/rackspace/reference/{RackSpaceHeaders.java => RackspaceHeaders.java} (94%) rename rackspace/core/src/test/java/org/jclouds/rackspace/{RackSpaceAuthenticationLiveTest.java => RackspaceAuthenticationLiveTest.java} (83%) mode change 100755 => 100644 rename rackspace/core/src/test/java/org/jclouds/rackspace/{RackSpaceAuthenticationTest.java => RackspaceAuthenticationTest.java} (87%) mode change 100755 => 100644 diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesConstants.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesConstants.java index c1e198e98e..502402d885 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesConstants.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesConstants.java @@ -24,14 +24,14 @@ package org.jclouds.rackspace.cloudfiles.reference; import org.jclouds.objectstore.reference.ObjectStoreConstants; -import org.jclouds.rackspace.reference.RackSpaceConstants; +import org.jclouds.rackspace.reference.RackspaceConstants; /** * Configuration properties and constants used in Cloud Files connections. * * @author Adrian Cole */ -public interface CloudFilesConstants extends ObjectStoreConstants, RackSpaceConstants { +public interface CloudFilesConstants extends ObjectStoreConstants, RackspaceConstants { diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/filters/AuthenticateRequest.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/filters/AuthenticateRequest.java index dbee91b0bf..1f1572fe0e 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/filters/AuthenticateRequest.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/filters/AuthenticateRequest.java @@ -31,7 +31,7 @@ import org.jclouds.http.HttpException; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequestFilter; import org.jclouds.rackspace.Authentication; -import org.jclouds.rackspace.reference.RackSpaceHeaders; +import org.jclouds.rackspace.reference.RackspaceHeaders; import com.google.inject.Inject; import com.google.inject.Provider; @@ -89,7 +89,7 @@ public class AuthenticateRequest implements HttpRequestFilter { } public void filter(HttpRequest request) throws HttpException { - request.getHeaders().replaceValues(RackSpaceHeaders.AUTH_TOKEN, + request.getHeaders().replaceValues(RackspaceHeaders.AUTH_TOKEN, Collections.singletonList(getAuthToken())); } diff --git a/rackspace/core/src/main/java/org/jclouds/rackspace/RackSpaceAuthentication.java b/rackspace/core/src/main/java/org/jclouds/rackspace/RackspaceAuthentication.java old mode 100755 new mode 100644 similarity index 89% rename from rackspace/core/src/main/java/org/jclouds/rackspace/RackSpaceAuthentication.java rename to rackspace/core/src/main/java/org/jclouds/rackspace/RackspaceAuthentication.java index 72e4180c39..dbee025e2a --- a/rackspace/core/src/main/java/org/jclouds/rackspace/RackSpaceAuthentication.java +++ b/rackspace/core/src/main/java/org/jclouds/rackspace/RackspaceAuthentication.java @@ -30,7 +30,7 @@ import javax.ws.rs.HeaderParam; import javax.ws.rs.Path; import org.jclouds.rackspace.functions.ParseAuthenticationResponseFromHeaders; -import org.jclouds.rackspace.reference.RackSpaceHeaders; +import org.jclouds.rackspace.reference.RackspaceHeaders; import org.jclouds.rest.ResponseParser; /** @@ -42,7 +42,7 @@ import org.jclouds.rest.ResponseParser; * @author Adrian Cole */ -public interface RackSpaceAuthentication { +public interface RackspaceAuthentication { public interface AuthenticationResponse { @Storage @@ -61,6 +61,6 @@ public interface RackSpaceAuthentication { @GET @ResponseParser(ParseAuthenticationResponseFromHeaders.class) @Path("/auth") - AuthenticationResponse authenticate(@HeaderParam(RackSpaceHeaders.AUTH_USER) String user, - @HeaderParam(RackSpaceHeaders.AUTH_KEY) String key); + AuthenticationResponse authenticate(@HeaderParam(RackspaceHeaders.AUTH_USER) String user, + @HeaderParam(RackspaceHeaders.AUTH_KEY) String key); } diff --git a/rackspace/core/src/main/java/org/jclouds/rackspace/RackspaceContextBuilder.java b/rackspace/core/src/main/java/org/jclouds/rackspace/RackspaceContextBuilder.java index 108f041b7b..bc52da864f 100755 --- a/rackspace/core/src/main/java/org/jclouds/rackspace/RackspaceContextBuilder.java +++ b/rackspace/core/src/main/java/org/jclouds/rackspace/RackspaceContextBuilder.java @@ -34,8 +34,8 @@ import static org.jclouds.http.pool.PoolConstants.PROPERTY_POOL_MAX_CONNECTIONS; import static org.jclouds.http.pool.PoolConstants.PROPERTY_POOL_MAX_CONNECTION_REUSE; import static org.jclouds.http.pool.PoolConstants.PROPERTY_POOL_MAX_SESSION_FAILURES; import static org.jclouds.http.pool.PoolConstants.PROPERTY_POOL_REQUEST_INVOKER_THREADS; -import static org.jclouds.rackspace.reference.RackSpaceConstants.PROPERTY_RACKSPACE_KEY; -import static org.jclouds.rackspace.reference.RackSpaceConstants.PROPERTY_RACKSPACE_USER; +import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_KEY; +import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_USER; import java.util.List; import java.util.Properties; diff --git a/rackspace/core/src/main/java/org/jclouds/rackspace/config/RackspaceAuthenticationModule.java b/rackspace/core/src/main/java/org/jclouds/rackspace/config/RackspaceAuthenticationModule.java index 50c182af5b..c4005786cc 100755 --- a/rackspace/core/src/main/java/org/jclouds/rackspace/config/RackspaceAuthenticationModule.java +++ b/rackspace/core/src/main/java/org/jclouds/rackspace/config/RackspaceAuthenticationModule.java @@ -1,7 +1,7 @@ package org.jclouds.rackspace.config; -import static org.jclouds.rackspace.reference.RackSpaceConstants.PROPERTY_RACKSPACE_KEY; -import static org.jclouds.rackspace.reference.RackSpaceConstants.PROPERTY_RACKSPACE_USER; +import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_KEY; +import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_USER; import java.net.MalformedURLException; import java.net.URI; @@ -10,10 +10,10 @@ import org.jclouds.http.HttpConstants; import org.jclouds.http.RequiresHttp; import org.jclouds.rackspace.Authentication; import org.jclouds.rackspace.CDN; -import org.jclouds.rackspace.RackSpaceAuthentication; +import org.jclouds.rackspace.RackspaceAuthentication; import org.jclouds.rackspace.Server; import org.jclouds.rackspace.Storage; -import org.jclouds.rackspace.RackSpaceAuthentication.AuthenticationResponse; +import org.jclouds.rackspace.RackspaceAuthentication.AuthenticationResponse; import org.jclouds.rest.RestClientFactory; import org.jclouds.rest.config.JaxrsModule; @@ -43,7 +43,7 @@ public class RackspaceAuthenticationModule extends AbstractModule { @Authentication URI authenticationUri, RestClientFactory factory, @Named(PROPERTY_RACKSPACE_USER) String user, @Named(PROPERTY_RACKSPACE_KEY) String key) { - return factory.create(authenticationUri, RackSpaceAuthentication.class).authenticate(user, + return factory.create(authenticationUri, RackspaceAuthentication.class).authenticate(user, key); } @@ -53,7 +53,7 @@ public class RackspaceAuthenticationModule extends AbstractModule { RestClientFactory factory, @Named(PROPERTY_RACKSPACE_USER) String user, @Named(PROPERTY_RACKSPACE_KEY) String key) { - return factory.create(authenticationUri, RackSpaceAuthentication.class).authenticate(user, + return factory.create(authenticationUri, RackspaceAuthentication.class).authenticate(user, key).getAuthToken(); } diff --git a/rackspace/core/src/main/java/org/jclouds/rackspace/functions/ParseAuthenticationResponseFromHeaders.java b/rackspace/core/src/main/java/org/jclouds/rackspace/functions/ParseAuthenticationResponseFromHeaders.java index 7c0bba2f52..d0d65d3fa3 100755 --- a/rackspace/core/src/main/java/org/jclouds/rackspace/functions/ParseAuthenticationResponseFromHeaders.java +++ b/rackspace/core/src/main/java/org/jclouds/rackspace/functions/ParseAuthenticationResponseFromHeaders.java @@ -24,15 +24,15 @@ package org.jclouds.rackspace.functions; import static com.google.common.base.Preconditions.checkNotNull; -import static org.jclouds.rackspace.reference.RackSpaceHeaders.AUTH_TOKEN; -import static org.jclouds.rackspace.reference.RackSpaceHeaders.CDN_MANAGEMENT_URL; -import static org.jclouds.rackspace.reference.RackSpaceHeaders.SERVER_MANAGEMENT_URL; -import static org.jclouds.rackspace.reference.RackSpaceHeaders.STORAGE_URL; +import static org.jclouds.rackspace.reference.RackspaceHeaders.AUTH_TOKEN; +import static org.jclouds.rackspace.reference.RackspaceHeaders.CDN_MANAGEMENT_URL; +import static org.jclouds.rackspace.reference.RackspaceHeaders.SERVER_MANAGEMENT_URL; +import static org.jclouds.rackspace.reference.RackspaceHeaders.STORAGE_URL; import java.net.URI; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.RackSpaceAuthentication.AuthenticationResponse; +import org.jclouds.rackspace.RackspaceAuthentication.AuthenticationResponse; import com.google.common.base.Function; diff --git a/rackspace/core/src/main/java/org/jclouds/rackspace/reference/RackSpaceConstants.java b/rackspace/core/src/main/java/org/jclouds/rackspace/reference/RackspaceConstants.java similarity index 92% rename from rackspace/core/src/main/java/org/jclouds/rackspace/reference/RackSpaceConstants.java rename to rackspace/core/src/main/java/org/jclouds/rackspace/reference/RackspaceConstants.java index 87c92bc6af..93b7fc06c4 100644 --- a/rackspace/core/src/main/java/org/jclouds/rackspace/reference/RackSpaceConstants.java +++ b/rackspace/core/src/main/java/org/jclouds/rackspace/reference/RackspaceConstants.java @@ -24,11 +24,11 @@ package org.jclouds.rackspace.reference; /** - * Configuration properties and constants used in RackSpace connections. + * Configuration properties and constants used in Rackspace connections. * * @author Adrian Cole */ -public interface RackSpaceConstants { +public interface RackspaceConstants { public static final String PROPERTY_RACKSPACE_USER = "jclouds.rackspace.user"; public static final String PROPERTY_RACKSPACE_KEY = "jclouds.rackspace.key"; } diff --git a/rackspace/core/src/main/java/org/jclouds/rackspace/reference/RackSpaceHeaders.java b/rackspace/core/src/main/java/org/jclouds/rackspace/reference/RackspaceHeaders.java similarity index 94% rename from rackspace/core/src/main/java/org/jclouds/rackspace/reference/RackSpaceHeaders.java rename to rackspace/core/src/main/java/org/jclouds/rackspace/reference/RackspaceHeaders.java index f105c9c3ca..c9608e7dd2 100644 --- a/rackspace/core/src/main/java/org/jclouds/rackspace/reference/RackSpaceHeaders.java +++ b/rackspace/core/src/main/java/org/jclouds/rackspace/reference/RackspaceHeaders.java @@ -7,7 +7,7 @@ package org.jclouds.rackspace.reference; * @author Adrian Cole * */ -public interface RackSpaceHeaders { +public interface RackspaceHeaders { public static final String AUTH_USER = "X-Auth-User"; public static final String AUTH_KEY = "X-Auth-Key"; diff --git a/rackspace/core/src/test/java/org/jclouds/rackspace/RackSpaceAuthenticationLiveTest.java b/rackspace/core/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationLiveTest.java old mode 100755 new mode 100644 similarity index 83% rename from rackspace/core/src/test/java/org/jclouds/rackspace/RackSpaceAuthenticationLiveTest.java rename to rackspace/core/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationLiveTest.java index 89a1347f36..31d18f4fb0 --- a/rackspace/core/src/test/java/org/jclouds/rackspace/RackSpaceAuthenticationLiveTest.java +++ b/rackspace/core/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationLiveTest.java @@ -23,8 +23,8 @@ */ package org.jclouds.rackspace; -import static org.jclouds.rackspace.reference.RackSpaceConstants.PROPERTY_RACKSPACE_KEY; -import static org.jclouds.rackspace.reference.RackSpaceConstants.PROPERTY_RACKSPACE_USER; +import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_KEY; +import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_USER; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.fail; @@ -36,8 +36,8 @@ import org.jclouds.concurrent.WithinThreadExecutorService; import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.http.HttpResponseException; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; -import org.jclouds.rackspace.RackSpaceAuthentication; -import org.jclouds.rackspace.RackSpaceAuthentication.AuthenticationResponse; +import org.jclouds.rackspace.RackspaceAuthentication; +import org.jclouds.rackspace.RackspaceAuthentication.AuthenticationResponse; import org.jclouds.rest.RestClientFactory; import org.jclouds.rest.config.JaxrsModule; import org.testng.annotations.BeforeClass; @@ -54,8 +54,8 @@ import com.google.inject.Singleton; * * @author Adrian Cole */ -@Test(groups = "live", testName = "rackspace.RackSpaceAuthenticationLiveTest") -public class RackSpaceAuthenticationLiveTest { +@Test(groups = "live", testName = "rackspace.RackspaceAuthenticationLiveTest") +public class RackspaceAuthenticationLiveTest { protected static final String sysRackspaceUser = System.getProperty(PROPERTY_RACKSPACE_USER); protected static final String sysRackspaceKey = System.getProperty(PROPERTY_RACKSPACE_KEY); @@ -63,8 +63,8 @@ public class RackSpaceAuthenticationLiveTest { @Test public void testAuthentication() throws Exception { - RackSpaceAuthentication authentication = injector - .getInstance(RackSpaceAuthentication.class); + RackspaceAuthentication authentication = injector + .getInstance(RackspaceAuthentication.class); AuthenticationResponse response = authentication.authenticate(sysRackspaceUser, sysRackspaceKey); assertNotNull(response); @@ -76,8 +76,8 @@ public class RackSpaceAuthenticationLiveTest { @Test(expectedExceptions = HttpResponseException.class) public void testBadAuthentication() throws Exception { - RackSpaceAuthentication authentication = injector - .getInstance(RackSpaceAuthentication.class); + RackspaceAuthentication authentication = injector + .getInstance(RackspaceAuthentication.class); try { authentication.authenticate("foo", "bar"); } catch (UndeclaredThrowableException e) { @@ -98,10 +98,10 @@ public class RackSpaceAuthenticationLiveTest { @SuppressWarnings("unused") @Provides @Singleton - protected RackSpaceAuthentication provideCloudFilesAuthentication( + protected RackspaceAuthentication provideCloudFilesAuthentication( RestClientFactory factory) { return factory.create(URI.create("https://api.mosso.com"), - RackSpaceAuthentication.class); + RackspaceAuthentication.class); } }, new JaxrsModule(), new ExecutorServiceModule(new WithinThreadExecutorService()), new JavaUrlHttpCommandExecutorServiceModule()); diff --git a/rackspace/core/src/test/java/org/jclouds/rackspace/RackSpaceAuthenticationTest.java b/rackspace/core/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationTest.java old mode 100755 new mode 100644 similarity index 87% rename from rackspace/core/src/test/java/org/jclouds/rackspace/RackSpaceAuthenticationTest.java rename to rackspace/core/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationTest.java index 23412b396a..7752dc75e5 --- a/rackspace/core/src/test/java/org/jclouds/rackspace/RackSpaceAuthenticationTest.java +++ b/rackspace/core/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationTest.java @@ -35,7 +35,7 @@ import org.jclouds.http.HttpMethod; import org.jclouds.http.HttpRequest; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.rackspace.functions.ParseAuthenticationResponseFromHeaders; -import org.jclouds.rackspace.reference.RackSpaceHeaders; +import org.jclouds.rackspace.reference.RackspaceHeaders; import org.jclouds.rest.JaxrsAnnotationProcessor; import org.jclouds.rest.config.JaxrsModule; import org.testng.annotations.BeforeClass; @@ -49,26 +49,26 @@ import com.google.inject.Guice; * * @author Adrian Cole */ -@Test(groups = "unit", testName = "rackspace.RackSpaceAuthentication") -public class RackSpaceAuthenticationTest { +@Test(groups = "unit", testName = "rackspace.RackspaceAuthentication") +public class RackspaceAuthenticationTest { JaxrsAnnotationProcessor.Factory factory; public void testAuthenticate() throws SecurityException, NoSuchMethodException { - Method method = RackSpaceAuthentication.class.getMethod("authenticate", String.class, + Method method = RackspaceAuthentication.class.getMethod("authenticate", String.class, String.class); URI endpoint = URI.create("http://localhost"); - HttpRequest httpMethod = factory.create(RackSpaceAuthentication.class).createRequest( + HttpRequest httpMethod = factory.create(RackspaceAuthentication.class).createRequest( endpoint, method, new Object[] { "foo", "bar" }); assertEquals(httpMethod.getEndpoint().getHost(), "localhost"); assertEquals(httpMethod.getEndpoint().getPath(), "/auth"); assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 2); - assertEquals(httpMethod.getHeaders().get(RackSpaceHeaders.AUTH_USER), Collections + assertEquals(httpMethod.getHeaders().get(RackspaceHeaders.AUTH_USER), Collections .singletonList("foo")); - assertEquals(httpMethod.getHeaders().get(RackSpaceHeaders.AUTH_KEY), Collections + assertEquals(httpMethod.getHeaders().get(RackspaceHeaders.AUTH_KEY), Collections .singletonList("bar")); - factory.create(RackSpaceAuthentication.class); + factory.create(RackspaceAuthentication.class); assertEquals(JaxrsAnnotationProcessor.getParserOrThrowException(method), ParseAuthenticationResponseFromHeaders.class);