File copy operations now preserve the file date by default. An additional copyFile variant enables to disable this feature.

Suggested by: Craig Doremus <craig.at.maine.com> in Bugzilla #27615


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@140542 13f79535-47bb-0310-9956-ffa450edef68

Author: jmaerki

src/java/org/apache/commons/io/FileUtils.java

@@ -78,7 +78,7 @@
  * @author <a href="mailto:jefft@apache.org">Jeff Turner</a>
  * @author Matthew Hawthorne
  * @author <a href="mailto:jeremias@apache.org">Jeremias Maerki</a>
- * @version $Id: FileUtils.java,v 1.28 2004/03/12 21:44:25 jeremias Exp $
+ * @version $Id: FileUtils.java,v 1.29 2004/03/12 22:21:38 jeremias Exp $
  */
 public class FileUtils {
 
@@ -332,6 +332,7 @@ public static URL[] toURLs(File[] files) throws IOException {
      * Copy file from source to destination. If <code>destinationDirectory</code> does not exist, it
      * (and any parent directories) will be created. If a file <code>source</code> in
      * <code>destinationDirectory</code> exists, it will be overwritten.
+     * The copy will have the same file date as the original.
      *
      * @param source An existing <code>File</code> to copy.
      * @param destinationDirectory A directory to copy <code>source</code> into.
@@ -350,13 +351,14 @@ public static void copyFileToDirectory(
             throw new IllegalArgumentException("Destination is not a directory");
         }
 
-        copyFile(source, new File(destinationDirectory, source.getName()));
+        copyFile(source, new File(destinationDirectory, source.getName()), true);
     }
 
     /**
      * Copy file from source to destination. The directories up to 
      * <code>destination</code> will be created if they don't already exist. 
      * <code>destination</code> will be overwritten if it already exists.
+     * The copy will have the same file date as the original.
      *
      * @param source An existing non-directory <code>File</code> to copy 
      * bytes from.
@@ -370,7 +372,31 @@ public static void copyFileToDirectory(
      * (use {@link #copyFileToDirectory}).
      */
     public static void copyFile(File source, File destination)
-        throws IOException {
+                throws IOException {
+        copyFile(source, destination, true);
+    }
+                
+                
+    /**
+     * Copy file from source to destination. The directories up to 
+     * <code>destination</code> will be created if they don't already exist. 
+     * <code>destination</code> will be overwritten if it already exists.
+     *
+     * @param source An existing non-directory <code>File</code> to copy 
+     * bytes from.
+     * @param destination A non-directory <code>File</code> to write bytes to 
+     * (possibly overwriting).
+     * @param preserveFileDate True if the file date of the copy should be the
+     * same as the original.
+     *
+     * @throws IOException if <code>source</code> does not exist, <code>destination</code> cannot be
+     * written to, or an IO error occurs during copying.
+     *
+     * @throws FileNotFoundException if <code>destination</code> is a directory
+     * (use {@link #copyFileToDirectory}).
+     */
+    public static void copyFile(File source, File destination, boolean preserveFileDate)
+                throws IOException {
         //check source exists
         if (!source.exists()) {
             String message = "File " + source + " does not exist";
@@ -410,6 +436,11 @@ public static void copyFile(File source, File destination)
                     + destination;
             throw new IOException(message);
         }
+        
+        if (preserveFileDate) {
+            //file copy should preserve file date
+            destination.setLastModified(source.lastModified());        
+        }
     }
 
     /**

src/test/org/apache/commons/io/FileUtilsTestCase.java

@@ -31,7 +31,7 @@
  *
  * @author Peter Donald
  * @author Matthew Hawthorne
- * @version $Id: FileUtilsTestCase.java,v 1.12 2004/03/12 21:44:47 jeremias Exp $
+ * @version $Id: FileUtilsTestCase.java,v 1.13 2004/03/12 22:22:25 jeremias Exp $
  * @see FileUtils
  */
 public class FileUtilsTestCase extends FileBasedTestCase {
@@ -249,16 +249,41 @@ private void log(Object obj) {
 
     public void testCopyFile1() throws Exception {
         File destination = new File(getTestDirectory(), "copy1.txt");
+        
+        Thread.sleep(200); //This is to slow things down so we can catch if 
+                           //the lastModified date is not ok
+        
         FileUtils.copyFile(testFile1, destination);
         assertTrue("Check Exist", destination.exists());
         assertTrue("Check Full copy", destination.length() == testFile1Size);
+        assertTrue("Check last modified date preserved", 
+            testFile1.lastModified() == destination.lastModified());    
     }
 
     public void testCopyFile2() throws Exception {
         File destination = new File(getTestDirectory(), "copy2.txt");
+        
+        Thread.sleep(200); //This is to slow things down so we can catch if 
+                           //the lastModified date is not ok
+        
         FileUtils.copyFile(testFile1, destination);
         assertTrue("Check Exist", destination.exists());
         assertTrue("Check Full copy", destination.length() == testFile2Size);
+        assertTrue("Check last modified date preserved", 
+            testFile1.lastModified() == destination.lastModified());    
+    }
+
+    public void testCopyFile2WithoutFileDatePreservation() throws Exception {
+        File destination = new File(getTestDirectory(), "copy2.txt");
+        
+        Thread.sleep(200); //This is to slow things down so we can catch if 
+                           //the lastModified date is not ok
+        
+        FileUtils.copyFile(testFile1, destination, false);
+        assertTrue("Check Exist", destination.exists());
+        assertTrue("Check Full copy", destination.length() == testFile2Size);
+        assertTrue("Check last modified date modified", 
+            testFile1.lastModified() != destination.lastModified());    
     }
 
     // forceDelete
@@ -286,19 +311,31 @@ public void testCopyFile1ToDir() throws Exception {
         if (!directory.exists())
             directory.mkdirs();
         File destination = new File(directory, testFile1.getName());
+        
+        Thread.sleep(200); //This is to slow things down so we can catch if 
+                           //the lastModified date is not ok
+        
         FileUtils.copyFileToDirectory(testFile1, directory);
         assertTrue("Check Exist", destination.exists());
         assertTrue("Check Full copy", destination.length() == testFile1Size);
+        assertTrue("Check last modified date preserved", 
+            testFile1.lastModified() == destination.lastModified());    
     }
 
     public void testCopyFile2ToDir() throws Exception {
         File directory = new File(getTestDirectory(), "subdir");
         if (!directory.exists())
             directory.mkdirs();
         File destination = new File(directory, testFile1.getName());
+        
+        Thread.sleep(200); //This is to slow things down so we can catch if 
+                           //the lastModified date is not ok
+        
         FileUtils.copyFileToDirectory(testFile1, directory);
         assertTrue("Check Exist", destination.exists());
         assertTrue("Check Full copy", destination.length() == testFile2Size);
+        assertTrue("Check last modified date preserved", 
+            testFile1.lastModified() == destination.lastModified());    
     }
 
     // forceDelete