Browse Source

Polish gh-314

Polish gh-304
pull/318/head
Steve Riesenberg 5 years ago
parent
commit
5e79f21913
  1. 6
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationConsentService.java
  2. 4
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationService.java

6
oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationConsentService.java

@ -139,7 +139,7 @@ public final class JdbcOAuth2AuthorizationConsentService implements OAuth2Author @@ -139,7 +139,7 @@ public final class JdbcOAuth2AuthorizationConsentService implements OAuth2Author
@Override
public void remove(OAuth2AuthorizationConsent authorizationConsent) {
Assert.notNull(authorizationConsent, "authorizationConsent cannot be null");
SqlParameterValue[] parameters = new SqlParameterValue[]{
SqlParameterValue[] parameters = new SqlParameterValue[] {
new SqlParameterValue(Types.VARCHAR, authorizationConsent.getRegisteredClientId()),
new SqlParameterValue(Types.VARCHAR, authorizationConsent.getPrincipalName())
};
@ -152,7 +152,7 @@ public final class JdbcOAuth2AuthorizationConsentService implements OAuth2Author @@ -152,7 +152,7 @@ public final class JdbcOAuth2AuthorizationConsentService implements OAuth2Author
public OAuth2AuthorizationConsent findById(String registeredClientId, String principalName) {
Assert.hasText(registeredClientId, "registeredClientId cannot be empty");
Assert.hasText(principalName, "principalName cannot be empty");
SqlParameterValue[] parameters = new SqlParameterValue[]{
SqlParameterValue[] parameters = new SqlParameterValue[] {
new SqlParameterValue(Types.VARCHAR, registeredClientId),
new SqlParameterValue(Types.VARCHAR, principalName)};
PreparedStatementSetter pss = new ArgumentPreparedStatementSetter(parameters);
@ -209,7 +209,7 @@ public final class JdbcOAuth2AuthorizationConsentService implements OAuth2Author @@ -209,7 +209,7 @@ public final class JdbcOAuth2AuthorizationConsentService implements OAuth2Author
.findById(registeredClientId);
if (registeredClient == null) {
throw new DataRetrievalFailureException(
"The RegisteredClient with id '" + registeredClientId + "' it was not found in the RegisteredClientRepository.");
"The RegisteredClient with id '" + registeredClientId + "' was not found in the RegisteredClientRepository.");
}
String principalName = rs.getString("principal_name");

4
oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationService.java

@ -224,7 +224,7 @@ public final class JdbcOAuth2AuthorizationService implements OAuth2Authorization @@ -224,7 +224,7 @@ public final class JdbcOAuth2AuthorizationService implements OAuth2Authorization
@Override
public void remove(OAuth2Authorization authorization) {
Assert.notNull(authorization, "authorization cannot be null");
SqlParameterValue[] parameters = new SqlParameterValue[]{
SqlParameterValue[] parameters = new SqlParameterValue[] {
new SqlParameterValue(Types.VARCHAR, authorization.getId())
};
PreparedStatementSetter pss = new ArgumentPreparedStatementSetter(parameters);
@ -325,7 +325,7 @@ public final class JdbcOAuth2AuthorizationService implements OAuth2Authorization @@ -325,7 +325,7 @@ public final class JdbcOAuth2AuthorizationService implements OAuth2Authorization
RegisteredClient registeredClient = this.registeredClientRepository.findById(registeredClientId);
if (registeredClient == null) {
throw new DataRetrievalFailureException(
"The RegisteredClient with id '" + registeredClientId + "' it was not found in the RegisteredClientRepository.");
"The RegisteredClient with id '" + registeredClientId + "' was not found in the RegisteredClientRepository.");
}
OAuth2Authorization.Builder builder = OAuth2Authorization.withRegisteredClient(registeredClient);

Loading…
Cancel
Save