diff options
author | Huabing Zhao <zhaohuabing@gmail.com> | 2019-03-20 11:34:25 +0800 |
---|---|---|
committer | Huabing Zhao <zhaohuabing@gmail.com> | 2019-03-20 11:39:46 +0800 |
commit | 14fe96da81b4197373ba6347773164465145c9df (patch) | |
tree | 330bf6104c82f6610ff817626880d6150c3575a8 /src/main/java/org/onap/msb/sdk/discovery | |
parent | 9c3e9283ac99b8fd44ec2241c098d3dc450a64ed (diff) |
Remove Chinese comments1.2.0
Change-Id: I6734d0e2264c79faf1c02b5d3c4500140dc14f80
Issue-ID: MSB-197
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
Diffstat (limited to 'src/main/java/org/onap/msb/sdk/discovery')
6 files changed, 37 insertions, 41 deletions
diff --git a/src/main/java/org/onap/msb/sdk/discovery/entity/MicroServiceInfo.java b/src/main/java/org/onap/msb/sdk/discovery/entity/MicroServiceInfo.java index 61c66c3..6c70e7b 100644 --- a/src/main/java/org/onap/msb/sdk/discovery/entity/MicroServiceInfo.java +++ b/src/main/java/org/onap/msb/sdk/discovery/entity/MicroServiceInfo.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 @@ -17,7 +17,7 @@ import java.io.Serializable; /** * @ClassName: MicroServiceInfo Bean - * @Description:微服务信息实体类 + * @Description * @author 10188044 * @date 2016-1-19 */ diff --git a/src/main/java/org/onap/msb/sdk/discovery/entity/Node.java b/src/main/java/org/onap/msb/sdk/discovery/entity/Node.java index f630528..7f101c4 100644 --- a/src/main/java/org/onap/msb/sdk/discovery/entity/Node.java +++ b/src/main/java/org/onap/msb/sdk/discovery/entity/Node.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright 2017-2018 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 @@ -28,7 +28,6 @@ public class Node implements Serializable { private String ttl = ""; - // 健康检查参数 // health check type, allowableValues = "HTTP,TCP, TTL", example = "HTTP") private String checkType = ""; // health check url, example for http "http://192.168.0.2:80/heallth", example for tcp diff --git a/src/main/java/org/onap/msb/sdk/discovery/entity/NodeInfo.java b/src/main/java/org/onap/msb/sdk/discovery/entity/NodeInfo.java index 316b548..43555a3 100644 --- a/src/main/java/org/onap/msb/sdk/discovery/entity/NodeInfo.java +++ b/src/main/java/org/onap/msb/sdk/discovery/entity/NodeInfo.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 @@ -25,7 +25,7 @@ public class NodeInfo extends Node { private String nodeId; - private String status; // 实例健康检查状态 + private String status; @JsonSerialize(using = CustomDateSerializer.class) private Date expiration; diff --git a/src/main/java/org/onap/msb/sdk/discovery/entity/RouteResult.java b/src/main/java/org/onap/msb/sdk/discovery/entity/RouteResult.java index 9e266fa..d5d668d 100644 --- a/src/main/java/org/onap/msb/sdk/discovery/entity/RouteResult.java +++ b/src/main/java/org/onap/msb/sdk/discovery/entity/RouteResult.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 @@ -15,10 +15,10 @@ package org.onap.msb.sdk.discovery.entity; /** * @ClassName: ApiRouteResult - * @Description: TODO(ApiRoute操作返回类) + * @Description * @author tanghua10186366 - * @date 2015年9月25日 上午11:24:42 - * + * @date 2015/9/25 + * */ public class RouteResult { private String result; 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"); |