CLEANUP: Fixes typos, object construction using reflection, Collectio…

…n use, missing annotations, etc (#1152)

* code cleanup

* more typos

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;
 
 /**
  * <p>This class is the user profile for sites using CAS protocol with proxy capabilities.</p>
@@ -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;
 
     /**

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());
     }
 

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());
     }
 }

pac4j-config/src/main/java/org/pac4j/config/client/PropertiesConfigFactory.java

@@ -33,6 +33,7 @@ public PropertiesConfigFactory(final String callbackUrl, final Map<String, Strin
         this.callbackUrl = callbackUrl;
     }
 
+    @Override
     public Config build(final Object... parameters) {
 
         final List<Client> clients = new ArrayList<>();

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);
             }

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<Client> find(final Clients clients, final WebContext context, final String clientNames) {
 
         final List<Client> result = new ArrayList<>();

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<Client> find(final Clients clients, final WebContext context, final String clientNames) {
         final List<Client> result = new ArrayList<>();
 

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<ConfigFactory>) 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);

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();
 }

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;
     }
 

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("<?xml version='1.0' encoding='UTF-8'?>");
         buffer.append("<partial-response>");
         buffer.append("<redirect url=\"" + url.replaceAll("&", "&amp;") + "\"></redirect>");

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<String, String> data) {
         RedirectAction action = new RedirectAction();
         action.type = RedirectType.SUCCESS;
-        final StringBuffer buffer = new StringBuffer();
+        final StringBuilder buffer = new StringBuilder();
         buffer.append("<html>\n");
         buffer.append("<body>\n");
         buffer.append("<form action=\"" + escapeHtml(location) + "\" name=\"f\" method=\"post\">\n");

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");
     }
 }

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");
     }
 }

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

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

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<CommonProfile> {
+        @Override
         public boolean isAuthorized(final WebContext context, final List<CommonProfile> profiles) {
             return VALUE.equals(profiles.get(0).getId());
         }

pac4j-core/src/test/java/org/pac4j/core/store/GuavaStoreTests.java

@@ -14,6 +14,7 @@
  */
 public final class GuavaStoreTests extends AbstractStoreTests<GuavaStore> {
 
+    @Override
     protected GuavaStore buildStore() {
         return new GuavaStore(10, 1000, TimeUnit.MILLISECONDS);
     }

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()) {

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

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

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);

pac4j-kerberos/src/test/java/org/pac4j/kerberos/client/direct/KerberosClientsKerbyTests.java

@@ -107,15 +107,15 @@ 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
     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

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();
 

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);

pac4j-oauth/src/main/java/org/pac4j/oauth/client/GenericOAuth20Client.java

@@ -100,7 +100,7 @@ private AbstractAttributeConverter getConverter(final String typeName) {
             Stream<Class> 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) {

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();
 }

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<FacebookRelationshipStatus> {
-
+
+    @Override
     public FacebookRelationshipStatus convert(final Object attribute) {
         if (attribute != null) {
             if (attribute instanceof String) {

pac4j-oauth/src/test/java/org/pac4j/oauth/client/OAuth20ClientTests.java

@@ -70,7 +70,7 @@ public void testStateRandom() throws MalformedURLException {
     public static Map<String, String> splitQuery(URL url) {
         Map<String, String> 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)));

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<NameIDFormat> buildNameIDFormat() {
 
         final SAMLObjectBuilder<NameIDFormat> builder = (SAMLObjectBuilder<NameIDFormat>) this.builderFactory
                 .getBuilder(NameIDFormat.DEFAULT_ELEMENT_NAME);
-        final Collection<NameIDFormat> formats = new LinkedList<NameIDFormat>();
+        final Collection<NameIDFormat> formats = new ArrayList<>();
 
         if (this.nameIdPolicyFormat != null) {
             final NameIDFormat nameID = builder.buildObject();