Merge branch 'master' into PDFBoxMemoryUsage

iroqueta · web-flow · commit de0d991f58ea · 2024-12-17T14:40:05.000-03:00
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -80,16 +80,14 @@ jobs:
           master)
             echo "## Is MASTER branch"
 
-            versionChangelist="-stable.$timestamp-SNAPSHOT"
+            versionChangelist="-preview.$timestamp-SNAPSHOT"
             SHOULD_DEPLOY='true'
             ;;
 
           beta)
-            echo "## Is BETA branch, add +100 to major number"
+            echo "## Is BETA branch"
 
-            pomMajorNumber=$(expr $pomMajorNumber + 100)
-            
-            versionChangelist="-trunk.$timestamp-SNAPSHOT"
+            versionChangelist="-beta.$timestamp-SNAPSHOT"
             SHOULD_DEPLOY='true'
             ;;
 
diff --git a/gxdynamiccall/src/main/java/com/genexus/gxdynamiccall/GXDynCallProperties.java b/gxdynamiccall/src/main/java/com/genexus/gxdynamiccall/GXDynCallProperties.java
diff --git a/gxdynamiccall/src/main/java/com/genexus/gxdynamiccall/GXDynamicCall.java b/gxdynamiccall/src/main/java/com/genexus/gxdynamiccall/GXDynamicCall.java
@@ -7,36 +7,38 @@
 
 import com.genexus.CommonUtil;
 import com.genexus.GXBaseCollection;
+import com.genexus.ModelContext;
 import com.genexus.SdtMessages_Message;
-import com.genexus.common.interfaces.SpecificImplementation;
+import com.genexus.util.GXProperties;
 
 public class GXDynamicCall {
 
-	private GXDynCallProperties properties;
+	private GXProperties properties;
 	private Object instanceObject;
-	private String objectName;
+	private String externalName;
+	private int remoteHandle;
+	private ModelContext context;
 
-	public GXDynamicCall(){
-		properties = new GXDynCallProperties();
-		properties.setPackageName(SpecificImplementation.Application.getPACKAGE());
+	public GXDynamicCall(int remoteHandle, ModelContext context){
+		this.remoteHandle = remoteHandle;
+		this.context = context;
+		this.properties = new GXProperties();
 	}
 
-	public GXDynCallProperties getProperties() {
+	public GXProperties getProperties() {
 		return properties;
 	}
 
-	public void setProperties(GXDynCallProperties properties) {
+	public void setProperties(GXProperties properties) {
 		this.properties = properties;
 	}
 
-	public String getObjectName(){
-		return objectName;
-		
+	public String getExternalName(){
+		return externalName;
 	}
 
-	public void setObjectName(String name){
-		objectName=name;
-		properties.setExternalName(name);
+	public void setExternalName(String name){
+		externalName=name;
 	}
 
 	public void execute(Vector<Object> parameters, Vector<SdtMessages_Message> errorsArray) {
@@ -73,7 +75,7 @@ public Object execute(Vector<Object> parameters, GXDynCallMethodConf methodConfi
 		{
 			Class<?> auxClass=null;
 			try {
-				auxClass = loadClass(properties.getExternalName(),properties.getPackageName());
+				auxClass = loadClass(this.externalName, properties.get("PackageName"));
 			} catch (ClassNotFoundException e) {
 				CommonUtil.ErrorToMessages("Load class Error", e.getMessage(), errors);
 				errorsArray.addAll(errors.getStruct());
@@ -88,12 +90,10 @@ public Object execute(Vector<Object> parameters, GXDynCallMethodConf methodConfi
 
 	public void create(Vector<Object> constructParameters, Vector<SdtMessages_Message> errors) {
 		GXBaseCollection<SdtMessages_Message> error =new GXBaseCollection<SdtMessages_Message>();
-		String objectNameToInvoke;
 		Constructor<?> constructor=null;
-		objectNameToInvoke = constructParameters==null?objectName:properties.getExternalName();
-		if (!objectNameToInvoke.isEmpty()) {
+		if (!this.externalName.isEmpty()) {
 			try {
-				Class<?> objClass = loadClass(objectNameToInvoke, properties.getPackageName());
+				Class<?> objClass = loadClass(this.externalName, properties.get("PackageName"));
 				Object[] auxConstParameters;
 				Class<?>[] auxConstructorTypes;
 				if (constructParameters != null && constructParameters.size() > 0) {
@@ -104,9 +104,9 @@ public void create(Vector<Object> constructParameters, Vector<SdtMessages_Messag
 						auxConstructorTypes[i] = obj.getClass(); 
 						i++;
 					}
-				} else {								
-					auxConstParameters = new Object[] {Integer.valueOf(-1)};
-					auxConstructorTypes = new Class[] {int.class};
+				} else {				
+					auxConstParameters = new Object[] {this.remoteHandle, this.context};
+					auxConstructorTypes = new Class[] {int.class, ModelContext.class};
 				}
 				try{
 				 	constructor =  objClass.getConstructor(auxConstructorTypes);
@@ -258,7 +258,7 @@ private static void updateParams(Vector<Object> originalParameter, Object[] call
 
 	private Class<?> loadClass(String className, String sPackage) throws ClassNotFoundException {
 		String classPackage="";
-		if(sPackage != null)
+		if(sPackage != null && !sPackage.isEmpty())
 		 classPackage+=  sPackage + ".";
 		classPackage+= className;
 		Class<?> c = Class.forName(classPackage);;
diff --git a/gxdynamiccall/src/test/java/com/genexus/gxdynamiccall/test/GxDynamicCallTest.java b/gxdynamiccall/src/test/java/com/genexus/gxdynamiccall/test/GxDynamicCallTest.java
@@ -1,12 +1,10 @@
 package com.genexus.gxdynamiccall.test;
 import com.genexus.Application;
-import com.genexus.GXBaseCollection;
-import com.genexus.GXSimpleCollection;
+import com.genexus.ModelContext;
 import com.genexus.SdtMessages_Message;
 import com.genexus.gxdynamiccall.GXDynCallMethodConf;
-import com.genexus.gxdynamiccall.GXDynCallProperties;
+
 import com.genexus.gxdynamiccall.GXDynamicCall;
-import com.genexus.specific.java.Connect;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -18,8 +16,8 @@ public class GxDynamicCallTest  {
     @Test
     public void callGxNativeObject(){
         Application.init(com.genexus.gxdynamiccall.test.GXcfg.class);
-        GXDynamicCall call = new GXDynamicCall();
-        call.setObjectName("DynamicCallTestProcedure");
+        GXDynamicCall call = new GXDynamicCall(-1, new ModelContext(GxDynamicCallTest.class));
+        call.setExternalName("com.genexus.gxdynamiccall.test.DynamicCallTestProcedure");
         Vector<Object> paramArray = new Vector<>();
         paramArray.add(Double.parseDouble("3"));
         paramArray.add((short)4);
@@ -34,10 +32,9 @@ public void callGxNativeObject(){
     @Test
     public void callExternalClass(){
         Application.init(com.genexus.gxdynamiccall.test.GXcfg.class);
-        GXDynamicCall call = new GXDynamicCall();
+        GXDynamicCall call = new GXDynamicCall(-1, new ModelContext(GxDynamicCallTest.class));
 		Vector<SdtMessages_Message> errorsArray= new Vector<>();
-        call.getProperties().setExternalName("DynamicCallExternalTestProcedure");
-        call.getProperties().setPackageName("com.genexus.gxdynamiccall.test");
+        call.setExternalName("com.genexus.gxdynamiccall.test.DynamicCallExternalTestProcedure");
         //Constructor 
         Vector<Object> constructParamArray = new Vector<>();
         constructParamArray.add((int)3); 
@@ -64,9 +61,8 @@ public void callExternalClass(){
     @Test
     public void callExternalClassWithStaticMethod(){
         Application.init(com.genexus.gxdynamiccall.test.GXcfg.class);
-        GXDynamicCall call = new GXDynamicCall();
-        call.getProperties().setExternalName("DynamicCallExternalTestProcedure");
-        call.getProperties().setPackageName("com.genexus.gxdynamiccall.test");
+        GXDynamicCall call = new GXDynamicCall(-1, new ModelContext(GxDynamicCallTest.class));
+        call.setExternalName("com.genexus.gxdynamiccall.test.DynamicCallExternalTestProcedure");
 		Vector<SdtMessages_Message> errorsArray= new Vector<>();
         //Parameters
 		Vector<Object> paramArray = new Vector<>();
diff --git a/gxspringboot/pom.xml b/gxspringboot/pom.xml
@@ -18,6 +18,12 @@
 			<groupId>${project.groupId}</groupId>
 			<artifactId>gxclassR</artifactId>
 			<version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>gxwrapperjavax</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/gxspringboot/src/main/java/com/genexus/springboot/GXConfig.java b/gxspringboot/src/main/java/com/genexus/springboot/GXConfig.java
@@ -4,6 +4,7 @@
 import com.genexus.common.interfaces.SpecificImplementation;
 import com.genexus.diagnostics.core.ILogger;
 import com.genexus.diagnostics.core.LogManager;
+import com.genexus.servlet.CorsFilter;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -51,6 +52,15 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 		}
 	}
 
+	@Bean
+	public FilterRegistrationBean<CorsFilter> corsFilter() {
+		FilterRegistrationBean<CorsFilter> registrationBean = new FilterRegistrationBean<>();
+		registrationBean.setFilter(new CorsFilter());
+		registrationBean.addUrlPatterns("/*");
+		return registrationBean;
+	}
+
+
 	@Bean
 	public FilterRegistrationBean<UrlRewriteFilter> urlRewriteFilter() {
 		FilterRegistrationBean<UrlRewriteFilter> registrationBean = new FilterRegistrationBean<>();
diff --git a/java/src/main/java/com/genexus/sap/EnterpriseConnect.java b/java/src/main/java/com/genexus/sap/EnterpriseConnect.java
@@ -217,7 +217,20 @@ public void setValue(String parameterName, IGxJSONAble value)
 					String key = (String)keys.next();
 					int jcoType = jStruct.getMetaData().getType(key);	
 				
-					if( jObj.get(key) instanceof String )
+					if (jcoType == JCoMetaData.TYPE_BYTE)
+					{
+						if ( jStruct.getMetaData().getLength(key) <= 4)
+						{
+							jStruct.setValue(key, jObj.getInt(key));
+						}
+						else if ( jStruct.getMetaData().getLength(key) <= 8)
+						{
+							jStruct.setValue(key, jObj.getLong(key));						
+						}
+						else
+							jStruct.setValue(key, jObj.getString(key).getBytes());
+					}
+					else if( jObj.get(key) instanceof String )
 					{
 						jStruct.setValue(key, jObj.getString(key));
 					}					
