0.8.6-jvfs4 (2023-01-20)

+ Added db script for daogen jfile mount
+ Added JFileCopyFacade

Author: fugerit79

docgen/parameters.json

@@ -1,7 +1,7 @@
 {
 	"title" : "Jupiter (Fugerit Core A.P.I.)",
 	"name": "Jupiter",
-	"version" : "0.8.6-jvfs3",
+	"version" : "0.8.6-jvfs4",
 	"date" : "20/01/2023",
 	"organization" : {
 		"name" : "Fugerit Org",

docgen/release-notes.txt

@@ -1,6 +1,7 @@
-0.8.6-jvfs3 (2023-01-20)
+0.8.6-jvfs4 (2023-01-20)
 ------------------
-+ Fix in handling of db jvfs for oracle data base
++ Added db script for daogen jfile mount
++ Added JFileCopyFacade
 
 0.8.6-jvfs2 (2023-01-19)
 ------------------

fj-core/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-lib</artifactId>
-		<version>0.8.6-jvfs3</version>
+		<version>0.8.6-jvfs4</version>
 	</parent>
 
 	<name>fj-core</name>

fj-core/src/main/java/org/fugerit/java/core/jvfs/JFileCopyFacade.java

@@ -0,0 +1,70 @@
+package org.fugerit.java.core.jvfs;
+
+import java.io.IOException;
+
+import org.fugerit.java.core.io.StreamIO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JFileCopyFacade {
+
+	private final static Logger logger = LoggerFactory.getLogger( JFileCopyFacade.class );
+	
+	public static int copyFile( JFile from, JFile to ) throws IOException {
+		return copyFile(from, to, false);
+	}
+	
+	public static int copyFile( JFile from, JFile to, boolean recurse ) throws IOException {
+		return copyFile(from, to, recurse, false);
+	}
+	
+	public static int copyFile( JFile from, JFile to, boolean recurse, boolean force ) throws IOException {
+		return copyFile(from, to, recurse, force, false);
+	}
+	
+	public static int copyFileRecurse( JFile from, JFile to ) throws IOException {
+		return copyFile(from, to, true );
+	}
+	
+	public static int copyFileRecurseForce( JFile from, JFile to ) throws IOException {
+		return copyFile(from, to, true, true );
+	}
+	
+	public static int copyFileRecurseForceVerbose( JFile from, JFile to ) throws IOException {
+		return copyFile(from, to, true, true, true );
+	}
+	
+	public static int copyFile( JFile from, JFile to, boolean recurse, boolean force, boolean verbose ) throws IOException {
+		int res = 1;
+		if ( verbose ) {
+			logger.info( "copyFile( recurse:"+recurse+", force:"+force+" ) {} -> {}", from, to );
+		}
+		if ( to.exists() && !force ) {
+			throw new IOException( "You can overwrite existing files only with the 'force' flag" );
+		} else {
+			if ( from.isFile() && to.isFile() )  {
+				StreamIO.pipeStream( from.getInputStream() , to.getOutputStream(), StreamIO.MODE_CLOSE_BOTH );
+			} else  if ( from.isDirectory() && to.isDirectory() )  {
+				if ( recurse ) {
+					to.mkdir();
+					JFile[] list = from.listFiles();
+					for ( int k=0; k<list.length; k++ ) {
+						JFile kidFrom = list[k];
+						JFile kidTo = to.getChild( kidFrom.getName() );
+						res+= copyFile( kidFrom, kidTo, recurse, force, verbose);
+					}
+				} else {
+					throw new IOException( "Directories can only be copied recursively, from:("+from+") to:("+to+")" );
+				}
+			} else {
+				if ( verbose ) {
+					logger.warn( "from {} -> isDirectory:{}", from, from.isDirectory() );
+					logger.warn( "to {} -> isDirectory:{}", to, to.isDirectory() );
+				}
+				throw new IOException( "You can only copy a two files or two directories, from:("+from+") to:("+to+")" );
+			}
+		}
+		return res;
+	}
+	
+}

fj-core/src/main/java/org/fugerit/java/core/jvfs/file/RealJFile.java

@@ -7,6 +7,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.fugerit.java.core.cfg.ConfigRuntimeException;
 import org.fugerit.java.core.jvfs.JFile;
 import org.fugerit.java.core.jvfs.JVFS;
 import org.fugerit.java.core.jvfs.helpers.AbstractJFile;
@@ -42,7 +43,15 @@ public InputStream getInputStream() throws IOException {
 
     @Override
     public String getName() {
-        return this.file.getName();
+    	String name = this.file.getName();
+    	try {
+			if ( this.isDirectory() && !name.endsWith( SEPARATOR ) ) {
+				name+= SEPARATOR;
+			}
+		} catch (IOException e) {
+			throw new ConfigRuntimeException( e );
+		}
+        return name;
     }
 
     @Override

fj-core/src/test/java/test/org/fugerit/java/core/jvfs/TestJVFSHelper.java

@@ -6,8 +6,8 @@
 import org.fugerit.java.core.db.daogen.BasicDaoResult;
 import org.fugerit.java.core.db.daogen.CloseableDAOContext;
 import org.fugerit.java.core.db.daogen.CloseableDAOContextSC;
-import org.fugerit.java.core.io.StreamIO;
 import org.fugerit.java.core.jvfs.JFile;
+import org.fugerit.java.core.jvfs.JFileCopyFacade;
 import org.fugerit.java.core.jvfs.JVFS;
 import org.fugerit.java.core.jvfs.db.daogen.EntityDbJvfsFileFacade;
 import org.fugerit.java.core.jvfs.db.daogen.ModelDbJvfsFile;
@@ -39,18 +39,7 @@ protected void testJVFSWorker( JVFS jvfs ) {
 
 	private void testCopyRecurse( JVFS to, JFile source ) throws IOException {
 		JFile dest = to.getJFile( source.getPath() );
-		logger.info( "testCopyRecurse() source:{} -> dest:{}", source, dest );
-		if ( source.isDirectory() ) {
-			if ( !dest.exists() ) {
-				dest.mkdir();	
-			}
-			JFile[] list = source.listFiles();
-			for ( int k=0; k<list.length; k++ ) {
-				testCopyRecurse( to , list[k] );
-			}
-		} else {
-			StreamIO.pipeStream( source.getInputStream() , dest.getOutputStream(), StreamIO.MODE_CLOSE_BOTH );
-		}
+		JFileCopyFacade.copyFile( source , dest , true, true, true );
 	}
 
 	private void testReadRecurse( JFile file1, JFile file2 ) throws IOException {

fj-tool/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-lib</artifactId>
-		<version>0.8.6-jvfs3</version>
+		<version>0.8.6-jvfs4</version>
 	</parent>
 
 	<name>fj-tool</name>

pom.xml

@@ -11,7 +11,7 @@
 		<relativePath></relativePath>
 	</parent>
 
-	<version>0.8.6-jvfs3</version>
+	<version>0.8.6-jvfs4</version>
 	<packaging>pom</packaging>
 
 	<name>fj-lib</name>