Browse Source

Polish JSON class scope

Use package scope when possible

Issue gh-3736
pull/4057/head
Rob Winch 9 years ago
parent
commit
6d2003722e
  1. 2
      cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java
  2. 2
      cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java
  3. 2
      cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java
  4. 2
      core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java
  5. 2
      core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java
  6. 2
      core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetMixin.java
  7. 2
      core/src/main/java/org/springframework/security/jackson2/UserDeserializer.java
  8. 2
      core/src/main/java/org/springframework/security/jackson2/UserMixin.java
  9. 2
      core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenDeserializer.java
  10. 2
      core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixin.java
  11. 2
      web/src/main/java/org/springframework/security/web/jackson2/CookieDeserializer.java
  12. 2
      web/src/main/java/org/springframework/security/web/jackson2/CookieMixin.java
  13. 2
      web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java
  14. 2
      web/src/main/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixin.java
  15. 2
      web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java
  16. 2
      web/src/main/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixin.java

2
cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java

@ -43,7 +43,7 @@ import java.util.Map; @@ -43,7 +43,7 @@ import java.util.Map;
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY,
getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE)
@JsonIgnoreProperties(ignoreUnknown = true)
public class AssertionImplMixin {
class AssertionImplMixin {
/**
* Mixin Constructor helps in deserialize {@link org.jasig.cas.client.validation.AssertionImpl}

2
cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java

@ -40,7 +40,7 @@ import java.util.Map; @@ -40,7 +40,7 @@ import java.util.Map;
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
isGetterVisibility = JsonAutoDetect.Visibility.NONE)
@JsonIgnoreProperties(ignoreUnknown = true)
public class AttributePrincipalImplMixin {
class AttributePrincipalImplMixin {
/**
* Mixin Constructor helps in deserialize {@link org.jasig.cas.client.authentication.AttributePrincipalImpl}

2
cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java

@ -49,7 +49,7 @@ import java.util.Collection; @@ -49,7 +49,7 @@ import java.util.Collection;
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, isGetterVisibility = JsonAutoDetect.Visibility.NONE,
getterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.ANY)
@JsonIgnoreProperties(ignoreUnknown = true)
public class CasAuthenticationTokenMixin {
class CasAuthenticationTokenMixin {
/**
* Mixin Constructor helps in deserialize {@link CasAuthenticationToken}

2
core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java

@ -42,7 +42,7 @@ import java.util.Collection; @@ -42,7 +42,7 @@ import java.util.Collection;
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, isGetterVisibility = JsonAutoDetect.Visibility.NONE,
getterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.ANY)
@JsonIgnoreProperties(ignoreUnknown = true)
public class AnonymousAuthenticationTokenMixin {
class AnonymousAuthenticationTokenMixin {
/**
* Constructor used by Jackson to create object of {@link org.springframework.security.authentication.AnonymousAuthenticationToken}.

2
core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java

@ -48,7 +48,7 @@ import java.util.Collection; @@ -48,7 +48,7 @@ import java.util.Collection;
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.ANY)
@JsonIgnoreProperties(ignoreUnknown = true)
public class RememberMeAuthenticationTokenMixin {
class RememberMeAuthenticationTokenMixin {
/**
* Constructor used by Jackson to create

2
core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetMixin.java

@ -36,7 +36,7 @@ import java.util.Set; @@ -36,7 +36,7 @@ import java.util.Set;
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
public class UnmodifiableSetMixin {
class UnmodifiableSetMixin {
/**
* Mixin Constructor

2
core/src/main/java/org/springframework/security/jackson2/UserDeserializer.java

@ -39,7 +39,7 @@ import java.util.Set; @@ -39,7 +39,7 @@ import java.util.Set;
* @see UserMixin
* @since 4.2
*/
public class UserDeserializer extends JsonDeserializer<User> {
class UserDeserializer extends JsonDeserializer<User> {
/**
* This method will create {@link User} object. It will ensure successful object creation even if password key is null in

2
core/src/main/java/org/springframework/security/jackson2/UserMixin.java

@ -45,5 +45,5 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -45,5 +45,5 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
isGetterVisibility = JsonAutoDetect.Visibility.NONE)
@JsonIgnoreProperties(ignoreUnknown = true)
public abstract class UserMixin {
abstract class UserMixin {
}

2
core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenDeserializer.java

@ -43,7 +43,7 @@ import java.util.List; @@ -43,7 +43,7 @@ import java.util.List;
* @see UsernamePasswordAuthenticationTokenMixin
* @since 4.2
*/
public class UsernamePasswordAuthenticationTokenDeserializer extends JsonDeserializer<UsernamePasswordAuthenticationToken> {
class UsernamePasswordAuthenticationTokenDeserializer extends JsonDeserializer<UsernamePasswordAuthenticationToken> {
/**
* This method construct {@link UsernamePasswordAuthenticationToken} object from serialized json.

2
core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixin.java

@ -44,5 +44,5 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -44,5 +44,5 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
isGetterVisibility = JsonAutoDetect.Visibility.NONE)
@JsonDeserialize(using = UsernamePasswordAuthenticationTokenDeserializer.class)
public abstract class UsernamePasswordAuthenticationTokenMixin {
abstract class UsernamePasswordAuthenticationTokenMixin {
}

2
web/src/main/java/org/springframework/security/web/jackson2/CookieDeserializer.java

@ -38,7 +38,7 @@ import java.io.IOException; @@ -38,7 +38,7 @@ import java.io.IOException;
* @see CookieMixin
* @since 4.2
*/
public class CookieDeserializer extends JsonDeserializer<Cookie> {
class CookieDeserializer extends JsonDeserializer<Cookie> {
@Override
public Cookie deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {

2
web/src/main/java/org/springframework/security/web/jackson2/CookieMixin.java

@ -36,5 +36,5 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -36,5 +36,5 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
@JsonDeserialize(using = CookieDeserializer.class)
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, isGetterVisibility = JsonAutoDetect.Visibility.NONE)
public abstract class CookieMixin {
abstract class CookieMixin {
}

2
web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java

@ -37,7 +37,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -37,7 +37,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
@JsonIgnoreProperties(ignoreUnknown = true)
public class DefaultCsrfTokenMixin {
class DefaultCsrfTokenMixin {
/**
* JsonCreator constructor needed by Jackson to create {@link org.springframework.security.web.csrf.DefaultCsrfToken}

2
web/src/main/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixin.java

@ -40,5 +40,5 @@ import org.springframework.security.web.savedrequest.DefaultSavedRequest; @@ -40,5 +40,5 @@ import org.springframework.security.web.savedrequest.DefaultSavedRequest;
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
@JsonDeserialize(builder = DefaultSavedRequest.Builder.class)
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE)
public abstract class DefaultSavedRequestMixin {
abstract class DefaultSavedRequestMixin {
}

2
web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java

@ -36,7 +36,7 @@ import com.fasterxml.jackson.annotation.*; @@ -36,7 +36,7 @@ import com.fasterxml.jackson.annotation.*;
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY,
getterVisibility = JsonAutoDetect.Visibility.NONE)
@JsonIgnoreProperties(ignoreUnknown = true)
public abstract class SavedCookieMixin {
abstract class SavedCookieMixin {
@JsonCreator
public SavedCookieMixin(@JsonProperty("name") String name, @JsonProperty("value") String value,

2
web/src/main/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixin.java

@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.*; @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.*;
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.ANY)
public class WebAuthenticationDetailsMixin {
class WebAuthenticationDetailsMixin {
@JsonCreator
WebAuthenticationDetailsMixin(@JsonProperty("remoteAddress") String remoteAddress,

Loading…
Cancel
Save