SQOOP-2556: Sqoop2: Declare default constructor private for singleton classes

(Dian Fu via Jarek Jarcec Cecho)

core/src/main/java/org/apache/sqoop/audit/AuditLoggerManager.java

@@ -63,7 +63,7 @@ public static AuditLoggerManager getInstance() {
     return instance;
   }
 
-  public AuditLoggerManager() {
+  private AuditLoggerManager() {
     loggers = new ArrayList<AuditLogger>();
   }
 
@@ -122,10 +122,11 @@ private void initializeLoggers() {
   }
 
   public synchronized void destroy() {
+    loggers = null;
     LOG.trace("Begin audit logger manager destroy");
   }
 
-  public void logAuditEvent(String username,
+  public synchronized void logAuditEvent(String username,
       String ip, String operation, String objectType, String objectId) {
     for (AuditLogger logger : loggers) {
       logger.logAuditEvent(username, ip, operation, objectType, objectId);
@@ -133,7 +134,7 @@ public void logAuditEvent(String username,
   }
 
   @Override
-  public void configurationChanged() {
+  public synchronized void configurationChanged() {
     LOG.info("Begin audit logger manager reconfiguring");
     initializeLoggers();
     LOG.info("Audit logger manager reconfigured");

core/src/main/java/org/apache/sqoop/audit/FileAuditLogger.java

@@ -41,22 +41,10 @@ public class FileAuditLogger extends AuditLogger {
    */
   private Logger logger;
 
-  /**
-   * Configurations for this audit logger
-   */
-  private Map<String, String> config;
-
-  /**
-   * Properties to setup logger
-   */
-  private Properties props;
-
-  public FileAuditLogger() {
-    this.props = new Properties();
-  }
+  public FileAuditLogger() {}
 
   public void initialize() {
-    config = getLoggerConfig();
+    Map<String, String> config = getLoggerConfig();
 
     String outputFile = config.get(FILE);
     if (outputFile == null) {
@@ -66,6 +54,7 @@ public void initialize() {
     // setup logger
     String appender = "log4j.appender." + getLoggerName() + APPENDER_SURFIX;
     LOG.warn("appender: " + appender);
+    Properties props = new Properties();
     props.put(appender, "org.apache.log4j.RollingFileAppender");
     props.put(appender + ".File", outputFile);
     props.put(appender + ".layout", "org.apache.log4j.PatternLayout");

core/src/main/java/org/apache/sqoop/connector/ConnectorManager.java

@@ -67,6 +67,11 @@ public class ConnectorManager implements Reconfigurable {
     instance = new ConnectorManager();
   }
 
+  /**
+   * The private constructor for the singleton class.
+   */
+  private ConnectorManager() {}
+
   /**
    * Return current instance.
    *

core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java

@@ -68,6 +68,11 @@ public class SqoopConfiguration implements Reconfigurable {
     instance = new SqoopConfiguration();
   }
 
+  /**
+   * The private constructor for the singleton class.
+   */
+  private SqoopConfiguration() {}
+
   /**
    * Return current instance.
    *

core/src/main/java/org/apache/sqoop/driver/Driver.java

@@ -110,7 +110,7 @@ public Class getDriverJobConfigurationClass() {
       return JobConfiguration.class;
   }
 
-  public Driver() {
+  private Driver() {
     List<MConfig> driverConfig = ConfigUtils.toConfigs(getDriverJobConfigurationClass());
     mDriver = new MDriver(new MDriverConfig(driverConfig), DriverBean.CURRENT_DRIVER_VERSION);
 

core/src/main/java/org/apache/sqoop/driver/JobManager.java

@@ -72,6 +72,11 @@ public class JobManager implements Reconfigurable {
     instance = new JobManager();
   }
 
+  /**
+   * The private constructor for the singleton class.
+   */
+  private JobManager() {}
+
   /**
    * Return current instance.
    *

core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java

@@ -48,6 +48,11 @@ public class RepositoryManager implements Reconfigurable {
     instance = new RepositoryManager();
   }
 
+  /**
+   * The private constructor for the singleton class.
+   */
+  private RepositoryManager() {}
+
   /**
    * Return current instance.
    *

core/src/main/java/org/apache/sqoop/security/AuthenticationManager.java

@@ -46,7 +46,7 @@ public class AuthenticationManager implements Reconfigurable {
   }
 
   /**
-   * The private constructor for the singleton class,
+   * The private constructor for the singleton class.
    */
   private AuthenticationManager(){}
 

core/src/test/java/org/apache/sqoop/driver/TestJobManager.java

@@ -51,7 +51,7 @@ public class TestJobManager {
 
   @BeforeMethod(alwaysRun = true)
   public void setUp() {
-    jobManager = new JobManager();
+    jobManager = JobManager.getInstance();
     connectorMgrMock = mock(ConnectorManager.class);
     sqoopConnectorMock = mock(SqoopConnector.class);
     ConnectorManager.setInstance(connectorMgrMock);