Removed MSB Dependencies

Issue-ID: HOLMES-629
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: Ia74c8456822ba71f465a7142431327a884c50a70

8 files changed, 423 insertions, 7 deletions

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/MsbRegisterTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/msb/MsbRegisterTest.java
index 073fcc7..997d1cc 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/MsbRegisterTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/msb/MsbRegisterTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2022 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,23 +14,24 @@
  * limitations under the License.
  */
 
-package org.onap.holmes.common.utils;
+package org.onap.holmes.common.msb;
 
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MediaType;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.holmes.common.config.MicroServiceConfig;
 import org.onap.holmes.common.exception.CorrelationException;
-import org.onap.msb.sdk.discovery.entity.MicroServiceFullInfo;
-import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
+import org.onap.holmes.common.msb.entity.MicroServiceFullInfo;
+import org.onap.holmes.common.msb.entity.MicroServiceInfo;
+import org.onap.holmes.common.utils.GsonUtil;
+import org.onap.holmes.common.utils.JerseyClient;
 import org.powermock.api.easymock.PowerMock;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.core.MediaType;
-
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.expect;
 import static org.powermock.api.easymock.PowerMock.createMock;
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/CustomDateSerializerTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/CustomDateSerializerTest.java
new file mode 100644
index 0000000..fb105e8
--- /dev/null
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/CustomDateSerializerTest.java
@@ -0,0 +1,32 @@
+package org.onap.holmes.common.msb.entity;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import static org.junit.Assert.*;
+
+public class CustomDateSerializerTest {
+    @Test
+    public void testSerialize() throws IOException {
+        Date date = new Date();
+
+        StringWriter writer = new StringWriter();
+        JsonGenerator jsonGenerator = new JsonFactory().createGenerator(writer);
+        SerializerProvider provider = new ObjectMapper().getSerializerProvider();
+
+        CustomDateSerializer serializer = new CustomDateSerializer();
+        serializer.serialize(date, jsonGenerator, provider);
+        jsonGenerator.flush();
+
+        String expectedOutput = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX").format(date);
+        assertEquals("\"" + expectedOutput + "\"", writer.toString());
+    }
+}
\ No newline at end of file
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/KeyValuePairTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/KeyValuePairTest.java
new file mode 100644
index 0000000..9c1bad2
--- /dev/null
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/KeyValuePairTest.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2023 ZTE Corporation.
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 the License.
+ */
+
+package org.onap.holmes.common.msb.entity;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class KeyValuePairTest {
+
+    @Test
+    public void testGettersAndSetters() {
+        KeyValuePair pair = new KeyValuePair();
+        pair.setKey("myKey");
+        pair.setValue("myValue");
+
+        assertEquals("myKey", pair.getKey());
+        assertEquals("myValue", pair.getValue());
+    }
+
+    @Test
+    public void testConstructor() {
+        KeyValuePair pair = new KeyValuePair("key1", "value1");
+
+        assertEquals("key1", pair.getKey());
+        assertEquals("value1", pair.getValue());
+    }
+
+}
\ No newline at end of file
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/MicroServiceFullInfoTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/MicroServiceFullInfoTest.java
new file mode 100644
index 0000000..8e63b59
--- /dev/null
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/MicroServiceFullInfoTest.java
@@ -0,0 +1,114 @@
+/**
+ * Copyright 2023 ZTE Corporation.
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 the License.
+ */
+
+package org.onap.holmes.common.msb.entity;
+
+import org.junit.Test;
+
+import java.util.*;
+
+import static org.junit.Assert.*;
+
+public class MicroServiceFullInfoTest {
+    @Test
+    public void testGettersAndSetters() {
+        MicroServiceFullInfo microServiceFullInfo = new MicroServiceFullInfo();
+        microServiceFullInfo.setServiceName("service-name");
+        microServiceFullInfo.setVersion("1.0");
+        microServiceFullInfo.setUrl("http://example.com");
+        microServiceFullInfo.setProtocol("http");
+        microServiceFullInfo.setVisualRange("local");
+        microServiceFullInfo.setStatus("active");
+
+        Set<NodeInfo> nodes = new HashSet<>();
+        NodeInfo nodeInfo = new NodeInfo();
+        nodeInfo.setNodeId("node-1");
+        nodeInfo.setIp("127.0.0.1");
+        nodeInfo.setPort("8080");
+        nodeInfo.setTtl("300");
+        nodeInfo.setCreated_at(new Date());
+        nodeInfo.setUpdated_at(new Date());
+        nodeInfo.setExpiration(new Date());
+        nodes.add(nodeInfo);
+        microServiceFullInfo.setNodes(nodes);
+
+        List<KeyValuePair> metadata = new ArrayList<>();
+        metadata.add(new KeyValuePair("key1", "value1"));
+        metadata.add(new KeyValuePair("key2", "value2"));
+        microServiceFullInfo.setMetadata(metadata);
+
+        assertEquals("service-name", microServiceFullInfo.getServiceName());
+        assertEquals("1.0", microServiceFullInfo.getVersion());
+        assertEquals("http://example.com", microServiceFullInfo.getUrl());
+        assertEquals("http", microServiceFullInfo.getProtocol());
+        assertEquals("local", microServiceFullInfo.getVisualRange());
+        assertEquals("active", microServiceFullInfo.getStatus());
+        assertEquals(nodes, microServiceFullInfo.getNodes());
+        assertEquals(metadata, microServiceFullInfo.getMetadata());
+    }
+
+    @Test
+    public void testToString() {
+        MicroServiceFullInfo microServiceFullInfo = new MicroServiceFullInfo();
+        microServiceFullInfo.setServiceName("service-name");
+        microServiceFullInfo.setVersion("1.0");
+        microServiceFullInfo.setUrl("http://example.com");
+        microServiceFullInfo.setProtocol("http");
+        microServiceFullInfo.setVisualRange("local");
+        microServiceFullInfo.setStatus("active");
+
+        NodeInfo nodeInfo = new NodeInfo();
+        nodeInfo.setNodeId("node-1");
+        nodeInfo.setIp("127.0.0.1");
+        nodeInfo.setPort("8080");
+        nodeInfo.setTtl("300");
+        nodeInfo.setCreated_at(new Date());
+        nodeInfo.setUpdated_at(new Date());
+        nodeInfo.setExpiration(new Date());
+
+        Set<NodeInfo> nodes = new HashSet<>();
+        nodes.add(nodeInfo);
+        microServiceFullInfo.setNodes(nodes);
+
+        List<KeyValuePair> metadata = new ArrayList<>();
+        metadata.add(new KeyValuePair("key1", "value1"));
+        metadata.add(new KeyValuePair("key2", "value2"));
+        microServiceFullInfo.setMetadata(metadata);
+
+        // Test the toString method
+        String expectedOutput = "MicroService List:\r\n" +
+                "serviceName:service-name\r\n" +
+                "version:1.0\r\n" +
+                "url:http://example.com\r\n" +
+                "protocol:http\r\n" +
+                "visualRange:local\r\n" +
+                "nodes:\r\n" +
+                "  nodeId-node-1\r\n" +
+                "  ip-127.0.0.1\r\n" +
+                "  port-8080\r\n" +
+                "  ttl-300\r\n" +
+                "  Created_at-" + nodeInfo.getCreated_at() + "\r\n" +
+                "  Updated_at-" + nodeInfo.getUpdated_at() + "\r\n" +
+                "  Expiration-" + nodeInfo.getExpiration() + "\r\n" +
+                "metadata:\r\n" +
+                "  key-key1\r\n" +
+                "  value-value1\r\n" +
+                "  key-key2\r\n" +
+                "  value-value2\r\n";
+
+        assertEquals(expectedOutput, microServiceFullInfo.toString());
+    }
+}
\ No newline at end of file
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/MicroServiceInfoTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/MicroServiceInfoTest.java
new file mode 100644
index 0000000..aa89f19
--- /dev/null
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/MicroServiceInfoTest.java
@@ -0,0 +1,64 @@
+/**
+ * Copyright 2023 ZTE Corporation.
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 the License.
+ */
+
+package org.onap.holmes.common.msb.entity;
+
+import org.junit.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+public class MicroServiceInfoTest {
+    @Test
+    public void testToString() {
+        MicroServiceInfo microServiceInfo = getMicroServiceInfo();
+
+        String expectedOutput = "MicroService List:\r\n" +
+                "serviceName:service-name\r\n" +
+                "version:1.0\r\n" +
+                "url:http://example.com\r\n" +
+                "protocol:http\r\n" +
+                "visualRange:local\r\n" +
+                "enable_ssl:true\r\n" +
+                "nodes:\r\n" +
+                "  ip-127.0.0.1\r\n" +
+                "  port-8080\r\n" +
+                "  ttl-300\r\n";
+
+        assertEquals(expectedOutput, microServiceInfo.toString());
+    }
+
+    private static MicroServiceInfo getMicroServiceInfo() {
+        MicroServiceInfo microServiceInfo = new MicroServiceInfo();
+        microServiceInfo.setServiceName("service-name");
+        microServiceInfo.setVersion("1.0");
+        microServiceInfo.setUrl("http://example.com");
+        microServiceInfo.setProtocol("http");
+        microServiceInfo.setVisualRange("local");
+        microServiceInfo.setEnable_ssl(true);
+
+        Set<Node> nodes = new HashSet<>();
+        Node node = new Node();
+        node.setIp("127.0.0.1");
+        node.setPort("8080");
+        node.setTtl("300");
+        nodes.add(node);
+        microServiceInfo.setNodes(nodes);
+        return microServiceInfo;
+    }
+}
\ No newline at end of file
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/NodeInfoTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/NodeInfoTest.java
new file mode 100644
index 0000000..9458dcf
--- /dev/null
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/NodeInfoTest.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2023 ZTE Corporation.
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 the License.
+ */
+
+package org.onap.holmes.common.msb.entity;
+
+import org.junit.Test;
+
+import java.util.Date;
+
+import static org.junit.Assert.*;
+
+public class NodeInfoTest {
+    @Test
+    public void testGettersAndSetters() {
+        NodeInfo nodeInfo = new NodeInfo();
+        nodeInfo.setNodeId("node-1");
+        nodeInfo.setStatus("active");
+
+        Date expiration = new Date();
+        nodeInfo.setExpiration(expiration);
+
+        Date createdAt = new Date();
+        nodeInfo.setCreated_at(createdAt);
+
+        Date updatedAt = new Date();
+        nodeInfo.setUpdated_at(updatedAt);
+
+        assertEquals("node-1", nodeInfo.getNodeId());
+        assertEquals("active", nodeInfo.getStatus());
+        assertEquals(expiration, nodeInfo.getExpiration());
+        assertEquals(createdAt, nodeInfo.getCreated_at());
+        assertEquals(updatedAt, nodeInfo.getUpdated_at());
+    }
+}
\ No newline at end of file
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/NodeTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/NodeTest.java
new file mode 100644
index 0000000..7555ad3
--- /dev/null
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/NodeTest.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2023 ZTE Corporation.
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 the License.
+ */
+
+package org.onap.holmes.common.msb.entity;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class NodeTest {
+
+    @Test
+    public void testToString() {
+        Node node = new Node();
+        node.setIp("127.0.0.1");
+        node.setPort("8080");
+        node.setTtl("300");
+
+        String expectedOutput = "127.0.0.1:8080  ttl:300";
+        assertEquals(expectedOutput, node.toString());
+    }
+
+    @Test
+    public void testGettersAndSetters() {
+        Node node = new Node();
+        node.setIp("192.168.1.1");
+        node.setPort("8888");
+        node.setTtl("600");
+        node.setCheckType("http");
+        node.setCheckUrl("/health");
+        node.setCheckInterval("30s");
+        node.setCheckTimeOut("5s");
+
+        assertEquals("192.168.1.1", node.getIp());
+        assertEquals("8888", node.getPort());
+        assertEquals("600", node.getTtl());
+        assertEquals("http", node.getCheckType());
+        assertEquals("/health", node.getCheckUrl());
+        assertEquals("30s", node.getCheckInterval());
+        assertEquals("5s", node.getCheckTimeOut());
+    }
+
+}
\ No newline at end of file
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/ServiceTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/ServiceTest.java
new file mode 100644
index 0000000..ac50841
--- /dev/null
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/ServiceTest.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright 2023 ZTE Corporation.
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 the License.
+ */
+
+package org.onap.holmes.common.msb.entity;
+
+import org.junit.Test;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.*;
+
+public class ServiceTest {
+    @Test
+    public void testGettersAndSetters() {
+        Service<Integer> service = new Service<>();
+        service.setServiceName("my-service");
+        service.setVersion("1.0");
+        service.setUrl("http://example.com");
+        service.setProtocol("http");
+        service.setVisualRange("local");
+        service.setLb_policy("round-robin");
+        service.setPath("/api");
+        service.setEnable_ssl(true);
+
+        Set<Integer> nodes = new HashSet<>();
+        nodes.add(8080);
+        nodes.add(8081);
+        service.setNodes(nodes);
+
+        List<KeyValuePair> metadata = List.of(new KeyValuePair("key1", "value1"), new KeyValuePair("key2", "value2"));
+        service.setMetadata(metadata);
+
+        assertEquals("my-service", service.getServiceName());
+        assertEquals("1.0", service.getVersion());
+        assertEquals("http://example.com", service.getUrl());
+        assertEquals("http", service.getProtocol());
+        assertEquals("local", service.getVisualRange());
+        assertEquals("round-robin", service.getLb_policy());
+        assertEquals("/api", service.getPath());
+        assertEquals(true, service.isEnable_ssl());
+        assertEquals(nodes, service.getNodes());
+        assertEquals(metadata, service.getMetadata());
+    }
+}
\ No newline at end of file