Merging bug 22398 into default

Author: Matthew Sackman

src/com/rabbitmq/client/Connection.java

@@ -41,7 +41,7 @@
  * ConnectionFactory factory = new ConnectionFactory();
  * factory.setHostName(hostName);
  * factory.setVirtualHost(virtualHost);
- * factory.setUsername(userName);
+ * factory.setUsername(username);
  * factory.setPassword(password);
  * Connection conn = factory.newConnection();
  *

src/com/rabbitmq/client/ConnectionFactory.java

@@ -90,7 +90,7 @@ public class ConnectionFactory implements Cloneable {
      */
     public static final String DEFAULT_SSL_PROTOCOL = "SSLv3";
 
-    private String userName               = DEFAULT_USER;
+    private String username               = DEFAULT_USER;
     private String password               = DEFAULT_PASS;
     private String virtualHost            = DEFAULT_VHOST;
     private String host                   = DEFAULT_HOST;
@@ -144,16 +144,16 @@ public void setPort(int port) {
      * Retrieve the user name.
      * @return the AMQP user name to use when connecting to the broker
      */
-    public String getUserName() {
-        return this.userName;
+    public String getUsername() {
+        return this.username;
     }
 
     /**
      * Set the user name.
-     * @param userName the AMQP user name to use when connecting to the broker
+     * @param username the AMQP user name to use when connecting to the broker
      */
-    public void setUsername(String userName) {
-        this.userName = userName;
+    public void setUsername(String username) {
+        this.username = username;
     }
 
     /**

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -57,7 +57,7 @@
  *
  * <pre>
  * AMQConnection conn = new AMQConnection(hostName, portNumber);
- * conn.open(userName, portNumber, virtualHost);
+ * conn.open(username, portNumber, virtualHost);
  * </pre>
  *
  * <pre>
@@ -144,7 +144,7 @@ public void ensureIsOpen()
     /** Hosts retrieved from the connection.open-ok */
     private Address[] _knownHosts;
 
-    private final String _userName, _password, _virtualHost;
+    private final String _username, _password, _virtualHost;
     private final int _requestedChannelMax, _requestedFrameMax, _requestedHeartbeat;
 
     /** {@inheritDoc} */
@@ -188,7 +188,7 @@ public AMQConnection(ConnectionFactory factory,
     {
         checkPreconditions();
 
-        _userName = factory.getUserName();
+        _username = factory.getUsername();
         _password = factory.getPassword();
         _virtualHost = factory.getVirtualHost();
         _requestedChannelMax = factory.getRequestedChannelMax();
@@ -258,7 +258,7 @@ public void start(boolean insist)
             throw AMQChannel.wrap(sse);
         }
 
-        LongString saslResponse = LongStringHelper.asLongString("\0" + _userName +
+        LongString saslResponse = LongStringHelper.asLongString("\0" + _username +
                                                                 "\0" + _password);
         AMQImpl.Connection.StartOk startOk =
             new AMQImpl.Connection.StartOk(buildClientPropertiesTable(),
@@ -716,6 +716,6 @@ public void close(int closeCode,
     }
 
     @Override public String toString() {
-        return "amqp://" + _userName + "@" + getHost() + ":" + getPort() + _virtualHost;
+        return "amqp://" + _username + "@" + getHost() + ":" + getPort() + _virtualHost;
     }
 }