Skip to content

ipgallery.common.java / microservice

Go to a project
Commit 18c6fb01 by Amir Aharon
Options

Merge branch 'feature-PubSubPulsar' into 'Feature-PulsarMerge' 

# Conflicts:
#   README.md
#   build.gradle
#   src/main/java/microservice/utils/RestHttpClient.java
parents 49ba3894 8827fb54
Inline Side-by-side
Showing with 1343 additions and 334 deletions
README.md
### Microservice Framework in JAVA ### Microservice Framework in JAVA
## 2.2.0
- Add Pulsar PubSub Implementation
- Add Either as default for optional
- Divide src to common and main so that app's can use only common where needed
- Note on Pulsar topic: can't be nested so after the domain prefix change the / with @
e.g: rest path like /domain/apiFamiliy/api1 will be in pubsub /domain/apiFamily@api1
## 2.1.4 ## 2.1.4
- connect with undertow 2.0.28 - connect with undertow 2.0.28
## 2.1.3 ## 2.1.3
...@@ -7,6 +14,7 @@ ...@@ -7,6 +14,7 @@
- add config to okhttp client read/connect timeouts - add config to okhttp client read/connect timeouts
"microservice.http.client.read.timeout.seconds" (30) "microservice.http.client.read.timeout.seconds" (30)
"microservice.http.client.connect.timeout.seconds" (10) "microservice.http.client.connect.timeout.seconds" (10)
## 2.1.1 ## 2.1.1
- downgrade metrics influxdb to fit the reporter on iot jar - downgrade metrics influxdb to fit the reporter on iot jar
......
build.gradle
group 'com.ipgallery.common' group 'com.ipgallery.common'
version '2.1.4' version '2.2.0'
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
...@@ -17,42 +17,91 @@ repositories { ...@@ -17,42 +17,91 @@ repositories {
} }
sourceSets {
main
// client
common
}
dependencies { dependencies {
// compile 'io.undertow:undertow-core:1.0.1.Final'
compile 'io.undertow:undertow-core:2.0.28.Final' commonCompile (
compile 'com.fasterxml.jackson.core:jackson-databind:2.2.3' 'com.fasterxml.jackson.core:jackson-databind:2.2.3',
compile 'com.github.stephenc.eaio-uuid:uuid:3.4.0' 'io.jsonwebtoken:jjwt:0.6.0',
compile 'io.dropwizard.metrics:metrics-core:3.1.0' 'com.ipgallery.common:utils:1.2.5',
compile 'com.netflix.hystrix:hystrix-codahale-metrics-publisher:1.4.14' 'com.github.stephenc.eaio-uuid:uuid:3.4.0',
compile 'com.netflix.hystrix:hystrix-metrics-event-stream:1.4.12' 'com.netflix.hystrix:hystrix-core:1.4.14'
compile 'redis.clients:jedis:2.4.2' )
compile 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2'
compile 'com.ipgallery.common:utils:1.2.5' // clientCompile (
compile ('com.ipgallery.common:rabbitmq:1.0.3') // files('build/common/microservice-common.jar'),
compile 'com.ecwid.consul:consul-api:1.1.9' //// files('build/common/activities-common.jar'),
//compile 'com.github.davidb:metrics-influxdb:0.9.3' // //'com.ipgallery.common:microservice:2.1.1'
compile 'com.github.davidb:metrics-influxdb:0.8.2' // )
compile 'io.dropwizard.metrics:metrics-graphite:3.2.5'
compile 'io.jsonwebtoken:jjwt:0.6.0' compile (
compile group: 'org.zeromq', name: 'jeromq', version: '0.4.0' files('build/common/microservice-common.jar'),
compile 'org.elasticsearch.client:rest:5.4.1' // files('build/client/microservice-client.jar'),
compile 'com.netflix.rxjava:rxjava-apache-http:0.20.7' 'io.jsonwebtoken:jjwt:0.6.0',
compile 'com.squareup.okhttp3:okhttp:3.8.0' 'io.undertow:undertow-core:1.0.1.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',
'redis.clients:jedis:2.4.2',
'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2',
'com.ipgallery.common:utils:1.2.5',
'com.ipgallery.common:rabbitmq:1.0.3',
'com.ecwid.consul:consul-api:1.1.9',
//'com.github.davidb:metrics-influxdb:0.9.3'
'com.github.davidb:metrics-influxdb:0.8.2',
'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'
)
// compile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.2' // 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' testCompile (
'junit:junit:4.11',
'org.zeromq:jeromq:0.4.0',
'com.github.stephenc.eaio-uuid:uuid:3.4.0'
)
}
task commonJar(type: Jar) {
from configurations.commonCompile.collect { zipTree it }
from sourceSets.common.output
version = '1.0.0'
archiveName = "microservice-common.jar"
destinationDir = file("build/common")
} }
//1. use this install task (under "other" section) to create this jar localy on your machine. //// client
// version will be extended with the Postfix "-LOCAL" //task clientJar(type: Jar) {
//2. in order to use this jar in a project using this jar: // dependsOn commonJar
// in the build.gradle add "mavenLocal()" as first repository // mustRunAfter commonJar
//and the dependency with correct version number ended with "-LOCAL" // from configurations.clientCompile.collect { zipTree it }
//install { // from sourceSets.client.output
// repositories.mavenInstaller { // version = '1.0.0'
// pom.version = version + '-LOCAL' // archiveName = "microservice-client.jar"
// } // destinationDir = file("build/client")
//}
jar {
dependsOn commonJar
mustRunAfter commonJar
}
// from configurations.compile.collect { zipTree it }
// from sourceSets.main.output
// //version = '2.2.0'
// archiveName = "microservice-${version}.jar"
// destinationDir = file("build/main")
//} //}
...@@ -67,16 +116,53 @@ publishing { ...@@ -67,16 +116,53 @@ publishing {
} }
} }
// repositories.maven {
// url 'http://172.16.1.132:8081/repository/internal'
// credentials {
// username "admin"
// password "giptmgr1"
// }
// }
mavenJava(MavenPublication) { mavenJava(MavenPublication) {
//artifactId 'group-service' artifactId 'microservice'
from components.java from components.java
} }
// client(MavenPublication) {
// artifactId 'microservice-client'
// version clientJar.version
// // adding dependencies
// pom.withXml {
// def dependenciesNode = asNode().appendNode('dependencies')
// //Iterate over the compile dependencies (we don't want the test ones), adding a <dependency> node for each
// configurations.clientCompile.dependencies.each {
// if (it.group != null && it.name != null){
// def dependencyNode = dependenciesNode.appendNode('dependency')
// dependencyNode.appendNode('groupId', it.group)
// dependencyNode.appendNode('artifactId', it.name)
// dependencyNode.appendNode('version', it.version)
// }
// }
// }
// //version - taking prom the project version
// //from components.java
// artifact clientJar
// }
common(MavenPublication) {
artifactId 'microservice-common'
version commonJar.version
// adding dependencies
pom.withXml {
def dependenciesNode = asNode().appendNode('dependencies')
//Iterate over the compile dependencies (we don't want the test ones), adding a <dependency> node for each
// configurations.clientCompile.dependencies.each {
// if (it.group != null && it.name != null){
// def dependencyNode = dependenciesNode.appendNode('dependency')
// dependencyNode.appendNode('groupId', it.group)
// dependencyNode.appendNode('artifactId', it.name)
// dependencyNode.appendNode('version', it.version)
// }
// }
}
//version - taking prom the project version
//from components.java
artifact commonJar
}
} }
} }
\ No newline at end of file
doc/pulsar.txt 0 → 100644
Running standalone
docker run -it -p 80:80 -p 8080:8080 -p 6650:6650 apachepulsar/pulsar-standalone
[curl]
- show tenant
curl -s http://localhost:8080/admin/v2/tenants/mcz
- show namespaces
curl -s http://localhost:8080/admin/v2/namespaces/mcx/publish
[pulsar-admin]
run "docker exec -it [pulsar-standalone-instance] bash"
and then execute admin commands:
https://pulsar.apache.org/docs/latest/admin-api/overview/
- create tenant: pulsar-admin tenants create mcx
- create namespace in tenant: pulsar-admin namespaces create mcx/namespace1
- set replication clusters (needed to have policies, otherwise we can't publish):
bin/pulsar-admin namespaces set-clusters mcx/namespace1 --clusters standalone
src/main/java/com/google/flatbuffers/FlatBufferBuilder.java → src/common/java/com/google/flatbuffers/FlatBufferBuilder.java
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
package com.google.flatbuffers; package com.google.flatbuffers;
import static com.google.flatbuffers.Constants.*;
import java.nio.CharBuffer; import java.nio.CharBuffer;
import java.nio.charset.CharacterCodingException; import java.nio.charset.CharacterCodingException;
import java.nio.charset.CharsetEncoder; import java.nio.charset.CharsetEncoder;
...@@ -27,6 +25,10 @@ import java.nio.ByteBuffer; ...@@ -27,6 +25,10 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import static com.google.flatbuffers.Constants.FILE_IDENTIFIER_LENGTH;
import static com.google.flatbuffers.Constants.SIZEOF_INT;
import static com.google.flatbuffers.Constants.SIZEOF_SHORT;
/// @file /// @file
/// @addtogroup flatbuffers_java_api /// @addtogroup flatbuffers_java_api
/// @{ /// @{
...@@ -204,7 +206,7 @@ public class FlatBufferBuilder { ...@@ -204,7 +206,7 @@ public class FlatBufferBuilder {
* *
* @param x A `short` to put into the buffer. * @param x A `short` to put into the buffer.
*/ */
public void putShort (short x) { bb.putShort (space -= Constants.SIZEOF_SHORT, x); } public void putShort (short x) { bb.putShort (space -= SIZEOF_SHORT, x); }
/** /**
* Add an `int` to the buffer, backwards from the current location. Doesn't align nor * Add an `int` to the buffer, backwards from the current location. Doesn't align nor
...@@ -212,7 +214,7 @@ public class FlatBufferBuilder { ...@@ -212,7 +214,7 @@ public class FlatBufferBuilder {
* *
* @param x An `int` to put into the buffer. * @param x An `int` to put into the buffer.
*/ */
public void putInt (int x) { bb.putInt (space -= Constants.SIZEOF_INT, x); } public void putInt (int x) { bb.putInt (space -= SIZEOF_INT, x); }
/** /**
* Add a `long` to the buffer, backwards from the current location. Doesn't align nor * Add a `long` to the buffer, backwards from the current location. Doesn't align nor
...@@ -258,14 +260,14 @@ public class FlatBufferBuilder { ...@@ -258,14 +260,14 @@ public class FlatBufferBuilder {
* *
* @param x A `short` to put into the buffer. * @param x A `short` to put into the buffer.
*/ */
public void addShort (short x) { prep(Constants.SIZEOF_SHORT, 0); putShort (x); } public void addShort (short x) { prep(SIZEOF_SHORT, 0); putShort (x); }
/** /**
* Add an `int` to the buffer, properly aligned, and grows the buffer (if necessary). * Add an `int` to the buffer, properly aligned, and grows the buffer (if necessary).
* *
* @param x An `int` to put into the buffer. * @param x An `int` to put into the buffer.
*/ */
public void addInt (int x) { prep(Constants.SIZEOF_INT, 0); putInt (x); } public void addInt (int x) { prep(SIZEOF_INT, 0); putInt (x); }
/** /**
* Add a `long` to the buffer, properly aligned, and grows the buffer (if necessary). * Add a `long` to the buffer, properly aligned, and grows the buffer (if necessary).
...@@ -397,7 +399,7 @@ public class FlatBufferBuilder { ...@@ -397,7 +399,7 @@ public class FlatBufferBuilder {
*/ */
public int createVectorOfTables(int[] offsets) { public int createVectorOfTables(int[] offsets) {
notNested(); notNested();
startVector(Constants.SIZEOF_INT, offsets.length, Constants.SIZEOF_INT); startVector(SIZEOF_INT, offsets.length, SIZEOF_INT);
for(int i = offsets.length - 1; i >= 0; i--) addOffset(offsets[i]); for(int i = offsets.length - 1; i >= 0; i--) addOffset(offsets[i]);
return endVector(); return endVector();
} }
......
src/main/java/microservice/common/context/CrudMethod.java → src/common/java/common/microservice/context/CrudMethod.java
// automatically generated by the FlatBuffers compiler, do not modify // automatically generated by the FlatBuffers compiler, do not modify
package microservice.common.context; package common.microservice.context;
public final class CrudMethod { public final class CrudMethod {
private CrudMethod() { } private CrudMethod() { }
......
src/main/java/microservice/common/context/ParamValue.java → src/common/java/common/microservice/context/ParamValue.java
// automatically generated by the FlatBuffers compiler, do not modify // automatically generated by the FlatBuffers compiler, do not modify
package microservice.common.context; package common.microservice.context;
import java.nio.*; import java.nio.*;
import java.lang.*; import java.lang.*;
import java.util.*;
import com.google.flatbuffers.*; import com.google.flatbuffers.*;
@SuppressWarnings("unused") @SuppressWarnings("unused")
......
src/common/java/common/microservice/context/PubSubContext.java 0 → 100644
package common.microservice.context;
import common.microservice.services.CommonServices;
import java.util.Deque;
import java.util.Map;
public class PubSubContext implements CommonServices.IMsgContext {
public String[] params = null;
public Map<String, Deque<String>> queryParameters = null;
public Map<String, String> pathParameters = null;
public String rcid; // request correlation id
public String getParameter(String paramName) {
if (queryParameters != null && queryParameters.containsKey(paramName))
return queryParameters.get(paramName).getFirst();
else
return null;
}
public String getPathParameter(String paramName) {
if (pathParameters != null )
return pathParameters.get(paramName);
else
return null;
}
@Override
public void setParameters(Map<String, String> parameters) {
pathParameters = parameters;
}
}
src/common/java/common/microservice/context/PubSubMsg.java 0 → 100644
package common.microservice.context;
import java.util.HashMap;
import java.util.Map;
public class PubSubMsg {
String content;
String mcid; // msg context id
Map<String, String> parameters = null;
public PubSubMsg(String content, String mcid) {
this.content = content;
this.mcid = mcid;
}
public PubSubMsg(String content, String mcid, Map<String, String> parameters) {
this.content = content;
this.mcid = mcid;
this.parameters = parameters;
}
public PubSubMsg() {
}
PubSubMsg addParameter(String param, String value){
if (parameters == null)
parameters = new HashMap<>();
parameters.put(param,value);
return this;
}
public Map<String, String> getParameters() {
return parameters;
}
public String getContent() {
return content;
}
public String getMcid() {
return mcid;
}
@Override
public String toString() {
return "mcid: " + mcid + ", content: " + content;
}
}
src/main/java/microservice/common/context/QueueMsg.java → src/common/java/common/microservice/context/QueueMsg.java
// automatically generated by the FlatBuffers compiler, do not modify // automatically generated by the FlatBuffers compiler, do not modify
package microservice.common.context; package common.microservice.context;
import java.nio.*; import java.nio.*;
import java.lang.*; import java.lang.*;
import java.util.*;
import com.google.flatbuffers.*; import com.google.flatbuffers.*;
@SuppressWarnings("unused") @SuppressWarnings("unused")
......
src/main/java/microservice/common/context/RestContext.java → src/common/java/common/microservice/context/RestContext.java
package microservice.common.context; package common.microservice.context;
import java.util.Deque; import java.util.Deque;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import microservice.services.CommonServices; import common.microservice.services.CommonServices;
import microservice.io.iface.IContainer; import common.microservice.io.iface.IContainer;
import microservice.io.iface.IRequest; import common.microservice.io.iface.IRequest;
import microservice.io.iface.IResponse; import common.microservice.io.iface.IResponse;
import microservice.types.UserProfile; import common.microservice.types.UserProfile;
public class RestContext implements CommonServices.IMsgContext public class RestContext implements CommonServices.IMsgContext
......
src/main/java/microservice/common/context/RestMsg.java → src/common/java/common/microservice/context/RestMsg.java
// automatically generated by the FlatBuffers compiler, do not modify // automatically generated by the FlatBuffers compiler, do not modify
package microservice.common.context; package common.microservice.context;
import java.nio.*; import java.nio.*;
import java.lang.*; import java.lang.*;
import java.util.*;
import com.google.flatbuffers.*; import com.google.flatbuffers.*;
@SuppressWarnings("unused") @SuppressWarnings("unused")
......
src/main/java/microservice/common/context/RestResponse.java → src/common/java/common/microservice/context/RestResponse.java
// automatically generated by the FlatBuffers compiler, do not modify // automatically generated by the FlatBuffers compiler, do not modify
package microservice.common.context; package common.microservice.context;
import java.nio.*; import java.nio.*;
import java.lang.*; import java.lang.*;
import java.util.*;
import com.google.flatbuffers.*; import com.google.flatbuffers.*;
@SuppressWarnings("unused") @SuppressWarnings("unused")
......
src/main/java/microservice/defs/Constants.java → src/common/java/common/microservice/defs/Constants.java
package microservice.defs; package common.microservice.defs;
public class Constants public class Constants
{ {
...@@ -25,4 +25,5 @@ public class Constants ...@@ -25,4 +25,5 @@ public class Constants
public static final String TIMER = "Timer:"; public static final String TIMER = "Timer:";
public static final String HTTP_SCHEME = "http"; public static final String HTTP_SCHEME = "http";
public static final String MSGQ_ID = "mqid"; public static final String MSGQ_ID = "mqid";
public static final String DEFAULT_TENANT = "mcx";
} }
src/main/java/microservice/defs/Enums.java → src/common/java/common/microservice/defs/Enums.java
package microservice.defs; package common.microservice.defs;
public class Enums public class Enums
{ {
......
src/main/java/microservice/io/iface/IConfiguration.java → src/common/java/common/microservice/io/iface/IConfiguration.java
package microservice.io.iface; package common.microservice.io.iface;
import common.configuration.IConfigurationProvider; import common.configuration.IConfigurationProvider;
......
src/main/java/microservice/io/iface/IContainer.java → src/common/java/common/microservice/io/iface/IContainer.java
package microservice.io.iface; package common.microservice.io.iface;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import com.fasterxml.jackson.databind.JsonNode;
import microservice.handlers.BaseHandler;
/** /**
* this interface defines the basic operations * this interface defines the basic operations
* required from the container implementor * required from the container implementor
......
src/main/java/microservice/io/iface/ILogger.java → src/common/java/common/microservice/io/iface/ILogger.java
package microservice.io.iface; package common.microservice.io.iface;
import java.util.Optional;
import java.util.stream.Stream;
/** /**
* logger interface to use in the MS * logger interface to use in the MS
......
src/main/java/microservice/io/iface/IMetricsFactory.java → src/common/java/common/microservice/io/iface/IMetricsFactory.java
package microservice.io.iface; package common.microservice.io.iface;
/** /**
* metrics interface for adding/incerementing metrics counters (collectd/...) * metrics interface for adding/incerementing metrics counters (collectd/...)
......
src/main/java/microservice/io/iface/INotifyCallback.java → src/common/java/common/microservice/io/iface/INotifyCallback.java
package microservice.io.iface; package common.microservice.io.iface;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
......
src/main/java/microservice/io/iface/IPubSub.java → src/common/java/common/microservice/io/iface/IPubSub.java
package microservice.io.iface; package common.microservice.io.iface;
public interface IPubSub public interface IPubSub
{ {
......
src/main/java/microservice/io/iface/IRequest.java → src/common/java/common/microservice/io/iface/IRequest.java
package microservice.io.iface; package common.microservice.io.iface;
import java.io.InputStream; import java.io.InputStream;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Consumer;
public interface IRequest public interface IRequest
{ {
......
src/main/java/microservice/io/iface/IResponse.java → src/common/java/common/microservice/io/iface/IResponse.java
package microservice.io.iface; package common.microservice.io.iface;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
......
src/main/java/microservice/io/iface/IRestClient.java → src/common/java/common/microservice/io/iface/IRestClient.java
package microservice.io.iface; package common.microservice.io.iface;
import microservice.params.CommandParams; import common.microservice.params.CommandParams;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.netflix.hystrix.HystrixCommand; import com.netflix.hystrix.HystrixCommand;
import com.netflix.hystrix.HystrixCommandGroupKey; import com.netflix.hystrix.HystrixCommandGroupKey;
import microservice.types.BaseRestResponse; import common.microservice.types.BaseRestResponse;
import java.util.function.Consumer; import java.util.function.Consumer;
......
src/main/java/microservice/io/iface/IServiceDiscovery.java → src/common/java/common/microservice/io/iface/IServiceDiscovery.java
package microservice.io.iface; package common.microservice.io.iface;
import microservice.defs.Enums; import common.microservice.defs.Enums;
import common.configuration.IConfigurationProvider; import common.configuration.IConfigurationProvider;
/** /**
......
src/main/java/microservice/common/paging/Href.java → src/common/java/common/microservice/paging/Href.java
package microservice.common.paging; package common.microservice.paging;
/** /**
* Created by amir on 23/03/17. * Created by amir on 23/03/17.
......
src/main/java/microservice/common/paging/Links.java → src/common/java/common/microservice/paging/Links.java
package microservice.common.paging; package common.microservice.paging;
/** /**
* Created by amir on 23/03/17. * Created by amir on 23/03/17.
......
src/main/java/microservice/common/paging/Page.java → src/common/java/common/microservice/paging/Page.java
package microservice.common.paging; package common.microservice.paging;
/** /**
* Created by amir on 23/03/17. * Created by amir on 23/03/17.
......
src/main/java/microservice/common/paging/PageBuilder.java → src/common/java/common/microservice/paging/PageBuilder.java
package microservice.common.paging; package common.microservice.paging;
import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ArrayNode;
......
src/main/java/microservice/common/paging/PageBuilderJsonNodeImpl.java → src/common/java/common/microservice/paging/PageBuilderJsonNodeImpl.java
package microservice.common.paging; package common.microservice.paging;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ArrayNode;
......
src/main/java/microservice/common/paging/Sort.java → src/common/java/common/microservice/paging/Sort.java
package microservice.common.paging; package common.microservice.paging;
/** /**
* Created by amir on 23/03/17. * Created by amir on 23/03/17.
......
src/main/java/microservice/params/CommandParams.java → src/common/java/common/microservice/params/CommandParams.java
package microservice.params; package common.microservice.params;
import java.util.Map; import java.util.Map;
......
src/main/java/microservice/params/CommandParamsBuilder.java → src/common/java/common/microservice/params/CommandParamsBuilder.java
package microservice.params; package common.microservice.params;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
......
src/main/java/microservice/common/BCrypt.java → src/common/java/common/microservice/security/BCrypt.java
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
package microservice.common; package common.microservice.security;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.security.SecureRandom; import java.security.SecureRandom;
......
src/main/java/microservice/common/EncryptionUtils.java → src/common/java/common/microservice/security/EncryptionUtils.java
package microservice.common; package common.microservice.security;
import common.microservice.types.UserProfile;
import io.jsonwebtoken.*; import io.jsonwebtoken.*;
import microservice.types.UserProfile;
import javax.crypto.spec.SecretKeySpec; import javax.crypto.spec.SecretKeySpec;
import javax.xml.bind.DatatypeConverter; import javax.xml.bind.DatatypeConverter;
......
src/main/java/microservice/services/CommonServices.java → src/common/java/common/microservice/services/CommonServices.java
package microservice.services; package common.microservice.services;
import microservice.common.context.CrudMethod; import common.microservice.context.CrudMethod;
import microservice.defs.Constants; import common.microservice.defs.Constants;
import microservice.defs.Enums; import common.microservice.defs.Enums;
import microservice.io.iface.IMetricsFactory; import common.microservice.io.iface.IMetricsFactory;
import microservice.io.iface.IRequest; import common.microservice.io.iface.IRequest;
import microservice.io.iface.IResponse; import common.microservice.io.iface.IResponse;
import microservice.io.iface.IServiceDiscovery; import common.microservice.io.iface.IServiceDiscovery;
import microservice.params.CommandParams; import common.microservice.params.CommandParams;
import microservice.types.BaseRestResponse; import common.microservice.types.BaseRestResponse;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -40,6 +40,7 @@ public class CommonServices { ...@@ -40,6 +40,7 @@ public class CommonServices {
public abstract void run(); public abstract void run();
public abstract void shutdown(); public abstract void shutdown();
public abstract void handleNotImplmented(IMsgContext msgContext); public abstract void handleNotImplmented(IMsgContext msgContext);
public abstract Enums.EnumServiceType getServiceType();
/// when relevant /// when relevant
public abstract void register(IServiceDiscovery serviceDiscovery, String id); public abstract void register(IServiceDiscovery serviceDiscovery, String id);
...@@ -138,14 +139,15 @@ public class CommonServices { ...@@ -138,14 +139,15 @@ public class CommonServices {
protected static String DELETE_METRIC_PREFIX = Constants.METER + SEND + Enums.EnumServiceType.E_REST.name() + ':' + CrudMethod.name(CrudMethod.Delete) + ':'; protected static String DELETE_METRIC_PREFIX = Constants.METER + SEND + Enums.EnumServiceType.E_REST.name() + ':' + CrudMethod.name(CrudMethod.Delete) + ':';
EnumRestServiceMode serviceMode = EnumRestServiceMode.E_UNKNOWN; EnumRestServiceMode serviceMode = EnumRestServiceMode.E_UNKNOWN;
protected microservice.io.iface.IRestClient restClient = null; protected common.microservice.io.iface.IRestClient restClient = null;
public EnumRestServiceMode getServiceMode() { return serviceMode; } public EnumRestServiceMode getServiceMode() { return serviceMode; }
public void setServiceMode(EnumRestServiceMode serviceMode) { this.serviceMode = serviceMode; } public void setServiceMode(EnumRestServiceMode serviceMode) { this.serviceMode = serviceMode; }
public void setRestClient(microservice.io.iface.IRestClient restClient) { public void setRestClient(common.microservice.io.iface.IRestClient restClient) {
this.restClient = restClient; this.restClient = restClient;
} }
@Override
public Enums.EnumServiceType getServiceType() { return Enums.EnumServiceType.E_REST; }
///////////// SYNC ////////////////////////// ///////////// SYNC //////////////////////////
public abstract BaseRestResponse create(CommandParams cmdParams); public abstract BaseRestResponse create(CommandParams cmdParams);
...@@ -166,29 +168,88 @@ public class CommonServices { ...@@ -166,29 +168,88 @@ public class CommonServices {
public abstract void startAsync(IRequest request,Runnable asyncFunc); public abstract void startAsync(IRequest request,Runnable asyncFunc);
} }
enum EnumPubSubCommands implements IServiceCommands { public enum EnumPubSubCommands implements IServiceCommands {
E_SUBSCRIBE, E_SUBSCRIBE,
E_PUBLISH, E_PUBLISH,
E_NOTIFY E_NOTIFY
} }
public enum EnumPubSubServiceMode {
E_PUBLISHER,
E_SUBSCRIBER,
E_BOTH
}
public static abstract class IPubSubService extends IService { public static abstract class IPubSubService extends IService {
public class PubSubMsgContext implements IMsgContext { public static class PubSubMsgContext implements IMsgContext {
public String topic; private String topic;
public String msg; private String msg;
private String mcid = null;
public Map<String, String> parameters = null;
public PubSubMsgContext(String topic, String msg) { public PubSubMsgContext(String topic, String msg) {
this.topic = topic; this.topic = topic;
this.msg = msg; this.msg = msg;
} }
public PubSubMsgContext(String topic,
String msg,
String mcid,
Map<String, String> parameters) {
this.topic = topic;
this.msg = msg;
this.mcid = mcid;
this.parameters = parameters;
}
public String getTopic() {
return topic;
}
public void setTopic(String topic) {
this.topic = topic;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public String getMcid() {
return mcid;
}
public PubSubMsgContext setMcid(String mcid) {
this.mcid = mcid;
return this;
}
public Map<String, String> getParameters() {
return parameters;
}
@Override @Override
public void setParameters(Map<String, String> parameters) { public void setParameters(Map<String, String> parameters) {
this.parameters = parameters;
} }
} }
EnumPubSubServiceMode serviceMode = EnumPubSubServiceMode.E_BOTH;
public EnumPubSubServiceMode getServiceMode() {
return serviceMode;
}
public void setServiceMode(EnumPubSubServiceMode serviceMode) {
this.serviceMode = serviceMode;
}
@Override
public Enums.EnumServiceType getServiceType() { return Enums.EnumServiceType.E_PUBSUB; }
public abstract void subscribe(String topic, Consumer<PubSubMsgContext> notifyFunc,Consumer<String> errorFunc); public abstract void subscribe(String topic, Consumer<PubSubMsgContext> notifyFunc,Consumer<String> errorFunc);
public abstract void unsubscribe(String topic); public abstract void unsubscribe(String topic);
public abstract void publish(PubSubMsgContext pubSubMsgContext); public abstract void publish(PubSubMsgContext pubSubMsgContext);
...@@ -227,7 +288,8 @@ public class CommonServices { ...@@ -227,7 +288,8 @@ public class CommonServices {
public EnumMsgQServiceMode getServiceMode() { public EnumMsgQServiceMode getServiceMode() {
return serviceMode; return serviceMode;
} }
@Override
public Enums.EnumServiceType getServiceType() { return Enums.EnumServiceType.E_MSGQ; }
public void setServiceMode(EnumMsgQServiceMode serviceMode) { public void setServiceMode(EnumMsgQServiceMode serviceMode) {
this.serviceMode = serviceMode; this.serviceMode = serviceMode;
} }
......
src/main/java/microservice/types/BaseRestResponse.java → src/common/java/common/microservice/types/BaseRestResponse.java
package microservice.types; package common.microservice.types;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
......
src/main/java/microservice/types/UserProfile.java → src/common/java/common/microservice/types/UserProfile.java
package microservice.types; package common.microservice.types;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.jsonwebtoken.impl.DefaultClaims; import io.jsonwebtoken.impl.DefaultClaims;
import microservice.services.CommonServices; import common.microservice.services.CommonServices;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
......
src/main/java/microservice/utils/CheckedFunction.java → src/common/java/common/microservice/utils/CheckedFunction.java
package microservice.utils; package common.microservice.utils;
@FunctionalInterface @FunctionalInterface
public interface CheckedFunction<T,R> { public interface CheckedFunction<T,R> {
......
src/main/java/microservice/utils/Either.java → src/common/java/common/microservice/utils/Either.java
package microservice.utils; package common.microservice.utils;
import com.google.gdata.util.common.base.Pair; import com.google.gdata.util.common.base.Pair;
......
src/main/java/microservice/utils/ICacheClientGuavaImpl.java → src/common/java/common/microservice/utils/ICacheClientGuavaImpl.java
package microservice.utils; package common.microservice.utils;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import microservice.services.CommonServices; import common.microservice.services.CommonServices;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
......
src/common/java/common/microservice/utils/IDGenerator.java 0 → 100644
package common.microservice.utils;
import com.eaio.uuid.UUID;
public class IDGenerator {
public static String createUUID(){
return new UUID().toString();
}
public static long createUUIDLong(){
return new UUID().getTime();
}
}
src/main/java/microservice/MicroserviceApp.java
package microservice; package microservice;
import common.microservice.io.iface.*;
import io.undertow.Handlers; import io.undertow.Handlers;
import io.undertow.Undertow; import io.undertow.Undertow;
import io.undertow.Undertow.Builder; import io.undertow.Undertow.Builder;
...@@ -7,14 +8,14 @@ import io.undertow.server.HttpHandler; ...@@ -7,14 +8,14 @@ import io.undertow.server.HttpHandler;
import io.undertow.server.handlers.PathHandler; import io.undertow.server.handlers.PathHandler;
import io.undertow.server.handlers.resource.ClassPathResourceManager; import io.undertow.server.handlers.resource.ClassPathResourceManager;
import io.undertow.util.MimeMappings; import io.undertow.util.MimeMappings;
import microservice.defs.Enums; import common.microservice.defs.Enums;
import microservice.handlers.*;
import microservice.io.iface.*;
import microservice.io.impl.*;
import microservice.params.RMQClientParams; import microservice.params.RMQClientParams;
import microservice.params.RestServerParams; import microservice.params.RestServerParams;
import microservice.handlers.*;
import microservice.io.iface.IRestServer;
import microservice.io.impl.*;
import microservice.services.CommonServices; import common.microservice.services.CommonServices;
import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttException;
import rabbitmq.common.RMQId; import rabbitmq.common.RMQId;
...@@ -643,6 +644,7 @@ public class MicroserviceApp ...@@ -643,6 +644,7 @@ public class MicroserviceApp
/** /**
* מי מתחכם זה מיקו!!! * מי מתחכם זה מיקו!!!
* running only if there are any valid services
*/ */
if (Arrays.stream(servicesArray) if (Arrays.stream(servicesArray)
.filter(p -> p != null) .filter(p -> p != null)
...@@ -695,4 +697,8 @@ public class MicroserviceApp ...@@ -695,4 +697,8 @@ public class MicroserviceApp
public void logRcid(String from, String rcid){ public void logRcid(String from, String rcid){
getLogger().info(from + " RCID: " + rcid); getLogger().info(from + " RCID: " + rcid);
} }
public void logMcid(String from, String mcid){
getLogger().info(from + " MCID: " + mcid);
}
} }
src/main/java/microservice/MicroserviceClient.java
package microservice; package microservice;
import microservice.defs.Constants; import common.microservice.defs.Constants;
import microservice.types.BaseRestResponse;
import common.CacheClient; import common.CacheClient;
import common.JsonHandler; import common.JsonHandler;
import common.RedisCacheClient; import common.RedisCacheClient;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import microservice.io.iface.IRestClient; import common.microservice.io.iface.IRestClient;
import common.microservice.types.BaseRestResponse;
import microservice.io.impl.IRestClientHttpImpl; import microservice.io.impl.IRestClientHttpImpl;
import microservice.params.BaseClientParams; import microservice.params.BaseClientParams;
import microservice.params.CommandParams; import common.microservice.params.CommandParams;
/** /**
* *
......
src/main/java/microservice/handlers/BaseHandler.java
...@@ -6,11 +6,11 @@ import com.fasterxml.jackson.databind.JsonNode; ...@@ -6,11 +6,11 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import microservice.MicroserviceApp; import microservice.MicroserviceApp;
import microservice.common.context.RestContext; import common.microservice.context.RestContext;
import microservice.io.iface.IConfiguration; import common.microservice.io.iface.IConfiguration;
import microservice.io.iface.IContainer; import common.microservice.io.iface.IContainer;
import microservice.io.iface.ILogger; import common.microservice.io.iface.ILogger;
import microservice.io.iface.INotifyCallback; import common.microservice.io.iface.INotifyCallback;
public abstract class BaseHandler public abstract class BaseHandler
{ {
......
src/main/java/microservice/handlers/MBIHandler.java
...@@ -5,16 +5,18 @@ import java.util.Deque; ...@@ -5,16 +5,18 @@ import java.util.Deque;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import microservice.common.context.RestContext; import common.microservice.context.RestContext;
import microservice.defs.Constants; import common.microservice.defs.Constants;
import microservice.defs.Enums.EnumHttpMethod; import common.microservice.defs.Enums.EnumHttpMethod;
import microservice.io.iface.*; import common.microservice.io.iface.IContainer;
import common.microservice.io.iface.ILogger;
import common.microservice.io.iface.IRequest;
import common.microservice.io.iface.IResponse;
import common.microservice.types.BaseRestResponse;
import microservice.io.impl.IRequestMBIImpl; import microservice.io.impl.IRequestMBIImpl;
import microservice.io.impl.IResponseMBIImpl; import microservice.io.impl.IResponseMBIImpl;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import microservice.types.BaseRestResponse;
import rabbitmq.common.RMQId; import rabbitmq.common.RMQId;
import rabbitmq.common.RMQMessage; import rabbitmq.common.RMQMessage;
......
src/main/java/microservice/handlers/MonitorHandler.java
package microservice.handlers; package microservice.handlers;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.codahale.metrics.Counter; import com.codahale.metrics.Counter;
import com.codahale.metrics.Gauge; import com.codahale.metrics.Gauge;
...@@ -16,15 +14,15 @@ import com.fasterxml.jackson.databind.ObjectMapper; ...@@ -16,15 +14,15 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import common.microservice.types.BaseRestResponse;
import microservice.MicroserviceApp; import microservice.MicroserviceApp;
import microservice.defs.Constants; import common.microservice.defs.Constants;
import microservice.defs.Enums; import common.microservice.defs.Enums;
import microservice.io.iface.ILogger; import common.microservice.io.iface.ILogger;
import microservice.services.CommonServices; import common.microservice.services.CommonServices;
import microservice.io.iface.IConfiguration; import common.microservice.io.iface.IConfiguration;
import microservice.io.impl.IMetricsFactoryImpl; import microservice.io.impl.IMetricsFactoryImpl;
import microservice.types.BaseRestResponse; import common.microservice.context.RestContext;
import microservice.common.context.RestContext;
/** /**
* this class is for monitoring the microservice * this class is for monitoring the microservice
......
src/main/java/microservice/handlers/Reactor.java
...@@ -2,11 +2,11 @@ package microservice.handlers; ...@@ -2,11 +2,11 @@ package microservice.handlers;
import io.undertow.util.PathMatcher; import io.undertow.util.PathMatcher;
import io.undertow.util.PathTemplateMatcher; import io.undertow.util.PathTemplateMatcher;
import microservice.defs.Constants; import common.microservice.defs.Constants;
import microservice.defs.Enums; import common.microservice.defs.Enums;
import microservice.services.CommonServices; import common.microservice.services.CommonServices;
import microservice.io.iface.ILogger; import common.microservice.io.iface.ILogger;
import microservice.io.iface.IMetricsFactory; import common.microservice.io.iface.IMetricsFactory;
import java.util.*; import java.util.*;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
......
src/main/java/microservice/handlers/RestHandler.java
package microservice.handlers; package microservice.handlers;
import com.eaio.uuid.UUID;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import common.microservice.io.iface.IContainer;
import common.microservice.io.iface.IPubSub;
import common.microservice.io.iface.IRequest;
import common.microservice.io.iface.IResponse;
import common.microservice.types.BaseRestResponse;
import common.microservice.types.UserProfile;
import common.microservice.utils.IDGenerator;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.ExpiredJwtException;
import io.undertow.server.HttpHandler; import io.undertow.server.HttpHandler;
...@@ -10,21 +17,18 @@ import io.undertow.util.HeaderMap; ...@@ -10,21 +17,18 @@ import io.undertow.util.HeaderMap;
import io.undertow.util.Headers; import io.undertow.util.Headers;
import io.undertow.util.HttpString; import io.undertow.util.HttpString;
import microservice.MicroserviceApp; import microservice.MicroserviceApp;
import microservice.common.context.RestContext; import common.microservice.context.RestContext;
import microservice.common.EncryptionUtils; import common.microservice.security.EncryptionUtils;
import microservice.defs.Constants; import common.microservice.defs.Constants;
import microservice.defs.Enums.EnumHttpMethod; import common.microservice.defs.Enums.EnumHttpMethod;
import microservice.io.iface.*; import common.microservice.io.iface.IMetricsFactory.IMeter;
import microservice.io.iface.IMetricsFactory.IMeter; import common.microservice.io.iface.IMetricsFactory.ITimer;
import microservice.io.iface.IMetricsFactory.ITimer;
import microservice.io.impl.IMetricsFactoryImpl; import microservice.io.impl.IMetricsFactoryImpl;
import microservice.io.impl.IRequestRestImpl; import microservice.io.impl.IRequestRestImpl;
import microservice.io.impl.IResponseRestImpl; import microservice.io.impl.IResponseRestImpl;
import microservice.services.CommonServices; import common.microservice.services.CommonServices;
import microservice.types.BaseRestResponse;
import microservice.types.UserProfile;
import static microservice.defs.Constants.*; import static common.microservice.defs.Constants.*;
public class RestHandler implements HttpHandler , IContainer public class RestHandler implements HttpHandler , IContainer
{ {
...@@ -283,7 +287,7 @@ public class RestHandler implements HttpHandler , IContainer ...@@ -283,7 +287,7 @@ public class RestHandler implements HttpHandler , IContainer
HeaderMap requestHeaders = exchange.getRequestHeaders(); HeaderMap requestHeaders = exchange.getRequestHeaders();
reqCtx.rcid = requestHeaders.getFirst(Constants.RCID_HEADER); reqCtx.rcid = requestHeaders.getFirst(Constants.RCID_HEADER);
if (reqCtx.rcid == null) // create a new one if (reqCtx.rcid == null) // create a new one
reqCtx.rcid = new UUID().toString(); reqCtx.rcid = IDGenerator.createUUID();
return reqCtx; return reqCtx;
} }
......
src/main/java/microservice/io/iface/IRestServer.java
...@@ -2,6 +2,9 @@ package microservice.io.iface; ...@@ -2,6 +2,9 @@ package microservice.io.iface;
import java.util.Map; import java.util.Map;
import common.microservice.io.iface.IPubSub;
import common.microservice.io.iface.IServiceDiscovery;
import microservice.handlers.BaseHandler; import microservice.handlers.BaseHandler;
/** /**
...@@ -13,7 +16,7 @@ public interface IRestServer { ...@@ -13,7 +16,7 @@ public interface IRestServer {
public boolean build(String appName, public boolean build(String appName,
Map<String, BaseHandler> msHandlersMap, Map<String, BaseHandler> msHandlersMap,
IPubSub pubSub, IPubSub pubSub,
boolean withMetrics); boolean withMetrics);
public void run(); public void run();
public void stop(); public void stop();
......
src/main/java/microservice/io/impl/IConfigurationConfigPropImpl.java
...@@ -3,7 +3,7 @@ package microservice.io.impl; ...@@ -3,7 +3,7 @@ package microservice.io.impl;
import common.configuration.ConfigProperties; import common.configuration.ConfigProperties;
import common.configuration.EnumPropertyType; import common.configuration.EnumPropertyType;
import common.configuration.IConfigurationProvider; import common.configuration.IConfigurationProvider;
import microservice.io.iface.IConfiguration; import common.microservice.io.iface.IConfiguration;
public class IConfigurationConfigPropImpl implements IConfiguration { public class IConfigurationConfigPropImpl implements IConfiguration {
ConfigProperties instance = null; ConfigProperties instance = null;
......
src/main/java/microservice/io/impl/ILogger4jImpl.java
package microservice.io.impl; package microservice.io.impl;
import common.Log4jHandler; import common.Log4jHandler;
import microservice.io.iface.ILogger; import common.microservice.io.iface.ILogger;
public class ILogger4jImpl implements ILogger public class ILogger4jImpl implements ILogger
{ {
......
src/main/java/microservice/io/impl/ILoggerConsoleImpl.java
package microservice.io.impl; package microservice.io.impl;
import microservice.io.iface.ILogger; import common.microservice.io.iface.ILogger;
import java.time.LocalDateTime; import java.time.LocalDateTime;
......
src/main/java/microservice/io/impl/IMetricsFactoryImpl.java
...@@ -10,7 +10,7 @@ import metrics_influxdb.InfluxdbReporter; ...@@ -10,7 +10,7 @@ import metrics_influxdb.InfluxdbReporter;
import metrics_influxdb.api.measurements.CategoriesMetricMeasurementTransformer; import metrics_influxdb.api.measurements.CategoriesMetricMeasurementTransformer;
import metrics_influxdb.api.protocols.HttpInfluxdbProtocol; import metrics_influxdb.api.protocols.HttpInfluxdbProtocol;
import microservice.MicroserviceApp; import microservice.MicroserviceApp;
import microservice.io.iface.IMetricsFactory; import common.microservice.io.iface.IMetricsFactory;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
......
src/main/java/microservice/io/impl/IPubSubMQTTImpl.java
...@@ -9,8 +9,8 @@ import org.eclipse.paho.client.mqttv3.MqttPersistenceException; ...@@ -9,8 +9,8 @@ import org.eclipse.paho.client.mqttv3.MqttPersistenceException;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import microservice.io.iface.INotifyCallback; import common.microservice.io.iface.INotifyCallback;
import microservice.io.iface.IPubSub; import common.microservice.io.iface.IPubSub;
import common.JsonHandler; import common.JsonHandler;
public class IPubSubMQTTImpl implements IPubSub{ public class IPubSubMQTTImpl implements IPubSub{
......
src/main/java/microservice/io/impl/IPubSubRedisImpl.java
...@@ -10,8 +10,8 @@ import redis.clients.jedis.JedisPool; ...@@ -10,8 +10,8 @@ import redis.clients.jedis.JedisPool;
import redis.clients.jedis.JedisPoolConfig; import redis.clients.jedis.JedisPoolConfig;
import redis.clients.jedis.JedisPubSub; import redis.clients.jedis.JedisPubSub;
import common.JsonHandler; import common.JsonHandler;
import microservice.io.iface.INotifyCallback; import common.microservice.io.iface.INotifyCallback;
import microservice.io.iface.IPubSub; import common.microservice.io.iface.IPubSub;
public class IPubSubRedisImpl implements IPubSub public class IPubSubRedisImpl implements IPubSub
{ {
......
src/main/java/microservice/io/impl/IRMQClientRestImpl.java
...@@ -5,13 +5,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; ...@@ -5,13 +5,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ArrayNode;
import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsPoller; import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsPoller;
import http.simpleRestClient.SimpleRestResponse; import http.simpleRestClient.SimpleRestResponse;
import microservice.defs.Enums; import common.microservice.defs.Enums;
import microservice.io.iface.IRestClient; import common.microservice.io.iface.IRestClient;
import microservice.io.iface.IServiceDiscovery; import common.microservice.io.iface.IServiceDiscovery;
import microservice.params.BaseClientParams; import microservice.params.BaseClientParams;
import microservice.params.CommandParams; import common.microservice.params.CommandParams;
import microservice.params.RMQClientParams; import microservice.params.RMQClientParams;
import microservice.types.BaseRestResponse; import common.microservice.types.BaseRestResponse;
import rabbitmq.client.RMQRestClient; import rabbitmq.client.RMQRestClient;
import rabbitmq.common.RMQId; import rabbitmq.common.RMQId;
import rabbitmq.common.RMQMessage; import rabbitmq.common.RMQMessage;
......
src/main/java/microservice/io/impl/IRequestMBIImpl.java
...@@ -4,14 +4,13 @@ import java.io.ByteArrayInputStream; ...@@ -4,14 +4,13 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream; import java.io.InputStream;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Consumer;
//import com.sun.xml.internal.ws.api.message.stream.InputStreamMessage; //import com.sun.xml.internal.ws.api.message.stream.InputStreamMessage;
import rabbitmq.common.RMQMessage; import rabbitmq.common.RMQMessage;
import rabbitmq.common.RMQRestRequest; import rabbitmq.common.RMQRestRequest;
//import io.undertow.server.HttpServerExchange; //import io.undertow.server.HttpServerExchange;
import microservice.io.iface.IRequest; import common.microservice.io.iface.IRequest;
public class IRequestMBIImpl implements IRequest public class IRequestMBIImpl implements IRequest
{ {
......
src/main/java/microservice/io/impl/IRequestRestImpl.java
...@@ -2,15 +2,13 @@ package microservice.io.impl; ...@@ -2,15 +2,13 @@ package microservice.io.impl;
import java.io.InputStream; import java.io.InputStream;
import java.util.Arrays; import java.util.Arrays;
import java.util.Deque;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Consumer;
import io.undertow.server.HttpServerExchange; import io.undertow.server.HttpServerExchange;
import io.undertow.util.HeaderValues; import io.undertow.util.HeaderValues;
import microservice.io.iface.IRequest; import common.microservice.io.iface.IRequest;
public class IRequestRestImpl implements IRequest public class IRequestRestImpl implements IRequest
{ {
......
src/main/java/microservice/io/impl/IResponseMBIImpl.java
package microservice.io.impl; package microservice.io.impl;
import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import microservice.io.iface.ILogger; import common.microservice.io.iface.ILogger;
import rabbitmq.common.RMQSender; import rabbitmq.common.RMQSender;
import rabbitmq.common.RMQId; import rabbitmq.common.RMQId;
import rabbitmq.common.RMQMessage; import rabbitmq.common.RMQMessage;
import rabbitmq.common.RMQRestResponse; import rabbitmq.common.RMQRestResponse;
import microservice.io.iface.IResponse; import common.microservice.io.iface.IResponse;
public class IResponseMBIImpl implements IResponse public class IResponseMBIImpl implements IResponse
{ {
......
src/main/java/microservice/io/impl/IResponseRestImpl.java
...@@ -4,7 +4,7 @@ import io.undertow.server.HttpServerExchange; ...@@ -4,7 +4,7 @@ import io.undertow.server.HttpServerExchange;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import microservice.io.iface.IResponse; import common.microservice.io.iface.IResponse;
public class IResponseRestImpl implements IResponse public class IResponseRestImpl implements IResponse
{ {
......
src/main/java/microservice/io/impl/IRestClientHttpImpl.java
...@@ -10,14 +10,14 @@ import com.netflix.hystrix.contrib.codahalemetricspublisher.HystrixCodaHaleMetri ...@@ -10,14 +10,14 @@ import com.netflix.hystrix.contrib.codahalemetricspublisher.HystrixCodaHaleMetri
import com.netflix.hystrix.strategy.HystrixPlugins; import com.netflix.hystrix.strategy.HystrixPlugins;
import com.netflix.hystrix.strategy.metrics.HystrixMetricsPublisher; import com.netflix.hystrix.strategy.metrics.HystrixMetricsPublisher;
import microservice.MicroserviceApp; import microservice.MicroserviceApp;
import microservice.defs.Constants; import common.microservice.defs.Constants;
import microservice.defs.Enums; import common.microservice.defs.Enums;
import microservice.io.iface.IRestClient; import common.microservice.io.iface.IRestClient;
import microservice.io.iface.IServiceDiscovery; import common.microservice.io.iface.IServiceDiscovery;
import microservice.params.BaseClientParams; import microservice.params.BaseClientParams;
import microservice.params.CommandParams; import common.microservice.params.CommandParams;
import microservice.params.RestClientParams; import microservice.params.RestClientParams;
import microservice.types.BaseRestResponse; import common.microservice.types.BaseRestResponse;
import microservice.utils.RestHttpClient; import microservice.utils.RestHttpClient;
import rx.Observable; import rx.Observable;
import rx.Subscriber; import rx.Subscriber;
......
src/main/java/microservice/io/impl/IRestServerRMQImpl.java
...@@ -10,9 +10,9 @@ import rabbitmq.server.RMQHandler; ...@@ -10,9 +10,9 @@ import rabbitmq.server.RMQHandler;
import rabbitmq.server.RMQServer; import rabbitmq.server.RMQServer;
import microservice.handlers.BaseHandler; import microservice.handlers.BaseHandler;
import microservice.handlers.MBIHandler; import microservice.handlers.MBIHandler;
import microservice.io.iface.IPubSub; import common.microservice.io.iface.IPubSub;
import microservice.io.iface.IRestServer; import microservice.io.iface.IRestServer;
import microservice.io.iface.IServiceDiscovery; import common.microservice.io.iface.IServiceDiscovery;
import microservice.params.RMQClientParams; import microservice.params.RMQClientParams;
public class IRestServerRMQImpl implements IRestServer { public class IRestServerRMQImpl implements IRestServer {
......
src/main/java/microservice/io/impl/IRestServerUndertowImpl.java
...@@ -16,9 +16,9 @@ import common.Network; ...@@ -16,9 +16,9 @@ import common.Network;
import microservice.MicroserviceApp; import microservice.MicroserviceApp;
import microservice.handlers.BaseHandler; import microservice.handlers.BaseHandler;
import microservice.handlers.RestHandler; import microservice.handlers.RestHandler;
import microservice.io.iface.IPubSub; import common.microservice.io.iface.IPubSub;
import microservice.io.iface.IRestServer; import microservice.io.iface.IRestServer;
import microservice.io.iface.IServiceDiscovery; import common.microservice.io.iface.IServiceDiscovery;
import microservice.params.RestServerParams; import microservice.params.RestServerParams;
import static io.undertow.Handlers.resource; import static io.undertow.Handlers.resource;
......
src/main/java/microservice/io/impl/IServiceDiscoveryConsulImpl.java
...@@ -10,8 +10,8 @@ import com.google.common.collect.Lists; ...@@ -10,8 +10,8 @@ import com.google.common.collect.Lists;
import common.Network; import common.Network;
import common.configuration.IConfigurationProvider; import common.configuration.IConfigurationProvider;
import microservice.MicroserviceApp; import microservice.MicroserviceApp;
import microservice.defs.Enums; import common.microservice.defs.Enums;
import microservice.io.iface.IServiceDiscovery; import common.microservice.io.iface.IServiceDiscovery;
import java.util.*; import java.util.*;
import java.util.Base64.Decoder; import java.util.Base64.Decoder;
......
src/main/java/microservice/params/PulsarParams.java 0 → 100644
package microservice.params;
import org.apache.commons.lang.StringUtils;
/**
* parameters to init pulsar pub-sub
* namepaces and topic - admin
*/
public class PulsarParams {
int msgTtl;
String clusters = "standalone";;
String serviceUrl;
String adminUrl;
int consumersThreadPoolSize;
public static class PulsarParamsBuilder {
public static final int DEFAULT_ADMIN_PORT = 8080;
public static final int DEFAULT_SERVICE_PORT = 6650;
public static final String STANDALONE_CLUSTER = "standalone";
int msgTtl = 3600;
String clusters = STANDALONE_CLUSTER;
String serviceUrl;
String adminUrl = null;
int consumersThreadPoolSize = 0;
public PulsarParamsBuilder() {
}
public String getServiceUrl() {
return serviceUrl;
}
public PulsarParamsBuilder setServiceUrl(String serviceUrl) {
final String[] parts = serviceUrl.split(":");
if(parts.length < 2 ) { // || !StringUtils.isNumeric(parts[1]))
this.serviceUrl = String.format("%s:%u",serviceUrl, DEFAULT_SERVICE_PORT);
} else if (!StringUtils.isNumeric(parts[1])){
this.serviceUrl = String.format("%s:%u",parts[0], DEFAULT_SERVICE_PORT);
} else {
this.serviceUrl = serviceUrl;
}
return this;
}
public PulsarParamsBuilder setMsgTtl(int msgTtl) {
this.msgTtl = msgTtl;
return this;
}
public PulsarParamsBuilder setClusters(String clusters) {
this.clusters = clusters;
return this;
}
public PulsarParamsBuilder setAdminUrl(String adminUrl) {
this.adminUrl = adminUrl;
return this;
}
public void setConsumersThreadPoolSize(int consumersThreadPoolSize) {
this.consumersThreadPoolSize = consumersThreadPoolSize;
}
public PulsarParams build(){
try {
if (adminUrl == null) {
String host = serviceUrl.substring(0, serviceUrl.indexOf(':'));
adminUrl = String.format("%s:%d",host, DEFAULT_ADMIN_PORT);
}
if (consumersThreadPoolSize == 0){
consumersThreadPoolSize = Runtime.getRuntime().availableProcessors();
}
return new PulsarParams(msgTtl,
clusters,
serviceUrl,
adminUrl,
consumersThreadPoolSize);
} catch (Exception e){
System.err.println("PulsarParamsBuilder > " + e.toString());
}
return null;
}
}
public PulsarParams(int msgTtl, String clusters, String serviceUrl, String adminUrl, int consumersThreadPoolSize) {
this.msgTtl = msgTtl;
this.clusters = clusters;
this.serviceUrl = serviceUrl;
this.adminUrl = adminUrl;
this.consumersThreadPoolSize = consumersThreadPoolSize;
}
public int getMsgTtl() {
return msgTtl;
}
public void setMsgTtl(int msgTtl) {
this.msgTtl = msgTtl;
}
public String getClusters() {
return clusters;
}
public void setClusters(String clusters) {
this.clusters = clusters;
}
public String getServiceUrl() {
return serviceUrl;
}
public void setServiceUrl(String serviceUrl) {
this.serviceUrl = serviceUrl;
}
public String getAdminUrl() {
return adminUrl;
}
public void setAdminUrl(String adminUrl) {
this.adminUrl = adminUrl;
}
public int getConsumersThreadPoolSize() {
return consumersThreadPoolSize;
}
public void setConsumersThreadPoolSize(int consumersThreadPoolSize) {
this.consumersThreadPoolSize = consumersThreadPoolSize;
}
}
src/main/java/microservice/services/IPubSubServiceMqttImpl.java
package microservice.services; package microservice.services;
import microservice.services.CommonServices; import common.microservice.services.CommonServices;
import microservice.io.iface.IServiceDiscovery; import common.microservice.io.iface.IServiceDiscovery;
import org.eclipse.paho.client.mqttv3.*; import org.eclipse.paho.client.mqttv3.*;
import java.util.HashMap; import java.util.HashMap;
......
src/main/java/microservice/services/IPubSubServicePulsarImpl.java 0 → 100644
package microservice.services;
import common.microservice.context.PubSubMsg;
import common.microservice.defs.Constants;
import common.microservice.defs.Enums;
import common.microservice.io.iface.ILogger;
import common.microservice.io.iface.IServiceDiscovery;
import common.microservice.services.CommonServices;
import common.microservice.utils.IDGenerator;
import microservice.MicroserviceApp;
import microservice.handlers.Reactor;
import microservice.params.PulsarParams;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.admin.Tenants;
import org.apache.pulsar.client.admin.internal.PulsarAdminBuilderImpl;
import org.apache.pulsar.client.api.*;
import org.apache.pulsar.client.impl.schema.JSONSchema;
import org.apache.pulsar.common.policies.data.TenantInfo;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.regex.Pattern;
/**
* This class implements PubSubService for Apache Pulsar
* The subscription is wildcard for service name (appName): 'persistent://service/.*'
* the part after the service name contains the method path to pass to the reactor
* the consumer part receives a message, creates the pubsub context and dispatch it to
* thread poll executor which handle the message and delegate it to the reactor
* currently ot sending message as a flatbuffer, using json so that external tools
* i.e apache flink, can subscribe and inject the messages as well.
*/
public class IPubSubServicePulsarImpl extends CommonServices.IPubSubService {
public static final String PULSAR_PREFIX = "pulsar://";
public static final String SERVICE_NAME = "IPubSubServicePulsarImpl";
public static final String PERSISTENT_PREFIX = "persistent://";
public static final String TOPIC_PREFIX = PERSISTENT_PREFIX + Constants.DEFAULT_TENANT;
public static int INIITIAL_PRODUCERS_SIZE = 5;
private String adminUrl;
private PulsarClient client = null;
// private String serviceUrl;
private Consumer<PubSubMsg> consumer = null;
private ILogger logger = null;
private String clientId;
private Thread consumerThread = null;
// private int consumersThreadPoolSize;
private ExecutorService consumerExecutorService = null;
private ConcurrentHashMap<String,Producer<PubSubMsg>> producersMap = new ConcurrentHashMap<>(INIITIAL_PRODUCERS_SIZE);
private boolean consumerRunning = false;
private Set<String> clusters; // = new HashSet<>(Arrays.asList("standalone"));
private String namespacePrefix;
private PulsarParams pulsarParams;
// public IPubSubServicePulsarImpl(String serviceUrl,
// String adminUrl,
// String clusters,
// int consumersThreadPoolSize) {
// if (!serviceUrl.startsWith(PULSAR_PREFIX))
// serviceUrl = PULSAR_PREFIX + serviceUrl;
// this.serviceUrl = serviceUrl;
// this.adminUrl = adminUrl;
// this.clusters = new HashSet<>(Arrays.asList(clusters.split(",")));
// this.consumersThreadPoolSize = consumersThreadPoolSize;
// }
public IPubSubServicePulsarImpl(PulsarParams pulsarParams) {
this.pulsarParams = pulsarParams;
if (!pulsarParams.getServiceUrl().startsWith(PULSAR_PREFIX))
pulsarParams.setServiceUrl(PULSAR_PREFIX + pulsarParams.getServiceUrl());
this.clusters = new HashSet<>(Arrays.asList(pulsarParams.getClusters().split(",")));
}
@Override
public boolean init() {
final MicroserviceApp microserviceApp = MicroserviceApp.getsInstance();
if (microserviceApp != null) {
clientId = microserviceApp.getAppName() + '-'
+ microserviceApp.getServerName() + '-'
+ microserviceApp.getId();
logger = MicroserviceApp.getsInstance().getLogger();
namespacePrefix = TOPIC_PREFIX + "/" + microserviceApp.getAppName();
} else {
// for tests where there is no MicroserviceApp
namespacePrefix = TOPIC_PREFIX + "/" + "testApp";
}
try {
client = PulsarClient.builder()
.serviceUrl(this.pulsarParams.getServiceUrl())
.build();
switch (getServiceMode()){
case E_SUBSCRIBER:
case E_BOTH:
createConsumer();
break;
}
} catch (PulsarClientException e) {
System.err.println(e.toString());
return false;
} catch (PulsarAdminException e) {
System.err.println(e.toString());
return false;
}
return true;
}
@Override
public void run() {
if (getServiceMode() == CommonServices.EnumPubSubServiceMode.E_PUBLISHER)
return;
consumerThread = new Thread(() -> {
// wait for message and dispatch it
consumerRunning = true;
logger.info("Pulsar PubSub started successfully");
try {
while (consumerRunning) {
Message<PubSubMsg> msg = consumer.receive();
try {
final PubSubMsgContext msgCtx = getMsgContext(msg);
if (msgCtx != null) {
logger.debug(SERVICE_NAME + " > Message received: " + msgCtx.toString());
consumerExecutorService.execute(() -> dispatchMsgCtx(msgCtx));
// dispatchMsgCtx(msgCtx);
} else {
logger.warning(SERVICE_NAME + " > Failed to parse Pulsar message: " + msg.getMessageId());
}
} finally {
// Acknowledge the message so that it can be deleted by the message broker
consumer.acknowledge(msg);
}
}
} catch (PulsarClientException e) {
e.printStackTrace();
}
});
consumerThread.setName(getClass().getName() + "::PulsarConsumerThread");
consumerThread.start();
}
/**
* getting the actual topic and
* delegate to reactor
* @param msgCtx
*/
private void dispatchMsgCtx(PubSubMsgContext msgCtx) {
String topic = msgCtx.getTopic();//.substring(TOPIC_PREFIX.length());
if (topic.length() > namespacePrefix.length() &&
topic.startsWith(namespacePrefix)) {
topic = topic.substring(namespacePrefix.length());
String key = Reactor.buildServiceKey(Enums.EnumServiceType.E_PUBSUB,
CommonServices.EnumPubSubCommands.E_NOTIFY,
topic);
reactor.delegate(this, key, msgCtx);
} else {
logger.warning(SERVICE_NAME + " > dispatchMsgCtx received topic with invalid/no namespace");
}
}
/**
* create the msg context
* @param msg
* @return
*/
private PubSubMsgContext getMsgContext(Message<PubSubMsg> msg) {
final PubSubMsg pubSubMsg = msg.getValue();
if (pubSubMsg != null){
return new PubSubMsgContext(msg.getTopicName(),
pubSubMsg.getContent(),
pubSubMsg.getMcid(),
pubSubMsg.getParameters());
} else {
logger.error(SERVICE_NAME + " > getMsgContext > Failed in parsing json to PubSubMsg");
}
return null;
}
@Override
public void shutdown() {
stopConsumer();
closeProducers();
if (client != null){
try {
client.close();
} catch (PulsarClientException e) {
e.printStackTrace();
}
}
}
private void closeProducers() {
// closing all topic producers
producersMap.values().forEach(producer -> {
if (producer != null){
try {
producer.close();
} catch (PulsarClientException e) {
e.printStackTrace();
}
}
});
}
private void stopConsumer() {
if (consumer != null){
try {
consumer.close();
if (consumerThread != null){
consumerRunning = false;
consumerThread.interrupt();
consumerThread.join(500);
}
} catch (PulsarClientException e) {
e.printStackTrace();
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
@Override
public void handleNotImplmented(CommonServices.IMsgContext msgContext) {
}
@Override
public void register(IServiceDiscovery serviceDiscovery, String id) {
}
@Override
public void subscribe(String topic, java.util.function.Consumer<PubSubMsgContext> notifyFunc, java.util.function.Consumer<String> errorFunc) {
}
@Override
public void unsubscribe(String topic) {
}
@Override
public void publish(PubSubMsgContext pubSubMsgContext) {
if (validateMsg(pubSubMsgContext)) {
try {
// create mcid if missing
if (pubSubMsgContext.getMcid() == null || pubSubMsgContext.getMcid().isEmpty())
pubSubMsgContext.setMcid(IDGenerator.createUUID());
final Producer<PubSubMsg> producerForTopic = getProducerForTopic(pubSubMsgContext.getTopic());
if(producerForTopic != null) {
// construct msg to send
PubSubMsg pubSubMsg = new PubSubMsg(pubSubMsgContext.getMsg(), pubSubMsgContext.getMcid(), pubSubMsgContext.getParameters());
producerForTopic.sendAsync(pubSubMsg).whenCompleteAsync((messageId, throwable) -> {
if (throwable != null) {
logger.error(SERVICE_NAME + " > Failed in sendAsync: " + throwable.getMessage());
} else if (messageId != null) {
logger.debug(SERVICE_NAME + " > publish > sent msg-id: " + messageId);
}
});
}
} catch (Exception e) {
logger.error(SERVICE_NAME + " > publish > Failed to create producer/send msg: " + e);
}
} else {
logger.warning(SERVICE_NAME + " > publish > message not valid");
}
}
private Producer<PubSubMsg> getProducerForTopic(String topic) {
return producersMap.computeIfAbsent(topic,t -> {
try {
Producer<PubSubMsg> producer = client.newProducer(JSONSchema.of(PubSubMsg.class))
.topic(topic)
.create();
return producer;
//return client.newProducer().topic(topic).create();
} catch (PulsarClientException e) {
logger.error(SERVICE_NAME + " > Failed to create producer for topic " + topic);
}
return null;
});
}
/**
* topic should be in the form [domain]/[method]
* the domain is actually the namespace which is the domain
* @param pubSubMsgContext
* @return
*/
private boolean validateMsg(PubSubMsgContext pubSubMsgContext) {
String topic = pubSubMsgContext.getTopic();
if(topic != null && !topic.isEmpty() &&
pubSubMsgContext.getMsg() != null && !pubSubMsgContext.getMsg().isEmpty()){
// adding the topic prefix
if(!topic.startsWith(TOPIC_PREFIX)){
topic = topic.charAt(0) == '/'? TOPIC_PREFIX + topic : TOPIC_PREFIX + '/' + topic;
pubSubMsgContext.setTopic(topic);
}
return true;
}
return false;
}
private void createConsumer() throws PulsarClientException, PulsarAdminException {
/**
* wildcard topic:
* {persistent|non-persistent}://<tenant>/<namespace>/<regular expression>
*/
final MicroserviceApp microserviceApp = MicroserviceApp.getsInstance();
String pattern = namespacePrefix + "/.*";
adminValidateTenantAndNamespace(Constants.DEFAULT_TENANT,microserviceApp.getAppName());
Pattern allTopicsInNamespace = Pattern.compile(pattern);
consumer = client.newConsumer(JSONSchema.of(PubSubMsg.class))
.subscriptionName(clientId)
.subscriptionType(SubscriptionType.Shared) // enable for multi-instance
.topicsPattern(allTopicsInNamespace)
.subscribe();
consumerExecutorService = Executors.newFixedThreadPool(pulsarParams.getConsumersThreadPoolSize());
}
private void adminValidateTenantAndNamespace(String tenant, String namespace) throws PulsarAdminException, PulsarClientException {
if (!pulsarParams.getAdminUrl().startsWith("http")){
pulsarParams.setAdminUrl("http://" + pulsarParams.getAdminUrl());
}
PulsarAdmin admin = new PulsarAdminBuilderImpl().serviceHttpUrl(pulsarParams.getAdminUrl()).build();
final Tenants tenants = admin.tenants();
final List<String> tenantList = tenants.getTenants();
final TenantInfo tenantInfo = new TenantInfo();
tenantInfo.setAllowedClusters(clusters);
if (!tenantList.contains(tenant)){
// creating tenant
logger.info(SERVICE_NAME + " >> Creating tenant: " + tenant);
tenants.createTenant(tenant, tenantInfo);
}
final List<String> namespaces = admin.namespaces().getNamespaces(tenant);
String namespaceStr = tenant + '/' + namespace;
if (!namespaces.contains(namespaceStr)){
logger.info(SERVICE_NAME + " >> Creating namespace: " + namespaceStr);
admin.namespaces().createNamespace(namespaceStr);
admin.namespaces().setNamespaceMessageTTL(namespaceStr,pulsarParams.getMsgTtl());
admin.namespaces().setNamespaceReplicationClusters(namespaceStr,clusters);
}
admin.close();
}
}
src/main/java/microservice/services/IRestServiceHttpImpl.java
package microservice.services; package microservice.services;
import com.eaio.uuid.UUID;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import common.Network; import common.Network;
import common.microservice.io.iface.*;
import common.microservice.services.CommonServices;
import common.microservice.types.BaseRestResponse;
import common.microservice.types.UserProfile;
import common.microservice.utils.IDGenerator;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.ExpiredJwtException;
import io.undertow.Handlers; import io.undertow.Handlers;
...@@ -16,31 +21,28 @@ import io.undertow.util.Headers; ...@@ -16,31 +21,28 @@ import io.undertow.util.Headers;
import io.undertow.util.HttpString; import io.undertow.util.HttpString;
import io.undertow.util.MimeMappings; import io.undertow.util.MimeMappings;
import microservice.MicroserviceApp; import microservice.MicroserviceApp;
import microservice.common.context.RestContext; import common.microservice.context.RestContext;
import microservice.common.EncryptionUtils; import common.microservice.security.EncryptionUtils;
import microservice.defs.Constants; import common.microservice.defs.Constants;
import microservice.defs.Enums; import common.microservice.defs.Enums;
import microservice.handlers.BaseHandler; import microservice.handlers.BaseHandler;
import microservice.handlers.Reactor; import microservice.handlers.Reactor;
import microservice.io.iface.*;
import microservice.io.impl.IRequestRestImpl; import microservice.io.impl.IRequestRestImpl;
import microservice.io.impl.IResponseRestImpl; import microservice.io.impl.IResponseRestImpl;
import microservice.params.CommandParams; import common.microservice.params.CommandParams;
import microservice.params.RestServerParams; import microservice.params.RestServerParams;
import microservice.types.BaseRestResponse;
import microservice.types.UserProfile;
import java.util.function.BooleanSupplier; import java.util.function.BooleanSupplier;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Supplier; import java.util.function.Supplier;
import static io.undertow.Handlers.resource; import static io.undertow.Handlers.resource;
import static microservice.defs.Constants.*; import static common.microservice.defs.Constants.*;
/** /**
* Created by amir on 08/05/17. * Created by amir on 08/05/17.
*/ */
public class IRestServiceHttpImpl extends CommonServices.IRestService implements HttpHandler , IContainer{ public class IRestServiceHttpImpl extends CommonServices.IRestService implements HttpHandler , IContainer {
ILogger logger = null; ILogger logger = null;
RestServerParams restServerParams = null; RestServerParams restServerParams = null;
...@@ -285,7 +287,7 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements ...@@ -285,7 +287,7 @@ public class IRestServiceHttpImpl extends CommonServices.IRestService implements
HeaderMap requestHeaders = exchange.getRequestHeaders(); HeaderMap requestHeaders = exchange.getRequestHeaders();
reqCtx.rcid = requestHeaders.getFirst(Constants.RCID_HEADER); reqCtx.rcid = requestHeaders.getFirst(Constants.RCID_HEADER);
if (reqCtx.rcid == null) // create a new one if (reqCtx.rcid == null) // create a new one
reqCtx.rcid = new UUID().toString(); reqCtx.rcid = IDGenerator.createUUID();
else // log it else // log it
msAppInstance.logRcid("getRequestContext",reqCtx.rcid); msAppInstance.logRcid("getRequestContext",reqCtx.rcid);
return reqCtx; return reqCtx;
......
src/main/java/microservice/services/IRestServiceZmqImpl.java
package microservice.services; package microservice.services;
import com.eaio.uuid.UUID;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.flatbuffers.FlatBufferBuilder; import com.google.flatbuffers.FlatBufferBuilder;
import common.JsonHandler; import common.JsonHandler;
import common.microservice.io.iface.*;
import common.microservice.services.CommonServices;
import common.microservice.types.BaseRestResponse;
import common.microservice.utils.IDGenerator;
import microservice.MicroserviceApp; import microservice.MicroserviceApp;
import microservice.common.context.CrudMethod; import common.microservice.context.CrudMethod;
import microservice.common.context.RestContext; import common.microservice.context.RestContext;
import microservice.common.context.RestMsg; import common.microservice.context.RestMsg;
import microservice.common.context.RestResponse; import common.microservice.context.RestResponse;
import microservice.defs.Constants; import common.microservice.defs.Constants;
import microservice.defs.Enums; import common.microservice.defs.Enums;
import microservice.handlers.Reactor; import microservice.handlers.Reactor;
import microservice.io.iface.*; import common.microservice.params.CommandParams;
import microservice.io.impl.IMetricsFactoryImpl;
import microservice.params.CommandParams;
import microservice.params.ZMQParams; import microservice.params.ZMQParams;
import microservice.services.protocol.zmq.RestImpl; import microservice.services.protocol.zmq.RestImpl;
import microservice.types.BaseRestResponse; import common.microservice.utils.ICacheClientGuavaImpl;
import microservice.utils.ICacheClientGuavaImpl;
import microservice.utils.ZSocketPool; import microservice.utils.ZSocketPool;
import org.apache.commons.lang.SerializationUtils; import org.apache.commons.lang.SerializationUtils;
import org.zeromq.ZMQ; import org.zeromq.ZMQ;
...@@ -28,15 +28,13 @@ import org.zeromq.ZSocket; ...@@ -28,15 +28,13 @@ import org.zeromq.ZSocket;
import java.io.Serializable; import java.io.Serializable;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.*; import java.util.*;
import java.util.function.BiConsumer;
import java.util.function.BooleanSupplier; import java.util.function.BooleanSupplier;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
import java.util.stream.Stream;
import static microservice.defs.Constants.EXIT_MSG; import static common.microservice.defs.Constants.EXIT_MSG;
import static microservice.defs.Constants.EXIT_MSG_LEN; import static common.microservice.defs.Constants.EXIT_MSG_LEN;
/** /**
* Created by amir on 14/05/17. * Created by amir on 14/05/17.
...@@ -460,7 +458,7 @@ public class IRestServiceZmqImpl extends CommonServices.IRestService implements ...@@ -460,7 +458,7 @@ public class IRestServiceZmqImpl extends CommonServices.IRestService implements
*/ */
reqCtx.rcid = String.valueOf(receiveMsg.rcid()); reqCtx.rcid = String.valueOf(receiveMsg.rcid());
if (reqCtx.rcid == null) // create a new one if (reqCtx.rcid == null) // create a new one
reqCtx.rcid = new UUID().toString(); reqCtx.rcid = IDGenerator.createUUID();
return reqCtx; return reqCtx;
...@@ -689,7 +687,7 @@ public class IRestServiceZmqImpl extends CommonServices.IRestService implements ...@@ -689,7 +687,7 @@ public class IRestServiceZmqImpl extends CommonServices.IRestService implements
final ByteBuffer existing_bb = clientSendByteBuffer.get(); final ByteBuffer existing_bb = clientSendByteBuffer.get();
FlatBufferBuilder requestBuilder = new FlatBufferBuilder(existing_bb); FlatBufferBuilder requestBuilder = new FlatBufferBuilder(existing_bb);
long rcid = new UUID().getTime(); long rcid = IDGenerator.createUUIDLong();
String url = buildUrl(cmdParams); String url = buildUrl(cmdParams);
final String content = cmdParams.getContent() != null ? cmdParams.getContent() : ""; final String content = cmdParams.getContent() != null ? cmdParams.getContent() : "";
int reqSize = RestMsg.createRestMsg(requestBuilder, int reqSize = RestMsg.createRestMsg(requestBuilder,
......
src/main/java/microservice/services/protocol/zmq/IMsgQServiceZmqImpl.java
package microservice.services.protocol.zmq; package microservice.services.protocol.zmq;
import com.eaio.uuid.UUID;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.flatbuffers.FlatBufferBuilder; import com.google.flatbuffers.FlatBufferBuilder;
import common.microservice.utils.IDGenerator;
import microservice.MicroserviceApp; import microservice.MicroserviceApp;
import microservice.common.context.ParamValue; import common.microservice.context.ParamValue;
import microservice.common.context.QueueMsg; import common.microservice.context.QueueMsg;
import microservice.defs.Constants; import common.microservice.defs.Constants;
import microservice.defs.Enums; import common.microservice.defs.Enums;
import microservice.handlers.Reactor; import microservice.handlers.Reactor;
import microservice.io.iface.ILogger; import common.microservice.io.iface.ILogger;
import microservice.io.iface.IServiceDiscovery; import common.microservice.io.iface.IServiceDiscovery;
import microservice.params.ZMQParams; import microservice.params.ZMQParams;
import microservice.services.CommonServices; import common.microservice.services.CommonServices;
import microservice.utils.ZSocketPool; import microservice.utils.ZSocketPool;
import org.zeromq.ZMQ; import org.zeromq.ZMQ;
import org.zeromq.ZSocket; import org.zeromq.ZSocket;
...@@ -23,8 +23,6 @@ import java.util.HashMap; ...@@ -23,8 +23,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
/** /**
* MsgQueue implementation in ZMQ * MsgQueue implementation in ZMQ
...@@ -206,9 +204,9 @@ public class IMsgQServiceZmqImpl extends CommonServices.IMsgQService { ...@@ -206,9 +204,9 @@ public class IMsgQServiceZmqImpl extends CommonServices.IMsgQService {
*/ */
if (msgCtx.parameters == null) { if (msgCtx.parameters == null) {
msgCtx.parameters = new HashMap<>(); msgCtx.parameters = new HashMap<>();
msgCtx.parameters.put(Constants.MSGQ_ID, new UUID().toString()); msgCtx.parameters.put(Constants.MSGQ_ID, IDGenerator.createUUID());
} else } else
msgCtx.parameters.putIfAbsent(Constants.MSGQ_ID, new UUID().toString()); msgCtx.parameters.putIfAbsent(Constants.MSGQ_ID, IDGenerator.createUUID());
int topicOffset = msgBuilder.createString(msgCtx.topic); int topicOffset = msgBuilder.createString(msgCtx.topic);
int msgOffset = msgBuilder.createString(msgCtx.msg); int msgOffset = msgBuilder.createString(msgCtx.msg);
......
src/main/java/microservice/services/protocol/zmq/RestImpl.java
package microservice.services.protocol.zmq; package microservice.services.protocol.zmq;
import microservice.common.context.RestMsg; import common.microservice.context.RestMsg;
import microservice.io.iface.IRequest; import common.microservice.io.iface.IRequest;
import microservice.io.iface.IResponse; import common.microservice.io.iface.IResponse;
import microservice.services.IRestServiceZmqImpl; import microservice.services.IRestServiceZmqImpl;
import microservice.utils.ZSocketPool; import microservice.utils.ZSocketPool;
import org.apache.commons.lang.SerializationUtils; import org.apache.commons.lang.SerializationUtils;
......
src/main/java/microservice/services/protocol/zmq/ZmqWorkers.java
package microservice.services.protocol.zmq; package microservice.services.protocol.zmq;
import com.eaio.uuid.UUID;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import common.microservice.utils.IDGenerator;
import microservice.MicroserviceApp; import microservice.MicroserviceApp;
import microservice.common.context.RestContext; import common.microservice.context.RestContext;
import microservice.common.context.RestMsg; import common.microservice.io.iface.ILogger;
import microservice.io.iface.ILogger;
import microservice.params.ZMQParams; import microservice.params.ZMQParams;
import microservice.services.CommonServices; import common.microservice.services.CommonServices;
import org.zeromq.ZMQ; import org.zeromq.ZMQ;
import org.zeromq.ZSocket; import org.zeromq.ZSocket;
import java.nio.ByteBuffer;
import java.util.List; import java.util.List;
import static microservice.defs.Constants.EXIT_MSG; import static common.microservice.defs.Constants.EXIT_MSG;
import static microservice.defs.Constants.EXIT_MSG_LEN; import static common.microservice.defs.Constants.EXIT_MSG_LEN;
/** /**
* all workers common to rest amd msgQ * all workers common to rest amd msgQ
...@@ -108,7 +107,7 @@ public class ZmqWorkers { ...@@ -108,7 +107,7 @@ public class ZmqWorkers {
this.parentService = parentService; this.parentService = parentService;
this.workerNumber = workerNumber; this.workerNumber = workerNumber;
bindAddress = ADDRESS + '/' + bindAddress = ADDRESS + '/' +
new UUID().toString() + '/' + IDGenerator.createUUID() + '/' +
String.valueOf(workerNumber); String.valueOf(workerNumber);
} }
......
src/main/java/microservice/utils/RestHttpClient.java
...@@ -9,9 +9,9 @@ import http.simpleHttpClient.SimpleHttpResponse; ...@@ -9,9 +9,9 @@ import http.simpleHttpClient.SimpleHttpResponse;
import http.simpleRestClient.SimpleRestClient; import http.simpleRestClient.SimpleRestClient;
import http.simpleRestClient.SimpleRestResponse; import http.simpleRestClient.SimpleRestResponse;
import microservice.MicroserviceApp; import microservice.MicroserviceApp;
import microservice.defs.Constants; import common.microservice.defs.Constants;
import microservice.params.CommandParams; import common.microservice.params.CommandParams;
import microservice.types.BaseRestResponse; import common.microservice.types.BaseRestResponse;
import okhttp3.Call; import okhttp3.Call;
import okhttp3.Callback; import okhttp3.Callback;
import okhttp3.MediaType; import okhttp3.MediaType;
...@@ -50,8 +50,9 @@ import java.util.Objects; ...@@ -50,8 +50,9 @@ import java.util.Objects;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.concurrent.TimeUnit;
import static microservice.io.iface.IRestClient.COMMAND_ERROR; import static common.microservice.io.iface.IRestClient.COMMAND_ERROR;
/** /**
* Created by amir on 10/05/17. * Created by amir on 10/05/17.
...@@ -88,10 +89,13 @@ public class RestHttpClient extends SimpleRestClient implements Closeable { ...@@ -88,10 +89,13 @@ public class RestHttpClient extends SimpleRestClient implements Closeable {
private void initClient() { private void initClient() {
client = new OkHttpClient.Builder() client = new OkHttpClient.Builder()
.connectTimeout(HTTP_SOCKET_CONNECT_TIMEOUT, TimeUnit.SECONDS) .connectTimeout(HTTP_SOCKET_CONNECT_TIMEOUT, TimeUnit.SECONDS)
.writeTimeout(10, TimeUnit.SECONDS) .writeTimeout(10, TimeUnit.SECONDS)
.readTimeout(HTTP_SOCKET_READ_TIMEOUT, TimeUnit.SECONDS) .readTimeout(HTTP_SOCKET_READ_TIMEOUT, TimeUnit.SECONDS)
.build(); .build();
// httpAsyncClient = createHttpClient();
// httpAsyncClient.start();
initBaseRestValidation(); initBaseRestValidation();
} }
......
src/main/java/microservice/utils/ServiceBuilderFactory.java
package microservice.utils; package microservice.utils;
import microservice.services.CommonServices; import common.microservice.services.CommonServices;
import microservice.io.iface.IRestClient; import common.microservice.io.iface.IRestClient;
import microservice.io.impl.IRestClientHttpImpl; import microservice.io.impl.IRestClientHttpImpl;
import microservice.params.PulsarParams;
import microservice.services.IPubSubServicePulsarImpl;
import microservice.services.IRestServiceHttpImpl; import microservice.services.IRestServiceHttpImpl;
import microservice.services.IRestServiceZmqImpl; import microservice.services.IRestServiceZmqImpl;
import microservice.params.RestClientParams; import microservice.params.RestClientParams;
...@@ -28,6 +30,10 @@ public class ServiceBuilderFactory { ...@@ -28,6 +30,10 @@ public class ServiceBuilderFactory {
return new MsgQServiceZmqBuilder(serviceMode); return new MsgQServiceZmqBuilder(serviceMode);
} }
public static PubSubServicePulsarBuilder createPubSubServicePulsarBuilder(CommonServices.EnumPubSubServiceMode serviceMode){
return new PubSubServicePulsarBuilder(serviceMode);
}
public interface IBuilder { public interface IBuilder {
CommonServices.IService build(); CommonServices.IService build();
} }
...@@ -317,4 +323,64 @@ public class ServiceBuilderFactory { ...@@ -317,4 +323,64 @@ public class ServiceBuilderFactory {
} }
} }
public static class PubSubServicePulsarBuilder implements IBuilder {
IPubSubServicePulsarImpl pubSubServicePulsar = null;
PulsarParams.PulsarParamsBuilder pulsarParamsBuilder = new PulsarParams.PulsarParamsBuilder();
CommonServices.EnumPubSubServiceMode serviceMode = CommonServices.EnumPubSubServiceMode.E_BOTH;
public PubSubServicePulsarBuilder(CommonServices.EnumPubSubServiceMode serviceMode) {
this.serviceMode = serviceMode;
}
public PubSubServicePulsarBuilder setConsumerPoolSize(int consumerPoolSize) {
this.pulsarParamsBuilder.setConsumersThreadPoolSize(consumerPoolSize);
return this;
}
public PubSubServicePulsarBuilder setServiceUrl(String serviceUrl) {
this.pulsarParamsBuilder.setServiceUrl(serviceUrl);
return this;
}
public PubSubServicePulsarBuilder setAdminUrl(String adminUrl) {
this.pulsarParamsBuilder.setAdminUrl(adminUrl);
return this;
}
public PubSubServicePulsarBuilder setClusters(String clusters) {
this.pulsarParamsBuilder.setClusters(clusters);
return this;
}
private boolean validateParams() {
if(pulsarParamsBuilder.getServiceUrl() == null)
return false;
return true;
}
@Override
public CommonServices.IService build() {
if (validateParams()) {
try {
PulsarParams pulsarParams = pulsarParamsBuilder.build();
if (pulsarParams != null){
pubSubServicePulsar = new IPubSubServicePulsarImpl(pulsarParams);
pubSubServicePulsar.setServiceMode(serviceMode);
}
} catch (Exception exp){
System.err.println(this.getClass().getName().toString() + "Exception >> " + exp);
pubSubServicePulsar = null;
}
} else {
System.err.println(this.getClass().getName().toString() + " >> Failed in validating params");
}
return pubSubServicePulsar;
}
}
} }
src/test/java/microservice/TestCommandClient.java
...@@ -2,13 +2,13 @@ package microservice; ...@@ -2,13 +2,13 @@ package microservice;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import microservice.io.iface.IRestClient; import common.microservice.io.iface.IRestClient;
import microservice.io.impl.IRMQClientRestImpl; import microservice.io.impl.IRMQClientRestImpl;
import microservice.params.BaseClientParams; import microservice.params.BaseClientParams;
import microservice.params.CommandParams; import common.microservice.params.CommandParams;
import microservice.params.CommandParamsBuilder; import common.microservice.params.CommandParamsBuilder;
import microservice.params.RMQClientParams; import microservice.params.RMQClientParams;
import microservice.types.BaseRestResponse; import common.microservice.types.BaseRestResponse;
import org.junit.Test; import org.junit.Test;
import rx.Observable; import rx.Observable;
......
src/test/java/microservice/TestConfiguration.java
package microservice; package microservice;
import microservice.io.iface.IConfiguration; import common.microservice.io.iface.IConfiguration;
import microservice.io.impl.IConfigurationConfigPropImpl; import microservice.io.impl.IConfigurationConfigPropImpl;
import microservice.io.impl.IServiceDiscoveryConsulImpl; import microservice.io.impl.IServiceDiscoveryConsulImpl;
......
src/test/java/microservice/TestEncryption.java
package microservice; package microservice;
import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.ExpiredJwtException;
import microservice.common.EncryptionUtils; import common.microservice.security.EncryptionUtils;
import microservice.types.UserProfile; import common.microservice.types.UserProfile;
import org.junit.Test; import org.junit.Test;
import static microservice.common.EncryptionUtils.checkPassword; import static common.microservice.security.EncryptionUtils.checkPassword;
/** /**
* Created by amir on 03/08/16. * Created by amir on 03/08/16.
......
src/test/java/microservice/TestMQTT.java
...@@ -3,8 +3,8 @@ package microservice; ...@@ -3,8 +3,8 @@ package microservice;
import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttException;
import org.junit.Test; import org.junit.Test;
import microservice.io.iface.INotifyCallback; import common.microservice.io.iface.INotifyCallback;
import microservice.io.iface.IPubSub; import common.microservice.io.iface.IPubSub;
import microservice.io.impl.IPubSubMQTTImpl; import microservice.io.impl.IPubSubMQTTImpl;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
......
src/test/java/microservice/TestMicroClient.java
package microservice; package microservice;
import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import microservice.common.context.CrudMethod; import common.microservice.defs.Enums;
import microservice.common.context.RestResponse; import common.microservice.io.iface.IRestClient;
import microservice.defs.Constants;
import microservice.defs.Enums;
import microservice.io.iface.IRestClient;
import microservice.io.impl.IRestClientHttpImpl; import microservice.io.impl.IRestClientHttpImpl;
import microservice.io.impl.IServiceDiscoveryConsulImpl; import microservice.io.impl.IServiceDiscoveryConsulImpl;
import microservice.utils.RestHttpClient; import microservice.utils.RestHttpClient;
...@@ -13,45 +10,30 @@ import okhttp3.Call; ...@@ -13,45 +10,30 @@ import okhttp3.Call;
import okhttp3.Callback; import okhttp3.Callback;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost; import org.apache.http.HttpHost;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.client.config.RequestConfig; import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.client.utils.URIBuilder; import org.apache.http.client.utils.URIBuilder;
import org.apache.http.concurrent.FutureCallback; import org.apache.http.concurrent.FutureCallback;
import org.apache.http.entity.ContentType;
import org.apache.http.impl.nio.client.CloseableHttpAsyncClient; import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder; import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
import org.apache.http.impl.nio.client.HttpAsyncClients;
import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
import org.apache.http.nio.entity.NStringEntity;
import org.apache.http.nio.reactor.ConnectingIOReactor;
import org.apache.http.util.EntityUtils;
import org.elasticsearch.client.Response; import org.elasticsearch.client.Response;
import org.elasticsearch.client.ResponseListener; import org.elasticsearch.client.ResponseListener;
import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClient;
import org.junit.Test; import org.junit.Test;
import microservice.MicroserviceClient.EnumRestClientType; import microservice.MicroserviceClient.EnumRestClientType;
import microservice.params.CommandParams; import common.microservice.params.CommandParams;
import microservice.params.RestClientParams; import microservice.params.RestClientParams;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import microservice.types.BaseRestResponse; import common.microservice.types.BaseRestResponse;
import rx.Observable;
import rx.apache.http.ObservableHttp;
import rx.apache.http.ObservableHttpResponse;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.ByteBuffer;
import java.util.Collections; import java.util.Collections;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; import java.util.concurrent.Future;
......
src/test/java/microservice/TestMicroserviceApp.java
...@@ -5,16 +5,17 @@ import com.fasterxml.jackson.databind.JsonNode; ...@@ -5,16 +5,17 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import microservice.common.context.RestContext; import common.microservice.context.RestContext;
import microservice.defs.Enums; import common.microservice.defs.Enums;
import microservice.services.CommonServices; import common.microservice.params.CommandParams;
import microservice.io.iface.IRestClient; import common.microservice.services.CommonServices;
import common.microservice.io.iface.IRestClient;
import microservice.io.impl.*; import microservice.io.impl.*;
import microservice.services.IRestServiceHttpImpl; import microservice.services.IRestServiceHttpImpl;
import microservice.params.*; import microservice.params.*;
import microservice.services.IRestServiceZmqImpl; import microservice.services.IRestServiceZmqImpl;
import microservice.types.BaseRestResponse; import common.microservice.types.BaseRestResponse;
import microservice.utils.ServiceBuilderFactory; import microservice.utils.ServiceBuilderFactory;
import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttException;
import org.junit.Test; import org.junit.Test;
...@@ -100,6 +101,11 @@ public class TestMicroserviceApp { ...@@ -100,6 +101,11 @@ public class TestMicroserviceApp {
CommonServices.IService zmqMsgQ = ServiceBuilderFactory.createMsgQServiceZmqBuilder(CommonServices.EnumMsgQServiceMode.E_SERVER) CommonServices.IService zmqMsgQ = ServiceBuilderFactory.createMsgQServiceZmqBuilder(CommonServices.EnumMsgQServiceMode.E_SERVER)
.setServerParams(new ZMQParams.ServerParams(ZMQParams.ServerParams.EnumProtocol.eTcp,32020,"localhost")) .setServerParams(new ZMQParams.ServerParams(ZMQParams.ServerParams.EnumProtocol.eTcp,32020,"localhost"))
.build(); .build();
CommonServices.IService pulsarPubSub = ServiceBuilderFactory.createPubSubServicePulsarBuilder(CommonServices.EnumPubSubServiceMode.E_BOTH)
.setServiceUrl("localhost:6650")
.setAdminUrl(null)
.setClusters("standalone")
.build();
microservice.MicroserviceApp msApp = new microservice.MicroserviceApp(appName); microservice.MicroserviceApp msApp = new microservice.MicroserviceApp(appName);
msApp.withMetrics() msApp.withMetrics()
...@@ -108,6 +114,7 @@ public class TestMicroserviceApp { ...@@ -108,6 +114,7 @@ public class TestMicroserviceApp {
.addService(Enums.EnumServiceType.E_REST,httpRestService,"undertowRestService") .addService(Enums.EnumServiceType.E_REST,httpRestService,"undertowRestService")
.addService(Enums.EnumServiceType.E_REST,zmqRestService,"zmqRestService") .addService(Enums.EnumServiceType.E_REST,zmqRestService,"zmqRestService")
.addService(Enums.EnumServiceType.E_MSGQ,zmqMsgQ,"zmqMsgQService") .addService(Enums.EnumServiceType.E_MSGQ,zmqMsgQ,"zmqMsgQService")
.addService(Enums.EnumServiceType.E_PUBSUB,pulsarPubSub,"pulsarPubSub")
.addMethodClass(new MethodClass()) .addMethodClass(new MethodClass())
.addMethod(Enums.EnumServiceType.E_REST,CommonServices.EnumRestCommands.E_READ,"/asyncRegistry/{query}",(msgCtx,orgService) -> { .addMethod(Enums.EnumServiceType.E_REST,CommonServices.EnumRestCommands.E_READ,"/asyncRegistry/{query}",(msgCtx,orgService) -> {
CommonServices.IRestService inRestService = (CommonServices.IRestService)MicroserviceApp.getsInstance().getService(Enums.EnumServiceType.E_REST,"undertowRestService"); CommonServices.IRestService inRestService = (CommonServices.IRestService)MicroserviceApp.getsInstance().getService(Enums.EnumServiceType.E_REST,"undertowRestService");
...@@ -164,12 +171,28 @@ public class TestMicroserviceApp { ...@@ -164,12 +171,28 @@ public class TestMicroserviceApp {
(msgCtx,orgService) -> { (msgCtx,orgService) -> {
testZmqMsgQueue((CommonServices.IMsgQService.MsgQContext)msgCtx); testZmqMsgQueue((CommonServices.IMsgQService.MsgQContext)msgCtx);
})); }));
methodParamsList.add(new CommonServices.MethodParams(Enums.EnumServiceType.E_PUBSUB,
CommonServices.EnumPubSubCommands.E_NOTIFY,
"/activity",
(msgCtx,orgService) -> {
testPubSubMsg((CommonServices.IPubSubService.PubSubMsgContext)msgCtx);
}));
} }
long startTime = 0; long startTime = 0;
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
private void testPubSubMsg(CommonServices.IPubSubService.PubSubMsgContext msgCtx) {
// System.out.println("Recieved mcid: " + msgCtx.getMcid());
try {
JsonNode jsonNode = objectMapper.readValue(msgCtx.getMsg(), JsonNode.class);
handleJsonTestStartStop(jsonNode);
} catch (IOException e) {
e.printStackTrace();
}
}
/** /**
* around 300k/s * around 300k/s
* @param msgCtx * @param msgCtx
...@@ -177,22 +200,26 @@ public class TestMicroserviceApp { ...@@ -177,22 +200,26 @@ public class TestMicroserviceApp {
private void testZmqMsgQueue(CommonServices.IMsgQService.MsgQContext msgCtx) { private void testZmqMsgQueue(CommonServices.IMsgQService.MsgQContext msgCtx) {
try { try {
JsonNode jsonNode = objectMapper.readValue(msgCtx.msg, JsonNode.class); JsonNode jsonNode = objectMapper.readValue(msgCtx.msg, JsonNode.class);
String state = jsonNode.path("state").asText(); handleJsonTestStartStop(jsonNode);
switch (state){
case "start":
startTime = System.currentTimeMillis();
break;
case "end":
System.out.println("Test took: " + String.valueOf(System.currentTimeMillis() - startTime) + "ms");
break;
case "msg":
break;
}
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
private void handleJsonTestStartStop(JsonNode jsonNode) {
String state = jsonNode.path("state").asText();
switch (state){
case "start":
startTime = System.currentTimeMillis();
break;
case "end":
System.out.println("Test took: " + String.valueOf(System.currentTimeMillis() - startTime) + "ms");
break;
case "msg":
break;
}
}
private void testZmqRead(RestContext msgCtx) { private void testZmqRead(RestContext msgCtx) {
RestContext restContext = (RestContext)msgCtx; RestContext restContext = (RestContext)msgCtx;
CommonServices.IRestService inRestService = (CommonServices.IRestService)MicroserviceApp.getsInstance().getService(Enums.EnumServiceType.E_REST,"undertowRestService"); CommonServices.IRestService inRestService = (CommonServices.IRestService)MicroserviceApp.getsInstance().getService(Enums.EnumServiceType.E_REST,"undertowRestService");
......
src/test/java/microservice/TestPulsar.java 0 → 100644
package microservice;
import common.microservice.context.PubSubMsg;
import common.microservice.utils.IDGenerator;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.PulsarAdminBuilder;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.admin.Tenants;
import org.apache.pulsar.client.admin.internal.PulsarAdminBuilderImpl;
import org.apache.pulsar.client.api.*;
import org.apache.pulsar.client.api.url.URL;
import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
import org.apache.pulsar.client.impl.schema.JSONSchema;
import org.apache.pulsar.common.policies.data.Policies;
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.junit.Test;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
public class TestPulsar {
@Test
public void testTopicProducer() throws PulsarClientException {
String localClusterUrl = "pulsar://localhost:6650";
String namespace = "mcx/testApp"; // This namespace is created automatically
String topic = String.format("persistent://%s/activity", namespace);
PulsarClient client = PulsarClient.builder()
.serviceUrl(localClusterUrl)
.build();
Producer<PubSubMsg> producer = client
.newProducer(JSONSchema.of(PubSubMsg.class))
.topic(topic)
.create();
// final Producer<byte[]> producer = client.newProducer().topic(topic).create();
// Publish 10 messages to the topic
for (int i = 0; i < 100; i++) {
PubSubMsg pubSubMsg = new PubSubMsg("hello - " + String.valueOf(System.currentTimeMillis()),String.valueOf(i));
producer.send(pubSubMsg);
// producer.send(String.format("Message number %d", i).getBytes());
System.out.println("Sending message");
// final Message message = MessageBuilder.create()
// .setContent(String.format("Message number %d", i).getBytes())
// .build();
// producer.send(message);
}
producer.close();
client.close();
}
@Test
public void testTopicConsumer() throws PulsarClientException {
String localClusterUrl = "pulsar://localhost:6650";
String namespace = "mcx/testApp";
String topic = String.format("persistent://%s/my-topic", namespace);
PulsarClient client = PulsarClient.builder()
.serviceUrl(localClusterUrl)
.build();
//final Consumer consumer = client.newConsumer().subscriptionName("my-sub-1").topic(topic).subscribe();
Pattern allTopicsInNamespace = Pattern.compile("persistent://mcx/testApp/.*");
final Consumer<PubSubMsg> consumer = client.newConsumer(JSONSchema.of(PubSubMsg.class))
.subscriptionName(IDGenerator.createUUID())
.subscriptionType(SubscriptionType.Shared) // enable for multi-instance
.topicsPattern(allTopicsInNamespace)
.subscribe();
// final Consumer consumer = client.newConsumer()
// .subscriptionName(IDGenerator.createUUID())
// .subscriptionType(SubscriptionType.Shared) // enable for multi-instance
// .topicsPattern(allTopicsInNamespace)
// .subscribe();
for (int i = 0; i < 10; i++) {
// Wait for a message
Message<PubSubMsg> msg = consumer.receive();
System.out.printf("Message received: %s\n", msg.getValue().toString());
// Acknowledge the message so that it can be deleted by the message broker
consumer.acknowledge(msg);
}
consumer.close();
client.close();
}
@Test
public void testPulsarAdmin() throws PulsarClientException, PulsarAdminException {
Set<String> clusters = new HashSet<>(Arrays.asList("standalone"));
PulsarAdmin admin = new PulsarAdminBuilderImpl().serviceHttpUrl("http://localhost:8080").build();
final Tenants tenants = admin.tenants();
final List<String> tenantList = tenants.getTenants();
final TenantInfo tenantInfo = new TenantInfo();
tenantInfo.setAllowedClusters(clusters);
if (!tenantList.contains("mcx")){
// creating tenant
tenants.createTenant("mcx", tenantInfo);
} else {
tenants.updateTenant("mcx",tenantInfo);
}
final List<String> namespaces = admin.namespaces().getNamespaces("mcx");
String namespaceStr = "mcx/testApp";
if (!namespaces.contains(namespaceStr)){
admin.namespaces().createNamespace(namespaceStr);
admin.namespaces().setNamespaceMessageTTL(namespaceStr,3600);
admin.namespaces().setNamespaceReplicationClusters(namespaceStr,clusters);
} else {
admin.namespaces().deleteNamespace(namespaceStr);
}
admin.close();
}
}
src/test/java/microservice/TestServiceDiscovery.java
package microservice; package microservice;
import microservice.defs.Enums; import common.microservice.defs.Enums;
import microservice.io.iface.IServiceDiscovery; import common.microservice.io.iface.IServiceDiscovery;
import microservice.io.impl.IServiceDiscoveryConsulImpl; import microservice.io.impl.IServiceDiscoveryConsulImpl;
import org.junit.Test; import org.junit.Test;
......
src/test/java/microservice/TestServicesAndMethods.java
...@@ -14,13 +14,10 @@ import com.google.common.cache.CacheBuilder; ...@@ -14,13 +14,10 @@ import com.google.common.cache.CacheBuilder;
import common.JsonHandler; import common.JsonHandler;
import io.undertow.predicate.Predicate; import io.undertow.predicate.Predicate;
import io.undertow.util.PathMatcher; import io.undertow.util.PathMatcher;
import io.undertow.util.PathTemplateMatcher;
import microservice.params.ZMQParams; import microservice.params.ZMQParams;
import microservice.services.CommonServices; import common.microservice.services.CommonServices;
import microservice.services.IRestServiceZmqImpl;
import microservice.types.BaseRestResponse;
import microservice.utils.ServiceBuilderFactory; import microservice.utils.ServiceBuilderFactory;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
...@@ -39,7 +36,7 @@ import java.util.stream.Collectors; ...@@ -39,7 +36,7 @@ import java.util.stream.Collectors;
*/ */
public class TestServicesAndMethods { public class TestServicesAndMethods {
public static final int ITERATIONS = 10000000; public static final int ITERATIONS = 10000;
private static class RoutingMatch { private static class RoutingMatch {
...@@ -278,4 +275,30 @@ public class TestServicesAndMethods { ...@@ -278,4 +275,30 @@ public class TestServicesAndMethods {
msgQService.send(new CommonServices.IMsgQService.MsgQContext("/test/msgQ/zmq", objectNode.toString())); msgQService.send(new CommonServices.IMsgQService.MsgQContext("/test/msgQ/zmq", objectNode.toString()));
//Thread.sleep(1000); //Thread.sleep(1000);
} }
@Test
public void testPubSubPulsar() throws InterruptedException {
CommonServices.IService iService = ServiceBuilderFactory.createPubSubServicePulsarBuilder(CommonServices.EnumPubSubServiceMode.E_PUBLISHER)
.setServiceUrl("localhost:6650")
.setAdminUrl("localhost:8080")
.build();
CommonServices.IPubSubService pubSubService = (CommonServices.IPubSubService)iService;
pubSubService.init();
pubSubService.run();
String topic = "/testApp/activity"; // '[domain]/[method]'
ObjectNode objectNode = JsonNodeFactory.instance.objectNode().put("state", "start").put("iterations", ITERATIONS);
System.out.println("Testing " + String.valueOf(ITERATIONS) + " iterations");
long start = System.currentTimeMillis();
pubSubService.publish(new CommonServices.IPubSubService.PubSubMsgContext(topic, objectNode.toString()));
objectNode.put("state", "msg");
for (int i = 0; i < TestServicesAndMethods.ITERATIONS; i++) {
objectNode.put("msg","hello" + String.valueOf(i));
pubSubService.publish(new CommonServices.IPubSubService.PubSubMsgContext(topic, objectNode.toString()));
}
objectNode.put("state", "end");
pubSubService.publish(new CommonServices.IPubSubService.PubSubMsgContext(topic, objectNode.toString()));
System.out.println("Async publish Test of: " + String.valueOf(ITERATIONS) +" took (msec): " + String.valueOf(System.currentTimeMillis() - start));
Thread.sleep(1000);
pubSubService.shutdown();
}
} }
src/test/java/microservice/TestZMQ.java
package microservice; package microservice;
import com.fasterxml.jackson.databind.JsonNode;
import com.google.flatbuffers.FlatBufferBuilder; import com.google.flatbuffers.FlatBufferBuilder;
import itc.ItcMessage; import itc.ItcMessage;
import itc.ItcMessageQueue; import itc.ItcMessageQueue;
import microservice.common.context.CrudMethod; import common.microservice.context.CrudMethod;
import microservice.common.context.RestMsg; import common.microservice.context.RestMsg;
import microservice.common.context.RestResponse; import common.microservice.context.RestResponse;
import microservice.services.IRestServiceZmqImpl;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.zeromq.*; import org.zeromq.*;
...@@ -19,7 +16,6 @@ import zmq.Utils; ...@@ -19,7 +16,6 @@ import zmq.Utils;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment