Rename ConnectionFactoryConfigurer to ConnectionFactoryConfigurator

References #324

Author: acogoluegnes

src/main/java/com/rabbitmq/client/ConnectionFactory.java

@@ -1065,66 +1065,66 @@ protected AddressResolver createAddressResolver(List<Address> addresses) {
      * @param propertyFileLocation location of the property file to use
      * @throws IOException when something goes wrong reading the file
      * @since 4.4.0
-     * @see ConnectionFactoryConfigurer
+     * @see ConnectionFactoryConfigurator
      */
     public void load(String propertyFileLocation) throws IOException {
-        ConnectionFactoryConfigurer.load(this, propertyFileLocation);
+        ConnectionFactoryConfigurator.load(this, propertyFileLocation);
     }
 
     /**
      * Load settings from a property file.
      * @param propertyFileLocation location of the property file to use
-     * @param prefix prefix used in the property file keys
+     * @param prefix key prefix for the entries in the file
      * @throws IOException when something goes wrong reading the file
      * @since 4.4.0
-     * @see ConnectionFactoryConfigurer
+     * @see ConnectionFactoryConfigurator
      */
     public void load(String propertyFileLocation, String prefix) throws IOException {
-        ConnectionFactoryConfigurer.load(this, propertyFileLocation, prefix);
+        ConnectionFactoryConfigurator.load(this, propertyFileLocation, prefix);
     }
 
     /**
      * Load settings from a {@link Properties} instance.
      * The default prefix for keys is <code>rabbitmq.</code>
      * @param properties source for settings
      * @since 4.4.0
-     * @see ConnectionFactoryConfigurer
+     * @see ConnectionFactoryConfigurator
      */
     public void load(Properties properties) {
-        ConnectionFactoryConfigurer.load(this, properties);
+        ConnectionFactoryConfigurator.load(this, properties);
     }
 
     /**
      * Load settings from a {@link Properties} instance.
      * @param properties source for settings
-     * @param prefix prefix used in keys
+     * @param prefix key prefix for properties entries
      * @since 4.4.0
-     * @see ConnectionFactoryConfigurer
+     * @see ConnectionFactoryConfigurator
      */
     public void load(Properties properties, String prefix) {
-        ConnectionFactoryConfigurer.load(this, (Map) properties, prefix);
+        ConnectionFactoryConfigurator.load(this, (Map) properties, prefix);
     }
 
     /**
      * Load settings from a {@link Map} instance.
      * The default prefix for keys is <code>rabbitmq.</code>
      * @param properties source for settings
      * @since 4.4.0
-     * @see ConnectionFactoryConfigurer
+     * @see ConnectionFactoryConfigurator
      */
     public void load(Map<String, String> properties) {
-        ConnectionFactoryConfigurer.load(this, properties);
+        ConnectionFactoryConfigurator.load(this, properties);
     }
 
     /**
      * Load settings from a {@link Map} instance.
      * @param properties source for settings
-     * @param prefix prefix used in keys
+     * @param prefix key prefix for map entries
      * @since 4.4.0
-     * @see ConnectionFactoryConfigurer
+     * @see ConnectionFactoryConfigurator
      */
     public void load(Map<String, String> properties, String prefix) {
-        ConnectionFactoryConfigurer.load(this, properties, prefix);
+        ConnectionFactoryConfigurator.load(this, properties, prefix);
     }
 
     /**

src/main/java/com/rabbitmq/client/ConnectionFactoryConfigurer.java renamed to src/main/java/com/rabbitmq/client/ConnectionFactoryConfigurator.java

@@ -48,7 +48,7 @@
  * @since 4.4.0
  * @see ConnectionFactory#load(String, String)
  */
-public class ConnectionFactoryConfigurer {
+public class ConnectionFactoryConfigurator {
 
     public static final String DEFAULT_PREFIX = "rabbitmq.";
 
@@ -85,7 +85,7 @@ public static void load(ConnectionFactory cf, String propertyFileLocation, Strin
         if (propertyFileLocation.startsWith("classpath:")) {
             InputStream in = null;
             try {
-                in = ConnectionFactoryConfigurer.class.getResourceAsStream(
+                in = ConnectionFactoryConfigurator.class.getResourceAsStream(
                     propertyFileLocation.substring("classpath:".length())
                 );
                 properties.load(in);

src/test/java/com/rabbitmq/client/test/PropertyFileInitialisationTest.java

@@ -16,7 +16,7 @@
 package com.rabbitmq.client.test;
 
 import com.rabbitmq.client.ConnectionFactory;
-import com.rabbitmq.client.ConnectionFactoryConfigurer;
+import com.rabbitmq.client.ConnectionFactoryConfigurator;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -160,7 +160,7 @@ private Properties getPropertiesWitPrefix(String prefix) throws IOException {
         Properties propertiesCustomPrefix = new Properties();
         for (Map.Entry<Object, Object> entry : properties.entrySet()) {
             propertiesCustomPrefix.put(
-                prefix + entry.getKey().toString().substring(ConnectionFactoryConfigurer.DEFAULT_PREFIX.length()),
+                prefix + entry.getKey().toString().substring(ConnectionFactoryConfigurator.DEFAULT_PREFIX.length()),
                 entry.getValue()
             );
         }