Image API support Local

Author: ggallotti

common/src/main/java/com/genexus/util/GXExternalFileInfo.java

@@ -8,6 +8,7 @@
 import com.genexus.CommonUtil;
 import com.genexus.db.driver.*;
 import com.genexus.common.interfaces.SpecificImplementation;
+import com.genexus.db.driver.ResourceAccessControlList;
 
 import java.util.Date;
 

common/src/main/java/com/genexus/util/GxFileInfoSourceType.java

@@ -0,0 +1,7 @@
+package com.genexus.util;
+
+public enum GxFileInfoSourceType {
+	Unknown,
+	LocalFile,
+	ExternalFile
+}

common/src/main/java/com/genexus/db/driver/ResourceAccessControlList.java renamed to common/src/main/java/com/genexus/util/ResourceAccessControlList.java

@@ -1,5 +1,6 @@
 package com.genexus.gxoffice.poi.sxssf;
 
+import com.genexus.util.GxFileInfoSourceType;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
@@ -28,8 +29,7 @@ public short Open(String fileName) {
 					return errCod;
 				}
 			} else {
-				boolean isAbsolute = new java.io.File(fileName).isAbsolute();
-				GXFile file = new GXFile(fileName, Constants.EXTERNAL_UPLOAD_ACL, isAbsolute);
+				GXFile file = new GXFile("", fileName, Constants.EXTERNAL_UPLOAD_ACL, GxFileInfoSourceType.Unknown);
 				if (file.exists()) {
 					// System.out.println("Opening..");
 					workBook = new SXSSFWorkbook(new XSSFWorkbook(file.getStream()));

gxoffice/src/main/java/com/genexus/gxoffice/poi/sxssf/ExcelDocument.java

@@ -3,6 +3,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
+import com.genexus.util.GxFileInfoSourceType;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -36,8 +37,7 @@ public short Open(String fileName) {
 					return errCod;
 				}
 			} else {
-				boolean isAbsolute = new java.io.File(fileName).isAbsolute();
-				GXFile file = new GXFile(fileName, Constants.EXTERNAL_UPLOAD_ACL, isAbsolute);
+				GXFile file = new GXFile("", fileName, Constants.EXTERNAL_UPLOAD_ACL, GxFileInfoSourceType.Unknown);
 				if (file.exists()) {
 					// System.out.println("Opening..");
 					workBook = new XSSFWorkbook(file.getStream());

gxoffice/src/main/java/com/genexus/gxoffice/poi/xssf/ExcelDocument.java

@@ -7,6 +7,8 @@
 import java.awt.image.BufferedImage;
 import java.io.*;
 
+import com.genexus.db.driver.ResourceAccessControlList;
+import com.genexus.util.GxFileInfoSourceType;
 import com.genexus.util.GXFile;
 import org.apache.logging.log4j.Logger;
 
@@ -15,7 +17,12 @@ public class GxImageUtil {
 	private static int INVALID_CODE = -1;
 
 	private static InputStream getInputStream(String imageFile) throws IOException {
-		return new GXFile(imageFile.replace("/", File.separator)).getStream();
+		return getGXFile(imageFile).getStream();
+	}
+
+	private static GXFile getGXFile(String imageFile) {
+		String basePath = (com.genexus.ModelContext.getModelContext() != null) ? com.genexus.ModelContext.getModelContext().getHttpContext().getDefaultPath(): "";
+		return new GXFile(basePath, imageFile.replace("/", File.separator), ResourceAccessControlList.Default, GxFileInfoSourceType.Unknown);
 	}
 
 	public static long getFileSize(String imageFile){
@@ -78,7 +85,7 @@ private static void writeImage(BufferedImage croppedImage, String destinationFil
 		try (ByteArrayOutputStream outStream = new ByteArrayOutputStream()) {
 			ImageIO.write(croppedImage, CommonUtil.getFileType(destinationFilePathOrUrl), outStream);
 			try (ByteArrayInputStream inStream = new ByteArrayInputStream(outStream.toByteArray())) {
-				GXFile file = new GXFile(destinationFilePathOrUrl);
+				GXFile file = getGXFile(destinationFilePathOrUrl);
 				file.create(inStream, true);
 				file.close();
 			}

java/src/main/java/com/genexus/GxImageUtil.java

@@ -1,8 +1,9 @@
 package com.genexus.specific.java;
 
 import com.genexus.common.classes.AbstractGXFile;
-import com.genexus.util.GXFile;
 import com.genexus.db.driver.ResourceAccessControlList;
+import com.genexus.util.GXFile;
+import com.genexus.util.GxFileInfoSourceType;
 
 import java.io.File;
 import java.io.IOException;
@@ -47,7 +48,7 @@ public void copyFile(File file, File file2) throws IOException {
 
 	@Override
 	public AbstractGXFile createFile(String file, ResourceAccessControlList acl, boolean local) {
-		return new GXFile(file, acl, local);
+		return new GXFile(file, acl, local ? GxFileInfoSourceType.LocalFile: GxFileInfoSourceType.Unknown);
 	}
 
 }

java/src/main/java/com/genexus/specific/java/FileUtils.java

@@ -46,35 +46,54 @@ public GXFile(String fileName) {
     }
 
     //For compatibility reasons
+	@Deprecated
 	public GXFile(String fileName, boolean isPrivate) {
-		this(fileName, isPrivate ? ResourceAccessControlList.Private: ResourceAccessControlList.Default, false);
+		this(fileName, isPrivate ? ResourceAccessControlList.Private: ResourceAccessControlList.Default, GxFileInfoSourceType.Unknown);
 	}
 
     public GXFile(String fileName, ResourceAccessControlList fileAcl) {
-    		this(fileName, fileAcl, false);
+    		this(fileName, fileAcl, GxFileInfoSourceType.Unknown);
     }
 
-    public GXFile(String fileName, ResourceAccessControlList fileAcl, boolean isLocalFilePath) {
+    public GXFile(String fileName, ResourceAccessControlList fileAcl, GxFileInfoSourceType sourceType) {
+		this("", fileName, fileAcl, sourceType);
+    }
+
+	@Deprecated
+	public GXFile(String fileName, ResourceAccessControlList fileAcl, boolean isLocalFile) {
+		this("", fileName, fileAcl, isLocalFile ? GxFileInfoSourceType.LocalFile: GxFileInfoSourceType.Unknown);
+	}
+
+	public GXFile(String baseDirectoryPath, String fileName, ResourceAccessControlList fileAcl, GxFileInfoSourceType sourceType) {
 		if (com.genexus.CommonUtil.isUploadPrefix(fileName)) {
 			uploadFileId = fileName;
 			fileName = SpecificImplementation.GXutil.getUploadValue(fileName);
 		}
 
-    	ExternalProvider storageProvider = Application.getExternalProvider();
-		isLocalFilePath =  isLocalFilePath || new java.io.File(fileName).isAbsolute();
-        if (!isLocalFilePath && storageProvider != null) {
-            FileSource = new GXExternalFileInfo(fileName, storageProvider, true, fileAcl);
-        } else {
-            FileSource = new GXFileInfo(new File(fileName));
-        }
-    }
+		switch (sourceType) {
+			case LocalFile:
+				FileSource = new GXFileInfo(Paths.get(baseDirectoryPath, fileName).toFile());
+				break;
+			case ExternalFile:
+				FileSource = new GXExternalFileInfo(fileName, Application.getExternalProvider(), true, fileAcl);
+				break;
+			case Unknown:
+				ExternalProvider storageProvider = Application.getExternalProvider();
+				if (!new File(fileName).isAbsolute() && storageProvider != null) {
+					FileSource = new GXExternalFileInfo(fileName, storageProvider, true, fileAcl);
+				} else {
+					FileSource = new GXFileInfo(Paths.get(baseDirectoryPath, fileName).toFile());
+				}
+				break;
+		}
+	}
 
     public GXFile(IGXFileInfo fileInfo) {
         FileSource = fileInfo;
     }
 
     public static String getgxFilename(String fileName) {
-        return new GXFile(fileName, ResourceAccessControlList.Default, true).getNameNoExt();
+        return new GXFile(fileName, ResourceAccessControlList.Default, GxFileInfoSourceType.LocalFile).getNameNoExt();
     }
 
     public static String getgxFileext(String fileName) {
@@ -770,3 +789,5 @@ public void close() {
         }
     }
 }
+
+

java/src/main/java/com/genexus/util/GXFile.java

@@ -48,7 +48,6 @@ private String initialize(String name)
 			e.printStackTrace();
 		}
 
-		System.out.println(copyFileLocation.toString());
 		return copyFileLocation.toString();
 	}