From a206f333bbe9382e8462f99d8e56a5b0b15f5835 Mon Sep 17 00:00:00 2001 From: Misagh Moayyed Date: Wed, 27 Jun 2018 00:13:21 -0700 Subject: [PATCH] CLEANUP: Fixes typos, object construction using reflection, Collection use, missing annotations, etc (#1152) * code cleanup * more typos --- .../pac4j/cas/profile/CasProxyProfile.java | 4 ---- .../org/pac4j/cas/client/CasClientTests.java | 2 +- .../cas/client/CasProxyReceptorTests.java | 6 +++--- .../client/PropertiesConfigFactory.java | 1 + .../LdaptiveAuthenticatorBuilder.java | 2 +- .../finder/DefaultCallbackClientFinder.java | 1 + .../finder/DefaultSecurityClientFinder.java | 1 + .../org/pac4j/core/config/ConfigBuilder.java | 2 +- .../pac4j/core/credentials/Credentials.java | 2 ++ .../org/pac4j/core/exception/HttpAction.java | 2 +- .../http/ajax/DefaultAjaxRequestResolver.java | 2 +- .../pac4j/core/redirect/RedirectAction.java | 2 +- .../IsAnonymousAuthorizerTests.java | 2 +- .../IsAuthenticatedAuthorizerTests.java | 2 +- .../IsFullyAuthenticatedAuthorizerTests.java | 3 ++- .../IsRememberedAuthorizerTests.java | 3 ++- .../DefaultAuthorizationCheckerTests.java | 1 + .../org/pac4j/core/store/GuavaStoreTests.java | 1 + .../credentials/extractor/IpExtractor.java | 1 + .../http/client/indirect/FormClientTests.java | 6 +++--- .../extractor/IpExtractorTests.java | 2 +- .../org/pac4j/http/test/tools/WebServer.java | 1 + .../direct/KerberosClientsKerbyTests.java | 4 ++-- .../direct/SpnegoServiceTicketHelper.java | 1 + .../org/pac4j/ldap/test/tools/LdapClient.java | 4 ++-- .../oauth/client/GenericOAuth20Client.java | 2 +- .../oauth/credentials/OAuthCredentials.java | 2 ++ .../FacebookRelationshipStatusConverter.java | 3 ++- .../oauth/client/OAuth20ClientTests.java | 2 +- .../saml/metadata/SAML2MetadataGenerator.java | 4 ++-- .../saml/storage/HttpSessionStorage.java | 20 +++++++++---------- .../saml/util/VelocityEngineFactoryTest.java | 7 ++++--- .../sql/profile/service/DbProfileService.java | 4 ++-- 33 files changed, 57 insertions(+), 45 deletions(-) diff --git a/pac4j-cas/src/main/java/org/pac4j/cas/profile/CasProxyProfile.java b/pac4j-cas/src/main/java/org/pac4j/cas/profile/CasProxyProfile.java index b9df883648..ca8f254147 100644 --- a/pac4j-cas/src/main/java/org/pac4j/cas/profile/CasProxyProfile.java +++ b/pac4j-cas/src/main/java/org/pac4j/cas/profile/CasProxyProfile.java @@ -1,8 +1,6 @@ package org.pac4j.cas.profile; import org.jasig.cas.client.authentication.AttributePrincipal; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** *

This class is the user profile for sites using CAS protocol with proxy capabilities.

@@ -19,8 +17,6 @@ public class CasProxyProfile extends CasProfile { private static final long serialVersionUID = 4956675835922254493L; - protected final Logger logger = LoggerFactory.getLogger(getClass()); - protected AttributePrincipal attributePrincipal = null; /** diff --git a/pac4j-cas/src/test/java/org/pac4j/cas/client/CasClientTests.java b/pac4j-cas/src/test/java/org/pac4j/cas/client/CasClientTests.java index dd84550c7d..6daee4de87 100644 --- a/pac4j-cas/src/test/java/org/pac4j/cas/client/CasClientTests.java +++ b/pac4j-cas/src/test/java/org/pac4j/cas/client/CasClientTests.java @@ -161,7 +161,7 @@ public void testBackLogout() { .addRequestParameter(CasConfiguration.LOGOUT_REQUEST_PARAMETER, LOGOUT_MESSAGE) .setRequestMethod(HTTP_METHOD.POST.name()); TestsHelper.expectException(() -> casClient.getCredentials(context), HttpAction.class, - "Perfoming a 204 HTTP action"); + "Performing a 204 HTTP action"); assertEquals(204, context.getResponseStatus()); } diff --git a/pac4j-cas/src/test/java/org/pac4j/cas/client/CasProxyReceptorTests.java b/pac4j-cas/src/test/java/org/pac4j/cas/client/CasProxyReceptorTests.java index 99133c4060..b8c5aaeeac 100644 --- a/pac4j-cas/src/test/java/org/pac4j/cas/client/CasProxyReceptorTests.java +++ b/pac4j-cas/src/test/java/org/pac4j/cas/client/CasProxyReceptorTests.java @@ -51,7 +51,7 @@ public void testMissingPgtiou() { final MockWebContext context = MockWebContext.create(); TestsHelper.expectException(() -> client.getCredentials(context .addRequestParameter(CasProxyReceptor.PARAM_PROXY_GRANTING_TICKET_IOU, VALUE)), HttpAction.class, - "Perfoming a 200 HTTP action"); + "Performing a 200 HTTP action"); assertEquals(200, context.getResponseStatus()); assertEquals("", context.getResponseContent()); } @@ -64,8 +64,8 @@ public void testOk() { .addRequestParameter(CasProxyReceptor.PARAM_PROXY_GRANTING_TICKET, VALUE) .addRequestParameter(CasProxyReceptor.PARAM_PROXY_GRANTING_TICKET_IOU, VALUE); TestsHelper.expectException(() -> client.getCredentials(context), HttpAction.class, - "Perfoming a 200 HTTP action"); + "Performing a 200 HTTP action"); assertEquals(200, context.getResponseStatus()); - assertTrue(context.getResponseContent().length() > 0); + assertFalse(context.getResponseContent().isEmpty()); } } diff --git a/pac4j-config/src/main/java/org/pac4j/config/client/PropertiesConfigFactory.java b/pac4j-config/src/main/java/org/pac4j/config/client/PropertiesConfigFactory.java index dc4c15adc7..164cb65375 100644 --- a/pac4j-config/src/main/java/org/pac4j/config/client/PropertiesConfigFactory.java +++ b/pac4j-config/src/main/java/org/pac4j/config/client/PropertiesConfigFactory.java @@ -33,6 +33,7 @@ public PropertiesConfigFactory(final String callbackUrl, final Map clients = new ArrayList<>(); diff --git a/pac4j-config/src/main/java/org/pac4j/config/ldaptive/LdaptiveAuthenticatorBuilder.java b/pac4j-config/src/main/java/org/pac4j/config/ldaptive/LdaptiveAuthenticatorBuilder.java index c1134565c5..482e136ffd 100644 --- a/pac4j-config/src/main/java/org/pac4j/config/ldaptive/LdaptiveAuthenticatorBuilder.java +++ b/pac4j-config/src/main/java/org/pac4j/config/ldaptive/LdaptiveAuthenticatorBuilder.java @@ -264,7 +264,7 @@ public static DefaultConnectionFactory newConnectionFactory(final AbstractLdapPr if (l.getProviderClass() != null) { try { final Class clazz = ClassUtils.getClass(l.getProviderClass()); - bindCf.setProvider(Provider.class.cast(clazz.newInstance())); + bindCf.setProvider(Provider.class.cast(clazz.getDeclaredConstructor().newInstance())); } catch (final Exception e) { LOGGER.error(e.getMessage(), e); } diff --git a/pac4j-core/src/main/java/org/pac4j/core/client/finder/DefaultCallbackClientFinder.java b/pac4j-core/src/main/java/org/pac4j/core/client/finder/DefaultCallbackClientFinder.java index 58b2be314f..db01ffb7e7 100644 --- a/pac4j-core/src/main/java/org/pac4j/core/client/finder/DefaultCallbackClientFinder.java +++ b/pac4j-core/src/main/java/org/pac4j/core/client/finder/DefaultCallbackClientFinder.java @@ -24,6 +24,7 @@ public class DefaultCallbackClientFinder implements ClientFinder { public DefaultCallbackClientFinder() {} + @Override public List find(final Clients clients, final WebContext context, final String clientNames) { final List result = new ArrayList<>(); diff --git a/pac4j-core/src/main/java/org/pac4j/core/client/finder/DefaultSecurityClientFinder.java b/pac4j-core/src/main/java/org/pac4j/core/client/finder/DefaultSecurityClientFinder.java index f400c3a591..d4d9bf5235 100644 --- a/pac4j-core/src/main/java/org/pac4j/core/client/finder/DefaultSecurityClientFinder.java +++ b/pac4j-core/src/main/java/org/pac4j/core/client/finder/DefaultSecurityClientFinder.java @@ -26,6 +26,7 @@ public class DefaultSecurityClientFinder implements ClientFinder { private String clientNameParameter = Pac4jConstants.DEFAULT_CLIENT_NAME_PARAMETER; + @Override public List find(final Clients clients, final WebContext context, final String clientNames) { final List result = new ArrayList<>(); diff --git a/pac4j-core/src/main/java/org/pac4j/core/config/ConfigBuilder.java b/pac4j-core/src/main/java/org/pac4j/core/config/ConfigBuilder.java index 8ff464d3ae..869d007f5d 100644 --- a/pac4j-core/src/main/java/org/pac4j/core/config/ConfigBuilder.java +++ b/pac4j-core/src/main/java/org/pac4j/core/config/ConfigBuilder.java @@ -26,7 +26,7 @@ public synchronized static Config build(final String factoryName, final Object.. } else { clazz = (Class) Class.forName(factoryName, true, tccl); } - final ConfigFactory factory = clazz.newInstance(); + final ConfigFactory factory = clazz.getDeclaredConstructor().newInstance(); return factory.build(parameters); } catch (final Exception e) { throw new TechnicalException("Cannot build configuration", e); diff --git a/pac4j-core/src/main/java/org/pac4j/core/credentials/Credentials.java b/pac4j-core/src/main/java/org/pac4j/core/credentials/Credentials.java index b10c8d1572..8d3a0e6129 100644 --- a/pac4j-core/src/main/java/org/pac4j/core/credentials/Credentials.java +++ b/pac4j-core/src/main/java/org/pac4j/core/credentials/Credentials.java @@ -24,7 +24,9 @@ public void setUserProfile(CommonProfile userProfile) { this.userProfile = userProfile; } + @Override public abstract boolean equals(Object o); + @Override public abstract int hashCode(); } diff --git a/pac4j-core/src/main/java/org/pac4j/core/exception/HttpAction.java b/pac4j-core/src/main/java/org/pac4j/core/exception/HttpAction.java index 186c1f0bf7..2c48265f21 100644 --- a/pac4j-core/src/main/java/org/pac4j/core/exception/HttpAction.java +++ b/pac4j-core/src/main/java/org/pac4j/core/exception/HttpAction.java @@ -17,7 +17,7 @@ public class HttpAction extends TechnicalException { protected int code; private HttpAction(final int code) { - super("Perfoming a " + code + " HTTP action"); + super("Performing a " + code + " HTTP action"); this.code = code; } diff --git a/pac4j-core/src/main/java/org/pac4j/core/http/ajax/DefaultAjaxRequestResolver.java b/pac4j-core/src/main/java/org/pac4j/core/http/ajax/DefaultAjaxRequestResolver.java index 3414848252..2742522043 100644 --- a/pac4j-core/src/main/java/org/pac4j/core/http/ajax/DefaultAjaxRequestResolver.java +++ b/pac4j-core/src/main/java/org/pac4j/core/http/ajax/DefaultAjaxRequestResolver.java @@ -32,7 +32,7 @@ public RedirectAction buildAjaxResponse(final String url,final WebContext contex throw HttpAction.unauthorized(context); } - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); buffer.append(""); buffer.append(""); buffer.append(""); diff --git a/pac4j-core/src/main/java/org/pac4j/core/redirect/RedirectAction.java b/pac4j-core/src/main/java/org/pac4j/core/redirect/RedirectAction.java index 6d92e96718..10aa8a51b2 100644 --- a/pac4j-core/src/main/java/org/pac4j/core/redirect/RedirectAction.java +++ b/pac4j-core/src/main/java/org/pac4j/core/redirect/RedirectAction.java @@ -49,7 +49,7 @@ public static RedirectAction success(final String content) { public static RedirectAction post(final String location, final Map data) { RedirectAction action = new RedirectAction(); action.type = RedirectType.SUCCESS; - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); buffer.append("\n"); buffer.append("\n"); buffer.append("
\n"); diff --git a/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsAnonymousAuthorizerTests.java b/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsAnonymousAuthorizerTests.java index 4b7dad8b1f..75dac0c84d 100644 --- a/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsAnonymousAuthorizerTests.java +++ b/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsAnonymousAuthorizerTests.java @@ -68,6 +68,6 @@ public void testCommonProfileRedirectionUrl() { profiles.add(new CommonProfile()); authorizer.setRedirectionUrl(PAC4J_URL); TestsHelper.expectException(() -> authorizer.isAuthorized(MockWebContext.create(), profiles), HttpAction.class, - "Perfoming a 302 HTTP action"); + "Performing a 302 HTTP action"); } } diff --git a/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsAuthenticatedAuthorizerTests.java b/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsAuthenticatedAuthorizerTests.java index f9d82902c9..95f3fa9326 100644 --- a/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsAuthenticatedAuthorizerTests.java +++ b/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsAuthenticatedAuthorizerTests.java @@ -74,6 +74,6 @@ public void testAnonymousProfileRedirectionUrl() { profiles.add(new AnonymousProfile()); ((IsAuthenticatedAuthorizer) authorizer).setRedirectionUrl(PAC4J_URL); TestsHelper.expectException(() -> authorizer.isAuthorized(MockWebContext.create(), profiles), HttpAction.class, - "Perfoming a 302 HTTP action"); + "Performing a 302 HTTP action"); } } diff --git a/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsFullyAuthenticatedAuthorizerTests.java b/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsFullyAuthenticatedAuthorizerTests.java index a5f097e014..06aa75bb7b 100644 --- a/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsFullyAuthenticatedAuthorizerTests.java +++ b/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsFullyAuthenticatedAuthorizerTests.java @@ -16,6 +16,7 @@ */ public final class IsFullyAuthenticatedAuthorizerTests extends IsAuthenticatedAuthorizerTests { + @Override protected Authorizer newAuthorizer() { return new IsFullyAuthenticatedAuthorizer(); } @@ -26,7 +27,7 @@ public void testAnonymousProfileRedirectionUrl() { profiles.add(new AnonymousProfile()); ((IsFullyAuthenticatedAuthorizer) authorizer).setRedirectionUrl(PAC4J_URL); TestsHelper.expectException(() -> authorizer.isAuthorized(MockWebContext.create(), profiles), HttpAction.class, - "Perfoming a 302 HTTP action"); + "Performing a 302 HTTP action"); } @Test diff --git a/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsRememberedAuthorizerTests.java b/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsRememberedAuthorizerTests.java index 09b7afa231..1724748ad6 100644 --- a/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsRememberedAuthorizerTests.java +++ b/pac4j-core/src/test/java/org/pac4j/core/authorization/authorizer/IsRememberedAuthorizerTests.java @@ -16,6 +16,7 @@ */ public final class IsRememberedAuthorizerTests extends IsAuthenticatedAuthorizerTests { + @Override protected Authorizer newAuthorizer() { return new IsRememberedAuthorizer<>(); } @@ -31,7 +32,7 @@ public void testAnonymousProfileRedirectionUrl() { profiles.add(new AnonymousProfile()); ((IsRememberedAuthorizer) authorizer).setRedirectionUrl(PAC4J_URL); TestsHelper.expectException(() -> authorizer.isAuthorized(MockWebContext.create(), profiles), HttpAction.class, - "Perfoming a 302 HTTP action"); + "Performing a 302 HTTP action"); } @Test diff --git a/pac4j-core/src/test/java/org/pac4j/core/authorization/checker/DefaultAuthorizationCheckerTests.java b/pac4j-core/src/test/java/org/pac4j/core/authorization/checker/DefaultAuthorizationCheckerTests.java index fdb5e12a95..733e3ec3b9 100644 --- a/pac4j-core/src/test/java/org/pac4j/core/authorization/checker/DefaultAuthorizationCheckerTests.java +++ b/pac4j-core/src/test/java/org/pac4j/core/authorization/checker/DefaultAuthorizationCheckerTests.java @@ -40,6 +40,7 @@ public void setUp() { } private static class IdAuthorizer implements Authorizer { + @Override public boolean isAuthorized(final WebContext context, final List profiles) { return VALUE.equals(profiles.get(0).getId()); } diff --git a/pac4j-core/src/test/java/org/pac4j/core/store/GuavaStoreTests.java b/pac4j-core/src/test/java/org/pac4j/core/store/GuavaStoreTests.java index 41334366bc..32546acec4 100644 --- a/pac4j-core/src/test/java/org/pac4j/core/store/GuavaStoreTests.java +++ b/pac4j-core/src/test/java/org/pac4j/core/store/GuavaStoreTests.java @@ -14,6 +14,7 @@ */ public final class GuavaStoreTests extends AbstractStoreTests { + @Override protected GuavaStore buildStore() { return new GuavaStore(10, 1000, TimeUnit.MILLISECONDS); } diff --git a/pac4j-http/src/main/java/org/pac4j/http/credentials/extractor/IpExtractor.java b/pac4j-http/src/main/java/org/pac4j/http/credentials/extractor/IpExtractor.java index b064f5f2ba..fcdcef11ac 100644 --- a/pac4j-http/src/main/java/org/pac4j/http/credentials/extractor/IpExtractor.java +++ b/pac4j-http/src/main/java/org/pac4j/http/credentials/extractor/IpExtractor.java @@ -31,6 +31,7 @@ public IpExtractor(String... alternateIpHeaders) { this.alternateIpHeaders = Arrays.asList(alternateIpHeaders); } + @Override public TokenCredentials extract(WebContext context) { final String ip; if (alternateIpHeaders.isEmpty()) { diff --git a/pac4j-http/src/test/java/org/pac4j/http/client/indirect/FormClientTests.java b/pac4j-http/src/test/java/org/pac4j/http/client/indirect/FormClientTests.java index b4d553ea53..4275210a21 100644 --- a/pac4j-http/src/test/java/org/pac4j/http/client/indirect/FormClientTests.java +++ b/pac4j-http/src/test/java/org/pac4j/http/client/indirect/FormClientTests.java @@ -75,7 +75,7 @@ public void testGetCredentialsMissingUsername() { final MockWebContext context = MockWebContext.create(); TestsHelper.expectException(() -> formClient.getCredentials(context.addRequestParameter(formClient.getUsernameParameter(), USERNAME)), - HttpAction.class, "Perfoming a 302 HTTP action"); + HttpAction.class, "Performing a 302 HTTP action"); assertEquals(302, context.getResponseStatus()); assertEquals(LOGIN_URL + "?" + formClient.getUsernameParameter() + "=" + USERNAME + "&" + FormClient.ERROR_PARAMETER + "=" + FormClient.MISSING_FIELD_ERROR, context.getResponseHeaders() @@ -88,7 +88,7 @@ public void testGetCredentialsMissingPassword() { final MockWebContext context = MockWebContext.create(); TestsHelper.expectException(() -> formClient.getCredentials(context.addRequestParameter(formClient.getPasswordParameter(), PASSWORD)), - HttpAction.class, "Perfoming a 302 HTTP action"); + HttpAction.class, "Performing a 302 HTTP action"); assertEquals(302, context.getResponseStatus()); assertEquals(LOGIN_URL + "?" + formClient.getUsernameParameter() + "=&" + FormClient.ERROR_PARAMETER + "=" + FormClient.MISSING_FIELD_ERROR, context.getResponseHeaders().get(HttpConstants.LOCATION_HEADER)); @@ -100,7 +100,7 @@ public void testGetCredentials() { final MockWebContext context = MockWebContext.create(); TestsHelper.expectException(() -> formClient.getCredentials(context.addRequestParameter(formClient.getUsernameParameter(), USERNAME) .addRequestParameter(formClient.getPasswordParameter(), PASSWORD)), - HttpAction.class, "Perfoming a 302 HTTP action"); + HttpAction.class, "Performing a 302 HTTP action"); assertEquals(302, context.getResponseStatus()); assertEquals(LOGIN_URL + "?" + formClient.getUsernameParameter() + "=" + USERNAME + "&" + FormClient.ERROR_PARAMETER + "=" + CredentialsException.class.getSimpleName(), context diff --git a/pac4j-http/src/test/java/org/pac4j/http/credentials/extractor/IpExtractorTests.java b/pac4j-http/src/test/java/org/pac4j/http/credentials/extractor/IpExtractorTests.java index 81f2d1ce53..3321561c3b 100644 --- a/pac4j-http/src/test/java/org/pac4j/http/credentials/extractor/IpExtractorTests.java +++ b/pac4j-http/src/test/java/org/pac4j/http/credentials/extractor/IpExtractorTests.java @@ -61,7 +61,7 @@ public void testRetrieveIpFromHeaderUsingConstructor() { @Test(expected = TechnicalException.class) public void testSetNullIpHeaderChain() { final IpExtractor ipExtractor = new IpExtractor(); - ipExtractor.setAlternateIpHeaders(null); + ipExtractor.setAlternateIpHeaders((String[]) null); } @Test diff --git a/pac4j-http/src/test/java/org/pac4j/http/test/tools/WebServer.java b/pac4j-http/src/test/java/org/pac4j/http/test/tools/WebServer.java index 6f3153f9fe..9a5749a023 100644 --- a/pac4j-http/src/test/java/org/pac4j/http/test/tools/WebServer.java +++ b/pac4j-http/src/test/java/org/pac4j/http/test/tools/WebServer.java @@ -27,6 +27,7 @@ public WebServer defineResponse(final String key, final ServerResponse response) return this; } + @Override public void start() { try { start(NanoHTTPD.SOCKET_READ_TIMEOUT, false); diff --git a/pac4j-kerberos/src/test/java/org/pac4j/kerberos/client/direct/KerberosClientsKerbyTests.java b/pac4j-kerberos/src/test/java/org/pac4j/kerberos/client/direct/KerberosClientsKerbyTests.java index 64130a13c5..efb00c6297 100644 --- a/pac4j-kerberos/src/test/java/org/pac4j/kerberos/client/direct/KerberosClientsKerbyTests.java +++ b/pac4j-kerberos/src/test/java/org/pac4j/kerberos/client/direct/KerberosClientsKerbyTests.java @@ -107,7 +107,7 @@ public void testDirectIncorrectAuth() { @Test public void testIndirectNoAuth() { // a request without "Authentication: (Negotiate|Kerberos) SomeToken" header - assertGetCredentialsFailsWithAuthRequired(setupIndirectKerberosClient(), MockWebContext.create(),"Perfoming a 401 HTTP action"); + assertGetCredentialsFailsWithAuthRequired(setupIndirectKerberosClient(), MockWebContext.create(),"Performing a 401 HTTP action"); } @Test @@ -115,7 +115,7 @@ public void testIndirectIncorrectAuth() { // a request with an incorrect Kerberos token, yields NULL credentials also final MockWebContext context = MockWebContext.create() .addRequestHeader(HttpConstants.AUTHORIZATION_HEADER, "Negotiate " + "AAAbbAA123"); - assertGetCredentialsFailsWithAuthRequired(setupIndirectKerberosClient(), context, "Perfoming a 401 HTTP action"); + assertGetCredentialsFailsWithAuthRequired(setupIndirectKerberosClient(), context, "Performing a 401 HTTP action"); } @Test diff --git a/pac4j-kerberos/src/test/java/org/pac4j/kerberos/client/direct/SpnegoServiceTicketHelper.java b/pac4j-kerberos/src/test/java/org/pac4j/kerberos/client/direct/SpnegoServiceTicketHelper.java index 263b82b8dc..0793ceed94 100644 --- a/pac4j-kerberos/src/test/java/org/pac4j/kerberos/client/direct/SpnegoServiceTicketHelper.java +++ b/pac4j-kerberos/src/test/java/org/pac4j/kerberos/client/direct/SpnegoServiceTicketHelper.java @@ -39,6 +39,7 @@ public KerberosClientExceptionAction(Principal clientPrincipal, String serviceNa this.serviceName = serviceName; } + @Override public byte[] run() throws GSSException { GSSManager gssManager = GSSManager.getInstance(); diff --git a/pac4j-ldap/src/test/java/org/pac4j/ldap/test/tools/LdapClient.java b/pac4j-ldap/src/test/java/org/pac4j/ldap/test/tools/LdapClient.java index 65e4c3f609..cce1371811 100644 --- a/pac4j-ldap/src/test/java/org/pac4j/ldap/test/tools/LdapClient.java +++ b/pac4j-ldap/src/test/java/org/pac4j/ldap/test/tools/LdapClient.java @@ -28,7 +28,7 @@ public LdapClient() { final ConnectionConfig connectionConfig = new ConnectionConfig(); connectionConfig.setConnectTimeout(Duration.ofMillis(500)); - connectionConfig.setResponseTimeout(Duration.ofMillis(1000)); + connectionConfig.setResponseTimeout(Duration.ofSeconds(1)); connectionConfig.setLdapUrl("ldap://localhost:" + LdapServer.PORT); connectionFactory = new DefaultConnectionFactory(); @@ -47,7 +47,7 @@ public LdapClient() { final BlockingConnectionPool connectionPool = new BlockingConnectionPool(); connectionPool.setPoolConfig(poolConfig); - connectionPool.setBlockWaitTime(Duration.ofMillis(1000)); + connectionPool.setBlockWaitTime(Duration.ofSeconds(1)); connectionPool.setValidator(searchValidator); connectionPool.setPruneStrategy(pruneStrategy); connectionPool.setConnectionFactory((DefaultConnectionFactory) connectionFactory); diff --git a/pac4j-oauth/src/main/java/org/pac4j/oauth/client/GenericOAuth20Client.java b/pac4j-oauth/src/main/java/org/pac4j/oauth/client/GenericOAuth20Client.java index 9a0ead06ba..79d265f27e 100644 --- a/pac4j-oauth/src/main/java/org/pac4j/oauth/client/GenericOAuth20Client.java +++ b/pac4j-oauth/src/main/java/org/pac4j/oauth/client/GenericOAuth20Client.java @@ -100,7 +100,7 @@ private AbstractAttributeConverter getConverter(final String typeName) { Stream acceptableConverters = Arrays.stream(getConverters()) .filter(x -> { try { - AbstractAttributeConverter converter = (AbstractAttributeConverter) x.newInstance(); + AbstractAttributeConverter converter = (AbstractAttributeConverter) x.getDeclaredConstructor().newInstance(); Method accept = AbstractAttributeConverter.class.getDeclaredMethod("accept", String.class); return (Boolean) accept.invoke(converter, typeName); } catch (Exception e) { diff --git a/pac4j-oauth/src/main/java/org/pac4j/oauth/credentials/OAuthCredentials.java b/pac4j-oauth/src/main/java/org/pac4j/oauth/credentials/OAuthCredentials.java index 72ad1bef3c..aab6c8c5a4 100644 --- a/pac4j-oauth/src/main/java/org/pac4j/oauth/credentials/OAuthCredentials.java +++ b/pac4j-oauth/src/main/java/org/pac4j/oauth/credentials/OAuthCredentials.java @@ -12,7 +12,9 @@ public abstract class OAuthCredentials extends Credentials { private static final long serialVersionUID = -7705033802712382951L; + @Override public abstract boolean equals(Object o); + @Override public abstract int hashCode(); } diff --git a/pac4j-oauth/src/main/java/org/pac4j/oauth/profile/facebook/converter/FacebookRelationshipStatusConverter.java b/pac4j-oauth/src/main/java/org/pac4j/oauth/profile/facebook/converter/FacebookRelationshipStatusConverter.java index 95bacab786..cf312c69da 100644 --- a/pac4j-oauth/src/main/java/org/pac4j/oauth/profile/facebook/converter/FacebookRelationshipStatusConverter.java +++ b/pac4j-oauth/src/main/java/org/pac4j/oauth/profile/facebook/converter/FacebookRelationshipStatusConverter.java @@ -10,7 +10,8 @@ * @since 1.0.0 */ public final class FacebookRelationshipStatusConverter implements AttributeConverter { - + + @Override public FacebookRelationshipStatus convert(final Object attribute) { if (attribute != null) { if (attribute instanceof String) { diff --git a/pac4j-oauth/src/test/java/org/pac4j/oauth/client/OAuth20ClientTests.java b/pac4j-oauth/src/test/java/org/pac4j/oauth/client/OAuth20ClientTests.java index fbbbfbb82a..17eecd3093 100644 --- a/pac4j-oauth/src/test/java/org/pac4j/oauth/client/OAuth20ClientTests.java +++ b/pac4j-oauth/src/test/java/org/pac4j/oauth/client/OAuth20ClientTests.java @@ -70,7 +70,7 @@ public void testStateRandom() throws MalformedURLException { public static Map splitQuery(URL url) { Map query_pairs = new LinkedHashMap<>(); String query = url.getQuery(); - String[] pairs = query.split("&"); + String[] pairs = query.split("&", -1); for (String pair : pairs) { int idx = pair.indexOf("="); query_pairs.put(CommonHelper.urlEncode(pair.substring(0, idx)), CommonHelper.urlEncode(pair.substring(idx + 1))); diff --git a/pac4j-saml/src/main/java/org/pac4j/saml/metadata/SAML2MetadataGenerator.java b/pac4j-saml/src/main/java/org/pac4j/saml/metadata/SAML2MetadataGenerator.java index a65143ce3f..9f2e4a42a7 100644 --- a/pac4j-saml/src/main/java/org/pac4j/saml/metadata/SAML2MetadataGenerator.java +++ b/pac4j-saml/src/main/java/org/pac4j/saml/metadata/SAML2MetadataGenerator.java @@ -28,8 +28,8 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Element; +import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedList; /** * Generates metadata object with standard values and overriden user defined values. @@ -221,7 +221,7 @@ protected final Collection buildNameIDFormat() { final SAMLObjectBuilder builder = (SAMLObjectBuilder) this.builderFactory .getBuilder(NameIDFormat.DEFAULT_ELEMENT_NAME); - final Collection formats = new LinkedList(); + final Collection formats = new ArrayList<>(); if (this.nameIdPolicyFormat != null) { final NameIDFormat nameID = builder.buildObject(); diff --git a/pac4j-saml/src/main/java/org/pac4j/saml/storage/HttpSessionStorage.java b/pac4j-saml/src/main/java/org/pac4j/saml/storage/HttpSessionStorage.java index 403b1d23cf..080af77400 100644 --- a/pac4j-saml/src/main/java/org/pac4j/saml/storage/HttpSessionStorage.java +++ b/pac4j-saml/src/main/java/org/pac4j/saml/storage/HttpSessionStorage.java @@ -6,7 +6,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Hashtable; +import java.util.LinkedHashMap; /** * Class implements storage of SAML messages and uses HttpSession as underlying dataStore. As the XMLObjects @@ -33,7 +33,7 @@ public class HttpSessionStorage implements SAMLMessageStorage { /** * Internal storage for messages, corresponding to the object in session. */ - private Hashtable internalMessages; + private LinkedHashMap internalMessages; /** * Session key for storage of the hashtable. @@ -64,7 +64,7 @@ public HttpSessionStorage(final WebContext context) { @Override public void storeMessage(final String messageID, final XMLObject message) { log.debug("Storing message {} to session {}", messageID, context.getSessionStore().getOrCreateSessionId(context)); - final Hashtable messages = getMessages(); + final LinkedHashMap messages = getMessages(); messages.put(messageID, message); updateSession(messages); } @@ -85,7 +85,7 @@ public void storeMessage(final String messageID, final XMLObject message) { */ @Override public XMLObject retrieveMessage(final String messageID) { - final Hashtable messages = getMessages(); + final LinkedHashMap messages = getMessages(); final XMLObject o = messages.get(messageID); if (o == null) { log.debug("Message {} not found in session {}", messageID, context.getSessionStore().getOrCreateSessionId(context)); @@ -105,7 +105,7 @@ public XMLObject retrieveMessage(final String messageID) { * * @return message storage */ - private Hashtable getMessages() { + private LinkedHashMap getMessages() { if (internalMessages == null) { internalMessages = initializeSession(); } @@ -119,14 +119,14 @@ private Hashtable getMessages() { * Method synchronizes on session object to prevent two threads from overwriting each others hashtable. */ @SuppressWarnings("unchecked") - private Hashtable initializeSession() { - Hashtable messages = (Hashtable) + private LinkedHashMap initializeSession() { + LinkedHashMap messages = (LinkedHashMap) context.getSessionStore().get(context, SAML_STORAGE_KEY); if (messages == null) { synchronized (context) { - messages = (Hashtable) context.getSessionStore().get(context, SAML_STORAGE_KEY); + messages = (LinkedHashMap) context.getSessionStore().get(context, SAML_STORAGE_KEY); if (messages == null) { - messages = new Hashtable<>(); + messages = new LinkedHashMap<>(); updateSession(messages); } } @@ -138,7 +138,7 @@ private Hashtable initializeSession() { * Updates session with the internalMessages key. Some application servers require session value to be updated * in order to replicate the session across nodes or persist it correctly. */ - private void updateSession(final Hashtable messages) { + private void updateSession(final LinkedHashMap messages) { context.getSessionStore().set(context, SAML_STORAGE_KEY, messages); } } diff --git a/pac4j-saml/src/test/java/org/pac4j/saml/util/VelocityEngineFactoryTest.java b/pac4j-saml/src/test/java/org/pac4j/saml/util/VelocityEngineFactoryTest.java index e10d48915f..c004bc2359 100644 --- a/pac4j-saml/src/test/java/org/pac4j/saml/util/VelocityEngineFactoryTest.java +++ b/pac4j-saml/src/test/java/org/pac4j/saml/util/VelocityEngineFactoryTest.java @@ -3,8 +3,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import java.util.ArrayList; import java.util.Arrays; -import java.util.Vector; +import java.util.List; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeConstants; @@ -27,7 +28,7 @@ public void defaultProperties() { engine.getProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS)); } - private Vector vector(final String... values) { - return new Vector<>(Arrays.asList(values)); + private static List vector(final String... values) { + return new ArrayList<>(Arrays.asList(values)); } } diff --git a/pac4j-sql/src/main/java/org/pac4j/sql/profile/service/DbProfileService.java b/pac4j-sql/src/main/java/org/pac4j/sql/profile/service/DbProfileService.java index 66183c22b1..34913d1901 100644 --- a/pac4j-sql/src/main/java/org/pac4j/sql/profile/service/DbProfileService.java +++ b/pac4j-sql/src/main/java/org/pac4j/sql/profile/service/DbProfileService.java @@ -77,7 +77,7 @@ protected void insert(final Map attributes) { @Override protected void update(final Map attributes) { - final StringBuffer attributesList = new StringBuffer(); + final StringBuilder attributesList = new StringBuilder(); String id = null; final List values = new ArrayList(); int i = 0; @@ -145,7 +145,7 @@ protected List> query(final String query, final String key, } protected String buildAttributesList(final List names) { - final StringBuffer sb = new StringBuffer(); + final StringBuilder sb = new StringBuilder(); boolean firstOne = true; for (final String name : names) { if (!firstOne) {