Repository: nifi Updated Branches: refs/heads/NIFI-655 16608aa85 -> c94d0271d
NIFI-655: - Fixed typo in error message for unrecognized authentication strategy. Signed-off-by: Matt Gilman <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/45b24a4b Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/45b24a4b Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/45b24a4b Branch: refs/heads/NIFI-655 Commit: 45b24a4b6015e14525da0feb93d0a3dbc98180f1 Parents: 16608aa Author: Andy LoPresto <[email protected]> Authored: Tue Nov 17 17:26:39 2015 -0800 Committer: Matt Gilman <[email protected]> Committed: Wed Nov 18 08:30:44 2015 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/nifi/ldap/LdapProvider.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/45b24a4b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java index 3c26d9f..628fc02 100644 --- a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java +++ b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java @@ -58,6 +58,8 @@ public class LdapProvider extends AbstractLdapProvider { // connection time out final String rawConnectTimeout = configurationContext.getProperty("Connect Timeout"); + + // TODO: Refactor to utility method to remove duplicate code if (StringUtils.isNotBlank(rawConnectTimeout)) { try { final Long connectTimeout = FormatUtils.getTimeDuration(rawConnectTimeout, TimeUnit.MILLISECONDS); @@ -89,7 +91,7 @@ public class LdapProvider extends AbstractLdapProvider { try { authenticationStrategy = LdapAuthenticationStrategy.valueOf(rawAuthenticationStrategy); } catch (final IllegalArgumentException iae) { - throw new ProviderCreationException(String.format("Unrecgonized authentication strategy '%s'. Possible values are [%s]", + throw new ProviderCreationException(String.format("Unrecognized authentication strategy '%s'. Possible values are [%s]", rawAuthenticationStrategy, StringUtils.join(LdapAuthenticationStrategy.values(), ", "))); } @@ -142,7 +144,7 @@ public class LdapProvider extends AbstractLdapProvider { sslContext = SslContextFactory.createSslContext(rawKeystore, rawKeystorePassword.toCharArray(), rawKeystoreType, rawTruststore, rawTruststorePassword.toCharArray(), rawTruststoreType, clientAuth, TLS); } catch (final IllegalArgumentException iae) { - throw new ProviderCreationException(String.format("Unrecgonized client auth '%s'", rawClientAuth)); + throw new ProviderCreationException(String.format("Unrecognized client auth '%s'", rawClientAuth)); } } }
