Merge branch 'master' into ErrorHandlerSQLCommand

Author: iroqueta

gxexternalproviders/pom.xml

@@ -39,16 +39,25 @@
             <artifactId>aws-java-sdk-s3</artifactId>
             <version>1.12.93</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.9.0</version>
+        </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-storage</artifactId>
-            <version>1.114.0</version>
+            <version>1.118.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.api-client</groupId>
             <artifactId>google-api-client</artifactId>
-            <version>1.31.5</version>
+            <version>1.34.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.oauth-client</groupId>
+            <artifactId>google-oauth-client</artifactId>
+            <version>1.33.3</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

gxwebsocket/src/main/java/com/genexus/internet/websocket/GXWebSocket.java

@@ -10,49 +10,34 @@
 import com.genexus.websocket.Session;
 
 @ServerEndpoint(value = "/gxwebsocket")
-public class GXWebSocket extends GXWebSocketCommon implements IGXWebSocketAsync  {
-	
-	private static GXWebSocket instance = null;
-	
-	public GXWebSocket(){		
-		instance = this;			
-	}
-	
-	public static IGXWebSocketAsync getInstance() {
-		return instance;
+public class GXWebSocket {
+
+	private GXWebSocketService wsService;
+
+	public GXWebSocket() {
+		wsService = GXWebSocketService.getService();
 	}
-	
+
 	@OnOpen
-	public void OnOpen (javax.websocket.Session session) {
-		OnOpenCommon(new Session(session));
+	public void onOpen(javax.websocket.Session session) {
+		wsService.onOpen(new Session(session));
 	}
 
 	@OnMessage
-	public void OnMessage (String txt, javax.websocket.Session session) {
-		OnMessageCommon(txt, new Session(session));
+	public void onMessage(String txt, javax.websocket.Session session) {
+		wsService.onMessage(txt, new Session(session));
 	}
 
 	@OnClose
-	public void myOnClose (javax.websocket.Session session, CloseReason reason) {
-		myOnCloseCommon(new Session(session));
+	public void onClose(javax.websocket.Session session, CloseReason reason) {
+		wsService.onClose(new Session(session));
 	}
 
 	@OnError
     public void onError(Throwable exception, javax.websocket.Session session) {
-		onErrorCommon(exception, new Session(session));
+		wsService.onError(exception, new Session(session));
     }
-		
-	public SendResponseType send(String clientId, String message) {
-		return sendCommon(clientId, message);
-	}
-	
-	public void broadcast(String message) {
-		broadcastCommon(message);
-	}
 
-	public boolean start() {
-		return true;
-	}	
 }
 
 

gxwebsocket/src/main/java/com/genexus/websocket/Session.java

@@ -14,7 +14,7 @@ public Integer getHashCode() {
 		return new Integer(session.hashCode());
 	}
 
-	public String getQueryString() {
+	public String getId() {
 		return session.getQueryString();
 	}
 

gxwebsocketjakarta/src/main/java/com/genexus/internet/websocket/GXWebSocket.java

@@ -10,49 +10,33 @@
 import com.genexus.websocket.Session;
 
 @ServerEndpoint(value = "/gxwebsocket")
-public class GXWebSocket extends GXWebSocketCommon implements IGXWebSocketAsync  {
-	
-	private static GXWebSocket instance = null;
-	
-	public GXWebSocket(){		
-		instance = this;			
-	}
-	
-	public static IGXWebSocketAsync getInstance() {
-		return instance;
+public class GXWebSocket {
+
+	private GXWebSocketService wsService;
+
+	public GXWebSocket() {
+		wsService = GXWebSocketService.getService();
 	}
-	
+
 	@OnOpen
-	public void OnOpen (jakarta.websocket.Session session) {
-		OnOpenCommon(new Session(session));
+	public void onOpen(jakarta.websocket.Session session) {
+		wsService.onOpen(new Session(session));
 	}
-		
+
 	@OnMessage
-	public void OnMessage (String txt, jakarta.websocket.Session session) {
-		OnMessageCommon(txt, new Session(session));
+	public void onMessage(String txt, jakarta.websocket.Session session) {
+		wsService.onMessage(txt, new Session(session));
 	}
 
 	@OnClose
-	public void myOnClose (jakarta.websocket.Session session, CloseReason reason) {
-		myOnCloseCommon(new Session(session));
+	public void onClose(jakarta.websocket.Session session, CloseReason reason) {
+		wsService.onClose(new Session(session));
 	}
-		
+
 	@OnError
-    public void onError(Throwable exception, jakarta.websocket.Session session) {
-		onErrorCommon(exception, new Session(session));
-    }
-		
-	public SendResponseType send(String clientId, String message) {
-		return sendCommon(clientId, message);
+	public void onError(Throwable exception, jakarta.websocket.Session session) {
+		wsService.onError(exception, new Session(session));
 	}
-	
-	public void broadcast(String message) {
-		broadcastCommon(message);
-	}
-
-	public boolean start() {
-		return true;
-	}	
 }
 
 

gxwebsocketjakarta/src/main/java/com/genexus/websocket/Session.java

@@ -3,7 +3,7 @@
 import jakarta.websocket.RemoteEndpoint;
 import java.io.IOException;
 
-public class Session implements ISession{
+public class Session implements ISession {
 	private jakarta.websocket.Session session;
 
 	public Session(jakarta.websocket.Session session) {
@@ -14,7 +14,7 @@ public Integer getHashCode() {
 		return new Integer(session.hashCode());
 	}
 
-	public String getQueryString() {
+	public String getId() {
 		return session.getQueryString();
 	}
 

java/src/main/java/com/genexus/Application.java

@@ -3,10 +3,7 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.sql.SQLException;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.Vector;
+import java.util.*;
 
 import com.genexus.db.DBConnectionManager;
 import com.genexus.db.DynamicExecute;
@@ -42,7 +39,6 @@ public class Application
 	private static Boolean isJMXEnabled;
 
 	public static Class gxCfg = ApplicationContext.getInstance().getClass();
-	//public static ModelContext clientContext;
 	private static Vector<ICleanedup> toCleanup = new Vector<>();
 	static LocalUtil localUtil;
 	static Class ClassName = null;
@@ -753,10 +749,10 @@ public static boolean getShowConnectError()
 
 
 	  static boolean useSmartCache = false;
+
 	  public static com.genexus.GXSmartCacheProvider getSmartCacheProvider(int handle)
 	  {
 	  	useSmartCache = true;
 			return getConnectionManager().getUserInformation(handle).getSmartCacheProvider();	  	
-	  }	  
-
+	  }
 }

java/src/main/java/com/genexus/GXutil.java

@@ -1362,7 +1362,7 @@ public static String cutUploadPrefix(String value)
 
 		//hack para salvar el caso de gxooflineeventreplicator que llegan los path de los blobs sin \ porque fueron sacadas por el FromJsonString
 		String blobPath = com.genexus.Preferences.getDefaultPreferences().getProperty("CS_BLOB_PATH", "");
-		if(uploadValue.indexOf(':') == 1 && uploadValue.indexOf(blobPath) != -1 )
+		if(uploadValue.indexOf(':') == 1 && uploadValue.indexOf(File.separator + blobPath) != -1 )
 		{
 			uploadValue = uploadValue.substring(uploadValue.indexOf(blobPath) + blobPath.length());
 			uploadValue = blobPath + "\\" + uploadValue;