Resolve package cycles in OAuth2 client

spring-attic · Nov 7, 2012 · 99aa002 · 99aa002
1 parent 324a3f7
commit 99aa002
Show file tree

Hide file tree

Showing 24 changed files with 28 additions and 28 deletions.
diff --git a/...test/java/org/springframework/security/oauth2/provider/TestAuthorizationCodeProvider.java b/...test/java/org/springframework/security/oauth2/provider/TestAuthorizationCodeProvider.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;

diff --git a/...rklr/src/test/java/org/springframework/security/oauth2/provider/TestImplicitProvider.java b/...rklr/src/test/java/org/springframework/security/oauth2/provider/TestImplicitProvider.java
@@ -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;

diff --git a/...est/java/org/springframework/security/oauth/examples/tonr/TestAuthorizationCodeGrant.java b/...est/java/org/springframework/security/oauth/examples/tonr/TestAuthorizationCodeGrant.java
@@ -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;

diff --git a/...est/java/org/springframework/security/oauth/examples/tonr/TestClientCredentialsGrant.java b/...est/java/org/springframework/security/oauth/examples/tonr/TestClientCredentialsGrant.java
@@ -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;

diff --git a/...src/test/java/org/springframework/security/oauth/examples/tonr/TestRefreshTokenGrant.java b/...src/test/java/org/springframework/security/oauth/examples/tonr/TestRefreshTokenGrant.java
@@ -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;

diff --git a/...t/context/DefaultOAuth2ClientContext.java → ...h2/client/DefaultOAuth2ClientContext.java b/...t/context/DefaultOAuth2ClientContext.java → ...h2/client/DefaultOAuth2ClientContext.java
@@ -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;

diff --git a/...2/client/context/OAuth2ClientContext.java → ...ty/oauth2/client/OAuth2ClientContext.java b/...2/client/context/OAuth2ClientContext.java → ...ty/oauth2/client/OAuth2ClientContext.java
@@ -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;

diff --git a/...oauth2/src/main/java/org/springframework/security/oauth2/client/OAuth2RestOperations.java b/...oauth2/src/main/java/org/springframework/security/oauth2/client/OAuth2RestOperations.java
@@ -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;
 

diff --git a/...y-oauth2/src/main/java/org/springframework/security/oauth2/client/OAuth2RestTemplate.java b/...y-oauth2/src/main/java/org/springframework/security/oauth2/client/OAuth2RestTemplate.java
@@ -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;

diff --git a/...ain/java/org/springframework/security/oauth2/client/filter/OAuth2ClientContextFilter.java b/...ain/java/org/springframework/security/oauth2/client/filter/OAuth2ClientContextFilter.java
@@ -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;

diff --git a/...client/UserApprovalRequiredException.java → ...source/UserApprovalRequiredException.java b/...client/UserApprovalRequiredException.java → ...source/UserApprovalRequiredException.java
@@ -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;

diff --git a/...client/UserRedirectRequiredException.java → ...source/UserRedirectRequiredException.java b/...client/UserRedirectRequiredException.java → ...source/UserRedirectRequiredException.java
@@ -1,4 +1,4 @@
-package org.springframework.security.oauth2.client;
+package org.springframework.security.oauth2.client.resource;
 
 import java.util.Map;
 

diff --git a/...th2/src/main/java/org/springframework/security/oauth2/client/test/OAuth2ContextSetup.java b/...th2/src/main/java/org/springframework/security/oauth2/client/test/OAuth2ContextSetup.java
@@ -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;

diff --git a/...2/src/main/java/org/springframework/security/oauth2/client/token/AccessTokenProvider.java b/...2/src/main/java/org/springframework/security/oauth2/client/token/AccessTokenProvider.java
@@ -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;
 

diff --git a/.../main/java/org/springframework/security/oauth2/client/token/AccessTokenProviderChain.java b/.../main/java/org/springframework/security/oauth2/client/token/AccessTokenProviderChain.java
@@ -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;

diff --git a/...ework/security/oauth2/client/token/grant/client/ClientCredentialsAccessTokenProvider.java b/...ework/security/oauth2/client/token/grant/client/ClientCredentialsAccessTokenProvider.java
@@ -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;

diff --git a/...amework/security/oauth2/client/token/grant/code/AuthorizationCodeAccessTokenProvider.java b/...amework/security/oauth2/client/token/grant/code/AuthorizationCodeAccessTokenProvider.java
@@ -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;

diff --git a/...ingframework/security/oauth2/client/token/grant/implicit/ImplicitAccessTokenProvider.java b/...ingframework/security/oauth2/client/token/grant/implicit/ImplicitAccessTokenProvider.java
@@ -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;

diff --git a/...security/oauth2/client/token/grant/password/ResourceOwnerPasswordAccessTokenProvider.java b/...security/oauth2/client/token/grant/password/ResourceOwnerPasswordAccessTokenProvider.java
@@ -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;

diff --git a/.../main/java/org/springframework/security/oauth2/config/OAuth2ClientContextFactoryBean.java b/.../main/java/org/springframework/security/oauth2/config/OAuth2ClientContextFactoryBean.java
@@ -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;
 

diff --git a/...ain/java/org/springframework/security/oauth2/config/RestTemplateBeanDefinitionParser.java b/...ain/java/org/springframework/security/oauth2/config/RestTemplateBeanDefinitionParser.java
@@ -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;

diff --git a/...uth2/src/test/java/org/springframework/security/oauth2/client/TestOAuth2RestTemplate.java b/...uth2/src/test/java/org/springframework/security/oauth2/client/TestOAuth2RestTemplate.java
@@ -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;

diff --git a/...t/java/org/springframework/security/oauth2/client/token/TestAccessTokenProviderChain.java b/...t/java/org/springframework/security/oauth2/client/token/TestAccessTokenProviderChain.java
@@ -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;

diff --git a/...ork/security/oauth2/client/token/grant/code/TestAuthorizationCodeAccessTokenProvider.java b/...ork/security/oauth2/client/token/grant/code/TestAuthorizationCodeAccessTokenProvider.java
@@ -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;