QPID-5878 : Address review comments from [~k-wall]
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1616902 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
index 6f99e53..8d53438 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
@@ -20,11 +20,6 @@
*/
package org.apache.qpid.client.security;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.qpid.util.FileUtils;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
@@ -39,6 +34,11 @@
import java.util.StringTokenizer;
import java.util.TreeMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.util.FileUtils;
+
/**
* CallbackHandlerRegistry is a registry for call back handlers for user authentication and interaction during user
* authentication. It is capable of reading its configuration from a properties file containing call back handler
@@ -75,7 +75,7 @@
/** Ordered collection of mechanisms for which callback handlers exist. */
private Collection<String> _mechanisms;
- private static final Collection<String> MECHS_THAT_NEED_USERPASS = Arrays.asList(new String [] {"PLAIN", "AMQPLAIN", "CRAM-MD5","CRAM-MD5-HASHED"});
+ private static final Collection<String> MECHS_THAT_NEED_USERPASS = Arrays.asList(new String [] {"PLAIN", "AMQPLAIN", "CRAM-MD5","CRAM-MD5-HASHED", "SCRAM-SHA-1", "SCRAM-SHA-256"});
static
{
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
index 8f02ee2..b77fa03 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
@@ -26,11 +26,11 @@
EXTERNAL.1=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
GSSAPI.2=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
-CRAM-MD5-HASHED.3=org.apache.qpid.client.security.UsernameHashedPasswordCallbackHandler
-CRAM-MD5.4=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
-AMQPLAIN.5=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
-PLAIN.6=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
-ANONYMOUS.7=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
-SCRAM-SHA-1.8=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
-SCRAM-SHA-256.9=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
+SCRAM-SHA-256.3=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
+SCRAM-SHA-1.4=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
+CRAM-MD5-HASHED.5=org.apache.qpid.client.security.UsernameHashedPasswordCallbackHandler
+CRAM-MD5.6=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
+PLAIN.7=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
+AMQPLAIN.8=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
+ANONYMOUS.9=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
