Skip to content

Commit a38b66a

Browse files
committed
Remove unused code
1 parent 33a7891 commit a38b66a

File tree

6 files changed

+10
-264
lines changed

6 files changed

+10
-264
lines changed

docs/src/docs/asciidoc/examples/src/test/java/sample/test/SpringTestContext.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,6 @@ public SpringTestContext configLocations(String... configLocations) {
9595
return this;
9696
}
9797

98-
// public SpringTestContext context(String configuration) {
99-
// InMemoryXmlWebApplicationContext context = new InMemoryXmlWebApplicationContext(configuration);
100-
// this.context = context;
101-
// return this;
102-
// }
103-
10498
public SpringTestContext mockMvcAfterSpringSecurityOk() {
10599
return addFilter(new OncePerRequestFilter() {
106100
@Override

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationRequestDeserializer.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.fasterxml.jackson.databind.JsonDeserializer;
2424
import com.fasterxml.jackson.databind.JsonNode;
2525
import com.fasterxml.jackson.databind.ObjectMapper;
26-
import com.fasterxml.jackson.databind.util.StdConverter;
2726

2827
import org.springframework.security.oauth2.core.AuthorizationGrantType;
2928
import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
@@ -39,8 +38,6 @@
3938
*/
4039
final class OAuth2AuthorizationRequestDeserializer extends JsonDeserializer<OAuth2AuthorizationRequest> {
4140

42-
private static final StdConverter<JsonNode, AuthorizationGrantType> AUTHORIZATION_GRANT_TYPE_CONVERTER = new StdConverters.AuthorizationGrantTypeConverter();
43-
4441
@Override
4542
public OAuth2AuthorizationRequest deserialize(JsonParser parser, DeserializationContext context)
4643
throws IOException {
@@ -51,8 +48,8 @@ public OAuth2AuthorizationRequest deserialize(JsonParser parser, Deserialization
5148

5249
private OAuth2AuthorizationRequest deserialize(JsonParser parser, ObjectMapper mapper, JsonNode root)
5350
throws JsonParseException {
54-
AuthorizationGrantType authorizationGrantType = AUTHORIZATION_GRANT_TYPE_CONVERTER
55-
.convert(JsonNodeUtils.findObjectNode(root, "authorizationGrantType"));
51+
AuthorizationGrantType authorizationGrantType = convertAuthorizationGrantType(
52+
JsonNodeUtils.findObjectNode(root, "authorizationGrantType"));
5653
Builder builder = getBuilder(parser, authorizationGrantType);
5754
builder.authorizationUri(JsonNodeUtils.findStringValue(root, "authorizationUri"));
5855
builder.clientId(JsonNodeUtils.findStringValue(root, "clientId"));
@@ -71,10 +68,15 @@ private Builder getBuilder(JsonParser parser,
7168
if (AuthorizationGrantType.AUTHORIZATION_CODE.equals(authorizationGrantType)) {
7269
return OAuth2AuthorizationRequest.authorizationCode();
7370
}
74-
if (AuthorizationGrantType.IMPLICIT.equals(authorizationGrantType)) {
75-
return OAuth2AuthorizationRequest.implicit();
76-
}
7771
throw new JsonParseException(parser, "Invalid authorizationGrantType");
7872
}
7973

74+
private static AuthorizationGrantType convertAuthorizationGrantType(JsonNode jsonNode) {
75+
String value = JsonNodeUtils.findStringValue(jsonNode, "value");
76+
if (AuthorizationGrantType.AUTHORIZATION_CODE.getValue().equalsIgnoreCase(value)) {
77+
return AuthorizationGrantType.AUTHORIZATION_CODE;
78+
}
79+
return null;
80+
}
81+
8082
}

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/StdConverters.java

Lines changed: 0 additions & 109 deletions
This file was deleted.

oauth2-authorization-server/src/test/java/org/springframework/security/config/test/SpringTestContext.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor;
2828
import org.springframework.mock.web.MockServletConfig;
2929
import org.springframework.mock.web.MockServletContext;
30-
import org.springframework.security.config.util.InMemoryXmlWebApplicationContext;
3130
import org.springframework.test.context.web.GenericXmlWebContextLoader;
3231
import org.springframework.test.web.servlet.MockMvc;
3332
import org.springframework.test.web.servlet.request.RequestPostProcessor;
@@ -90,12 +89,6 @@ public SpringTestContext configLocations(String... configLocations) {
9089
return this;
9190
}
9291

93-
public SpringTestContext context(String configuration) {
94-
InMemoryXmlWebApplicationContext context = new InMemoryXmlWebApplicationContext(configuration);
95-
this.context = context;
96-
return this;
97-
}
98-
9992
public SpringTestContext mockMvcAfterSpringSecurityOk() {
10093
return addFilter(new OncePerRequestFilter() {
10194
@Override

oauth2-authorization-server/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java

Lines changed: 0 additions & 77 deletions
This file was deleted.

oauth2-authorization-server/src/test/java/org/springframework/security/config/util/InMemoryXmlWebApplicationContext.java

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)