Client enhancement (#18)

* adding the possibility to use extra headers

* trustSSL

Author: valentin-gauthier-geosiris

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.geosiris</groupId>
 	<artifactId>etpproto-java</artifactId>
 	<name>${project.groupId}:${project.artifactId}</name>
-	<version>1.0.5</version>
+	<version>1.0.6</version>
 	<organization>
 		<name>Geosiris</name>
 		<url>http://www.geosiris.com</url>

src/example/com/geosiris/etp/example/Main.java

@@ -73,6 +73,7 @@ public static void main(String[] args) throws Exception {
 //		putDA_REST(args);
 //		putDA_split(args);
 		test_external_server(args);
+//		test_get_big_data_array_2(args);
 	}
 
 	public static void test_external_server(String[] args) throws Exception {
@@ -280,6 +281,21 @@ public static void test_get_big_data_array(String[] args) throws Exception {
 //			ETPHelper.sendGetDataArray(client, uri, "/RESQML/3a45fb70-8ba9-4341-a701-0f514270ba9c/points_patch0", 50000);
 			var m = ETPHelper.getMultipleDataArrays(client, uri, List.of("/RESQML/3a45fb70-8ba9-4341-a701-0f514270ba9c/points_patch0"), 50000);
 //			logger.info(m);
+//			Thread.sleep(3000000);
+		}finally {
+			client.closeClient();
+		}
+
+	}
+	public static void test_get_big_data_array_2(String[] args) throws Exception {
+		ETPClient client = getClient(1<<22, args);
+
+		String uri = "eml:///dataspace('bpmn')/resqml20.obj_PointSetRepresentation(91ef4b87-3d9d-4a3e-b753-8caa0cdc5931)";
+		try {
+//			ETPHelper.sendGetDataArray(client, uri, "/RESQML/3a45fb70-8ba9-4341-a701-0f514270ba9c/points_patch0", 50000);
+//			var m = ETPHelper.sendGetDataArray_prettier(client, uri, "/RESQML/6567dc5c-4bf5-491a-b019-bd067d355587/points_patch", 50000, true);
+			var m = ETPHelper.getMultipleDataArrays(client, uri, List.of("/RESQML/6567dc5c-4bf5-491a-b019-bd067d355587/points_patch"), 50000);
+			logger.info(m.values().iterator().next());
 //			Thread.sleep(3000000);
 		}finally {
 			client.closeClient();

src/main/java/com/geosiris/etp/communication/ETPConnection.java

@@ -159,7 +159,7 @@ public static List<SupportedProtocol> computeSupportedProtocols(Map<Communicatio
         for(Map.Entry<CommunicationProtocol, ProtocolHandler> ph: protocolHandlers.entrySet()){
             supported.add(new SupportedProtocol(
                     ph.getKey().id,
-                    new Version(),
+                    Version.newBuilder().setMajor(1).setMinor(2).build(), // TODO: change version when etp changes
                     "store",
                     new HashMap<>()
             ));

src/main/java/com/geosiris/etp/websocket/ETPClient.java

@@ -23,15 +23,18 @@
 import com.geosiris.etp.communication.*;
 import com.geosiris.etp.utils.ETPDefaultProtocolBuilder;
 import com.geosiris.etp.utils.ETPUtils;
+import com.google.gson.Gson;
 import org.apache.avro.specific.SpecificRecordBase;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.eclipse.jetty.http.HttpURI;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.WebSocketAdapter;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
 
+import javax.net.ssl.SSLContext;
 import java.net.ConnectException;
 import java.net.URI;
 import java.util.*;
@@ -139,7 +142,11 @@ public final static ETPClient getInstance(
 		ETPClient etpClient = new ETPClient(serverUri, etpConnection, maxMsgSize);
 
 		try {
-			etpClient.wsclient = new WebSocketClient();
+
+			SslContextFactory sslContextFactory = new SslContextFactory();
+			sslContextFactory.setTrustAll(true);
+			etpClient.wsclient = new WebSocketClient(sslContextFactory);
+
 //			etpClient.wsclient.setMaxTextMessageBufferSize(maxMsgSize);
 			etpClient.wsclient.setMaxBinaryMessageBufferSize(maxMsgSize);
 
@@ -154,10 +161,9 @@ public final static ETPClient getInstance(
 //			etpClient.wsclient.setMaxTextMessageBufferSize((int) etpClient.maxByteSizePerMessage);
 			ClientUpgradeRequest request = new ClientUpgradeRequest();
 
-
-			for(Map.Entry<String, String> e: headers.entrySet()){
-				request.setHeader(e.getKey(), e.getValue());
-			}
+			//for(Map.Entry<String, String> e: headers.entrySet()){
+			//	request.setHeader(e.getKey(), e.getValue());
+			//}
 
 			if (auth_basic_or_bearer != null && !auth_basic_or_bearer.isEmpty()) {
 				request.setHeader("Authorization", auth_basic_or_bearer);
@@ -166,10 +172,17 @@ public final static ETPClient getInstance(
 
 			request.setHeader("etp-encoding", (encoding + "").toLowerCase());
 			request.setSubProtocols(etpConnection.SUB_PROTOCOL);
+
+			for(Map.Entry<String, String> e: headers.entrySet()){
+				request.setHeader(e.getKey(), e.getValue());
+			}
+
 			logger.debug("try to connect to " + echoUri);
+			logger.info("Headers : " + (new Gson()).toJson(request.getHeaders()));
 			Future<Session> futureSession = etpClient.wsclient.connect(etpClient, echoUri, request);
 			Session session = futureSession.get();
 
+
 			session.getPolicy().setMaxBinaryMessageBufferSize(maxMsgSize);
 			session.getPolicy().setMaxBinaryMessageSize(maxMsgSize);