Merge branch 'master' into iam-s3v2

Author: iroqueta

.github/workflows/Build.yml

@@ -55,7 +55,7 @@ jobs:
         servers: '[
           { "id": "github-genexuslabs", "username": "genexusbot", "password": "${{ secrets.SECURE_TOKEN }}" },
           { "id": "azure-devops", "username": "genexuslabs", "password": "${env.AZURE_ARTIFACTS_TOKEN}" },
-          { "id": "ossrh", "username": "${env.MAVEN_USERNAME}", "password": "${env.MAVEN_PASSWORD}" },
+          { "id": "central", "username": "${env.MAVEN_USERNAME}", "password": "${env.MAVEN_PASSWORD}" },
           { "id": "gpg.passphrase", "passphrase": "${env.MAVEN_GPG_PASSPHRASE}" }
         ]'
 

README.md

@@ -4,22 +4,22 @@ These are the source of the GeneXus Standard Classes for Java, valid since GeneX
 ## Repo Status
 | Branch | Build | Security
 |---|---|---
-|master |[![](https://github.com/genexuslabs/JavaClasses/workflows/Build/badge.svg)](https://github.com/genexuslabs/JavaClasses/actions?query=workflow%3ABuild+branch%3Amaster)|[![CodeQL](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml)
-|beta   |[![](https://github.com/genexuslabs/JavaClasses/workflows/Build/badge.svg?branch=beta)](https://github.com/genexuslabs/JavaClasses/actions?query=workflow%3ABuild+branch%3Abeta)|[![CodeQL](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml/badge.svg?branch=beta)](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml)
+|master |[![Build](https://github.com/genexuslabs/JavaClasses/actions/workflows/Build.yml/badge.svg)](https://github.com/genexuslabs/JavaClasses/actions/workflows/Build.yml)|[![CodeQL](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml)
+|beta   |[![Build](https://github.com/genexuslabs/JavaClasses/actions/workflows/Build.yml/badge.svg?branch=beta)](https://github.com/genexuslabs/JavaClasses/actions/workflows/Build.yml)|[![CodeQL](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml/badge.svg?branch=beta)](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml)
 
 ## Modules
 
-| Name  | Description
-|---|---
-| common | Classes common to Android and Java
-| gxcryptocommon | Classes common to Android and Java related to Cryptography
-| gxmail | Classes related to mail handling
-| java | Java standard classes,  output is gxclassr.jar
-| wrappercommon | Interfaces to encapsulate Java EE and Jakarta EE support,  output is gxwrappercommon.jar
-| wrapperjavax | Implement the interfaces defined in wrappercommon in Java EE,  output is gxwrapperjavax.jar
-| wrapperjakarta | Implement the interfaces defined in wrappercommon in Jakarta EE,  output is gxwrapperjakarta.jar
-| gxoffice | Formerly Java classes are now separated to be included only when using office. 
-| gxsearch | Formerly in Java classes are now separated to be included only when using search.
+| Name                           | Description
+|--------------------------------|---
+| common                         | Classes common to Android and Java
+| gxcryptocommon                 | Classes common to Android and Java related to Cryptography
+| gxmail                         | Classes related to mail handling
+| java                           | Java standard classes,  output is gxclassr.jar
+| wrappercommon                  | Interfaces to encapsulate Java EE and Jakarta EE support,  output is gxwrappercommon.jar
+| wrapperjavax                   | Implement the interfaces defined in wrappercommon in Java EE,  output is gxwrapperjavax.jar
+| wrapperjakarta                 | Implement the interfaces defined in wrappercommon in Jakarta EE,  output is gxwrapperjakarta.jar
+| gxoffice                       | Formerly Java classes are now separated to be included only when using office. 
+| gxsearch                       | Formerly in Java classes are now separated to be included only when using search.
 | gxandroidpublisher and javapns | They are necessary for when you have Push Notifications in your old implementation. These are projects that should disappear in the short term.
 | android | The standard Android classes. **Note that this is not the full runtime for Android, the full runtime can be created by using the Android Flexible Client project**.
 | gxexternalproviders | Implements service provider for IBM Cloud, Google, Azure, Amazon
@@ -31,6 +31,8 @@ These are the source of the GeneXus Standard Classes for Java, valid since GeneX
 | gxxmlsignature | SecurityAPI's GeneXusXmlSignature module
 | gxftps | SecurityAPI's GeneXusFTPS module
 | gxsftp | SecurityAPI's GeneXusSFTP module
+| gamutils | GAM external object with utilities
+| gamtotp                        | GAM external object for RFC6238 implementation
 
 The dependencies between the projects are specified in each pom.xml within their directory.
 

common/pom.xml

@@ -28,17 +28,17 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.15</version>
+			<version>${commons-codec.version}</version>
 		</dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.17.0</version>
+            <version>3.18.0</version>
         </dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.11.0</version>
+			<version>${commons-io.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>

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

@@ -3490,4 +3490,69 @@ public static String Sanitize(String input, HashMap<Character, Character> whiteL
 		}
 		return sanitizedInput.toString();
 	}
+
+
+	public static boolean isKnownContentType(String type)
+	{
+		if (type != null)
+		{
+			for (int i = 0; i < contentTypes.length; i++)
+			{
+				if (contentTypes[i].length >= 2)
+				{
+					if (type.equalsIgnoreCase(contentTypes[i][1]))
+						return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public static String getContentFromExt( String extension)
+	{
+		if (extension != null)
+		{
+			extension = extension.toLowerCase();
+			for (int i = 0; i < contentTypes.length; i++) {
+				if (contentTypes[i][0].equals(extension.trim()))
+					return contentTypes[i][1];
+			}
+		}
+		return null;
+	}
+
+	private static final String contentTypes[][] = {
+		{"txt"     , "text/plain"},
+		{"rtx"     , "text/richtext"},
+		{"htm"     , "text/html"},
+		{"html" , "text/html"},
+		{"xml"     , "text/xml"},
+		{"aif"    , "audio/x-aiff"},
+		{"au"    , "audio/basic"},
+		{"wav"    , "audio/wav"},
+		{"bmp"    , "image/bmp"},
+		{"gif"    , "image/gif"},
+		{"jpe"    , "image/jpeg"},
+		{"jpeg"    , "image/jpeg"},
+		{"jpg"    , "image/jpeg"},
+		{"jfif"    , "image/pjpeg"},
+		{"tif"    , "image/tiff"},
+		{"tiff"    , "image/tiff"},
+		{"png"    , "image/x-png"},
+		{"3gp"    , "video/3gpp"},
+		{"3g2"    , "video/3gpp2"},
+		{"mpg"    , "video/mpeg"},
+		{"mpeg"    , "video/mpeg"},
+		{"mov"    , "video/quicktime"},
+		{"qt"    , "video/quicktime"},
+		{"avi"    , "video/x-msvideo"},
+		{"exe"    , "application/octet-stream"},
+		{"dll"    , "application/x-msdownload"},
+		{"ps"    , "application/postscript"},
+		{"pdf"    , "application/pdf"},
+		{"svg"    , "image/svg+xml"},
+		{"tgz"    , "application/x-compressed"},
+		{"zip"    , "application/x-zip-compressed"},
+		{"gz"    , "application/x-gzip"}
+	};
 }

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

@@ -99,13 +99,14 @@ public Vector getStruct()
 		return struct;
 	}
 
-	public ArrayList getExternalInstance() {
-		ArrayList list = new ArrayList();
+	@SuppressWarnings("unchecked")
+	public <E> ArrayList<E> getExternalInstance() {
+		ArrayList<E> list = new ArrayList<>();
 		for (T Item : this)
 		{
 			try
 			{
-				list.add(Item.getClass().getMethod("getExternalInstance", new Class[]{}).invoke(Item));
+				list.add((E) Item.getClass().getMethod("getExternalInstance", new Class[]{}).invoke(Item));
 			}
 			catch (Exception e)
 			{
@@ -115,5 +116,25 @@ public ArrayList getExternalInstance() {
 		return list;
 	}
 
+	@SuppressWarnings("unchecked")
+	public void setExternalInstance(ArrayList<?> data)
+	{
+		try {
+			if (elementsType != null) {
+				clear();
+				for (Object item : data) {
+					T obj = elementsType.getConstructor(new Class[]{}).newInstance();
+					obj.getClass().getMethod("setExternalInstance", item.getClass()).invoke(obj, item);
+					super.add(obj);
+					vectorExternal.add(item);
+				}
+			}
+		}
+		catch(Exception ex)
+		{
+			ex.printStackTrace();
+		}
+	}
+
 }
 

common/src/main/java/com/genexus/diagnostics/Log.java

@@ -7,63 +7,60 @@ public class Log {
 	private static ILogger getLogger() {
 		return getLogger("");
 	}
-	
+
 	public static ILogger getMainLogger() {
 		return LogManager.getLogger("com.genexus.logging");
 	}
-		
+
 	private static ILogger getLogger(String topic) {
 		ILogger log;
 		if (topic != null && topic.length() > 0) {
 			log = LogManager.getLogger(topic);
-		}
-		else {
+		} else {
 			log = getMainLogger();
 		}
 		return log;
 	}
-	
+
 	public static void write(int logLevel, String message, String topic) {
 		write(message, topic, logLevel);
 	}
-		
+
 	public static void write(String message, String topic, int logLevel) {
 		ILogger log = getLogger(topic);
-	
-		switch (logLevel) {			
-			case LogLevel.OFF: //LogLevel off
+		LogLevel level = LogLevel.fromInt(logLevel);
+
+		switch (level) {
+			case OFF: //LogLevel off
 				break;
-			case LogLevel.TRACE:
+			case TRACE:
 				log.trace(message);
 				break;
-			case LogLevel.DEBUG:
-				log.debug(message);
-				break;
-			case LogLevel.INFO:
+			case INFO:
 				log.info(message);
 				break;
-			case LogLevel.WARNING:
+			case WARN:
 				log.warn(message);
 				break;
-			case LogLevel.ERROR:
+			case ERROR:
 				log.error(message);
 				break;
-			case LogLevel.FATAL:
+			case FATAL:
 				log.fatal(message);
 				break;
 			default:
-				log.debug(message);			
-		}		
+				log.debug(message);
+		}
 	}
-	
+
 	public static void write(String message) {
 		getLogger().debug(message);
 	}
-	
+
 	public static void write(String message, String topic) {
 		getLogger(topic).debug(message);
 	}
-	
+
 	public static void error(String message) {
 		getLogger().error(message);
 	}
@@ -87,7 +84,7 @@ public static void fatal(String message, String topic) {
 	public static void fatal(String message, String topic, Throwable ex) {
 		getLogger(topic).fatal(message, ex);
 	}
-	
+
 	public static void warning(String message) {
 		getLogger().warn(message);
 	}
@@ -115,7 +112,7 @@ public static void debug(String message) {
 	public static void debug(String message, String topic) {
 		getLogger(topic).debug(message);
 	}
-	
+
 	public static void debug(String message, String topic, Throwable ex) {
 		getLogger(topic).debug(message, ex);
 	}

common/src/main/java/com/genexus/diagnostics/LogLevel.java

@@ -1,14 +1,24 @@
 package com.genexus.diagnostics;
 
-public class LogLevel {
-	
-	static final int OFF = 0;
-	static final int TRACE = 1;
-	static final int DEBUG = 5;
-	static final int INFO = 10;
-	static final int WARNING = 15;
-	static final int ERROR = 20;
-	static final int FATAL = 30;
-	
-	
+public enum LogLevel {
+	OFF(0),
+	TRACE(1),
+	DEBUG(5),
+	INFO(10),
+	WARN(15),
+	ERROR(20),
+	FATAL(30);
+
+	private final int lvl;
+	LogLevel(int lvl) { this.lvl = lvl; }
+	public int intValue() { return lvl; }
+
+	public static LogLevel fromInt(int lvl) {
+		for (LogLevel level : LogLevel.values()) {
+			if (level.intValue() == lvl) {
+				return level;
+			}
+		}
+		return LogLevel.OFF;
+	}
 }