From 6d2003722e249b9ff4ec8456aff58a1ca87fa0af Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Thu, 1 Sep 2016 14:49:03 -0500 Subject: [PATCH] Polish JSON class scope Use package scope when possible Issue gh-3736 --- .../security/cas/jackson2/AssertionImplMixin.java | 2 +- .../security/cas/jackson2/AttributePrincipalImplMixin.java | 2 +- .../security/cas/jackson2/CasAuthenticationTokenMixin.java | 2 +- .../security/jackson2/AnonymousAuthenticationTokenMixin.java | 2 +- .../security/jackson2/RememberMeAuthenticationTokenMixin.java | 2 +- .../springframework/security/jackson2/UnmodifiableSetMixin.java | 2 +- .../org/springframework/security/jackson2/UserDeserializer.java | 2 +- .../java/org/springframework/security/jackson2/UserMixin.java | 2 +- .../UsernamePasswordAuthenticationTokenDeserializer.java | 2 +- .../jackson2/UsernamePasswordAuthenticationTokenMixin.java | 2 +- .../security/web/jackson2/CookieDeserializer.java | 2 +- .../org/springframework/security/web/jackson2/CookieMixin.java | 2 +- .../security/web/jackson2/DefaultCsrfTokenMixin.java | 2 +- .../security/web/jackson2/DefaultSavedRequestMixin.java | 2 +- .../springframework/security/web/jackson2/SavedCookieMixin.java | 2 +- .../security/web/jackson2/WebAuthenticationDetailsMixin.java | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java b/cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java index 0e3dc552be..069c0bdcd3 100644 --- a/cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java +++ b/cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java @@ -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} diff --git a/cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java b/cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java index f9e71b2a54..9d24e06946 100644 --- a/cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java +++ b/cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java @@ -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} diff --git a/cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java b/cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java index 7e7ae7847a..c6884f049c 100644 --- a/cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java +++ b/cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java @@ -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} diff --git a/core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java b/core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java index c820795824..2ad528dc19 100644 --- a/core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java @@ -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}. diff --git a/core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java b/core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java index 5ea4230895..a9d5acd9d6 100644 --- a/core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java @@ -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 diff --git a/core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetMixin.java b/core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetMixin.java index 3fd3875efd..deb20e107c 100644 --- a/core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetMixin.java @@ -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 diff --git a/core/src/main/java/org/springframework/security/jackson2/UserDeserializer.java b/core/src/main/java/org/springframework/security/jackson2/UserDeserializer.java index 5367fd481e..e0956d0713 100644 --- a/core/src/main/java/org/springframework/security/jackson2/UserDeserializer.java +++ b/core/src/main/java/org/springframework/security/jackson2/UserDeserializer.java @@ -39,7 +39,7 @@ import java.util.Set; * @see UserMixin * @since 4.2 */ -public class UserDeserializer extends JsonDeserializer { +class UserDeserializer extends JsonDeserializer { /** * This method will create {@link User} object. It will ensure successful object creation even if password key is null in diff --git a/core/src/main/java/org/springframework/security/jackson2/UserMixin.java b/core/src/main/java/org/springframework/security/jackson2/UserMixin.java index 3f86ac92a2..3922b10b48 100644 --- a/core/src/main/java/org/springframework/security/jackson2/UserMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/UserMixin.java @@ -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 { } diff --git a/core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenDeserializer.java b/core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenDeserializer.java index 985f605e4f..e47e4c9629 100644 --- a/core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenDeserializer.java +++ b/core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenDeserializer.java @@ -43,7 +43,7 @@ import java.util.List; * @see UsernamePasswordAuthenticationTokenMixin * @since 4.2 */ -public class UsernamePasswordAuthenticationTokenDeserializer extends JsonDeserializer { +class UsernamePasswordAuthenticationTokenDeserializer extends JsonDeserializer { /** * This method construct {@link UsernamePasswordAuthenticationToken} object from serialized json. diff --git a/core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixin.java b/core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixin.java index 9815b68737..8ab154e146 100644 --- a/core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixin.java @@ -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 { } diff --git a/web/src/main/java/org/springframework/security/web/jackson2/CookieDeserializer.java b/web/src/main/java/org/springframework/security/web/jackson2/CookieDeserializer.java index ff6876a61b..9542ebbf4d 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/CookieDeserializer.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/CookieDeserializer.java @@ -38,7 +38,7 @@ import java.io.IOException; * @see CookieMixin * @since 4.2 */ -public class CookieDeserializer extends JsonDeserializer { +class CookieDeserializer extends JsonDeserializer { @Override public Cookie deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { diff --git a/web/src/main/java/org/springframework/security/web/jackson2/CookieMixin.java b/web/src/main/java/org/springframework/security/web/jackson2/CookieMixin.java index 9b5816a646..6e386045bc 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/CookieMixin.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/CookieMixin.java @@ -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 { } diff --git a/web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java b/web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java index 46be5b6670..bc167a3bf9 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java @@ -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} diff --git a/web/src/main/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixin.java b/web/src/main/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixin.java index b896882e20..449a4a09ba 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixin.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixin.java @@ -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 { } diff --git a/web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java b/web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java index a048cb82f2..d8cc287db2 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java @@ -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, diff --git a/web/src/main/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixin.java b/web/src/main/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixin.java index c07918aeab..2f60f9b31d 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixin.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixin.java @@ -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,