50% Code Coverage-MSB Discovery

Issue-ID: MSB-114

Change-Id: Ibf5f0acbd85fc7f4abbaae41ebbc04d6edc13770
Signed-off-by: tanghua <tang.hua52@zte.com.cn>

4 files changed, 6 insertions, 177 deletions

diff --git a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/ConsulServiceWrapper.java b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/ConsulServiceWrapper.java
index 2d3900c..87d2b84 100644
--- a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/ConsulServiceWrapper.java
+++ b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/ConsulServiceWrapper.java
@@ -1874,23 +1874,7 @@ public class ConsulServiceWrapper {
 
         }
 
-        // 检查同名不同协议注册
-        try {
-            List<MicroServiceFullInfo> serviceList = getMicroServiceForNodes(microServiceInfo.getServiceName(),
-                            microServiceInfo.getVersion(), false, "", microServiceInfo.getNamespace());
-            if (serviceList != null && serviceList.size() > 0) {
-                for (MicroServiceFullInfo service : serviceList) {
-                    if (!service.getProtocol().equalsIgnoreCase(microServiceInfo.getProtocol())) {
-                        throw new UnprocessableEntityException(
-                                        "register MicroServiceInfo FAIL:There is a same service ,but different protocol--"
-                                                        + service.getProtocol());
-                    }
-
-                }
-            }
-        } catch (ExtendedNotFoundException e) {
-            // LOGGER.info("register MicroServiceInfo CHECK ok for protocol:service is not fond");
-        }
+       
 
 
     }
diff --git a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/consul/model/health/ImmutableNode.java b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/consul/model/health/ImmutableNode.java
index b7083b4..a3f3de3 100644
--- a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/consul/model/health/ImmutableNode.java
+++ b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/consul/model/health/ImmutableNode.java
@@ -129,57 +129,7 @@ public final class ImmutableNode extends Node {
         return MoreObjects.toStringHelper("Node").add("node", node).add("address", address).toString();
     }
 
-    /**
-     * Utility type used to correctly read immutable object from JSON representation.
-     * 
-     * @deprecated Do not use this type directly, it exists only for the <em>Jackson</em>-binding
-     *             infrastructure
-     */
-    @Deprecated
-    @JsonDeserialize
-    static final class Json extends Node {
-        String node;
-        String address;
-
-        @JsonProperty(value = "Node")
-        public void setNode(String node) {
-            this.node = node;
-        }
-
-        @JsonProperty(value = "Address")
-        public void setAddress(String address) {
-            this.address = address;
-        }
-
-        @Override
-        public String getNode() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public String getAddress() {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * @param json A JSON-bindable data structure
-     * @return An immutable value type
-     * @deprecated Do not use this method directly, it exists only for the <em>Jackson</em>-binding
-     *             infrastructure
-     */
-    @Deprecated
-    @JsonCreator
-    static ImmutableNode fromJson(Json json) {
-        ImmutableNode.Builder builder = ImmutableNode.builder();
-        if (json.node != null) {
-            builder.node(json.node);
-        }
-        if (json.address != null) {
-            builder.address(json.address);
-        }
-        return builder.build();
-    }
+    
 
     /**
      * Creates an immutable copy of a {@link Node} value. Uses accessors to get values to initialize
diff --git a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/consul/model/health/ImmutableService.java b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/consul/model/health/ImmutableService.java
index b7167da..acf5a5b 100644
--- a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/consul/model/health/ImmutableService.java
+++ b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/consul/model/health/ImmutableService.java
@@ -228,101 +228,7 @@ public final class ImmutableService extends Service {
                         .add("address", address).add("port", port).toString();
     }
 
-    /**
-     * Utility type used to correctly read immutable object from JSON representation.
-     * 
-     * @deprecated Do not use this type directly, it exists only for the <em>Jackson</em>-binding
-     *             infrastructure
-     */
-    @Deprecated
-    @JsonDeserialize
-    static final class Json extends Service {
-        String id;
-        String service;
-        List<String> tags = ImmutableList.of();
-        String address;
-        Integer port;
-
-        @JsonProperty(value = "ID")
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        @JsonProperty(value = "Service")
-        public void setService(String service) {
-            this.service = service;
-        }
-
-        @JsonProperty(value = "Tags")
-        @JsonDeserialize(as = ImmutableList.class, contentAs = String.class)
-        public void setTags(List<String> tags) {
-            this.tags = tags;
-        }
-
-        @JsonProperty(value = "Address")
-        public void setAddress(String address) {
-            this.address = address;
-        }
-
-        @JsonProperty(value = "Port")
-        public void setPort(int port) {
-            this.port = port;
-        }
-
-        @Override
-        public String getId() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public String getService() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public List<String> getTags() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public String getAddress() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public int getPort() {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * @param json A JSON-bindable data structure
-     * @return An immutable value type
-     * @deprecated Do not use this method directly, it exists only for the <em>Jackson</em>-binding
-     *             infrastructure
-     */
-    @Deprecated
-    @JsonCreator
-    static ImmutableService fromJson(Json json) {
-        ImmutableService.Builder builder = ImmutableService.builder();
-        if (json.id != null) {
-            builder.id(json.id);
-        }
-        if (json.service != null) {
-            builder.service(json.service);
-        }
-        if (json.tags != null) {
-            builder.addAllTags(json.tags);
-        }
-        if (json.address != null) {
-            builder.address(json.address);
-        }
-        if (json.port != null) {
-            builder.port(json.port);
-        }
-        return builder.build();
-    }
-
+   
     /**
      * Creates an immutable copy of a {@link Service} value. Uses accessors to get values to
      * initialize the new immutable instance. If an instance is already immutable, it is returned as
diff --git a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/util/JacksonJsonUtil.java b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/util/JacksonJsonUtil.java
index 57c6c66..acbb17d 100644
--- a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/util/JacksonJsonUtil.java
+++ b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/util/JacksonJsonUtil.java
@@ -109,8 +109,7 @@ public class JacksonJsonUtil {
             vo = objectMapper.readValue(json, new TypeReference<List<CatalogService>>() {});
 
         } catch (Exception e) {
-            String errorMsg = " JsonTobean faild:" + e.getMessage();
-            logger.error(errorMsg);
+            logger.error(" JsonTobean faild:" + e.getMessage());
         }
         return vo;
     }
@@ -120,12 +119,10 @@ public class JacksonJsonUtil {
 
             ObjectMapper objectMapper = getMapperInstance();
 
-
             return objectMapper.readValue(json, valueTypeRef);
 
         } catch (Exception e) {
-            String errorMsg = " JsonTobean faild:" + e.getMessage();
-            logger.error(errorMsg);
+            logger.error(" JsonTobean faild:" + e.getMessage());
         }
         return null;
     }
@@ -150,20 +147,12 @@ public class JacksonJsonUtil {
             vo = objectMapper.readValue(json, new TypeReference<Map<String, String[]>>() {});
 
         } catch (Exception e) {
-            String errorMsg = " JsonTobean faild";
-            logger.error(errorMsg);
+            logger.error("JsonTobean faild");
         }
         return vo;
     }
 
 
-    public static void main(String[] args) {
-        String json = "[{\"Node\":{\"Node\":\"A23179111\",\"Address\":\"10.74.44.27\",\"CreateIndex\":3,\"ModifyIndex\":318},\"Service\":{\"ID\":\"oo_10.74.56.36_5656\",\"Service\":\"oo\",\"Tags\":[\"url:/root\",\"protocol:REST\",\"version:\",\"visualRange:0|1\",\"ttl:-1\",\"status:1\",\"lb_policy:client_custom\",\"lb_server_params:weight=1 max_fails=1 fail_timeout=16s\",\"checkType:TCP\",\"checkInterval:10\",\"checkUrl:10.56.23.63:8989\"],\"Address\":\"10.74.56.36\",\"Port\":5656,\"EnableTagOverride\":false,\"CreateIndex\":314,\"ModifyIndex\":318},\"Checks\":[{\"Node\":\"A23179111\",\"CheckID\":\"serfHealth\",\"Name\":\"Serf Health Status\",\"Status\":\"passing\",\"Notes\":\"\",\"Output\":\"Agent alive and reachable\",\"ServiceID\":\"\",\"ServiceName\":\"\",\"CreateIndex\":3,\"ModifyIndex\":3},{\"Node\":\"A23179111\",\"CheckID\":\"service:oo_10.74.56.36_5656\",\"Name\":\"Service 'oo' check\",\"Status\":\"critical\",\"Notes\":\"\",\"Output\":\"\",\"ServiceID\":\"oo_10.74.56.36_5656\",\"ServiceName\":\"oo\",\"CreateIndex\":314,\"ModifyIndex\":318}]},{\"Node\":{\"Node\":\"A23179111\",\"Address\":\"10.74.44.27\",\"CreateIndex\":3,\"ModifyIndex\":318},\"Service\":{\"ID\":\"oo_10.78.36.36_111\",\"Service\":\"oo\",\"Tags\":[\"url:/root\",\"protocol:REST\",\"version:\",\"visualRange:0|1\",\"ttl:-1\",\"status:1\",\"lb_policy:client_custom\"],\"Address\":\"10.78.36.36\",\"Port\":111,\"EnableTagOverride\":false,\"CreateIndex\":315,\"ModifyIndex\":315},\"Checks\":[{\"Node\":\"A23179111\",\"CheckID\":\"serfHealth\",\"Name\":\"Serf Health Status\",\"Status\":\"passing\",\"Notes\":\"\",\"Output\":\"Agent alive and reachable\",\"ServiceID\":\"\",\"ServiceName\":\"\",\"CreateIndex\":3,\"ModifyIndex\":3}]}]";
-        List<HealthService> list = jsonToListBean(json, new TypeReference<List<HealthService>>() {});
-        System.out.println(list);
-
-    }
-
 
 
 }