Discarded unnecessary changes

issue 100577

Author: tomas-sexenian

common/src/main/java/com/genexus/IHttpContext.java

@@ -63,5 +63,5 @@ public interface IHttpContext {
 	boolean isHttpContextNull();
 	boolean isHttpContextWeb();
 
-
+	String getContextPath();
 }

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

@@ -23,8 +23,9 @@ private static InputStream getInputStream(String filePathOrUrl) throws IOExcepti
 
 	private static BufferedImage createBufferedImageFromURI(String filePathOrUrl) throws IOException
 	{
-		if (PrivateUtilities.isValidURL(filePathOrUrl)){
-			try (InputStream is = new URL(filePathOrUrl).openStream();) {
+		if (filePathOrUrl.toLowerCase().startsWith("http://") || filePathOrUrl.toLowerCase().startsWith("https://") ||
+			(com.genexus.ModelContext.getModelContext().getHttpContext().isHttpContextWeb() && filePathOrUrl.startsWith(com.genexus.ModelContext.getModelContext().getHttpContext().getContextPath()))){
+			try (InputStream is = new URL(GXDbFile.pathToUrl( filePathOrUrl, com.genexus.ModelContext.getModelContext().getHttpContext())).openStream();) {
 				return ImageIO.read(is);
 			} catch (IOException | IllegalArgumentException e) {
 				log.error("Failed to read image stream: " + filePathOrUrl);
@@ -40,13 +41,8 @@ private static BufferedImage createBufferedImageFromURI(String filePathOrUrl) th
 		}
 	}
 
-
 	private static GXFile getGXFile(String filePathOrUrl) {
 		String basePath = (com.genexus.ModelContext.getModelContext() != null) ? com.genexus.ModelContext.getModelContext().getHttpContext().getDefaultPath(): "";
-		String environmentName = basePath.substring(basePath.lastIndexOf("\\") + 1);
-		if (filePathOrUrl.substring(1).startsWith(environmentName)) {
-			filePathOrUrl = filePathOrUrl.substring(environmentName.length() + 2);
-		}
 		return new GXFile(basePath, filePathOrUrl, ResourceAccessControlList.Default, GxFileInfoSourceType.Unknown);
 	}
 

java/src/main/java/com/genexus/PrivateUtilities.java

@@ -18,7 +18,6 @@
 import java.io.PushbackInputStream;
 import java.lang.reflect.Field;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Paths;
@@ -626,27 +625,6 @@ public static boolean isAbsoluteFilePath(String path) {
 		}
 	}
 
-
-	/**
-	 * <pre>
-	 * Checks if a string has valid URL syntax and points to a valid resource on the web.
-	 * Null safe.
-	 * </pre>
-	 */
-	public static boolean isValidURL(String urlString) {
-		try {
-			URL url = new URL(urlString);
-			HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-			connection.setRequestMethod("HEAD");
-			int responseCode = connection.getResponseCode();
-			return (responseCode == HttpURLConnection.HTTP_OK);
-		} catch (MalformedURLException e) {
-			return false;
-		} catch (IOException | NullPointerException e) {
-			return false;
-		}
-	}
-
 	public static String addLastPathSeparator(String dir)
 	{
 		return addLastChar(dir, File.separator);

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

@@ -32,9 +32,9 @@ public class GXFile extends AbstractGXFile {
     private boolean ret;
     private boolean isExternal = false;
     private String uploadFileId;
-    
+
     public static ICleanupFile CleanUp;
-    
+
     public GXFile() {
     }
 
@@ -51,7 +51,7 @@ public GXFile(String fileName, boolean isPrivate) {
     public GXFile(String fileName, ResourceAccessControlList fileAcl) {
     		this(fileName, fileAcl, GxFileInfoSourceType.Unknown);
     }
-    
+
     public GXFile(String fileName, ResourceAccessControlList fileAcl, GxFileInfoSourceType sourceType) {
 		this("", fileName, fileAcl, sourceType);
     }
@@ -87,14 +87,9 @@ public GXFile(String baseDirectoryPath, String fileName, ResourceAccessControlLi
 	}
 
 	private void createFileSourceLocal(String baseDirectoryPath, String fileName) {
-		if (PrivateUtilities.isValidURL(fileName)){
-			String absoluteOrRelativePath = Paths.get(baseDirectoryPath, fileName.substring(fileName.lastIndexOf("/") + 1)).toString(); //BaseDirectory could be empty.
-			FileSource = new GXFileInfo(new File(absoluteOrRelativePath));
-		} else {
-			boolean isAbsolutePath = PrivateUtilities.isAbsoluteFilePath(fileName);
-			String absoluteOrRelativePath = (isAbsolutePath) ? fileName : Paths.get(baseDirectoryPath, fileName).toString(); //BaseDirectory could be empty.
-			FileSource = new GXFileInfo(new File(absoluteOrRelativePath));
-		}
+		boolean isAbsolutePath = PrivateUtilities.isAbsoluteFilePath(fileName);
+		String absoluteOrRelativePath = (isAbsolutePath)? fileName : Paths.get(baseDirectoryPath, fileName).toString(); //BaseDirectory could be empty.
+		FileSource = new GXFileInfo(new File(absoluteOrRelativePath));
 	}
 
 	public GXFile(IGXFileInfo fileInfo) {
@@ -126,7 +121,7 @@ public void setFileInfo(IGXFileInfo fileInfo) {
 
     public void setExternal(boolean isExternal) {
     		this.isExternal = isExternal;
-    }	
+    }
 
     public void setSource(String FileName) {
 		boolean isUpload = com.genexus.CommonUtil.isUploadPrefix(FileName);
@@ -187,7 +182,7 @@ public void create() {
     public boolean create(InputStream input) {
     	return create(input, false);
     }
-    
+
     public boolean create(InputStream input, boolean overwrite) {
         resetErrors();
         try {
@@ -466,7 +461,7 @@ public Date getLastModified() {
 		calendar.set(0, 0, 0);
 		return calendar.getTime();
     }
-    
+
     public InputStream getStream() {
         if (sourceSeted()) {
             resetErrors();
@@ -587,7 +582,7 @@ public String toBase64() {
     public Boolean fromBytes(byte[] data) {
         if (FileSource == null) {
 			return false;
-		}		
+		}
 		try {
 			FileSource.fromBytes(data);
 		} catch (IOException e) {