diff options
Diffstat (limited to 'src/main/java/org/onap/msb/sdk/discovery/util')
| -rw-r--r-- | src/main/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtil.java | 27 | ||||
| -rw-r--r-- | src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java | 16 |
2 files changed, 20 insertions, 23 deletions
diff --git a/src/main/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtil.java b/src/main/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtil.java index aac256a..27b6f0d 100644 --- a/src/main/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtil.java +++ b/src/main/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtil.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright 2017 ZTE, Inc. and others. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express * or implied. See the License for the specific language governing permissions and limitations under @@ -40,9 +40,8 @@ public class JacksonJsonUtil { private static ObjectMapper mapper; /** - * 获取ObjectMapper实例 - * - * @param createNew 方式：true，新实例；false,存在的mapper实例 + * + * @param createNew create a new instanse if truer, otherwise return the existing instance * @return */ public static synchronized ObjectMapper getMapperInstance() { @@ -53,10 +52,10 @@ public class JacksonJsonUtil { } /** - * 将java对象转换成json字符串 - * - * @param obj 准备转换的对象 - * @return json字符串 + * conver java object to json + * + * @param obj + * @return * @throws Exception */ public static String beanToJson(Object obj) throws RouteException { @@ -73,10 +72,10 @@ public class JacksonJsonUtil { /** - * 将json字符串转换成java对象 - * - * @param json 准备转换的json字符串 - * @param cls 准备转换的类 + * convert json string to java object + * + * @param json + * @param cls * @return * @throws Exception */ diff --git a/src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java b/src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java index c54a51c..10cbbc2 100644 --- a/src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java +++ b/src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright 2017 ZTE, Inc. and others. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express * or implied. See the License for the specific language governing permissions and limitations under @@ -23,17 +23,17 @@ import org.onap.msb.sdk.discovery.entity.NodeInfo; /** * @ClassName: MsbUtil - * @Description: TODO(msb功能工具方法类) + * @Description: Utils for MSB * @author tanghua10186366 - * @date 2017年6月26日 - * + * @date 2017/6/26 + * */ public class MsbUtil { /** * @Title getConsulServiceName - * @Description TODO(通过服务名和命名空间组装conusl存储名，用于服务变化监听) + * @Description * @param serviceName * @param namespace * @return String @@ -64,7 +64,6 @@ public class MsbUtil { } public static String checkVersion(String version) throws RouteException{ - // 版本号格式检查 if (StringUtils.isNotBlank(version)) { if (!RegExpTestUtil.versionRegExpTest(version)) { throw new RouteException("version is not a valid format", "DATA_FORMAT_ERROR"); @@ -77,7 +76,6 @@ public class MsbUtil { } public static void checkHost(String ip,String port) throws RouteException{ - // HOST空值和格式检查 if (StringUtils.isBlank(ip)) { throw new RouteException("ip can't be empty", "DATA_FORMAT_ERROR"); |