Changed method to get cookies from context when executing as webapp (#514)

* Changed method to get cookies from context when executing as webapp

* Removed commented old code

* Removed unused variable

* Removed unused imports

* Removed qualifiers from all the HttpClientJavaLib class. Added two constants for Set-Cookie and Cookie

Co-authored-by: Martin Vigliarolo <MVigliarolo@Artech.local>

Author: MartinVigliarolo

java/src/main/java/com/genexus/internet/HttpClientJavaLib.java

@@ -9,7 +9,7 @@
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
-import com.genexus.servlet.http.ICookie;
+import com.genexus.ModelContext;
 import com.genexus.util.IniFile;
 import org.apache.http.*;
 import com.genexus.CommonUtil;
@@ -47,6 +47,8 @@
 import org.apache.http.ssl.SSLContexts;
 import org.apache.http.util.EntityUtils;
 import org.apache.logging.log4j.Logger;
+import com.genexus.webpanels.HttpContextWeb;
+import java.net.URI;
 
 import javax.net.ssl.SSLContext;
 
@@ -115,7 +117,9 @@ public void setTimeout(int timeout)
 	private ByteArrayEntity entity = null;	// Para mantener el stream luego de cerrada la conexion en la lectura de la response
 	private Boolean lastAuthIsBasic = null;
 	private Boolean lastAuthProxyIsBasic = null;
-	private static IniFile clientCfg = new com.genexus.ModelContext(com.genexus.ModelContext.getModelContextPackageClass()).getPreferences().getIniFile();
+	private static IniFile clientCfg = new ModelContext(ModelContext.getModelContextPackageClass()).getPreferences().getIniFile();
+	private static final String SET_COOKIE = "Set-Cookie";
+	private static final String COOKIE = "Cookie";
 
 
 	private void resetExecParams() {
@@ -167,7 +171,7 @@ private void resetStateAdapted()
 	public void setURL(String stringURL) {
 		try
 		{
-			java.net.URI url = new java.net.URI(stringURL);
+			URI url = new URI(stringURL);
 			setHost(url.getHost());
 			setPort(url.getPort());
 			setBaseURL(url.getPath());
@@ -181,10 +185,10 @@ public void setURL(String stringURL) {
 	}
 
 	private String getURLValid(String url) {
-		java.net.URI uri;
+		URI uri;
 		try
 		{
-			uri = new java.net.URI(url);
+			uri = new URI(url);
 			if (!uri.isAbsolute())		// En caso que la URL pasada por parametro no sea una URL valida (en este caso seria que no sea un URL absoluta), salta una excepcion en esta linea, y se continua haciendo todo el proceso con los datos ya guardados como atributos
 				return url;
 			else {
@@ -236,14 +240,12 @@ private static SSLConnectionSocketFactory getSSLSecureInstance() {
 	}
 
 	private CookieStore setAllStoredCookies() {
-		ICookie[] webcookies;
-
 		CookieStore cookiesToSend = new BasicCookieStore();
-		if (!com.genexus.ModelContext.getModelContext().isNullHttpContext()) { 	// Caso de ejecucion de varias instancia de HttpClientJavaLib, por lo que se obtienen cookies desde sesion web del browser
-			webcookies = ((com.genexus.webpanels.HttpContextWeb) com.genexus.ModelContext.getModelContext().getHttpContext()).getCookies();
-			ICookie webcookie = webcookies == null ? null : Arrays.stream(webcookies).filter(cookie -> "Set-Cookie".equalsIgnoreCase(cookie.getName())).findAny().orElse(null);
-			if (webcookie != null)
-				this.addHeader("Cookie", com.genexus.webpanels.WebUtils.decodeCookie(webcookie.getValue()));
+		if (!ModelContext.getModelContext().isNullHttpContext()) { 	// Caso de ejecucion de varias instancia de HttpClientJavaLib, por lo que se obtienen cookies desde sesion web del browser
+
+			String selfWebCookie = ((HttpContextWeb) ModelContext.getModelContext().getHttpContext()).getCookie(SET_COOKIE);
+			if (!selfWebCookie.isEmpty())
+				this.addHeader(COOKIE, selfWebCookie.replace("+",";"));
 
 		} else {	// Caso se ejecucion de una misma instancia HttpClientJavaLib mediante command line
 			if (!getIncludeCookies())
@@ -262,14 +264,14 @@ private CookieStore setAllStoredCookies() {
 
 	private void SetCookieAtr(CookieStore cookiesToSend) {
 		if (cookiesToSend != null) {
-			if (com.genexus.ModelContext.getModelContext().isNullHttpContext()) {
+			if (ModelContext.getModelContext().isNullHttpContext()) {
 				for (Cookie c : cookiesToSend.getCookies())
 					cookies.addCookie(c);
 			} else {
 				try {
-					com.genexus.webpanels.HttpContextWeb webcontext = ((com.genexus.webpanels.HttpContextWeb) com.genexus.ModelContext.getModelContext().getHttpContext());
+					HttpContextWeb webcontext = ((HttpContextWeb) ModelContext.getModelContext().getHttpContext());
 
-					Header[] headers = this.response.getHeaders("Set-Cookie");
+					Header[] headers = this.response.getHeaders(SET_COOKIE);
 					if (headers.length > 0) {
 						String webcontextCookieHeader = "";
 						for (Header header : headers) {
@@ -278,9 +280,9 @@ private void SetCookieAtr(CookieStore cookiesToSend) {
 							webcontextCookieHeader += cookieKeyAndValue[0] + "=" + cookieKeyAndValue[1] + "; ";
 						}
 						webcontextCookieHeader = webcontextCookieHeader.trim().substring(0,webcontextCookieHeader.length()-2);	// Se quita el espacio y la coma al final
-						webcontext.setCookie("Set-Cookie",webcontextCookieHeader,"",CommonUtil.nullDate(),"",this.getSecure());
+						webcontext.setCookie(SET_COOKIE,webcontextCookieHeader,"",CommonUtil.nullDate(),"",this.getSecure());
 					}
-					com.genexus.ModelContext.getModelContext().setHttpContext(webcontext);
+					ModelContext.getModelContext().setHttpContext(webcontext);
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
@@ -411,7 +413,7 @@ public void execute(String method, String url) {
 			}
 
 			url = setPathUrl(url);
-			url = com.genexus.CommonUtil.escapeUnsafeChars(url);
+			url = CommonUtil.escapeUnsafeChars(url);
 
 			if (getSecure() == 1)   // Se completa con esquema y host
 				url = url.startsWith("https://") ? url : "https://" + getHost()+ (getPort() != 443?":"+getPort():"")+ url;		// La lib de HttpClient agrega el port
@@ -447,7 +449,7 @@ public void execute(String method, String url) {
 
 				ByteArrayEntity dataToSend;
 				if (!getIsMultipart() && getVariablesToSend().size() > 0)
-					dataToSend = new ByteArrayEntity(com.genexus.CommonUtil.hashtable2query(getVariablesToSend()).getBytes());
+					dataToSend = new ByteArrayEntity(CommonUtil.hashtable2query(getVariablesToSend()).getBytes());
 				else
 					dataToSend = new ByteArrayEntity(getData());
 				httpPost.setEntity(dataToSend);
@@ -594,7 +596,7 @@ public void getHeader(String name, java.util.Date[] value) {
 			return;
 		try
 		{
-			value[0] = com.genexus.CommonUtil.getHeaderAsDate(response.getFirstHeader(name).getValue());
+			value[0] = CommonUtil.getHeaderAsDate(response.getFirstHeader(name).getValue());
 		}
 		catch (IOException e)
 		{
@@ -619,7 +621,7 @@ public InputStream getInputStream() throws IOException {
 	public InputStream getInputStream(String stringURL) throws IOException
 	{
 		try {
-			java.net.URI url = new java.net.URI(stringURL);
+			URI url = new URI(stringURL);
 			HttpGet gISHttpGet = new HttpGet(String.valueOf(url));
 			CloseableHttpClient gISHttpClient = HttpClients.createDefault();
 			return gISHttpClient.execute(gISHttpGet).getEntity().getContent();