commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1403346 - /commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java
Date Mon, 29 Oct 2012 15:06:48 GMT
Author: ggregory
Date: Mon Oct 29 15:06:48 2012
New Revision: 1403346

URL: http://svn.apache.org/viewvc?rev=1403346&view=rev
Log:
Checkstyle: Method length is 166 lines (max allowed is 150). Refactor large method. Refactor
anon constant.

Modified:
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java?rev=1403346&r1=1403345&r2=1403346&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java
Mon Oct 29 15:06:48 2012
@@ -34,12 +34,9 @@ import org.apache.commons.vfs2.util.User
  */
 public final class FtpsClientFactory
 {
+    private static final char[] ANON_CHAR_ARRAY = "anonymous".toCharArray();
     private static final int SHORT_MONTH_NAME_LEN = 40;
 
-    private FtpsClientFactory()
-    {
-    }
-
     /**
      * Creates a new connection to the server.
      * @param hostname The host name.
@@ -57,81 +54,23 @@ public final class FtpsClientFactory
         // Determine the username and password to use
         if (username == null)
         {
-            username = "anonymous".toCharArray();
+            username = ANON_CHAR_ARRAY;
         }
 
         if (password == null)
         {
-            password = "anonymous".toCharArray();
+            password = ANON_CHAR_ARRAY;
         }
 
         try
         {
 
-            final FTPSClient client;
-
-            if (FtpsFileSystemConfigBuilder.getInstance().getFtpsType(fileSystemOptions)
-                    .equals(FtpsFileSystemConfigBuilder.FTPS_TYPE_EXPLICIT))
-            {
-                client = new FTPSClient();
-            }
-            else if (FtpsFileSystemConfigBuilder.getInstance().getFtpsType(fileSystemOptions)
-                    .equals(FtpsFileSystemConfigBuilder.FTPS_TYPE_IMPLICIT))
-            {
-                client = new FTPSClient(true);
-            }
-            else
-            {
-                throw new FileSystemException("Invalid FTPS type of "
-                        + FtpsFileSystemConfigBuilder.getInstance().getFtpsType(fileSystemOptions)
-                        + " specified. Must be 'implicit' or 'explicit'");
-            }
+            final FTPSClient client = createFTPSClient(fileSystemOptions);
 
             String key = FtpsFileSystemConfigBuilder.getInstance().getEntryParser(fileSystemOptions);
             if (key != null)
             {
-                FTPClientConfig config = new FTPClientConfig(key);
-
-                String serverLanguageCode = FtpsFileSystemConfigBuilder.getInstance().getServerLanguageCode(
-                        fileSystemOptions);
-                if (serverLanguageCode != null)
-                {
-                    config.setServerLanguageCode(serverLanguageCode);
-                }
-                String defaultDateFormat = FtpsFileSystemConfigBuilder.getInstance().getDefaultDateFormat(
-                        fileSystemOptions);
-                if (defaultDateFormat != null)
-                {
-                    config.setDefaultDateFormatStr(defaultDateFormat);
-                }
-                String recentDateFormat = FtpsFileSystemConfigBuilder.getInstance().getRecentDateFormat(
-                        fileSystemOptions);
-                if (recentDateFormat != null)
-                {
-                    config.setRecentDateFormatStr(recentDateFormat);
-                }
-                String serverTimeZoneId = FtpsFileSystemConfigBuilder.getInstance().getServerTimeZoneId(
-                        fileSystemOptions);
-                if (serverTimeZoneId != null)
-                {
-                    config.setServerTimeZoneId(serverTimeZoneId);
-                }
-                String[] shortMonthNames = FtpsFileSystemConfigBuilder.getInstance().getShortMonthNames(
-                        fileSystemOptions);
-                if (shortMonthNames != null)
-                {
-                    StringBuilder shortMonthNamesStr = new StringBuilder(SHORT_MONTH_NAME_LEN);
-                    for (String shortMonthName : shortMonthNames)
-                    {
-                        if (shortMonthNamesStr.length() > 0)
-                        {
-                            shortMonthNamesStr.append("|");
-                        }
-                        shortMonthNamesStr.append(shortMonthName);
-                    }
-                    config.setShortMonthNames(shortMonthNamesStr.toString());
-                }
-
+                FTPClientConfig config = createFTPClientConfig(fileSystemOptions, key);
                 client.configure(config);
             }
 
@@ -215,4 +154,75 @@ public final class FtpsClientFactory
             throw new FileSystemException("vfs.provider.sftp/connect.error", exc, hostname);
         }
     }
+
+    private static FTPClientConfig createFTPClientConfig(FileSystemOptions fileSystemOptions,
String key)
+    {
+        FTPClientConfig config = new FTPClientConfig(key);
+
+        String serverLanguageCode = FtpsFileSystemConfigBuilder.getInstance().getServerLanguageCode(
+                fileSystemOptions);
+        if (serverLanguageCode != null)
+        {
+            config.setServerLanguageCode(serverLanguageCode);
+        }
+        String defaultDateFormat = FtpsFileSystemConfigBuilder.getInstance().getDefaultDateFormat(
+                fileSystemOptions);
+        if (defaultDateFormat != null)
+        {
+            config.setDefaultDateFormatStr(defaultDateFormat);
+        }
+        String recentDateFormat = FtpsFileSystemConfigBuilder.getInstance().getRecentDateFormat(
+                fileSystemOptions);
+        if (recentDateFormat != null)
+        {
+            config.setRecentDateFormatStr(recentDateFormat);
+        }
+        String serverTimeZoneId = FtpsFileSystemConfigBuilder.getInstance().getServerTimeZoneId(
+                fileSystemOptions);
+        if (serverTimeZoneId != null)
+        {
+            config.setServerTimeZoneId(serverTimeZoneId);
+        }
+        String[] shortMonthNames = FtpsFileSystemConfigBuilder.getInstance().getShortMonthNames(
+                fileSystemOptions);
+        if (shortMonthNames != null)
+        {
+            StringBuilder shortMonthNamesStr = new StringBuilder(SHORT_MONTH_NAME_LEN);
+            for (String shortMonthName : shortMonthNames)
+            {
+                if (shortMonthNamesStr.length() > 0)
+                {
+                    shortMonthNamesStr.append("|");
+                }
+                shortMonthNamesStr.append(shortMonthName);
+            }
+            config.setShortMonthNames(shortMonthNamesStr.toString());
+        }
+        return config;
+    }
+
+    private static FTPSClient createFTPSClient(FileSystemOptions fileSystemOptions)
+            throws FileSystemException
+    {
+        if (FtpsFileSystemConfigBuilder.getInstance().getFtpsType(fileSystemOptions)
+                .equals(FtpsFileSystemConfigBuilder.FTPS_TYPE_EXPLICIT))
+        {
+            return new FTPSClient();
+        }
+        else if (FtpsFileSystemConfigBuilder.getInstance().getFtpsType(fileSystemOptions)
+                .equals(FtpsFileSystemConfigBuilder.FTPS_TYPE_IMPLICIT))
+        {
+            return new FTPSClient(true);
+        }
+        else
+        {
+            throw new FileSystemException("Invalid FTPS type of "
+                    + FtpsFileSystemConfigBuilder.getInstance().getFtpsType(fileSystemOptions)
+                    + " specified. Must be 'implicit' or 'explicit'");
+        }
+    }
+
+    private FtpsClientFactory()
+    {
+    }
     }



Mime
View raw message