Remove cycle in common util

agjgupta · Apr 19, 2014 · 15dc701 · 15dc701
1 parent d3819e2
commit 15dc701
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.../util/DefaultSecurityContextAccessor.java → ...vider/DefaultSecurityContextAccessor.java b/.../util/DefaultSecurityContextAccessor.java → ...vider/DefaultSecurityContextAccessor.java
@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.security.oauth2.common.util;
+package org.springframework.security.oauth2.provider;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -20,7 +20,6 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.oauth2.provider.OAuth2Authentication;
 
 /**
  * Strategy for accessing useful information about the current security context.

diff --git a/.../common/util/SecurityContextAccessor.java → ...th2/provider/SecurityContextAccessor.java b/.../common/util/SecurityContextAccessor.java → ...th2/provider/SecurityContextAccessor.java
@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.security.oauth2.common.util;
+package org.springframework.security.oauth2.provider;
 
 import java.util.Set;
 

diff --git a/...ava/org/springframework/security/oauth2/provider/request/DefaultOAuth2RequestFactory.java b/...ava/org/springframework/security/oauth2/provider/request/DefaultOAuth2RequestFactory.java
@@ -19,14 +19,14 @@
 
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.oauth2.common.exceptions.InvalidClientException;
-import org.springframework.security.oauth2.common.util.DefaultSecurityContextAccessor;
 import org.springframework.security.oauth2.common.util.OAuth2Utils;
-import org.springframework.security.oauth2.common.util.SecurityContextAccessor;
 import org.springframework.security.oauth2.provider.AuthorizationRequest;
 import org.springframework.security.oauth2.provider.ClientDetails;
 import org.springframework.security.oauth2.provider.ClientDetailsService;
+import org.springframework.security.oauth2.provider.DefaultSecurityContextAccessor;
 import org.springframework.security.oauth2.provider.OAuth2Request;
 import org.springframework.security.oauth2.provider.OAuth2RequestFactory;
+import org.springframework.security.oauth2.provider.SecurityContextAccessor;
 import org.springframework.security.oauth2.provider.TokenRequest;
 
 /**