Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
ipgallery.common.java
/
microservice
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Registry
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
782f84dc
authored
May 08, 2017
by
amir
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
end of day commits
parent
77b83f2d
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
418 additions
and
105 deletions
doc/todo.txt
src/main/java/microservice/MicroserviceApp.java
src/main/java/microservice/handlers/Reactor.java
src/main/java/microservice/io/iface/CommonServices.java
src/main/java/microservice/io/impl/IPubSubServiceMqttImpl.java → src/main/java/microservice/io/impl/service/IPubSubServiceMqttImpl.java
src/main/java/microservice/io/impl/service/IRestServiceHttpImpl.java
src/test/java/microservice/TestMicroserviceApp.java
src/test/java/microservice/TestServicesAndMethods.java
doc/todo.txt
View file @
782f84dc
# new services design
# new services design
- counters and metrics in the
handler/
reactor
- counters and metrics in the reactor
- validateRequest in RestService , the jwt issues
- validateRequest in RestService , the jwt issues
- All the validation ,pre/post handling that was were done by the handler will be done by the base service
- All the validation ,pre/post handling that was were done by the handler will be done by the base service
...
...
src/main/java/microservice/MicroserviceApp.java
View file @
782f84dc
...
@@ -123,6 +123,7 @@ public class MicroserviceApp
...
@@ -123,6 +123,7 @@ public class MicroserviceApp
public
MicroserviceApp
withMetrics
()
public
MicroserviceApp
withMetrics
()
{
{
enableMetrics
=
true
;
enableMetrics
=
true
;
reactor
.
withMetricsFactory
(
IMetricsFactoryImpl
.
getInstance
());
return
this
;
return
this
;
}
}
/**
/**
...
@@ -207,6 +208,8 @@ public class MicroserviceApp
...
@@ -207,6 +208,8 @@ public class MicroserviceApp
public
ILogger
getLogger
()
{
return
logger
;
};
public
ILogger
getLogger
()
{
return
logger
;
};
public
microservice
.
MicroserviceClient
getMSClient
(
String
msName
){
return
msClientMap
.
get
(
msName
);
}
public
microservice
.
MicroserviceClient
getMSClient
(
String
msName
){
return
msClientMap
.
get
(
msName
);
}
public
boolean
isEnableMetrics
()
{
return
enableMetrics
;
}
public
MicroserviceApp
build
()
public
MicroserviceApp
build
()
{
{
if
(
logger
==
null
)
if
(
logger
==
null
)
...
@@ -233,7 +236,12 @@ public class MicroserviceApp
...
@@ -233,7 +236,12 @@ public class MicroserviceApp
handler
.
setApp
(
this
);
handler
.
setApp
(
this
);
handler
.
init
();
handler
.
init
();
});
});
/**
* reactor
*/
reactor
.
init
(
logger
);
/*
/*
* build servers
* build servers
*/
*/
...
@@ -508,22 +516,37 @@ public class MicroserviceApp
...
@@ -508,22 +516,37 @@ public class MicroserviceApp
/******** SERVICES DESIGN **********************************************/
/******** SERVICES DESIGN **********************************************/
/*************************************************************************/
/*************************************************************************/
//
//
List
<
Map
<
String
,
CommonServices
.
IService
>>
servicesArray
=
new
ArrayList
<
Map
<
String
,
CommonServices
.
IService
>>(
Enums
.
EnumServiceType
.
values
().
length
);
/// the services array
private
final
List
<
Map
<
String
,
CommonServices
.
IService
>>
servicesArray
=
new
ArrayList
<>(
Enums
.
EnumServiceType
.
values
().
length
);
public
MicroserviceApp
addService
(
Enums
.
EnumServiceType
serviceType
,
public
MicroserviceApp
addService
(
Enums
.
EnumServiceType
serviceType
,
CommonServices
.
IService
iService
,
CommonServices
.
IService
iService
,
String
serviceKey
)
String
serviceKey
)
{
{
reactor
.
addService
(
serviceType
,
iService
,
serviceKey
);
Map
<
String
,
CommonServices
.
IService
>
serviceMap
=
servicesArray
.
get
(
serviceType
.
ordinal
());
if
(
serviceMap
==
null
){
serviceMap
=
new
HashMap
<>();
servicesArray
.
set
(
serviceType
.
ordinal
(),
serviceMap
);
}
serviceMap
.
put
(
serviceKey
,
iService
);
iService
.
setReactor
(
reactor
);
return
this
;
return
this
;
}
}
CommonServices
.
IService
getService
(
Enums
.
EnumServiceType
serviceType
,
String
serviceKey
){
CommonServices
.
IService
getService
(
Enums
.
EnumServiceType
serviceType
,
String
serviceKey
){
return
reactor
.
getService
(
serviceType
,
serviceKey
);
Map
<
String
,
CommonServices
.
IService
>
serviceMap
=
servicesArray
.
get
(
serviceType
.
ordinal
());
if
(
serviceMap
!=
null
)
return
serviceMap
.
get
(
serviceKey
);
return
null
;
}
}
CommonServices
.
IService
getService
(
String
serviceKey
){
CommonServices
.
IService
getService
(
String
serviceKey
){
return
reactor
.
getService
(
serviceKey
);
Optional
<
CommonServices
.
IService
>
iServiceOptional
=
servicesArray
.
stream
()
.
filter
(
serviceMap
->
serviceMap
!=
null
&&
serviceMap
.
containsKey
(
serviceKey
))
.
map
(
serviceMap
->
serviceMap
.
get
(
serviceKey
))
.
findFirst
();
return
iServiceOptional
.
get
();
}
}
public
MicroserviceApp
addMethod
(
Enums
.
EnumServiceType
serviceType
,
public
MicroserviceApp
addMethod
(
Enums
.
EnumServiceType
serviceType
,
...
@@ -545,4 +568,86 @@ public class MicroserviceApp
...
@@ -545,4 +568,86 @@ public class MicroserviceApp
return
this
;
return
this
;
}
}
public
MicroserviceApp
_build
()
{
if
(
logger
==
null
)
logger
=
new
ILoggerConsoleImpl
(
appName
);
//new ILogger4jImpl(appName); // default logger
// some java 8 now...
optMonitorHandler
.
ifPresent
(
mon
->
msMap
.
forEach
((
prfx
,
handler
)
->
{
mon
.
addHandler
(
handler
);}));
/*
* checking configuration
*/
if
(
configuration
==
null
)
configuration
=
new
IConfigurationConfigPropImpl
();
if
(
serviceDiscovery
!=
null
)
{
serviceDiscovery
.
init
();
configuration
.
addConfigurationProvider
(
serviceDiscovery
.
getConfigurationProvider
());
}
/**
* reactor
*/
reactor
.
init
(
logger
);
/**
* init services
*/
servicesArray
.
stream
().
forEach
(
servicesMap
->
{
servicesMap
.
forEach
(
(
serviceKey
,
service
)
->
{
service
.
init
();
});
});
return
this
;
}
public
void
_run
()
{
if
(!
servicesArray
.
isEmpty
())
{
if
(
this
.
enableMetrics
)
{
IMetricsFactoryImpl
.
getInstance
().
startReporting
(
appName
);
}
servicesArray
.
stream
().
forEach
(
servicesMap
->
{
servicesMap
.
forEach
(
(
serviceKey
,
service
)
->
{
service
.
run
();
});
});
Runtime
.
getRuntime
().
addShutdownHook
(
new
Thread
(()
->
{
try
{
servicesArray
.
stream
().
forEach
(
servicesMap
->
{
servicesMap
.
forEach
(
(
serviceKey
,
service
)
->
{
service
.
shutdown
();
});
});
// notify main
notifyAll
();
}
catch
(
Exception
e
)
{
System
.
out
.
println
(
"exit..."
);
}
}));
/*
* blocking...
*/
try
{
synchronized
(
this
){
wait
();
}
}
catch
(
InterruptedException
e
)
{
System
.
out
.
println
(
"exit!..."
);
}
}
else
{
System
.
out
.
println
(
"no server/s...exit!"
);
}
}
}
}
src/main/java/microservice/handlers/Reactor.java
View file @
782f84dc
package
microservice
.
handlers
;
package
microservice
.
handlers
;
import
io.undertow.util.PathTemplateMatcher
;
import
microservice.defs.Constants
;
import
microservice.defs.Constants
;
import
microservice.defs.Enums
;
import
microservice.defs.Enums
;
import
microservice.io.iface.CommonServices
;
import
microservice.io.iface.CommonServices
;
import
microservice.io.iface.ILogger
;
import
microservice.io.iface.IMetricsFactory
;
import
microservice.io.iface.IMetricsFactory
;
import
java.util.*
;
import
java.util.*
;
import
java.util.function.BiConsumer
;
import
java.util.function.BiConsumer
;
/**
/**
* ------------
* Services -> | | -> Methods
* ------------
* Created by amir on 04/05/17.
* Created by amir on 04/05/17.
*/
*/
public
class
Reactor
{
public
class
Reactor
implements
CommonServices
.
IServiceReactor
{
private
Map
<
String
,
BiConsumer
<
CommonServices
.
IMsgContext
,
CommonServices
.
IService
>>
methodsMap
=
new
HashMap
<>();
private
IMetricsFactory
metricsFactory
=
null
;
List
<
Map
<
String
,
CommonServices
.
IService
>>
servicesArray
=
new
ArrayList
<>(
Enums
.
EnumServiceType
.
values
().
length
);
public
Reactor
()
{
}
public
static
class
MethodMetrics
{
IMetricsFactory
.
IMeter
meter
;
IMetricsFactory
.
ITimer
timer
;
public
Reactor
addService
(
Enums
.
EnumServiceType
serviceType
,
public
MethodMetrics
(
IMetricsFactory
.
IMeter
meter
,
IMetricsFactory
.
ITimer
timer
)
{
CommonServices
.
IService
iService
,
this
.
meter
=
meter
;
String
serviceKey
)
this
.
timer
=
timer
;
{
}
Map
<
String
,
CommonServices
.
IService
>
serviceMap
=
servicesArray
.
get
(
serviceType
.
ordinal
());
if
(
serviceMap
==
null
){
public
IMetricsFactory
.
IMeter
getMeter
()
{
serviceMap
=
new
HashMap
<>();
return
meter
;
servicesArray
.
set
(
serviceType
.
ordinal
(),
serviceMap
);
}
public
IMetricsFactory
.
ITimer
getTimer
()
{
return
timer
;
}
void
preHandle
(){
meter
.
mark
();
timer
.
start
();
}
void
postHandle
(){
timer
.
stop
();
}
}
serviceMap
.
put
(
serviceKey
,
iService
);
return
this
;
}
}
public
CommonServices
.
IService
getService
(
Enums
.
EnumServiceType
serviceType
,
String
serviceKey
){
private
static
class
MethodMatch
{
Map
<
String
,
CommonServices
.
IService
>
serviceMap
=
servicesArray
.
get
(
serviceType
.
ordinal
());
BiConsumer
<
CommonServices
.
IMsgContext
,
CommonServices
.
IService
>
methodCallback
;
if
(
serviceMap
!=
null
)
return
serviceMap
.
get
(
serviceKey
);
public
MethodMatch
(
BiConsumer
<
CommonServices
.
IMsgContext
,
CommonServices
.
IService
>
methodCallback
)
{
return
null
;
this
.
methodCallback
=
methodCallback
;
}
public
BiConsumer
<
CommonServices
.
IMsgContext
,
CommonServices
.
IService
>
getMethodCallback
()
{
return
methodCallback
;
}
}
}
public
CommonServices
.
IService
getService
(
String
serviceKey
){
/// the methods hashmap
Optional
<
CommonServices
.
IService
>
iServiceOptional
=
servicesArray
.
stream
()
private
final
PathTemplateMatcher
<
MethodMatch
>
methodsMap
=
new
PathTemplateMatcher
<>();
.
filter
(
serviceMap
->
serviceMap
!=
null
&&
serviceMap
.
containsKey
(
serviceKey
))
private
final
List
<
String
>
methodKeyList
=
new
ArrayList
<>();
.
map
(
serviceMap
->
serviceMap
.
get
(
serviceKey
))
//private Map<String,BiConsumer<CommonServices.IMsgContext,CommonServices.IService>> methodsMap = new HashMap<>();
.
findFirst
();
private
IMetricsFactory
metricsFactory
=
null
;
return
iServiceOptional
.
get
();
/// the metrics map
private
Map
<
String
,
MethodMetrics
>
methodMetricsMap
=
null
;
private
ILogger
logger
=
null
;
public
Reactor
()
{
}
}
public
void
addMethod
(
CommonServices
.
MethodParams
methodParams
){
public
void
addMethod
(
CommonServices
.
MethodParams
methodParams
){
...
@@ -52,10 +74,11 @@ public class Reactor {
...
@@ -52,10 +74,11 @@ public class Reactor {
* build the key
* build the key
*/
*/
String
key
=
buildServiceKey
(
methodParams
);
String
key
=
buildServiceKey
(
methodParams
);
methodsMap
.
put
(
key
,
methodParams
.
getConsumerMethod
());
methodsMap
.
add
(
key
,
new
MethodMatch
(
methodParams
.
getConsumerMethod
()));
methodKeyList
.
add
(
key
);
}
}
public
String
buildServiceKey
(
CommonServices
.
MethodParams
methodParams
)
{
public
static
String
buildServiceKey
(
CommonServices
.
MethodParams
methodParams
)
{
return
methodParams
.
getServiceType
().
name
()
+
Constants
.
TYPE_PREFIX_SEPERATOR
+
return
methodParams
.
getServiceType
().
name
()
+
Constants
.
TYPE_PREFIX_SEPERATOR
+
methodParams
.
getServiceCommand
().
toString
()
+
Constants
.
TYPE_PREFIX_SEPERATOR
+
methodParams
.
getServiceCommand
().
toString
()
+
Constants
.
TYPE_PREFIX_SEPERATOR
+
methodParams
.
getResourceUri
();
methodParams
.
getResourceUri
();
...
@@ -68,18 +91,39 @@ public class Reactor {
...
@@ -68,18 +91,39 @@ public class Reactor {
* @param msgContext
* @param msgContext
* @return
* @return
*/
*/
boolean
delegate
(
CommonServices
.
IService
orgService
,
String
key
,
CommonServices
.
IMsgContext
msgContext
){
@Override
public
boolean
delegate
(
CommonServices
.
IService
orgService
,
String
key
,
CommonServices
.
IMsgContext
msgContext
){
final
BiConsumer
<
CommonServices
.
IMsgContext
,
CommonServices
.
IService
>
methodCallback
=
methodsMap
.
get
(
key
);
MethodMetrics
methodMetrics
=
null
;
if
(
methodCallback
!=
null
)
{
boolean
result
=
true
;
methodCallback
.
accept
(
msgContext
,
orgService
);
final
PathTemplateMatcher
.
PathMatchResult
<
MethodMatch
>
match
=
methodsMap
.
match
(
key
);
}
else
{
try
{
orgService
.
handleNotImplmented
(
msgContext
);
if
(
match
!=
null
&&
match
.
getValue
().
getMethodCallback
()
!=
null
)
{
final
BiConsumer
<
CommonServices
.
IMsgContext
,
CommonServices
.
IService
>
methodCallback
=
match
.
getValue
().
getMethodCallback
();
/**
* pre-handling
*/
if
(
metricsFactory
!=
null
)
{
methodMetrics
=
methodMetricsMap
.
get
(
key
);
}
methodCallback
.
accept
(
msgContext
,
orgService
);
}
else
{
orgService
.
handleNotImplmented
(
msgContext
);
}
}
catch
(
Exception
exp
)
{
logger
.
error
(
exp
.
toString
());
result
=
false
;
}
finally
{
/**
* post handling
*/
if
(
methodMetrics
!=
null
)
methodMetrics
.
postHandle
();
}
}
return
true
;
return
result
;
}
}
public
final
Map
<
String
,
BiConsumer
<
CommonServices
.
IMsgContext
,
CommonServices
.
IService
>
>
getMethodsMap
()
{
public
final
PathTemplateMatcher
<
MethodMatch
>
getMethodsMap
()
{
return
methodsMap
;
return
methodsMap
;
}
}
...
@@ -88,5 +132,18 @@ public class Reactor {
...
@@ -88,5 +132,18 @@ public class Reactor {
return
this
;
return
this
;
}
}
public
void
init
(
ILogger
logger
){
this
.
logger
=
logger
;
if
(
metricsFactory
!=
null
){
methodMetricsMap
=
new
HashMap
<>();
/**
* create counters for every method
*/
for
(
String
key
:
methodKeyList
){
IMetricsFactory
.
IMeter
meter
=
metricsFactory
.
createMeter
(
key
);
IMetricsFactory
.
ITimer
timer
=
metricsFactory
.
createTimer
(
key
);
methodMetricsMap
.
put
(
key
,
new
MethodMetrics
(
meter
,
timer
));
}
}
}
}
}
src/main/java/microservice/io/iface/CommonServices.java
View file @
782f84dc
...
@@ -20,15 +20,21 @@ public class CommonServices {
...
@@ -20,15 +20,21 @@ public class CommonServices {
public
interface
IMsgContext
{
public
interface
IMsgContext
{
}
}
public
interface
IService
{
public
interface
IServiceReactor
{
boolean
delegate
(
CommonServices
.
IService
orgService
,
String
key
,
CommonServices
.
IMsgContext
msgContext
);
}
boolean
init
();
public
static
abstract
class
IService
{
void
run
();
protected
IServiceReactor
reactor
=
null
;
void
shutdown
();
void
addMethod
(
MethodParams
methodParams
);
public
abstract
boolean
init
();
public
abstract
void
run
();
public
abstract
void
shutdown
();
public
abstract
void
handleNotImplmented
(
IMsgContext
msgContext
);
void
handleNotImplmented
(
IMsgContext
msgContext
);
public
void
setReactor
(
IServiceReactor
reactor
)
{
this
.
reactor
=
reactor
;
}
}
}
// @FunctionalInterface
// @FunctionalInterface
...
@@ -73,28 +79,31 @@ public class CommonServices {
...
@@ -73,28 +79,31 @@ public class CommonServices {
void
getMethods
(
List
<
MethodParams
>
methodParamsList
);
void
getMethods
(
List
<
MethodParams
>
methodParamsList
);
}
}
public
interface
IRestService
extends
IService
{
public
enum
EnumRestCommands
implements
IServiceCommands
{
enum
EnumRestCommands
implements
IServiceCommands
{
E_CREATE
,
E_CREATE
,
E_READ
,
E_READ
,
E_UPDATE
,
E_UPDATE
,
E_DELETE
;
E_DELETE
;
}
}
public
static
abstract
class
IRestService
extends
IService
{
public
BaseRestResponse
create
(
CommandParams
cmdParams
);
public
abstract
BaseRestResponse
create
(
CommandParams
cmdParams
);
public
BaseRestResponse
read
(
CommandParams
cmdParams
);
public
abstract
BaseRestResponse
read
(
CommandParams
cmdParams
);
public
BaseRestResponse
update
(
CommandParams
cmdParams
);
public
abstract
BaseRestResponse
update
(
CommandParams
cmdParams
);
public
BaseRestResponse
delete
(
CommandParams
cmdParams
);
public
abstract
BaseRestResponse
delete
(
CommandParams
cmdParams
);
}
}
public
interface
IPubSubService
extends
IService
{
enum
EnumPubSubCommands
implements
IServiceCommands
{
enum
EnumPubSubCommands
implements
IServiceCommands
{
E_SUBSCRIBE
,
E_SUBSCRIBE
,
E_PUBLISH
,
E_PUBLISH
,
E_NOTIFY
E_NOTIFY
}
}
public
static
abstract
class
IPubSubService
extends
IService
{
class
PubSubMsgContext
implements
IMsgContext
{
public
class
PubSubMsgContext
implements
IMsgContext
{
public
String
topic
;
public
String
topic
;
public
String
msg
;
public
String
msg
;
...
@@ -104,18 +113,19 @@ public class CommonServices {
...
@@ -104,18 +113,19 @@ public class CommonServices {
}
}
}
}
void
subscribe
(
String
topic
,
Consumer
<
String
>
notifyFunc
);
public
abstract
void
subscribe
(
String
topic
,
Consumer
<
String
>
notifyFunc
);
void
unsubscribe
(
String
topic
);
public
abstract
void
unsubscribe
(
String
topic
);
void
publish
(
String
topic
,
String
message
);
public
abstract
void
publish
(
String
topic
,
String
message
);
}
}
public
interface
IMsgQService
extends
IService
{
enum
EnumMsgQCommands
{
enum
EnumMsgQCommands
{
E_SEND
,
E_SEND
,
E_RECEIVE
E_RECEIVE
}
}
void
receive
(
Consumer
<
String
>
receiveFunc
);
public
static
abstract
class
IMsgQService
extends
IService
{
void
send
(
String
msg
);
public
abstract
void
receive
(
Consumer
<
String
>
receiveFunc
);
public
abstract
void
send
(
String
msg
);
}
}
}
}
src/main/java/microservice/io/impl/IPubSubServiceMqttImpl.java
→
src/main/java/microservice/io/impl/
service/
IPubSubServiceMqttImpl.java
View file @
782f84dc
package
microservice
.
io
.
impl
;
package
microservice
.
io
.
impl
.
service
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
common.JsonHandler
;
import
common.JsonHandler
;
...
@@ -12,7 +12,7 @@ import java.util.function.Consumer;
...
@@ -12,7 +12,7 @@ import java.util.function.Consumer;
/**
/**
* Created by amir on 18/01/17.
* Created by amir on 18/01/17.
*/
*/
public
class
IPubSubServiceMqttImpl
implement
s
CommonServices
.
IPubSubService
{
public
class
IPubSubServiceMqttImpl
extend
s
CommonServices
.
IPubSubService
{
private
MqttAsyncClient
asyncClient
;
private
MqttAsyncClient
asyncClient
;
private
int
qos
;
private
int
qos
;
private
String
clientId
;
private
String
clientId
;
...
@@ -70,7 +70,7 @@ public class IPubSubServiceMqttImpl implements CommonServices.IPubSubService {
...
@@ -70,7 +70,7 @@ public class IPubSubServiceMqttImpl implements CommonServices.IPubSubService {
*/
*/
topicCallbackMap
.
entrySet
().
forEach
(
stringConsumerEntry
->
{
topicCallbackMap
.
entrySet
().
forEach
(
stringConsumerEntry
->
{
if
(
topic
.
startsWith
(
stringConsumerEntry
.
getKey
()))
if
(
topic
.
startsWith
(
stringConsumerEntry
.
getKey
()))
stringConsumerEntry
.
getValue
().
accept
(
new
PubSubMsgContext
(
topic
,
message
.
toString
()));
stringConsumerEntry
.
getValue
().
accept
(
new
CommonServices
.
IPubSubService
.
PubSubMsgContext
(
topic
,
message
.
toString
()));
});
});
}
}
...
@@ -112,24 +112,29 @@ public class IPubSubServiceMqttImpl implements CommonServices.IPubSubService {
...
@@ -112,24 +112,29 @@ public class IPubSubServiceMqttImpl implements CommonServices.IPubSubService {
}
}
}
}
// @Override
// public void addMethod(CommonServices.MethodParams methodParams) {
// String resourceUri = methodParams.getResourceUri();
// if (EnumPubSubCommands.E_SUBSCRIBE.equals(methodParams.getServiceCommand()) &&
// ! resourceUri.isEmpty() && methodParams.getConsumerMethod() != null){
// try {
// /**
// * search for last / or wildcard
// */
// int indexOfSlash = resourceUri.lastIndexOf('/');
// if (indexOfSlash != -1){
// resourceUri = resourceUri.substring(0,indexOfSlash);
// }
// asyncClient.subscribe(resourceUri,qos);
// topicCallbackMap.put(resourceUri,methodParams.getConsumerMethod());
// } catch (MqttException e) {
// e.printStackTrace();
// }
// }
// }
//
@Override
@Override
public
void
addMethod
(
CommonServices
.
MethodParams
methodParams
)
{
public
void
handleNotImplmented
(
CommonServices
.
IMsgContext
msgContext
)
{
String
resourceUri
=
methodParams
.
getResourceUri
();
if
(
EnumPubSubCommands
.
E_SUBSCRIBE
.
equals
(
methodParams
.
getServiceCommand
())
&&
!
resourceUri
.
isEmpty
()
&&
methodParams
.
getConsumerMethod
()
!=
null
){
try
{
/**
* search for last / or wildcard
*/
int
indexOfSlash
=
resourceUri
.
lastIndexOf
(
'/'
);
if
(
indexOfSlash
!=
-
1
){
resourceUri
=
resourceUri
.
substring
(
0
,
indexOfSlash
);
}
asyncClient
.
subscribe
(
resourceUri
,
qos
);
topicCallbackMap
.
put
(
resourceUri
,
methodParams
.
getConsumerMethod
());
}
catch
(
MqttException
e
)
{
e
.
printStackTrace
();
}
}
}
}
}
}
src/main/java/microservice/io/impl/service/IRestServiceHttpImpl.java
0 → 100644
View file @
782f84dc
package
microservice
.
io
.
impl
.
service
;
import
microservice.MicroserviceApp
;
import
microservice.io.iface.CommonServices
;
import
microservice.io.iface.ILogger
;
import
microservice.params.CommandParams
;
import
microservice.params.RestServerParams
;
import
microservice.types.BaseRestResponse
;
/**
* Created by amir on 08/05/17.
*/
public
class
IRestServiceHttpImpl
extends
CommonServices
.
IRestService
{
ILogger
logger
=
null
;
RestServerParams
restServerParams
;
public
IRestServiceHttpImpl
(
RestServerParams
restServerParams
)
{
this
.
restServerParams
=
restServerParams
;
}
@Override
public
BaseRestResponse
create
(
CommandParams
cmdParams
)
{
return
null
;
}
@Override
public
BaseRestResponse
read
(
CommandParams
cmdParams
)
{
return
null
;
}
@Override
public
BaseRestResponse
update
(
CommandParams
cmdParams
)
{
return
null
;
}
@Override
public
BaseRestResponse
delete
(
CommandParams
cmdParams
)
{
return
null
;
}
@Override
public
boolean
init
()
{
logger
=
MicroserviceApp
.
getsInstance
().
getLogger
();
return
false
;
}
@Override
public
void
run
()
{
}
@Override
public
void
shutdown
()
{
}
@Override
public
void
handleNotImplmented
(
CommonServices
.
IMsgContext
msgContext
)
{
}
}
src/test/java/microservice/TestMicroserviceApp.java
View file @
782f84dc
...
@@ -5,6 +5,7 @@ import microservice.defs.Enums;
...
@@ -5,6 +5,7 @@ import microservice.defs.Enums;
import
microservice.io.iface.CommonServices
;
import
microservice.io.iface.CommonServices
;
import
microservice.io.iface.ICommandClient
;
import
microservice.io.iface.ICommandClient
;
import
microservice.io.impl.*
;
import
microservice.io.impl.*
;
import
microservice.io.impl.service.IRestServiceHttpImpl
;
import
microservice.params.*
;
import
microservice.params.*
;
import
microservice.types.BaseRestResponse
;
import
microservice.types.BaseRestResponse
;
...
@@ -76,20 +77,20 @@ public class TestMicroserviceApp {
...
@@ -76,20 +77,20 @@ public class TestMicroserviceApp {
msApp
.
withMetrics
()
msApp
.
withMetrics
()
.
withMonitoring
()
.
withMonitoring
()
//.withDefaultServiceAuthorization()
//.withDefaultServiceAuthorization()
//.addService(Enums.EnumServiceType.E_REST,new IRestServiceUndertowImpl(new RestServerParams(32000, "localhost", 2
),"undertowRestService")
.
addService
(
Enums
.
EnumServiceType
.
E_REST
,
new
IRestServiceHttpImpl
(
new
RestServerParams
(
32000
,
"localhost"
,
2
)
),
"undertowRestService"
)
.
addMethod
(
Enums
.
EnumServiceType
.
E_REST
,
CommonServices
.
IRestService
.
EnumRestCommands
.
E_READ
,
"/resource/r1"
,(
msgCtx
,
orgService
)
->
{
.
addMethod
(
Enums
.
EnumServiceType
.
E_REST
,
CommonServices
.
EnumRestCommands
.
E_READ
,
"/resource/r1"
,(
msgCtx
,
orgService
)
->
{
BaseRestResponse
brr
;
BaseRestResponse
brr
;
msApp
.
getLogger
();
msApp
.
getLogger
();
CommonServices
.
IRestService
restService
=
(
CommonServices
.
IRestService
)
orgService
;
CommonServices
.
IRestService
restService
=
(
CommonServices
.
IRestService
)
orgService
;
//brr.setObject({ "a":"b" })
//brr.setObject({ "a":"b" })
restService
.
writeResponse
(
brr
);
//
restService.writeResponse(brr);
})
})
.
addMethod
(
Enums
.
EnumServiceType
.
E_REST
,
CommonServices
.
IRestService
.
EnumRestCommands
.
E_READ
,
"/resource/r1"
,(
msgCtx
,
orgService
)
->
{
.
addMethod
(
Enums
.
EnumServiceType
.
E_REST
,
CommonServices
.
EnumRestCommands
.
E_READ
,
"/resource/r1"
,(
msgCtx
,
orgService
)
->
{
CommonServices
.
IRestService
outRestService
=
(
CommonServices
.
IRestService
)
MicroserviceApp
.
getsInstance
().
getService
(
Enums
.
EnumServiceType
.
E_REST
,
"undertowRestService"
);
CommonServices
.
IRestService
outRestService
=
(
CommonServices
.
IRestService
)
MicroserviceApp
.
getsInstance
().
getService
(
Enums
.
EnumServiceType
.
E_REST
,
"undertowRestService"
);
CommonServices
.
IRestService
restService
=
(
CommonServices
.
IRestService
)
orgService
;
CommonServices
.
IRestService
restService
=
(
CommonServices
.
IRestService
)
orgService
;
CommandParams
cmdParams
=
new
CommandParams
();
CommandParams
cmdParams
=
new
CommandParams
();
BaseRestResponse
brr
=
restService
.
read
(
cmdParams
);
BaseRestResponse
brr
=
restService
.
read
(
cmdParams
);
restService
.
writeResponse
(
brr
);
//
restService.writeResponse(brr);
})
})
.
build
()
.
build
()
.
run
();
.
run
();
...
...
src/test/java/microservice/TestServicesAndMethods.java
0 → 100644
View file @
782f84dc
package
microservice
;
import
io.undertow.predicate.Predicate
;
import
io.undertow.util.PathTemplateMatcher
;
import
microservice.io.iface.CommonServices
;
import
org.junit.Test
;
import
java.util.List
;
import
java.util.concurrent.CopyOnWriteArrayList
;
import
java.util.function.BiConsumer
;
/**
* Created by amir on 08/05/17.
*/
public
class
TestServicesAndMethods
{
public
static
final
int
ITERATIONS
=
1000000
;
private
static
class
RoutingMatch
{
final
List
<
HandlerHolder
>
predicatedHandlers
=
new
CopyOnWriteArrayList
<>();
// volatile HttpHandler defaultHandler;
}
private
static
class
HandlerHolder
{
final
Predicate
predicate
;
final
BiConsumer
<
CommonServices
.
IMsgContext
,
CommonServices
.
IService
>
methodCallback
;
private
HandlerHolder
(
Predicate
predicate
,
BiConsumer
<
CommonServices
.
IMsgContext
,
CommonServices
.
IService
>
methodCallback
)
{
this
.
predicate
=
predicate
;
this
.
methodCallback
=
methodCallback
;
}
}
@Test
public
void
testMatcher
(){
final
PathTemplateMatcher
<
RoutingMatch
>
allMethodsMatcher
=
new
PathTemplateMatcher
<>();
addMatch
(
allMethodsMatcher
,
"/baz/{foo}"
);
addMatch
(
allMethodsMatcher
,
"/baz/ok/{foo}"
);
addMatch
(
allMethodsMatcher
,
"/baz/entities"
);
addMatch
(
allMethodsMatcher
,
"REST:GET:/baz/entities/entity/{entityId}"
);
findMatch
(
allMethodsMatcher
,
"/baz/1"
);
findMatch
(
allMethodsMatcher
,
"/baz/ok/1"
);
findMatch
(
allMethodsMatcher
,
"/baz/ok"
);
findMatch
(
allMethodsMatcher
,
"/baz/entities"
);
findMatch
(
allMethodsMatcher
,
"/baz/entities/entity/"
);
long
start
=
System
.
currentTimeMillis
();
for
(
int
i
=
0
;
i
<
ITERATIONS
;
i
++)
{
findMatch
(
allMethodsMatcher
,
"REST:GET:/baz/entities/entity/12345"
);
}
System
.
out
.
println
(
"Test of: "
+
String
.
valueOf
(
ITERATIONS
)
+
" took (msec): "
+
String
.
valueOf
(
System
.
currentTimeMillis
()
-
start
));
}
public
void
addMatch
(
PathTemplateMatcher
<
RoutingMatch
>
allMethodsMatcher
,
String
template1
)
{
RoutingMatch
res1
=
new
RoutingMatch
();
allMethodsMatcher
.
add
(
template1
,
res1
);
}
public
void
findMatch
(
PathTemplateMatcher
<
RoutingMatch
>
allMethodsMatcher
,
String
path
)
{
PathTemplateMatcher
.
PathMatchResult
<
RoutingMatch
>
match
=
allMethodsMatcher
.
match
(
path
);
if
(
match
==
null
)
System
.
out
.
println
(
"Failed to find handler for: "
+
path
);
// else
// System.out.println("Found match: " + match.getMatchedTemplate());
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment