change rest http client to okhttp and support real async client request, add…

change rest http client to okhttp and support real async client request, add scheme to command-params

build.gradle

@@ -33,6 +33,10 @@ dependencies {
     compile 'io.dropwizard.metrics:metrics-graphite:3.1.2'
     compile 'io.jsonwebtoken:jjwt:0.6.0'
     compile group: 'org.zeromq', name: 'jeromq', version: '0.4.0'
+    compile 'org.elasticsearch.client:rest:5.4.1'
+    compile 'com.netflix.rxjava:rxjava-apache-http:0.20.7'
+    compile 'com.squareup.okhttp3:okhttp:3.8.0'
+//    compile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.2'
 
     testCompile group: 'junit', name: 'junit', version: '4.11'
     testCompile group: 'org.zeromq', name: 'jeromq', version: '0.4.0'

doc/ServicesDesign.md

@@ -44,3 +44,6 @@
     to see in html go to /static/metrics.html
 ### ZMQRestService
 ![alt text](ZMQRestService.png)
+
+## Env for http client
+    "http.maxConnections" (default: 50) defines max per route, total is twice this size

src/main/java/microservice/MicroserviceApp.java

@@ -668,4 +668,10 @@ public class MicroserviceApp
 	}
 
 
+	/**
+	 * logging utils
+	 */
+	public void logRcid(String from, String rcid){
+			getLogger().info(from + " RCID: " + rcid);
+	}
 }

src/main/java/microservice/defs/Constants.java

@@ -23,4 +23,5 @@ public class Constants
 	public static final int STRING_INITIAL_CAPACITY = 64;
 	public static final String METER = "Meter:";
 	public static final String TIMER = "Timer:";
+	public static final String HTTP_SCHEME = "http";
 }

src/main/java/microservice/defs/Enums.java

@@ -62,6 +62,22 @@ public class Enums
 			}
 			return enumCrudMethod;
 		}
+
+		public static String resolveHttpMethod(EnumCrudMethod enumCrudMethod){
+
+			switch (enumCrudMethod){
+				case E_CREATE:
+					return EnumHttpMethod.E_POST.getStrMethod();
+				case E_READ:
+					return EnumHttpMethod.E_GET.getStrMethod();
+				case E_UPDATE:
+					return EnumHttpMethod.E_PUT.getStrMethod();
+				case E_DELETE:
+					return EnumHttpMethod.E_DELETE.getStrMethod();
+			}
+			return null;
+		}
+
 	}
 
 	public enum EnumProtocol

src/main/java/microservice/params/CommandParams.java

@@ -4,13 +4,15 @@ import java.util.Map;
 
 public class CommandParams
 {
-	String entity;
+	String scheme = null;
+	String entity = null;
 	String[] params;
 	String paramsString; // params as a continues string "p1/p2/p3"
 	String requestParams;
 	String content;
 	Map<String,String> headersMap = null;
-	int cmndId = 0;
+	Map<String,String> requestParamsMap = null;
+	String rcid = null;
 
 	public CommandParams() {
 	}
@@ -39,6 +41,15 @@ public class CommandParams
 		this.headersMap = headersMap;
 	}
 
+	public String getScheme() {
+		return scheme;
+	}
+
+	public CommandParams setScheme(String scheme) {
+		this.scheme = scheme;
+		return this;
+	}
+
 	public String getEntity()
 	{
 		return entity;
@@ -59,6 +70,10 @@ public class CommandParams
 		return requestParams;
 	}
 
+	public Map<String, String> getRequestParamsMap() {
+		return requestParamsMap;
+	}
+
 	public String getContent()
 	{
 		return content;
@@ -88,6 +103,11 @@ public class CommandParams
 		return this;
 	}
 
+	public CommandParams setRequestParamsMap(Map<String, String> requestParamsMap) {
+		this.requestParamsMap = requestParamsMap;
+		return this;
+	}
+
 	public CommandParams setContent(String content) {
 		this.content = content;
 		return this;
@@ -98,12 +118,12 @@ public class CommandParams
 		return this;
 	}
 
-	public CommandParams setCmndId(int cmndId) {
-		this.cmndId = cmndId;
+	public CommandParams setRcid(String rcid) {
+		this.rcid = rcid;
 		return this;
 	}
 
-	public int getCmndId() {
-		return cmndId;
+	public String getRcid() {
+		return rcid;
 	}
 }

src/main/java/microservice/params/CommandParamsBuilder.java

 package microservice.params;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -7,6 +8,7 @@ import java.util.Map;
  */
 public class CommandParamsBuilder {
     CommandParams commandParams = new CommandParams();
+    Map<String,String> requestParamsMap = null;
 
     public CommandParamsBuilder setEntity(String entity) {
         commandParams.setEntity(entity);
@@ -40,6 +42,20 @@ public class CommandParamsBuilder {
         return this;
     }
 
+    public CommandParamsBuilder setRequestParamsMap(Map<String, String> requestParamsMap) {
+        this.commandParams.setRequestParamsMap(requestParamsMap);
+        return this;
+    }
+
+    public CommandParamsBuilder addRequestParam(String key, String value) {
+        if (requestParamsMap == null)
+            requestParamsMap = new HashMap<>();
+        requestParamsMap.put(key,value);
+        this.commandParams.setRequestParamsMap(requestParamsMap);
+        return this;
+    }
+
+
     public CommandParams build(){
         return commandParams;
     }

src/main/java/microservice/services/IRestServiceHttpImpl.java

@@ -46,6 +46,7 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
     RestServerParams restServerParams = null;
     Undertow restServer = null;
     Thread restThread = null;
+    MicroserviceApp msAppInstance = null;
     private String appName;
     public ObjectMapper objMapper = null;
     protected Enums.EnumAuthenticationType authType = Enums.EnumAuthenticationType.DEFAULT;
@@ -72,11 +73,14 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
     public void setAuthType(Enums.EnumAuthenticationType authType) { this.authType = authType; }
 
 
-    public BaseRestResponse handleSyncRespCommand(Supplier<BaseRestResponse> command) {
+    public BaseRestResponse handleSyncRespCommand(String name, CommandParams cmdParams, Supplier<BaseRestResponse> command) {
         BaseRestResponse resp = null;
         try {
-            if (restClient != null)
+            if (restClient != null) {
+                if (cmdParams.getRcid() != null) // log rcid
+                    msAppInstance.logRcid("handleSyncRespCommand." + name,cmdParams.getRcid());
                 resp = command.get();
+            };
         } catch (Exception e) {
             resp = new BaseRestResponse(false,e.toString());
         } finally {
@@ -86,10 +90,12 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
         return resp;
     }
 
-    public boolean handleAsyncRespCommand(BooleanSupplier command) {
+    public boolean handleAsyncRespCommand(String name, CommandParams cmdParams, BooleanSupplier command) {
         boolean retstat;
         try {
-               retstat = command.getAsBoolean();
+            if (cmdParams.getRcid() != null) // log rcid
+                msAppInstance.logRcid("handleAsyncRespCommand." + name,cmdParams.getRcid());
+            retstat = command.getAsBoolean();
         } catch (Exception e) {
             retstat = false;
         }
@@ -98,49 +104,50 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
 
     @Override
     public BaseRestResponse create(CommandParams cmdParams) {
-        return handleSyncRespCommand(() -> restClient.create(cmdParams) );
+        return handleSyncRespCommand(Enums.EnumCrudMethod.E_CREATE.name(),cmdParams,() -> restClient.create(cmdParams) );
     }
 
     @Override
     public BaseRestResponse read(CommandParams cmdParams) {
-        return handleSyncRespCommand(() -> restClient.read(cmdParams) );
+        return handleSyncRespCommand(Enums.EnumCrudMethod.E_READ.name(), cmdParams, () -> restClient.read(cmdParams) );
     }
 
     @Override
     public BaseRestResponse update(CommandParams cmdParams) {
-        return handleSyncRespCommand(() -> restClient.update(cmdParams) );
+        return handleSyncRespCommand(Enums.EnumCrudMethod.E_UPDATE.name(), cmdParams, () -> restClient.update(cmdParams) );
     }
 
     @Override
     public BaseRestResponse delete(CommandParams cmdParams) {
-        return handleSyncRespCommand(() -> restClient.delete(cmdParams) );
+        return handleSyncRespCommand(Enums.EnumCrudMethod.E_DELETE.name(), cmdParams, () -> restClient.delete(cmdParams) );
     }
 
     @Override
     public boolean asyncCreate(CommandParams reqCtx, Consumer<BaseRestResponse> cbFunc) {
-        return handleAsyncRespCommand(() -> restClient.asyncCreate(reqCtx,cbFunc));
+        return handleAsyncRespCommand(Enums.EnumCrudMethod.E_CREATE.name(),reqCtx, () -> restClient.asyncCreate(reqCtx,cbFunc));
     }
 
     @Override
     public boolean asyncRead(CommandParams reqCtx, Consumer<BaseRestResponse> cbFunc) {
-        return handleAsyncRespCommand(() -> restClient.asyncRead(reqCtx,cbFunc));
+        return handleAsyncRespCommand(Enums.EnumCrudMethod.E_READ.name(), reqCtx, () -> restClient.asyncRead(reqCtx,cbFunc));
     }
 
     @Override
     public boolean asyncUpdate(CommandParams reqCtx, Consumer<BaseRestResponse> cbFunc) {
-        return handleAsyncRespCommand(() -> restClient.asyncUpdate(reqCtx,cbFunc));
+        return handleAsyncRespCommand(Enums.EnumCrudMethod.E_UPDATE.name(), reqCtx, () -> restClient.asyncUpdate(reqCtx,cbFunc));
     }
 
     @Override
     public boolean asyncDelete(CommandParams reqCtx, Consumer<BaseRestResponse> cbFunc) {
-        return handleAsyncRespCommand(() -> restClient.asyncDelete(reqCtx,cbFunc));
+        return handleAsyncRespCommand(Enums.EnumCrudMethod.E_DELETE.name(), reqCtx, () -> restClient.asyncDelete(reqCtx,cbFunc));
     }
 
     @Override
     public boolean init() {
         boolean stat = true;
-        logger = MicroserviceApp.getsInstance().getLogger();
-        this.appName = MicroserviceApp.getsInstance().getAppName();
+        msAppInstance = MicroserviceApp.getsInstance();
+        logger = msAppInstance.getLogger();
+        this.appName = msAppInstance.getAppName();
         switch (getServiceMode()){
             case E_CLIENT:
                 break;
@@ -276,7 +283,8 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
         reqCtx.rcid = requestHeaders.getFirst(Constants.RCID_HEADER);
         if (reqCtx.rcid == null) // create a new one
             reqCtx.rcid = new UUID().toString();
-
+        else // log it
+            msAppInstance.logRcid("getRequestContext",reqCtx.rcid);
         return reqCtx;
     }
 
@@ -416,7 +424,7 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
             }
             else
             {
-                MicroserviceApp.getsInstance().getLogger().error(NO_TOKEN_FOR_REQUEST);
+                msAppInstance.getLogger().error(NO_TOKEN_FOR_REQUEST);
                 sendErrorResp(restContext.response,NO_TOKEN_FOR_REQUEST);
                 valid = false;
             }

src/test/java/microservice/TestMicroserviceApp.java

@@ -178,7 +178,11 @@ public class TestMicroserviceApp {
             CommonServices.IRestService inRestService = (CommonServices.IRestService)MicroserviceApp.getsInstance().getService(Enums.EnumServiceType.E_REST,"undertowRestService");
             RestContext restContext = (RestContext)msgCtx;
             String query = restContext.getPathParameter("query");
-            CommandParams cmdParams = new CommandParams().setEntity("172.16.1.132:5000").setParamsString("/v1/search").setRequestParams("q=" + query);
+            CommandParams cmdParams = new CommandParams()
+                    .setRcid(restContext.rcid)
+                    .setEntity("172.16.1.132:5000")
+                    .setParamsString("/v1/search")
+                    .setRequestParams("q=" + query);
             BaseRestResponse brr = inRestService.read(cmdParams);
             inRestService.writeObjectToResponse(restContext.response,brr);
         }