diff options
author | HuabingZhao <zhao.huabing@zte.com.cn> | 2018-03-13 10:19:52 +0800 |
---|---|---|
committer | HuabingZhao <zhao.huabing@zte.com.cn> | 2018-03-13 10:27:20 +0800 |
commit | c9b3c2d143621f25a670049aadf61830d3ed321c (patch) | |
tree | bb76129f0ef5101b8fd69431bb6aab61c8101479 /apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/RouteUtil.java | |
parent | 556ec2e4d3fa31b96fe0d3f5a842254ad906af68 (diff) |
Support multiple versions under a service name
Modify the service name when sync service route from consul
Issue-ID: MSB-178
Change-Id: I5a1a3efe02a8cf7f56518d1b745505b049553810
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
Diffstat (limited to 'apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/RouteUtil.java')
-rw-r--r-- | apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/RouteUtil.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/RouteUtil.java b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/RouteUtil.java index ae60f50..5f9557f 100644 --- a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/RouteUtil.java +++ b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/RouteUtil.java @@ -294,14 +294,24 @@ public class RouteUtil { * @return * @return String */ - public static String getRouteNameByns(String consul_serviceName, String namespace) { + public static String getRouteNameByns(String consul_serviceName, String version, String namespace) { String serviceName = consul_serviceName; - if (StringUtils.isNotBlank(namespace)) { + // Remove version and namespace from consul service name + // Consul_serviceName Format: serviceName-version-namespace + if (StringUtils.isNotBlank(version) && StringUtils.isNotBlank(namespace)) { + if (consul_serviceName.endsWith("-" + version + "-" + namespace)) { + serviceName = consul_serviceName.substring(0, + consul_serviceName.length() - version.length() - namespace.length() - 2); + } + } else if (StringUtils.isNotBlank(version)) { + if (consul_serviceName.endsWith("-" + version)) { + serviceName = consul_serviceName.substring(0, consul_serviceName.length() - version.length() - 1); + } + } else if (StringUtils.isNotBlank(namespace)) { if (consul_serviceName.endsWith("-" + namespace)) { serviceName = consul_serviceName.substring(0, consul_serviceName.length() - namespace.length() - 1); } } - return serviceName; } |