first commit with seperation of jars:

common,clients,pubsub and app

README.md

@@ -37,13 +37,13 @@
 - add ZeroMQ support for Rest
 ## 1.3.8: Add colorful logging
 ## 1.3.7: Add Pagination - PageBuilder
-## 1.3.6: upgrade common-utils 1.2.0
+## 1.3.6: upgrade common-common.microservice.utils 1.2.0
 ## 1.3.2:
 - add getMD5Hash, catch unhandled exceptions, add command-params builder
 ## 1.3.1:
 - add rabbotmq command client + change version to 1.3.1
 ## 1.3.0:
-- add service authorization with jwt
+- add microservice.service authorization with jwt
 - env param override config file
 ## 1.2.5:
 - support rabbit on server side
@@ -68,10 +68,10 @@
 - Add '/_stat' in monitoring to returns stats of metrics, more to come
 - Change '/reload' to '/_reload'
 ## Version '1.1.0':
-- Add resolveService in service discovery, used by http command-client to resolve the address
-  of the dest service
-# Env for service discovery:
-service.resolver.polling.interval (milli) default is 5000
+- Add resolveService in microservice.service discovery, used by http command-client to resolve the address
+  of the dest microservice.service
+# Env for microservice.service discovery:
+microservice.service.resolver.polling.interval (milli) default is 5000
 # Env for jwt:
 jwt.token.in.authorization : true
 jwt.salt : "12345678901234567890123456789012"

build.gradle

 group 'com.ipgallery.common'
-version '2.2.0'
+version '2.3.0'
 
 apply plugin: 'java'
 apply plugin: 'maven-publish'
@@ -18,9 +18,35 @@ repositories {
 }
 
 sourceSets {
-    main
-//    client
-    common
+    main {
+        java {
+            srcDir 'src/main/java'
+            exclude '**'
+        }
+    }
+
+    common {
+        java.srcDir 'src/main/java/microservice/common'
+        resources.srcDir 'src/main/java/microservice/common/resources'
+    }
+
+    clients {
+        java.srcDir'src/main/java/microservice/clients'
+        resources.srcDir 'src/main/java/microservice/clients/resources'
+    }
+
+    servicePubsub {
+        java.srcDir 'src/main/java/microservice/service/pubsub'
+        resources.srcDir 'src/main/java/microservice/service/resources'
+    }
+
+    app {
+        java.srcDir 'src/main/java/microservice/app'
+        resources.srcDir 'src/main/java/microservice/resources'
+        compileClasspath += sourceSets.servicePubsub.runtimeClasspath
+        compileClasspath += sourceSets.clients.runtimeClasspath
+    }
+
 }
 
 dependencies {
@@ -33,21 +59,31 @@ dependencies {
             'com.netflix.hystrix:hystrix-core:1.4.14'
     )
 
-//    clientCompile (
-//            files('build/common/microservice-common.jar'),
-////            files('build/common/activities-common.jar'),
-//            //'com.ipgallery.common:microservice:2.1.1'
-//    )
+    clientsCompile (
+            files('build/common/microservice-common.jar'),
+            'com.ipgallery.common:utils:1.2.5',
+            'com.netflix.rxjava:rxjava-apache-http:0.20.7',
+//            'com.netflix.hystrix:hystrix-codahale-metrics-publisher:1.4.14',
+            'com.netflix.hystrix:hystrix-metrics-event-stream:1.4.12',
+            'com.squareup.okhttp3:okhttp:3.8.0'
+
+    )
+
+    servicePubsubCompile (
+            files('build/common/microservice-common.jar'),
+            'org.apache.pulsar:pulsar-client:2.4.2',
+            'org.apache.pulsar:pulsar-client-admin:2.4.2'
+    )
 
-    compile (
+    appCompile (
             files('build/common/microservice-common.jar'),
-//            files('build/client/microservice-client.jar'),
+
             'io.jsonwebtoken:jjwt:0.6.0',
             'io.undertow:undertow-core:2.0.28.Final',
             'com.fasterxml.jackson.core:jackson-databind:2.2.3',
             'io.dropwizard.metrics:metrics-core:3.1.0',
-            'com.netflix.hystrix:hystrix-codahale-metrics-publisher:1.4.14',
-            'com.netflix.hystrix:hystrix-metrics-event-stream:1.4.12',
+//            'com.netflix.hystrix:hystrix-codahale-metrics-publisher:1.4.14',
+//            'com.netflix.hystrix:hystrix-metrics-event-stream:1.4.12',
             'redis.clients:jedis:2.4.2',
             'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2',
             'com.ipgallery.common:utils:1.2.5',
@@ -58,11 +94,8 @@ dependencies {
             'io.dropwizard.metrics:metrics-graphite:3.2.5',
             'org.zeromq:jeromq:0.4.0',
             'org.elasticsearch.client:rest:5.4.1',
-            'com.netflix.rxjava:rxjava-apache-http:0.20.7',
-            'com.squareup.okhttp3:okhttp:3.8.0',
-            'org.apache.pulsar:pulsar-client:2.4.2',
-            'org.apache.pulsar:pulsar-client-admin:2.4.2'
-
+//            'com.netflix.rxjava:rxjava-apache-http:0.20.7',
+//            'com.squareup.okhttp3:okhttp:3.8.0'
     )
 //    compile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.2'
 
@@ -82,21 +115,51 @@ task commonJar(type: Jar) {
     destinationDir = file("build/common")
 }
 
-//// client
-//task clientJar(type: Jar) {
-//    dependsOn commonJar
-//    mustRunAfter commonJar
-//    from configurations.clientCompile.collect { zipTree it }
-//    from sourceSets.client.output
-//    version = '1.0.0'
-//    archiveName = "microservice-client.jar"
-//    destinationDir = file("build/client")
-//}
+// pubsub
+task servicePubsubJar(type: Jar) {
+    dependsOn commonJar
+    mustRunAfter commonJar
+    from configurations.servicePubsubCompile.collect { zipTree it }
+    from sourceSets.servicePubsub.output
+    version = '1.0.0'
+    archiveName = "microservice-service-pubsub.jar"
+    destinationDir = file("build/servicePubsub")
+}
 
-jar {
+// client
+task clientsJar(type: Jar) {
     dependsOn commonJar
     mustRunAfter commonJar
+    from configurations.clientsCompile.collect { zipTree it }
+    from sourceSets.clients.output
+    version = '1.0.0'
+    archiveName = "microservice-clients.jar"
+    destinationDir = file("build/clients")
 }
+
+// app
+task appJar(type: Jar) {
+    dependsOn commonJar
+    mustRunAfter commonJar
+    from configurations.appCompile.collect { zipTree it }
+    from sourceSets.app.output
+    version = version // '2.3.0'
+    archiveName = "microservice-app.jar"
+    destinationDir = file("build/app")
+}
+
+
+assemble {
+    dependsOn commonJar
+    dependsOn clientsJar
+    dependsOn servicePubsubJar
+    dependsOn appJar
+}
+
+//jar {
+//    dependsOn servicePubsubJar
+//    mustRunAfter servicePubsubJar
+//}
 //    from configurations.compile.collect { zipTree it }
 //    from sourceSets.main.output
 //    //version = '2.2.0'
@@ -116,10 +179,10 @@ publishing {
             }
         }
 
-        mavenJava(MavenPublication) {
-            artifactId 'microservice'
-            from components.java
-        }
+//        mavenJava(MavenPublication) {
+//            artifactId 'microservice'
+//            from components.java
+//        }
 
 
 //        client(MavenPublication) {
@@ -164,5 +227,37 @@ publishing {
             artifact commonJar
         }
 
+        clients(MavenPublication) {
+            artifactId 'microservice-clients'
+            version clientsJar.version
+            // adding dependencies
+            pom.withXml {
+                def dependenciesNode = asNode().appendNode('dependencies')
+            }
+            artifact clientsJar
+        }
+
+        servicePubsub(MavenPublication) {
+            artifactId 'microservice-service-pubsub'
+            version servicePubsubJar.version
+            // adding dependencies
+            pom.withXml {
+                def dependenciesNode = asNode().appendNode('dependencies')
+            }
+            artifact servicePubsubJar
         }
+
+        app(MavenPublication) {
+            artifactId 'microservice-app'
+            version appJar.version
+            // adding dependencies
+            pom.withXml {
+                def dependenciesNode = asNode().appendNode('dependencies')
+            }
+            artifact appJar
+        }
+
+    }
+
+
 }

doc/todo.txt

@@ -3,13 +3,13 @@
 +- counters and metrics in the reactor
 +- validateRequest in RestService , the jwt issues
 +- Add monitoring apis
-+- All the validation ,pre/post handling that was were done by the handler will be done by the base service
++- All the validation ,pre/post handling that was were done by the handler will be done by the base microservice.service
 - add Runtime Test:
     addTest(const char *testName, nsMicroservice_Iface::TestFunction testFunction);
     addTest(nsMicroservice_Iface::ITest *p_testClass)
 
 
-+- Add true async in http rest service, that we can send response after handleRequest ends.
++- Add true async in http rest microservice.service, that we can send response after handleRequest ends.
 //                        exchange.dispatch(() -> {
 //                            new Timer().schedule(new TimerTask() {
 //                                public void run() {

src/main/java/microservice/MicroserviceApp.java → src/main/java/microservice/app/microservice/MicroserviceApp.java

 package microservice;
 
 import common.microservice.io.iface.*;
+import common.microservice.io.impl.ILoggerConsoleImpl;
 import io.undertow.Handlers;
 import io.undertow.Undertow;
 import io.undertow.Undertow.Builder;
@@ -9,8 +10,8 @@ import io.undertow.server.handlers.PathHandler;
 import io.undertow.server.handlers.resource.ClassPathResourceManager;
 import io.undertow.util.MimeMappings;
 import common.microservice.defs.Enums;
-import microservice.params.RMQClientParams;
-import microservice.params.RestServerParams;
+import common.microservice.params.RMQClientParams;
+import common.microservice.params.RestServerParams;
 import microservice.handlers.*;
 import microservice.io.iface.IRestServer;
 import microservice.io.impl.*;
@@ -42,7 +43,7 @@ import static io.undertow.Handlers.resource;
  * @author amir
  *
  */
-public class MicroserviceApp
+public class MicroserviceApp implements IApp
 {
 	private static MicroserviceApp sInstance = null;
 
@@ -630,7 +631,7 @@ public class MicroserviceApp
 				.filter(p -> p != null)
 				.forEach(servicesMap ->
 						servicesMap.forEach((serviceKey, service) -> {
-							service.init();
+							service.init(this);
 							if (enableMetrics)
 								service.withMetricsFactory(IMetricsFactoryImpl.getInstance());
 							service.register(serviceDiscovery, id);
@@ -691,14 +692,14 @@ public class MicroserviceApp
 	}
 
 
-	/**
-	 * logging utils
-	 */
-	public void logRcid(String from, String rcid){
-			getLogger().info(from + " RCID: " + rcid);
-	}
-
-	public void logMcid(String from, String mcid){
-		getLogger().info(from + " MCID: " + mcid);
-	}
+//	/**
+//	 * logging utils
+//	 */
+//	public void logRcid(String from, String rcid){
+//			getLogger().info(from + " RCID: " + rcid);
+//	}
+//
+//	public void logMcid(String from, String mcid){
+//		getLogger().info(from + " MCID: " + mcid);
+//	}
 }

src/main/java/microservice/MicroserviceClient.java → src/main/java/microservice/app/microservice/MicroserviceClient.java

 package microservice;
 
 
+import clients.microservice.impl.IRestClientHttpImpl;
 import common.microservice.defs.Constants;
 import common.CacheClient;
 import common.JsonHandler;
@@ -10,8 +11,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 
 import common.microservice.io.iface.IRestClient;
 import common.microservice.types.BaseRestResponse;
-import microservice.io.impl.IRestClientHttpImpl;
-import microservice.params.BaseClientParams;
+import common.microservice.params.BaseClientParams;
 import common.microservice.params.CommandParams;
 
 /**

src/main/java/microservice/handlers/Reactor.java → src/main/java/microservice/app/microservice/handlers/Reactor.java

@@ -11,6 +11,8 @@ import common.microservice.io.iface.IMetricsFactory;
 import java.util.*;
 import java.util.function.BiConsumer;
 
+import static common.microservice.services.CommonServices.buildServiceKey;
+
 /**
  *              ------------
  * Services -> |            | -> Methods
@@ -86,20 +88,20 @@ public class Reactor implements CommonServices.IServiceReactor {
         methodKeyList.add(key);
     }
 
-    public static String buildServiceKey(CommonServices.MethodParams methodParams) {
-        return Constants.SLASH_SEPERATOR  +
-                methodParams.getServiceType().name() + Constants.TYPE_PREFIX_SEPERATOR +
-                methodParams.getServiceCommand().toString() + Constants.TYPE_PREFIX_SEPERATOR +
-                methodParams.getResourceUri();
-    }
-
-    public static String buildServiceKey(Enums.EnumServiceType enumServiceType,
-                                             CommonServices.IServiceCommands serviceCommands,
-                                             String resourceUri) {
-        return new StringBuilder(32).append(Constants.SLASH_SEPERATOR).append(enumServiceType.name()).append(Constants.TYPE_PREFIX_SEPERATOR)
-                .append(serviceCommands.toString()).append(Constants.TYPE_PREFIX_SEPERATOR)
-                .append(resourceUri).toString();
-    }
+//    public static String buildServiceKey(CommonServices.MethodParams methodParams) {
+//        return Constants.SLASH_SEPERATOR  +
+//                methodParams.getServiceType().name() + Constants.TYPE_PREFIX_SEPERATOR +
+//                methodParams.getServiceCommand().toString() + Constants.TYPE_PREFIX_SEPERATOR +
+//                methodParams.getResourceUri();
+//    }
+
+//    public static String buildServiceKey(Enums.EnumServiceType enumServiceType,
+//                                             CommonServices.IServiceCommands serviceCommands,
+//                                             String resourceUri) {
+//        return new StringBuilder(32).append(Constants.SLASH_SEPERATOR).append(enumServiceType.name()).append(Constants.TYPE_PREFIX_SEPERATOR)
+//                .append(serviceCommands.toString()).append(Constants.TYPE_PREFIX_SEPERATOR)
+//                .append(resourceUri).toString();
+//    }
 
     /**
      * delegating the msg/request from the service to the method if any

src/main/java/microservice/io/impl/IMetricsFactoryImpl.java → src/main/java/microservice/app/microservice/io/impl/IMetricsFactoryImpl.java

@@ -167,7 +167,7 @@ public class IMetricsFactoryImpl implements IMetricsFactory
 					.convertDurationsTo(TimeUnit.MILLISECONDS)
 					.filter(MetricFilter.ALL)
 					.skipIdleMetrics(true)
-					.tag("service", MicroserviceApp.getsInstance().getAppName())
+					.tag("microservice/service/microservice/microservice", MicroserviceApp.getsInstance().getAppName())
 					.tag("instance", MicroserviceApp.getsInstance().getId())
 					.tag("server", MicroserviceApp.getsInstance().getServerName())
 					.transformer(new CategoriesMetricMeasurementTransformer("module", "artifact"))

src/main/java/microservice/io/impl/IRMQClientRestImpl.java → src/main/java/microservice/app/microservice/io/impl/IRMQClientRestImpl.java

@@ -4,13 +4,14 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsPoller;
+import common.microservice.io.iface.ILogger;
 import http.simpleRestClient.SimpleRestResponse;
 import common.microservice.defs.Enums;
 import common.microservice.io.iface.IRestClient;
 import common.microservice.io.iface.IServiceDiscovery;
-import microservice.params.BaseClientParams;
+import common.microservice.params.BaseClientParams;
 import common.microservice.params.CommandParams;
-import microservice.params.RMQClientParams;
+import common.microservice.params.RMQClientParams;
 import common.microservice.types.BaseRestResponse;
 import rabbitmq.client.RMQRestClient;
 import rabbitmq.common.RMQId;
@@ -28,6 +29,7 @@ import java.util.function.Consumer;
 public class IRMQClientRestImpl implements IRestClient
 {
 	private static int REQUEST_TIMEOUT = 30000;
+	private ILogger logger;
 
 	/*********************************************************************************************/
 	/*  JSON LISTENER
@@ -112,6 +114,11 @@ public class IRMQClientRestImpl implements IRestClient
 	}
 
 	@Override
+	public void init(ILogger logger) {
+		this.logger = logger;
+	}
+
+	@Override
 	public BaseRestResponse create(CommandParams reqCtx)
 	{
 		BaseRestResponse brr = null;

src/main/java/microservice/io/impl/IRestServerRMQImpl.java → src/main/java/microservice/app/microservice/io/impl/IRestServerRMQImpl.java

@@ -13,7 +13,7 @@ import microservice.handlers.MBIHandler;
 import common.microservice.io.iface.IPubSub;
 import microservice.io.iface.IRestServer;
 import common.microservice.io.iface.IServiceDiscovery;
-import microservice.params.RMQClientParams;
+import common.microservice.params.RMQClientParams;
 
 public class IRestServerRMQImpl implements IRestServer {
 

src/main/java/microservice/io/impl/IRestServerUndertowImpl.java → src/main/java/microservice/app/microservice/io/impl/IRestServerUndertowImpl.java

@@ -19,7 +19,7 @@ import microservice.handlers.RestHandler;
 import common.microservice.io.iface.IPubSub;
 import microservice.io.iface.IRestServer;
 import common.microservice.io.iface.IServiceDiscovery;
-import microservice.params.RestServerParams;
+import common.microservice.params.RestServerParams;
 import static io.undertow.Handlers.resource;
 
 public class IRestServerUndertowImpl implements IRestServer {

src/main/java/microservice/services/IPubSubServiceMqttImpl.java → src/main/java/microservice/app/microservice/service/pubsub/impl/IPubSubServiceMqttImpl.java

-package microservice.services;
+package microservice.service.pubsub.impl;
 
+import common.microservice.io.iface.IApp;
 import common.microservice.services.CommonServices;
 import common.microservice.io.iface.IServiceDiscovery;
 import org.eclipse.paho.client.mqttv3.*;
@@ -46,7 +47,7 @@ public class IPubSubServiceMqttImpl extends CommonServices.IPubSubService {
     }
 
     @Override
-    public boolean init() {
+    public boolean init(IApp app) {
         try {
 
 

src/main/java/microservice/services/IRestServiceHttpImpl.java → src/main/java/microservice/app/microservice/service/pubsub/impl/IRestServiceHttpImpl.java

-package microservice.services;
+package microservice.service.pubsub.impl;
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -8,6 +8,7 @@ import common.microservice.services.CommonServices;
 import common.microservice.types.BaseRestResponse;
 import common.microservice.types.UserProfile;
 import common.microservice.utils.IDGenerator;
+import common.microservice.utils.Logging;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.undertow.Handlers;
@@ -26,16 +27,16 @@ import common.microservice.security.EncryptionUtils;
 import common.microservice.defs.Constants;
 import common.microservice.defs.Enums;
 import microservice.handlers.BaseHandler;
-import microservice.handlers.Reactor;
 import microservice.io.impl.IRequestRestImpl;
 import microservice.io.impl.IResponseRestImpl;
 import common.microservice.params.CommandParams;
-import microservice.params.RestServerParams;
+import common.microservice.params.RestServerParams;
 
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import static common.microservice.services.CommonServices.buildServiceKey;
 import static io.undertow.Handlers.resource;
 import static common.microservice.defs.Constants.*;
 
@@ -48,7 +49,6 @@ 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;
@@ -80,7 +80,7 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
         try {
             if (restClient != null) {
                 if (cmdParams.getRcid() != null) // log rcid
-                    msAppInstance.logRcid("handleSyncRespCommand." + name,cmdParams.getRcid());
+                    Logging.logRcid(logger,"handleSyncRespCommand." + name,cmdParams.getRcid());
                 resp = command.get();
             };
         } catch (Exception e) {
@@ -96,7 +96,7 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
         boolean retstat;
         try {
             if (cmdParams.getRcid() != null) // log rcid
-                msAppInstance.logRcid("handleAsyncRespCommand." + name,cmdParams.getRcid());
+                Logging.logRcid(logger,"handleAsyncRespCommand." + name,cmdParams.getRcid());
             retstat = command.getAsBoolean();
         } catch (Exception e) {
             retstat = false;
@@ -145,19 +145,21 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
     }
 
     @Override
-    public boolean init() {
+    public boolean init(IApp app) {
         boolean stat = true;
-        if (MicroserviceApp.getsInstance() != null) {
-            msAppInstance = MicroserviceApp.getsInstance();
-            logger = msAppInstance.getLogger();
-            this.appName = msAppInstance.getAppName();
+        this.app = app;
+        if (app != null) {
+            logger = app.getLogger();
+            this.appName = app.getAppName();
         }
 
         switch (getServiceMode()){
             case E_CLIENT:
+                initRestClient();
                 break;
             case E_CLIENT_SERVER:
             case E_SERVER:
+                initRestClient();
                 stat = buildRestServer();
                 break;
             default:
@@ -168,6 +170,12 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
         return stat;
     }
 
+    private void initRestClient() {
+        if (restClient != null) {
+            restClient.init(logger);
+        }
+    }
+
     private boolean buildRestServer() {
         String host = this.restServerParams.getHost();
         if (host == null || Network.LOCALHOST.equals(host))
@@ -235,7 +243,7 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
                         /**
                          * finally we can delegate
                          */
-                        String key = Reactor.buildServiceKey(Enums.EnumServiceType.E_REST,reqContext.enumRestCommands,reqContext.request.getRelativePath());
+                        String key = buildServiceKey(Enums.EnumServiceType.E_REST,reqContext.enumRestCommands,reqContext.request.getRelativePath());
                         reactor.delegate(this, key ,reqContext);
                     }
                 } else {
@@ -289,7 +297,7 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
         if (reqCtx.rcid == null) // create a new one
             reqCtx.rcid = IDGenerator.createUUID();
         else // log it
-            msAppInstance.logRcid("getRequestContext",reqCtx.rcid);
+            Logging.logRcid(logger,"getRequestContext",reqCtx.rcid);
         return reqCtx;
     }
 
@@ -345,7 +353,7 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
         apiDocMimeMappingsBuilder.addMapping("yaml", "text/x-yaml");
         apiDocMimeMappingsBuilder.addMapping("html", "text/html");
         pathHandler.addPrefixPath("/static", resource(new ClassPathResourceManager(getClass().getClassLoader(),getClass().getPackage()))//"static"))
-                .addWelcomeFiles("microservice/services/metrics.html")
+                .addWelcomeFiles("microservice/service/pubsub/metrics.html")
                 .setMimeMappings(apiDocMimeMappingsBuilder.build())
                 .setDirectoryListingEnabled(false));
     }
@@ -429,7 +437,7 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
             }
             else
             {
-                msAppInstance.getLogger().error(NO_TOKEN_FOR_REQUEST);
+                logger.error(NO_TOKEN_FOR_REQUEST);
                 sendErrorResp(restContext.response,NO_TOKEN_FOR_REQUEST);
                 valid = false;
             }

src/main/java/microservice/services/IRestServiceZmqImpl.java → src/main/java/microservice/app/microservice/service/pubsub/impl/IRestServiceZmqImpl.java

-package microservice.services;
+package microservice.service.pubsub.impl;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -8,17 +8,15 @@ import common.microservice.io.iface.*;
 import common.microservice.services.CommonServices;
 import common.microservice.types.BaseRestResponse;
 import common.microservice.utils.IDGenerator;
-import microservice.MicroserviceApp;
 import common.microservice.context.CrudMethod;
 import common.microservice.context.RestContext;
 import common.microservice.context.RestMsg;
 import common.microservice.context.RestResponse;
 import common.microservice.defs.Constants;
 import common.microservice.defs.Enums;
-import microservice.handlers.Reactor;
 import common.microservice.params.CommandParams;
-import microservice.params.ZMQParams;
-import microservice.services.protocol.zmq.RestImpl;
+import common.microservice.params.ZMQParams;
+import microservice.service.pubsub.impl.protocol.zmq.RestImpl;
 import common.microservice.utils.ICacheClientGuavaImpl;
 import microservice.utils.ZSocketPool;
 import org.apache.commons.lang.SerializationUtils;
@@ -35,6 +33,7 @@ import java.util.stream.IntStream;
 
 import static common.microservice.defs.Constants.EXIT_MSG;
 import static common.microservice.defs.Constants.EXIT_MSG_LEN;
+import static common.microservice.services.CommonServices.buildServiceKey;
 
 /**
  * Created by amir on 14/05/17.
@@ -154,15 +153,15 @@ public class IRestServiceZmqImpl extends CommonServices.IRestService implements
         private ILogger logger= null;
         private CommonServices.ICacheClient<Long,CacheEntry> responseCacheClient = null;
 
-        public ClientWorker(int workerNumber, CommonServices.ICacheClient<Long, CacheEntry> responseCacheClient) {
+        public ClientWorker(ILogger logger,int workerNumber, CommonServices.ICacheClient<Long, CacheEntry> responseCacheClient) {
             this.workerNumber = workerNumber;
             this.responseCacheClient = responseCacheClient;
             bindAddress = ADDRESS + String.valueOf(workerNumber);
+            this.logger = logger;
         }
 
         @Override
         public boolean init() {
-            logger = MicroserviceApp.getsInstance().getLogger();
             pull = new ZSocket(ZMQ.PULL);
             return pull.bind(bindAddress);
         }
@@ -287,10 +286,12 @@ public class IRestServiceZmqImpl extends CommonServices.IRestService implements
         private ZMQParams.ServerParams zmqParams;
         private ZSocket pull = null;
         private ZSocket push = null;
+        private ILogger logger;
         private int numOfServerWorkers;
-        public ServerReceive(ZMQParams.ServerParams zmqParams, int numOfServerWorkers) {
+        public ServerReceive(ILogger logger,ZMQParams.ServerParams zmqParams, int numOfServerWorkers) {
             this.zmqParams = zmqParams;
             this.numOfServerWorkers = numOfServerWorkers;
+            this.logger = logger;
         }
 
 
@@ -329,7 +330,7 @@ public class IRestServiceZmqImpl extends CommonServices.IRestService implements
                 }
             });
             runThread.start();
-            MicroserviceApp.getsInstance().getLogger().info("ZMQ server started successfully on host: " + zmqParams.getHost() + ", and port: " + String.valueOf(zmqParams.getPort()));
+            logger.info("ZMQ server started successfully on host: " + zmqParams.getHost() + ", and port: " + String.valueOf(zmqParams.getPort()));
         }
 
         @Override
@@ -352,15 +353,16 @@ public class IRestServiceZmqImpl extends CommonServices.IRestService implements
         private CommonServices.IServiceReactor reactor = null;
         private CommonServices.IRestService parentService = null;
         public ObjectMapper objMapper = null;
-        private ILogger logger= null;
+        private ILogger logger = null;
         private ZSocketPool serverSendPool = null;
         private int workerNumber = 0;
         private String bindAddress = null;
 
-        public ServerWorker(CommonServices.IServiceReactor reactor,
+        public ServerWorker(ILogger logger, CommonServices.IServiceReactor reactor,
                             CommonServices.IRestService parentService,
                             ZSocketPool serverSendPool,
                             int workerNumber) {
+            this.logger = logger;
             this.reactor = reactor;
             this.parentService = parentService;
             this.serverSendPool = serverSendPool;
@@ -371,7 +373,6 @@ public class IRestServiceZmqImpl extends CommonServices.IRestService implements
 
         @Override
         public boolean init() {
-            logger = MicroserviceApp.getsInstance().getLogger();
             pull = new ZSocket(ZMQ.PULL);
             objMapper = new ObjectMapper();
             return pull.bind(bindAddress);
@@ -393,7 +394,7 @@ public class IRestServiceZmqImpl extends CommonServices.IRestService implements
                         if (receiveMsg != null){
                             RestContext restContext = getRequestContext(receiveMsg);
                             if (restContext != null){
-                                String key = Reactor.buildServiceKey(Enums.EnumServiceType.E_REST,
+                                String key = buildServiceKey(Enums.EnumServiceType.E_REST,
                                         restContext.enumRestCommands,
                                         restContext.request.getRelativePath());
                                 reactor.delegate(parentService, key ,restContext);
@@ -547,9 +548,12 @@ public class IRestServiceZmqImpl extends CommonServices.IRestService implements
         ByteBuffer respBB = ByteBuffer.allocate(CAPACITY);
         FlatBufferBuilder respBuilder = new FlatBufferBuilder();
 
+        public ServerReply(ILogger logger) {
+            this.logger = logger;
+        }
+
         @Override
         public boolean init() {
-            logger = MicroserviceApp.getsInstance().getLogger();
             pull = new ZSocket(ZMQ.PULL);
             return pull.bind(ADDRESS);
         }
@@ -822,11 +826,12 @@ public class IRestServiceZmqImpl extends CommonServices.IRestService implements
     }
 
     @Override
-    public boolean init() {
+    public boolean init(IApp app) {
         boolean retstat = true;
-        if (MicroserviceApp.getsInstance() != null) {
-            this.appName = MicroserviceApp.getsInstance().getAppName();
-            this.logger = MicroserviceApp.getsInstance().getLogger();
+        this.app = app;
+        if (app != null) {
+            this.appName = app.getAppName();
+            this.logger = app.getLogger();
         }
 
         switch (getServiceMode()){
@@ -853,24 +858,24 @@ public class IRestServiceZmqImpl extends CommonServices.IRestService implements
 
     public boolean allocateServer() {
 
-        allWorkersList.add(new ServerReply());
+        allWorkersList.add(new ServerReply(logger));
         /**
          * init server send pool
          */
         serverSendPool = ZSocketPool.buildPool(ServerReply.ADDRESS,ZMQ.PUSH,numOfServerWorkers);
 
         for (int i = 0; i < numOfServerWorkers; i++){
-            allWorkersList.add(new ServerWorker(reactor,this,serverSendPool,i));
+            allWorkersList.add(new ServerWorker(logger,reactor,this,serverSendPool,i));
         }
         // must be after the workers
-        allWorkersList.add(new ServerReceive(serverParams,numOfServerWorkers));
+        allWorkersList.add(new ServerReceive(logger,serverParams,numOfServerWorkers));
         return serverSendPool != null;
     }
 
     public boolean allocateClient() {
         responseCacheClient = new ICacheClientGuavaImpl<>(EXPIRES_MILLI_SECONDS);
         for (int i = 0; i < numOfClientWorkers; i++){
-            allWorkersList.add(new ClientWorker(i,responseCacheClient));
+            allWorkersList.add(new ClientWorker(logger,i,responseCacheClient));
         }
         // must be after workers
         allWorkersList.add(new ClientReceive(clientReceiveParams,numOfClientWorkers));

src/main/java/microservice/services/protocol/zmq/IMsgQServiceZmqImpl.java → src/main/java/microservice/app/microservice/service/pubsub/impl/protocol/zmq/IMsgQServiceZmqImpl.java

-package microservice.services.protocol.zmq;
+package microservice.service.pubsub.impl.protocol.zmq;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.flatbuffers.FlatBufferBuilder;
+import common.microservice.io.iface.IApp;
 import common.microservice.utils.IDGenerator;
-import microservice.MicroserviceApp;
 import common.microservice.context.ParamValue;
 import common.microservice.context.QueueMsg;
 import common.microservice.defs.Constants;
 import common.microservice.defs.Enums;
-import microservice.handlers.Reactor;
 import common.microservice.io.iface.ILogger;
 import common.microservice.io.iface.IServiceDiscovery;
-import microservice.params.ZMQParams;
+import common.microservice.params.ZMQParams;
 import common.microservice.services.CommonServices;
 import microservice.utils.ZSocketPool;
 import org.zeromq.ZMQ;
@@ -24,6 +23,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
+import static common.microservice.services.CommonServices.buildServiceKey;
+
 /**
  * MsgQueue implementation in ZMQ
  */
@@ -56,7 +57,7 @@ public class IMsgQServiceZmqImpl extends CommonServices.IMsgQService {
             QueueMsg queueMsg = QueueMsg.getRootAsQueueMsg(bb);
             if (queueMsg != null){
                 MsgQContext msgQContext = getMsgQContext(queueMsg);
-                String key = Reactor.buildServiceKey(Enums.EnumServiceType.E_MSGQ,
+                String key = buildServiceKey(Enums.EnumServiceType.E_MSGQ,
                         CommonServices.EnumMsgQueueCommands.E_QUEUE,
                         msgQContext.topic);
                 reactor.delegate(parentService, key ,msgQContext);
@@ -82,11 +83,12 @@ public class IMsgQServiceZmqImpl extends CommonServices.IMsgQService {
 
 
     @Override
-    public boolean init() {
+    public boolean init(IApp app) {
         boolean retstat = true;
-        if (MicroserviceApp.getsInstance() != null) {
-            this.appName = MicroserviceApp.getsInstance().getAppName();
-            this.logger = MicroserviceApp.getsInstance().getLogger();
+        this.app = app;
+        if (app != null) {
+            this.appName = app.getAppName();
+            this.logger = app.getLogger();
         }
 
         if (getServiceMode() != null) {

src/main/java/microservice/services/protocol/zmq/RestImpl.java → src/main/java/microservice/app/microservice/service/pubsub/impl/protocol/zmq/RestImpl.java

-package microservice.services.protocol.zmq;
+package microservice.service.pubsub.impl.protocol.zmq;
 
 import common.microservice.context.RestMsg;
 import common.microservice.io.iface.IRequest;
 import common.microservice.io.iface.IResponse;
-import microservice.services.IRestServiceZmqImpl;
+import microservice.service.pubsub.impl.IRestServiceZmqImpl;
 import microservice.utils.ZSocketPool;
 import org.apache.commons.lang.SerializationUtils;
 import org.zeromq.ZMQ;

src/main/java/microservice/services/protocol/zmq/ZmqWorkers.java → src/main/java/microservice/app/microservice/service/pubsub/impl/protocol/zmq/ZmqWorkers.java

-package microservice.services.protocol.zmq;
+package microservice.service.pubsub.impl.protocol.zmq;
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -6,7 +6,7 @@ import common.microservice.utils.IDGenerator;
 import microservice.MicroserviceApp;
 import common.microservice.context.RestContext;
 import common.microservice.io.iface.ILogger;
-import microservice.params.ZMQParams;
+import common.microservice.params.ZMQParams;
 import common.microservice.services.CommonServices;
 import org.zeromq.ZMQ;
 import org.zeromq.ZSocket;

src/main/java/microservice/utils/ServiceBuilderFactory.java → src/main/java/microservice/app/microservice/utils/ServiceBuilderFactory.java

 package microservice.utils;
 
+import clients.microservice.impl.IRestClientHttpImpl;
 import common.microservice.services.CommonServices;
 import common.microservice.io.iface.IRestClient;
-import microservice.io.impl.IRestClientHttpImpl;
-import microservice.params.PulsarParams;
-import microservice.services.IPubSubServicePulsarImpl;
-import microservice.services.IRestServiceHttpImpl;
-import microservice.services.IRestServiceZmqImpl;
-import microservice.params.RestClientParams;
-import microservice.params.RestServerParams;
-import microservice.params.ZMQParams;
-import microservice.services.protocol.zmq.IMsgQServiceZmqImpl;
+import common.microservice.params.PulsarParams;
+import microservice.service.pubsub.impl.IRestServiceHttpImpl;
+import microservice.service.pubsub.impl.IRestServiceZmqImpl;
+import common.microservice.params.RestClientParams;
+import common.microservice.params.RestServerParams;
+import common.microservice.params.ZMQParams;
+import microservice.service.pubsub.impl.protocol.zmq.IMsgQServiceZmqImpl;
+import service.microservice.IPubSubServicePulsarImpl;
 
 /**
  * Created by amir on 09/05/17.

src/main/java/microservice/io/impl/IRestClientHttpImpl.java → src/main/java/microservice/clients/clients/microservice/impl/IRestClientHttpImpl.java

-package microservice.io.impl;
+package clients.microservice.impl;
 
+import clients.microservice.utils.RestHttpClient;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.netflix.hystrix.HystrixCommand;
 import com.netflix.hystrix.HystrixCommandGroupKey;
 import com.netflix.hystrix.HystrixObservableCommand;
-import com.netflix.hystrix.contrib.codahalemetricspublisher.HystrixCodaHaleMetricsPublisher;
-import com.netflix.hystrix.strategy.HystrixPlugins;
-import com.netflix.hystrix.strategy.metrics.HystrixMetricsPublisher;
-import microservice.MicroserviceApp;
 import common.microservice.defs.Constants;
 import common.microservice.defs.Enums;
+import common.microservice.io.iface.ILogger;
 import common.microservice.io.iface.IRestClient;
 import common.microservice.io.iface.IServiceDiscovery;
-import microservice.params.BaseClientParams;
+import common.microservice.params.BaseClientParams;
 import common.microservice.params.CommandParams;
-import microservice.params.RestClientParams;
+import common.microservice.params.RestClientParams;
 import common.microservice.types.BaseRestResponse;
-import microservice.utils.RestHttpClient;
 import rx.Observable;
 import rx.Subscriber;
 
 import java.util.Optional;
 import java.util.function.Consumer;
 
+import static common.microservice.utils.Logging.logRcid;
+
 public class IRestClientHttpImpl implements IRestClient
 {
 
 	public static final String HYSTRIX_PLUGIN_HYSTRIX_METRICS_PUBLISHER_IMPLEMENTATION = "hystrix.plugin.HystrixMetricsPublisher.implementation";
 	private static final int POLLING_DELAY = 500;
+	private ILogger logger = null;
 
 	/*************************************************************************
 	 * COMMANDS
@@ -213,8 +213,6 @@ public class IRestClientHttpImpl implements IRestClient
     private static final String COMMAND_ERROR = "Command Error: ";
 	RestClientParams clientParams = null;
 	RestHttpClient httpRestClient = null;
-//	HystrixMetricsPoller poller = null;
-//	MetricJsonListener jsonListener = null;
 	Optional<IServiceDiscovery> serviceDiscovery = Optional.empty();
 
     private final ObjectMapper objMapper = new ObjectMapper();
@@ -237,29 +235,26 @@ public class IRestClientHttpImpl implements IRestClient
 
         if (clientParams.isMetricsEnabled())
         {
-			initMetricsPublisher();
-//        	jsonListener = new MetricJsonListener();
-//        	poller = new HystrixMetricsPoller(jsonListener, POLLING_DELAY);
-//        	poller.start();
+//			initMetricsPublisher();
         }
 
 	}
 
 
-	private synchronized void initMetricsPublisher() {
-		String publisherStr = System.getProperty(HYSTRIX_PLUGIN_HYSTRIX_METRICS_PUBLISHER_IMPLEMENTATION);
-		if(publisherStr == null) {
-			try {
-				IMetricsFactoryImpl factoryImpl = (IMetricsFactoryImpl) IMetricsFactoryImpl.getInstance();
-				HystrixMetricsPublisher publisher = new HystrixCodaHaleMetricsPublisher(factoryImpl.getMetrics());
-				HystrixPlugins.getInstance().registerMetricsPublisher(publisher);
-				System.setProperty(HYSTRIX_PLUGIN_HYSTRIX_METRICS_PUBLISHER_IMPLEMENTATION, publisher.getClass().getName());
-			}
-			catch (IllegalStateException ise){
-
-			}
-		}
-	}
+//	private synchronized void initMetricsPublisher() {
+//		String publisherStr = System.getProperty(HYSTRIX_PLUGIN_HYSTRIX_METRICS_PUBLISHER_IMPLEMENTATION);
+//		if(publisherStr == null) {
+//			try {
+//				IMetricsFactoryImpl factoryImpl = (IMetricsFactoryImpl) IMetricsFactoryImpl.getInstance();
+//				HystrixMetricsPublisher publisher = new HystrixCodaHaleMetricsPublisher(factoryImpl.getMetrics());
+//				HystrixPlugins.getInstance().registerMetricsPublisher(publisher);
+//				System.setProperty(HYSTRIX_PLUGIN_HYSTRIX_METRICS_PUBLISHER_IMPLEMENTATION, publisher.getClass().getName());
+//			}
+//			catch (IllegalStateException ise){
+//
+//			}
+//		}
+//	}
 
 	public IRestClientHttpImpl withServiceDiscovery(IServiceDiscovery servDisco)
 	{
@@ -320,6 +315,12 @@ public class IRestClientHttpImpl implements IRestClient
 //	}
 
 	@Override
+	public void init(ILogger logger) {
+		this.logger = logger;
+		httpRestClient.setLogger(logger);
+	}
+
+	@Override
 	public BaseRestResponse create(CommandParams reqCtx)
 	{
 		BaseRestResponse brr = null;
@@ -413,7 +414,7 @@ public class IRestClientHttpImpl implements IRestClient
 		if (cbFunc != null) {
 			try {
 				if (reqCtx.getRcid() != null)
-					MicroserviceApp.getsInstance().logRcid("asyncCreate",reqCtx.getRcid());
+					logRcid(logger,"asyncCreate",reqCtx.getRcid());
 
 				resolveService(reqCtx);
 				retstat = httpRestClient.executeAsync(Enums.EnumHttpMethod.E_POST.getStrMethod(),reqCtx, brr -> cbFunc.accept(brr));
@@ -421,11 +422,11 @@ public class IRestClientHttpImpl implements IRestClient
 //						(brr) -> cbFunc.accept(brr),
 //						(err) -> cbFunc.accept(new BaseRestResponse(false,err.toString()))); // create error BaseRestResponse
 			} catch (Exception e) {
-				MicroserviceApp.getsInstance().getLogger().error(this.getClass().getName() + " >> Exception in asyncCreate: " + e.toString());
+				logger.error(this.getClass().getName() + " >> Exception in asyncCreate: " + e.toString());
 				retstat = false;
 			}
 		} else {
-			MicroserviceApp.getsInstance().getLogger().error(this.getClass().getName() + " >> null cbFunc in asyncCreate");
+			logger.error(this.getClass().getName() + " >> null cbFunc in asyncCreate");
 			retstat = false;
 		}
 		return retstat;
@@ -443,11 +444,11 @@ public class IRestClientHttpImpl implements IRestClient
 //						(brr) -> cbFunc.accept(brr),
 //						(err) -> cbFunc.accept(new BaseRestResponse(false,err.toString()))); // create error BaseRestResponse
 			} catch (Exception e) {
-				MicroserviceApp.getsInstance().getLogger().error(this.getClass().getName() + " >> Exception in asyncRead: " + e.toString());
+				logger.error(this.getClass().getName() + " >> Exception in asyncRead: " + e.toString());
 				retstat = false;
 			}
 		} else {
-			MicroserviceApp.getsInstance().getLogger().error(this.getClass().getName() + " >> null cbFunc in asyncRead");
+			logger.error(this.getClass().getName() + " >> null cbFunc in asyncRead");
 			retstat = false;
 		}
 		return retstat;
@@ -459,7 +460,7 @@ public class IRestClientHttpImpl implements IRestClient
 		if (cbFunc != null) {
 			try {
 				if (reqCtx.getRcid() != null)
-					MicroserviceApp.getsInstance().logRcid("asyncUpdate",reqCtx.getRcid());
+					logRcid(logger,"asyncUpdate",reqCtx.getRcid());
 
 				resolveService();
 				retstat = httpRestClient.executeAsync(Enums.EnumHttpMethod.E_PUT.getStrMethod(),reqCtx, brr -> cbFunc.accept(brr));
@@ -467,11 +468,11 @@ public class IRestClientHttpImpl implements IRestClient
 //						(brr) -> cbFunc.accept(brr),
 //						(err) -> cbFunc.accept(new BaseRestResponse(false,err.toString()))); // create error BaseRestResponse
 			} catch (Exception e) {
-				MicroserviceApp.getsInstance().getLogger().error(this.getClass().getName() + " >> Exception in asyncUpdate: " + e.toString());
+				logger.error(this.getClass().getName() + " >> Exception in asyncUpdate: " + e.toString());
 				retstat = false;
 			}
 		} else {
-			MicroserviceApp.getsInstance().getLogger().error(this.getClass().getName() + " >> null cbFunc in asyncUpdate");
+			logger.error(this.getClass().getName() + " >> null cbFunc in asyncUpdate");
 			retstat = false;
 		}
 		return retstat;
@@ -483,7 +484,7 @@ public class IRestClientHttpImpl implements IRestClient
 		if (cbFunc != null) {
 			try {
 				if (reqCtx.getRcid() != null)
-					MicroserviceApp.getsInstance().logRcid("asyncDelete",reqCtx.getRcid());
+					logRcid(logger,"asyncDelete",reqCtx.getRcid());
 
 				resolveService();
 				retstat = httpRestClient.executeAsync(Enums.EnumHttpMethod.E_DELETE.getStrMethod(),reqCtx, brr -> cbFunc.accept(brr));
@@ -491,11 +492,11 @@ public class IRestClientHttpImpl implements IRestClient
 //						(brr) -> cbFunc.accept(brr),
 //						(err) -> cbFunc.accept(new BaseRestResponse(false,err.toString()))); // create error BaseRestResponse
 			} catch (Exception e) {
-				MicroserviceApp.getsInstance().getLogger().error(this.getClass().getName() + " >> Exception in asyncDelete: " + e.toString());
+				logger.error(this.getClass().getName() + " >> Exception in asyncDelete: " + e.toString());
 				retstat = false;
 			}
 		} else {
-			MicroserviceApp.getsInstance().getLogger().error(this.getClass().getName() + " >> null cbFunc in asyncDelete");
+			logger.error(this.getClass().getName() + " >> null cbFunc in asyncDelete");
 			retstat = false;
 		}
 		return retstat;

src/main/java/microservice/common/common/microservice/io/iface/IApp.java

+package common.microservice.io.iface;
+
+public interface IApp {
+
+    ILogger getLogger();
+    String getAppName();
+    String getServerName();
+    String getId();
+    IConfiguration getConfiguration();
+}

src/common/java/common/microservice/io/iface/IRestClient.java → src/main/java/microservice/common/common/microservice/io/iface/IRestClient.java

@@ -12,7 +12,7 @@ import java.util.function.Consumer;
 public interface IRestClient
 {
 	static final String COMMAND_ERROR = "Command Error: ";
-	
+	void init(ILogger logger);
 	public abstract class Command extends HystrixCommand<BaseRestResponse> {
 		protected CommandParams reqCtx = null;
 		

src/main/java/microservice/io/impl/ILoggerConsoleImpl.java → src/main/java/microservice/common/common/microservice/io/impl/ILoggerConsoleImpl.java

-package microservice.io.impl;
+package common.microservice.io.impl;
 
 import common.microservice.io.iface.ILogger;
 

src/main/java/microservice/params/BaseClientParams.java → src/main/java/microservice/common/common/microservice/params/BaseClientParams.java

-package microservice.params;
+package common.microservice.params;
 
 public class BaseClientParams
 {

src/main/java/microservice/params/PulsarParams.java → src/main/java/microservice/common/common/microservice/params/PulsarParams.java

-package microservice.params;
+package common.microservice.params;
 
 import org.apache.commons.lang.StringUtils;
 

src/main/java/microservice/params/RMQClientParams.java → src/main/java/microservice/common/common/microservice/params/RMQClientParams.java

-package microservice.params;
+package common.microservice.params;
 
 public class RMQClientParams extends BaseClientParams
 {

src/main/java/microservice/params/RestClientParams.java → src/main/java/microservice/common/common/microservice/params/RestClientParams.java

-package microservice.params;
+package common.microservice.params;
 
 public class RestClientParams extends BaseClientParams
 {

src/main/java/microservice/params/RestServerParams.java → src/main/java/microservice/common/common/microservice/params/RestServerParams.java

-package microservice.params;
+package common.microservice.params;
 
 import java.util.Optional;
 

src/main/java/microservice/params/ZMQParams.java → src/main/java/microservice/common/common/microservice/params/ZMQParams.java

-package microservice.params;
+package common.microservice.params;
 
-import jdk.nashorn.internal.ir.EmptyNode;
+//import jdk.nashorn.internal.ir.EmptyNode;
 
 /**
  * Created by amir on 14/05/17.

src/common/java/common/microservice/services/CommonServices.java → src/main/java/microservice/common/common/microservice/services/CommonServices.java

@@ -3,10 +3,7 @@ package common.microservice.services;
 import common.microservice.context.CrudMethod;
 import common.microservice.defs.Constants;
 import common.microservice.defs.Enums;
-import common.microservice.io.iface.IMetricsFactory;
-import common.microservice.io.iface.IRequest;
-import common.microservice.io.iface.IResponse;
-import common.microservice.io.iface.IServiceDiscovery;
+import common.microservice.io.iface.*;
 import common.microservice.params.CommandParams;
 import common.microservice.types.BaseRestResponse;
 
@@ -35,8 +32,8 @@ public class CommonServices {
     public static abstract class IService {
         protected IServiceReactor reactor = null;
         protected IMetricsFactory metricsFactory = null;
-
-        public abstract boolean init();
+        protected IApp            app = null;
+        public abstract boolean init(IApp app);
         public abstract void run();
         public abstract void shutdown();
         public abstract void handleNotImplmented(IMsgContext msgContext);
@@ -339,4 +336,21 @@ public class CommonServices {
         public abstract void stop() throws InterruptedException;
 
     }
+
+
+    public static String buildServiceKey(CommonServices.MethodParams methodParams) {
+        return Constants.SLASH_SEPERATOR  +
+                methodParams.getServiceType().name() + Constants.TYPE_PREFIX_SEPERATOR +
+                methodParams.getServiceCommand().toString() + Constants.TYPE_PREFIX_SEPERATOR +
+                methodParams.getResourceUri();
+    }
+
+    public static String buildServiceKey(Enums.EnumServiceType enumServiceType,
+                                             CommonServices.IServiceCommands serviceCommands,
+                                             String resourceUri) {
+        return new StringBuilder(32).append(Constants.SLASH_SEPERATOR).append(enumServiceType.name()).append(Constants.TYPE_PREFIX_SEPERATOR)
+                .append(serviceCommands.toString()).append(Constants.TYPE_PREFIX_SEPERATOR)
+                .append(resourceUri).toString();
+    }
+
 }

src/main/java/microservice/common/common/microservice/utils/Logging.java

+package common.microservice.utils;
+
+import common.microservice.io.iface.ILogger;
+
+public class Logging {
+    /**
+     * logging utils
+     */
+    public static void logRcid(ILogger logger,String from, String rcid){
+        logger.info(from + " RCID: " + rcid);
+    }
+
+    public static void logMcid(ILogger logger,String from, String mcid){
+        logger.info(from + " MCID: " + mcid);
+    }
+
+}

src/test/java/microservice/TestCommandClient.java

@@ -4,10 +4,10 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import common.microservice.io.iface.IRestClient;
 import microservice.io.impl.IRMQClientRestImpl;
-import microservice.params.BaseClientParams;
+import common.microservice.params.BaseClientParams;
 import common.microservice.params.CommandParams;
 import common.microservice.params.CommandParamsBuilder;
-import microservice.params.RMQClientParams;
+import common.microservice.params.RMQClientParams;
 import common.microservice.types.BaseRestResponse;
 import org.junit.Test;
 import rx.Observable;

src/test/java/microservice/TestLogger.java

@@ -3,7 +3,7 @@ package microservice;
 
 
 import common.microservice.io.iface.ILogger;
-import microservice.io.impl.ILoggerConsoleImpl;
+import common.microservice.io.impl.ILoggerConsoleImpl;
 import org.junit.Test;
 
 import java.time.LocalDateTime;

src/test/java/microservice/TestMicroClient.java

@@ -25,7 +25,7 @@ import org.junit.Test;
 
 import microservice.MicroserviceClient.EnumRestClientType;
 import common.microservice.params.CommandParams;
-import microservice.params.RestClientParams;
+import common.microservice.params.RestClientParams;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import common.microservice.types.BaseRestResponse;

src/test/java/microservice/TestMicroserviceApp.java

@@ -7,14 +7,13 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import common.microservice.context.RestContext;
 import common.microservice.defs.Enums;
-import common.microservice.params.CommandParams;
+import common.microservice.params.*;
 import common.microservice.services.CommonServices;
 import common.microservice.io.iface.IRestClient;
 import microservice.io.impl.*;
-import microservice.services.IRestServiceHttpImpl;
-import microservice.params.*;
+import services.impl.IRestServiceHttpImpl;
 
-import microservice.services.IRestServiceZmqImpl;
+import services.impl.IRestServiceZmqImpl;
 import common.microservice.types.BaseRestResponse;
 import microservice.utils.ServiceBuilderFactory;
 import org.eclipse.paho.client.mqttv3.MqttException;

src/test/java/microservice/TestServicesAndMethods.java

@@ -14,7 +14,7 @@ import com.google.common.cache.CacheBuilder;
 import common.JsonHandler;
 import io.undertow.predicate.Predicate;
 import io.undertow.util.PathMatcher;
-import microservice.params.ZMQParams;
+import common.microservice.params.ZMQParams;
 import common.microservice.services.CommonServices;
 
 import microservice.utils.ServiceBuilderFactory;