diff options
author | 2016-10-20 19:49:32 +0800 | |
---|---|---|
committer | 2016-10-21 09:20:14 +0800 | |
commit | 71da542da90eb156db0c5c0e5130c043ba73c3b3 (patch) | |
tree | cb700a6f28697196a539c70191d23010a89e82c3 /msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MicroServiceWrapper.java | |
parent | 45a8046221d9880ed6dd51d84c1f454af44ea0a1 (diff) |
OCS-79 repair register services fails by interface because of delete api service
Change-Id: I50fc840c116533ff69724eacadd67679099b79dd
Issue-Id: OCS-79
Signed-off-by: tanghua <tang.hua52@zte.com.cn>
Diffstat (limited to 'msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MicroServiceWrapper.java')
-rw-r--r-- | msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MicroServiceWrapper.java | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MicroServiceWrapper.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MicroServiceWrapper.java index 2611605..0099481 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MicroServiceWrapper.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MicroServiceWrapper.java @@ -303,50 +303,31 @@ public class MicroServiceWrapper { + RouteUtil.PROTOCOL_LIST + ")"); } - MicroServiceFullInfo existingMicroServiceInfo; + try { - //To determine whether a service already exists - existingMicroServiceInfo = - MicroServiceDB.getInstance().getMicroServiceInstance( - microServiceInfo.getServiceName().trim(), microServiceInfo.getVersion().trim(),serverPort); - - MicroServiceFullInfo newMicroServiceInfo ; - if (existingMicroServiceInfo != null) { - //a service already exists - - if (!existingMicroServiceInfo.getProtocol().equals(microServiceInfo.getProtocol())) { - throw new ExtendedNotSupportedException( - "MicroServiceInfo with different protocols and same serviceName is already existing"); - } + + if (createOrUpdate == false) { //After the first remove added MicroServiceDB.getInstance().deleteMicroService( microServiceInfo.getServiceName(), microServiceInfo.getVersion(),serverPort); - MicroServiceDB.getInstance().saveMicroServiceInfo2Redis(microServiceInfo,serverPort); + //Notify the listeners + MicroServiceDB.getInstance().noticeApiListener(microServiceInfo, "DELETE",serverPort); - } else { - //Add the original record and save directly - MicroServiceDB.getInstance().saveMicroServiceInfo2Redis(microServiceInfo,serverPort); - } + } - newMicroServiceInfo = - MicroServiceDB.getInstance().getMicroServiceInstance( - microServiceInfo.getServiceName(), microServiceInfo.getVersion(),serverPort); - - //Notify the listeners - MicroServiceDB.getInstance().noticeUpdateApiListener(microServiceInfo.getServiceName(),microServiceInfo.getVersion(),newMicroServiceInfo,serverPort); - - } else { //Save the new record MicroServiceDB.getInstance().saveMicroServiceInfo2Redis(microServiceInfo,serverPort); //Notify the listeners MicroServiceDB.getInstance().noticeApiListener(microServiceInfo, "ADD",serverPort); - newMicroServiceInfo = - MicroServiceDB.getInstance().getMicroServiceInstance( - microServiceInfo.getServiceName(), microServiceInfo.getVersion(),serverPort); - } + + + + MicroServiceFullInfo newMicroServiceInfo = + MicroServiceDB.getInstance().getMicroServiceInstance( + microServiceInfo.getServiceName(), microServiceInfo.getVersion(),serverPort); |