Permalink
Browse files

Resolve package cycles in OAuth2 client

  • Loading branch information...
1 parent 496fc41 commit 2d6640db09f3c3b7612ec3bf08e7ff8ff2b90cc7 @dsyer dsyer committed Nov 7, 2012
Showing with 28 additions and 28 deletions.
  1. +2 −2 ...klr/src/test/java/org/springframework/security/oauth2/provider/TestAuthorizationCodeProvider.java
  2. +1 −1 ...uth2/sparklr/src/test/java/org/springframework/security/oauth2/provider/TestImplicitProvider.java
  3. +1 −1 ...nr/src/test/java/org/springframework/security/oauth/examples/tonr/TestAuthorizationCodeGrant.java
  4. +1 −1 ...nr/src/test/java/org/springframework/security/oauth/examples/tonr/TestClientCredentialsGrant.java
  5. +1 −1 ...h2/tonr/src/test/java/org/springframework/security/oauth/examples/tonr/TestRefreshTokenGrant.java
  6. +1 −1 ...main/java/org/springframework/security/oauth2/client/{context → }/DefaultOAuth2ClientContext.java
  7. +1 −1 ...h2/src/main/java/org/springframework/security/oauth2/client/{context → }/OAuth2ClientContext.java
  8. +1 −1 ...ecurity-oauth2/src/main/java/org/springframework/security/oauth2/client/OAuth2RestOperations.java
  9. +1 −2 ...-security-oauth2/src/main/java/org/springframework/security/oauth2/client/OAuth2RestTemplate.java
  10. +1 −1 ...h2/src/main/java/org/springframework/security/oauth2/client/filter/OAuth2ClientContextFilter.java
  11. +1 −1 .../java/org/springframework/security/oauth2/client/{ → resource}/UserApprovalRequiredException.java
  12. +1 −1 .../java/org/springframework/security/oauth2/client/{ → resource}/UserRedirectRequiredException.java
  13. +2 −2 ...rity-oauth2/src/main/java/org/springframework/security/oauth2/client/test/OAuth2ContextSetup.java
  14. +2 −2 ...ty-oauth2/src/main/java/org/springframework/security/oauth2/client/token/AccessTokenProvider.java
  15. +1 −1 ...uth2/src/main/java/org/springframework/security/oauth2/client/token/AccessTokenProviderChain.java
  16. +1 −1 ...ringframework/security/oauth2/client/token/grant/client/ClientCredentialsAccessTokenProvider.java
  17. +2 −2 ...springframework/security/oauth2/client/token/grant/code/AuthorizationCodeAccessTokenProvider.java
  18. +1 −1 .../org/springframework/security/oauth2/client/token/grant/implicit/ImplicitAccessTokenProvider.java
  19. +1 −1 ...amework/security/oauth2/client/token/grant/password/ResourceOwnerPasswordAccessTokenProvider.java
  20. +1 −1 ...uth2/src/main/java/org/springframework/security/oauth2/config/OAuth2ClientContextFactoryBean.java
  21. +1 −1 ...h2/src/main/java/org/springframework/security/oauth2/config/RestTemplateBeanDefinitionParser.java
  22. +1 −0 ...urity-oauth2/src/test/java/org/springframework/security/oauth2/client/TestOAuth2RestTemplate.java
  23. +1 −1 .../src/test/java/org/springframework/security/oauth2/client/token/TestAccessTokenProviderChain.java
  24. +1 −1 ...ngframework/security/oauth2/client/token/grant/code/TestAuthorizationCodeAccessTokenProvider.java
@@ -29,8 +29,8 @@
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.security.oauth2.client.UserApprovalRequiredException;
-import org.springframework.security.oauth2.client.UserRedirectRequiredException;
+import org.springframework.security.oauth2.client.resource.UserApprovalRequiredException;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.test.BeforeOAuth2Context;
import org.springframework.security.oauth2.client.test.OAuth2ContextConfiguration;
import org.springframework.security.oauth2.client.test.OAuth2ContextSetup;
@@ -10,7 +10,7 @@
import org.junit.Test;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.security.oauth2.client.UserRedirectRequiredException;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.test.BeforeOAuth2Context;
import org.springframework.security.oauth2.client.test.OAuth2ContextConfiguration;
import org.springframework.security.oauth2.client.test.OAuth2ContextSetup;
@@ -13,7 +13,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.security.oauth2.client.OAuth2RestTemplate;
-import org.springframework.security.oauth2.client.UserRedirectRequiredException;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.token.DefaultAccessTokenRequest;
import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeAccessTokenProvider;
import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeResourceDetails;
@@ -6,8 +6,8 @@
import org.junit.Rule;
import org.junit.Test;
+import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
import org.springframework.security.oauth2.client.OAuth2RestTemplate;
-import org.springframework.security.oauth2.client.context.DefaultOAuth2ClientContext;
import org.springframework.security.oauth2.client.token.DefaultAccessTokenRequest;
import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsAccessTokenProvider;
import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsResourceDetails;
@@ -14,8 +14,8 @@
import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.context.SecurityContextImpl;
+import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
import org.springframework.security.oauth2.client.OAuth2RestTemplate;
-import org.springframework.security.oauth2.client.context.DefaultOAuth2ClientContext;
import org.springframework.security.oauth2.client.token.AccessTokenRequest;
import org.springframework.security.oauth2.client.token.DefaultAccessTokenRequest;
import org.springframework.security.oauth2.client.token.grant.password.ResourceOwnerPasswordResourceDetails;
@@ -1,4 +1,4 @@
-package org.springframework.security.oauth2.client.context;
+package org.springframework.security.oauth2.client;
import java.io.Serializable;
import java.util.HashMap;
@@ -10,7 +10,7 @@
* 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.springframework.security.oauth2.client.context;
+package org.springframework.security.oauth2.client;
import org.springframework.security.oauth2.client.token.AccessTokenRequest;
import org.springframework.security.oauth2.common.OAuth2AccessToken;
@@ -13,7 +13,7 @@
package org.springframework.security.oauth2.client;
-import org.springframework.security.oauth2.client.context.OAuth2ClientContext;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.common.OAuth2AccessToken;
import org.springframework.web.client.RestOperations;
@@ -9,12 +9,11 @@
import org.springframework.http.HttpMethod;
import org.springframework.http.client.ClientHttpRequest;
-import org.springframework.security.oauth2.client.context.DefaultOAuth2ClientContext;
-import org.springframework.security.oauth2.client.context.OAuth2ClientContext;
import org.springframework.security.oauth2.client.http.AccessTokenRequiredException;
import org.springframework.security.oauth2.client.http.OAuth2ErrorHandler;
import org.springframework.security.oauth2.client.resource.OAuth2AccessDeniedException;
import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.token.AccessTokenProvider;
import org.springframework.security.oauth2.client.token.AccessTokenProviderChain;
import org.springframework.security.oauth2.client.token.AccessTokenRequest;
@@ -16,10 +16,10 @@
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.InitializingBean;
-import org.springframework.security.oauth2.client.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.http.AccessTokenRequiredException;
import org.springframework.security.oauth2.client.resource.OAuth2AccessDeniedException;
import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.common.DefaultThrowableAnalyzer;
import org.springframework.security.web.DefaultRedirectStrategy;
import org.springframework.security.web.PortResolver;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.security.oauth2.client;
+package org.springframework.security.oauth2.client.resource;
import java.util.List;
import java.util.Map;
@@ -1,4 +1,4 @@
-package org.springframework.security.oauth2.client;
+package org.springframework.security.oauth2.client.resource;
import java.util.Map;
@@ -34,9 +34,9 @@
import org.springframework.core.env.Environment;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
+import org.springframework.security.oauth2.client.OAuth2ClientContext;
import org.springframework.security.oauth2.client.OAuth2RestTemplate;
-import org.springframework.security.oauth2.client.context.DefaultOAuth2ClientContext;
-import org.springframework.security.oauth2.client.context.OAuth2ClientContext;
import org.springframework.security.oauth2.client.resource.OAuth2AccessDeniedException;
import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
import org.springframework.security.oauth2.client.token.AccessTokenProvider;
@@ -16,9 +16,9 @@
package org.springframework.security.oauth2.client.token;
import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.oauth2.client.UserApprovalRequiredException;
-import org.springframework.security.oauth2.client.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.UserApprovalRequiredException;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.common.OAuth2RefreshToken;
import org.springframework.security.oauth2.common.OAuth2AccessToken;
@@ -23,9 +23,9 @@
import org.springframework.security.authentication.InsufficientAuthenticationException;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.oauth2.client.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.resource.OAuth2AccessDeniedException;
import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.common.OAuth2AccessToken;
import org.springframework.security.oauth2.common.OAuth2RefreshToken;
import org.springframework.security.oauth2.common.exceptions.OAuth2Exception;
@@ -5,9 +5,9 @@
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.oauth2.client.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.resource.OAuth2AccessDeniedException;
import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.token.AccessTokenProvider;
import org.springframework.security.oauth2.client.token.AccessTokenRequest;
import org.springframework.security.oauth2.client.token.OAuth2AccessTokenSupport;
@@ -44,12 +44,12 @@
import org.springframework.http.ResponseEntity;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.oauth2.client.UserApprovalRequiredException;
-import org.springframework.security.oauth2.client.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.filter.state.DefaultStateKeyGenerator;
import org.springframework.security.oauth2.client.filter.state.StateKeyGenerator;
import org.springframework.security.oauth2.client.resource.OAuth2AccessDeniedException;
import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.UserApprovalRequiredException;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.token.AccessTokenProvider;
import org.springframework.security.oauth2.client.token.AccessTokenRequest;
import org.springframework.security.oauth2.client.token.OAuth2AccessTokenSupport;
@@ -9,9 +9,9 @@
import org.springframework.http.HttpHeaders;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.oauth2.client.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.resource.OAuth2AccessDeniedException;
import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.token.AccessTokenProvider;
import org.springframework.security.oauth2.client.token.AccessTokenRequest;
import org.springframework.security.oauth2.client.token.DefaultAccessTokenRequest;
@@ -5,9 +5,9 @@
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.oauth2.client.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.resource.OAuth2AccessDeniedException;
import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.token.AccessTokenProvider;
import org.springframework.security.oauth2.client.token.AccessTokenRequest;
import org.springframework.security.oauth2.client.token.OAuth2AccessTokenSupport;
@@ -15,7 +15,7 @@
package org.springframework.security.oauth2.config;
import org.springframework.beans.factory.FactoryBean;
-import org.springframework.security.oauth2.client.context.OAuth2ClientContext;
+import org.springframework.security.oauth2.client.OAuth2ClientContext;
import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsResourceDetails;
@@ -18,8 +18,8 @@
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
import org.springframework.security.oauth2.client.OAuth2RestTemplate;
-import org.springframework.security.oauth2.client.context.DefaultOAuth2ClientContext;
import org.springframework.security.oauth2.client.token.DefaultAccessTokenRequest;
import org.springframework.util.StringUtils;
import org.w3c.dom.Element;
@@ -25,6 +25,7 @@
import org.springframework.security.oauth2.client.http.AccessTokenRequiredException;
import org.springframework.security.oauth2.client.resource.BaseOAuth2ProtectedResourceDetails;
import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.token.AccessTokenProvider;
import org.springframework.security.oauth2.client.token.AccessTokenRequest;
import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken;
@@ -28,9 +28,9 @@
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.oauth2.client.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.resource.BaseOAuth2ProtectedResourceDetails;
import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.common.DefaultExpiringOAuth2RefreshToken;
import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken;
import org.springframework.security.oauth2.common.DefaultOAuth2RefreshToken;
@@ -19,8 +19,8 @@
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.http.HttpHeaders;
-import org.springframework.security.oauth2.client.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
import org.springframework.security.oauth2.client.token.AccessTokenRequest;
import org.springframework.security.oauth2.client.token.DefaultAccessTokenRequest;
import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken;

0 comments on commit 2d6640d

Please sign in to comment.