From f01cd76e0eb8f6a4ea78b26c60e3a37d7d4dd6ae Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Thu, 11 Aug 2022 11:12:33 +0800
Subject: [PATCH 01/16] Released the version to 1.4.3

Issue-ID: HOLMES-511
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: I5d86b2bb20e17bc8788e359190e571cbf40cc7d5
---
 releases/maven-1.4.3.yaml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 releases/maven-1.4.3.yaml

diff --git a/releases/maven-1.4.3.yaml b/releases/maven-1.4.3.yaml
new file mode 100644
index 0000000..a2e5297
--- /dev/null
+++ b/releases/maven-1.4.3.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: 'maven'
+version: '1.4.3'
+project: 'holmes-common'
+log_dir: 'holmes-common-maven-stage-master/1221/'
\ No newline at end of file
-- 
2.16.6


From f00f74740e42d08cc6823d094b78aedf87e4cff8 Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Wed, 17 Aug 2022 08:41:44 +0800
Subject: [PATCH 02/16] bugfix - username capitalization problem

Issue-ID: HOLMES-564
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: Ifa350d406f5fc7549c88bf5b50a8bc111d76fd8c
---
 holmes-actions/pom.xml                             |  2 +-
 .../org/onap/holmes/common/database/DbDaoUtil.java |  2 +-
 .../dmaap/store/ClosedLoopControlNameCache.java    |  2 +-
 .../common/dmaap/store/UniqueRequestIdCache.java   |  2 +-
 .../common/engine/dao/EngineEntityMapper.java      |  2 +-
 .../onap/holmes/common/utils/AlarmInfoMapper.java  |  2 +-
 .../holmes/common/utils/CorrelationRuleMapper.java |  2 +-
 .../org/onap/holmes/common/utils/GsonUtil.java     |  2 +-
 .../org/onap/holmes/common/utils/UserUtil.java     | 13 +++++------
 .../org/onap/holmes/common/utils/UserUtilTest.java | 25 ++++++++++------------
 pom.xml                                            |  2 +-
 version.properties                                 |  2 +-
 12 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 8c74bca..5687d18 100644
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.onap.holmes.common</groupId>
         <artifactId>holmes-common-parent</artifactId>
-        <version>1.4.3-SNAPSHOT</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <name>holmes-common-service</name>
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/database/DbDaoUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/database/DbDaoUtil.java
index 2cbb538..15f49e4 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/database/DbDaoUtil.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/database/DbDaoUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2021 ZTE Corporation.
+ * Copyright 2017-2022 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.
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/store/ClosedLoopControlNameCache.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/store/ClosedLoopControlNameCache.java
index 89514dc..cd47431 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/store/ClosedLoopControlNameCache.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/store/ClosedLoopControlNameCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 ZTE Corporation.
+ * Copyright 2020-2022 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/store/UniqueRequestIdCache.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/store/UniqueRequestIdCache.java
index 8c68776..6a65b0c 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/store/UniqueRequestIdCache.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/store/UniqueRequestIdCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 ZTE Corporation.
+ * Copyright 2020-2022 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/engine/dao/EngineEntityMapper.java b/holmes-actions/src/main/java/org/onap/holmes/common/engine/dao/EngineEntityMapper.java
index 5432027..3dc652e 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/engine/dao/EngineEntityMapper.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/engine/dao/EngineEntityMapper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2021 ZTE Corporation.
+ * Copyright 2020-2022 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/AlarmInfoMapper.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/AlarmInfoMapper.java
index 996df25..e9755e8 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/AlarmInfoMapper.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/AlarmInfoMapper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2021 ZTE Corporation.
+ * Copyright 2017-2022 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/CorrelationRuleMapper.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/CorrelationRuleMapper.java
index ed1c581..835d059 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/CorrelationRuleMapper.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/CorrelationRuleMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 ZTE Corporation.
+ * Copyright 2017-2022 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/GsonUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/GsonUtil.java
index f5ad56c..e43a68e 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/GsonUtil.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/GsonUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018-2021 ZTE Corporation.
+ * Copyright 2018-2022 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.
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/UserUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/UserUtil.java
index f0ff8d9..5400b20 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/UserUtil.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/UserUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2022 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,10 @@
  */
 package org.onap.holmes.common.utils;
 
-import javax.servlet.http.HttpServletRequest;
 import org.onap.holmes.common.constant.AlarmConst;
 
+import javax.servlet.http.HttpServletRequest;
+
 public class UserUtil {
 
     private UserUtil() {
@@ -25,11 +26,7 @@ public class UserUtil {
     }
 
     public static String getUserName(HttpServletRequest request) {
-        String userName = AlarmConst.ADMIN;
-        String sessionName = request.getHeader("username");
-        if (sessionName != null) {
-            userName = sessionName.toLowerCase();
-        }
-        return userName;
+        return request.getHeader("username") == null ?
+                AlarmConst.ADMIN : request.getHeader("username");
     }
 }
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java
index d88525a..7b452f0 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2022 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,16 @@
 
 package org.onap.holmes.common.utils;
 
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-import javax.servlet.http.HttpServletRequest;
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.powermock.api.easymock.PowerMock;
+
+import javax.servlet.http.HttpServletRequest;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
 public class UserUtilTest {
 
     private HttpServletRequest request;
@@ -39,29 +40,25 @@ public class UserUtilTest {
     }
 
     @Test
-    public void getUserName_header_name_empty() throws Exception {
+    public void getUserName_header_name_empty() {
         EasyMock.expect(request.getHeader("username")).andReturn(null);
 
         PowerMock.replayAll();
 
-        String userName = UserUtil.getUserName(request);
+        assertThat("admin", equalTo(UserUtil.getUserName(request)));
 
         PowerMock.verifyAll();
-
-        assertThat("admin", equalTo(userName));
     }
 
     @Test
-    public void getUserName_normal() throws Exception {
-        EasyMock.expect(request.getHeader("username")).andReturn("name1");
+    public void getUserName_normal() {
+        EasyMock.expect(request.getHeader("username")).andReturn("Name").times(2);
 
         PowerMock.replayAll();
 
-        String userName = UserUtil.getUserName(request);
+        assertThat("Name", equalTo(UserUtil.getUserName(request)));
 
         PowerMock.verifyAll();
-
-        assertThat("name1", equalTo(userName));
     }
 
 } 
diff --git a/pom.xml b/pom.xml
index cda749e..19a1f22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <artifactId>holmes-common-parent</artifactId>
     <packaging>pom</packaging>
 
-    <version>1.4.3-SNAPSHOT</version>
+    <version>1.4.4-SNAPSHOT</version>
     <name>holmes-common</name>
     <modules>
         <module>holmes-actions</module>
diff --git a/version.properties b/version.properties
index 5abc35c..4761c30 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=4
-patch=3
+patch=4
 
 base_version=${major}.${minor}.${patch}
 
-- 
2.16.6


From f40805fd803fe7e6aa8f7bb4c5d41cf85d163738 Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Wed, 17 Aug 2022 10:19:33 +0800
Subject: [PATCH 03/16] Releasing 1.4.4

Issue-ID: HOLMES-564
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: Ia4fb9859fc669061f3eacf16b9da08482bf31e01
---
 releases/maven-1.4.4.yaml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 releases/maven-1.4.4.yaml

diff --git a/releases/maven-1.4.4.yaml b/releases/maven-1.4.4.yaml
new file mode 100644
index 0000000..50dac16
--- /dev/null
+++ b/releases/maven-1.4.4.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: 'maven'
+version: '1.4.4'
+project: 'holmes-common'
+log_dir: 'holmes-common-maven-stage-master/1228/'
\ No newline at end of file
-- 
2.16.6


From 167b3d6d3f85e8d0ff3680a7d85ca1c9cf99b2b1 Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Mon, 20 Mar 2023 10:30:36 +0800
Subject: [PATCH 04/16] Removed MSB Invocation During AAI Calling

Issue-ID: HOLMES-327
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: I7e4319c3f6b17db53ffbb57efbe692ed523090e6
---
 holmes-actions/pom.xml                             |  9 +--
 .../onap/holmes/common/aai/AaiJsonParserUtil.java  |  7 +--
 .../org/onap/holmes/common/aai/AaiQuery4Ccvpn.java | 28 ++++-----
 .../onap/holmes/common/aai/AaiQuery4Ccvpn2.java    | 11 ++--
 .../org/onap/holmes/common/aai/AaiQueryMdons.java  |  8 +--
 .../onap/holmes/common/aai/config/AaiConfig.java   | 70 ++++++----------------
 .../holmes/common/aai/entity/RelationshipList.java |  5 +-
 .../onap/holmes/common/api/entity/AlarmInfo.java   |  3 +-
 .../common/api/entity/CorrelationResult.java       |  5 +-
 .../holmes/common/api/entity/CorrelationRule.java  |  7 +--
 .../holmes/common/api/entity/ServiceEntity.java    |  7 ++-
 .../onap/holmes/common/api/entity/ServiceNode.java |  3 +-
 .../common/api/entity/ServiceNode4Query.java       |  7 ++-
 .../common/api/entity/ServiceRegisterEntity.java   |  8 +--
 .../common/api/stat/AlarmAdditionalField.java      |  5 +-
 .../org/onap/holmes/common/api/stat/VesAlarm.java  |  9 +--
 .../holmes/common/config/MicroServiceConfig.java   | 25 +++++++-
 .../common/dcae/entity/DcaeConfigurations.java     |  8 +--
 .../org/onap/holmes/common/dmaap/Publisher.java    |  4 +-
 .../onap/holmes/common/dmaap/entity/PolicyMsg.java |  7 ++-
 .../onap/holmes/common/utils/AlarmInfoMapper.java  |  3 +-
 .../org/onap/holmes/common/utils/LanguageUtil.java |  7 ++-
 .../java/org/onap/holmes/common/utils/Md5Util.java |  3 +-
 .../org/onap/holmes/common/utils/MsbRegister.java  |  6 +-
 .../holmes/common/utils/RestExceptionHandler.java  |  5 +-
 .../AddHeadersHttpServletRequestWrapper.java       |  6 +-
 .../utils/transactionid/TransactionIdFilter.java   |  9 +--
 .../onap/holmes/common/aai/AaiQueryMdonsTest.java  |  6 +-
 .../holmes/common/aai/config/AaiConfigTest.java    |  4 +-
 pom.xml                                            |  4 +-
 30 files changed, 129 insertions(+), 160 deletions(-)

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 5687d18..cec3209 100644
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2017-2022 ZTE Corporation. Licensed under the Apache License, Version
+<!-- Copyright 2017-2023 ZTE Corporation. 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
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.onap.holmes.common</groupId>
         <artifactId>holmes-common-parent</artifactId>
-        <version>1.4.4-SNAPSHOT</version>
+        <version>1.4.5-SNAPSHOT</version>
     </parent>
 
     <name>holmes-common-service</name>
@@ -120,11 +120,6 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>5.3.13</version>
-        </dependency>
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiJsonParserUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiJsonParserUtil.java
index 0a9e4f7..2772c01 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiJsonParserUtil.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiJsonParserUtil.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.holmes.common.aai
  * ================================================================================
- * Copyright (C) 2018-2021 Huawei, ZTE. All rights reserved.
+ * Copyright (C) 2018-2023 Huawei, ZTE. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import lombok.extern.slf4j.Slf4j;
-import org.onap.holmes.common.config.MicroServiceConfig;
 import org.springframework.stereotype.Component;
 
 import java.util.regex.Matcher;
@@ -78,8 +77,4 @@ public class AaiJsonParserUtil {
         }
         return null;
     }
-
-    public static String getHostAddr() {
-        return MicroServiceConfig.getMsbServerAddrWithHttpPrefix();
-    }
 }
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn.java
index 40551ab..f8d739b 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018-2022 ZTE Corporation.
+ * Copyright 2018-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
@@ -17,13 +17,13 @@ package org.onap.holmes.common.aai;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import jakarta.ws.rs.client.Entity;
 import org.onap.holmes.common.aai.config.AaiConfig;
 import org.onap.holmes.common.config.MicroServiceConfig;
 import org.onap.holmes.common.utils.JerseyClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.ws.rs.client.Entity;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -69,7 +69,7 @@ public class AaiQuery4Ccvpn {
         params.put("pnfName", pnfName);
         params.put("ifName", ifName);
 
-        String response = get(getPath(AaiConfig.MsbConsts.AAI_LINK_QUERY, params)
+        String response = get(getPath(AaiConfig.AaiConsts.AAI_LINK_QUERY, params)
                 + (status == null ? "" : String.format("&operational-status=%s", status)));
 
         JsonObject linkInfo = getInfo(response, "p-interface", "logical-link");
@@ -147,20 +147,20 @@ public class AaiQuery4Ccvpn {
         params.put("networkId", networkId);
         params.put("pnfName", pnfName);
         params.put("ifName", ifName);
-        String r = get(getPath(AaiConfig.MsbConsts.AAI_TP_UPDATE, params));
+        String r = get(getPath(AaiConfig.AaiConsts.AAI_TP_UPDATE, params));
         JsonObject jsonObject = JsonParser.parseString(r).getAsJsonObject();
         body.put("resource-version", jsonObject.get("resource-version").toString());
 
-        put(getPath(AaiConfig.MsbConsts.AAI_TP_UPDATE, params), body);
+        put(getPath(AaiConfig.AaiConsts.AAI_TP_UPDATE, params), body);
     }
 
 
     public void updateLogicLinkStatus(String linkName, Map<String, Object> body) {
-        String r = get(getPath(AaiConfig.MsbConsts.AAI_LINK_UPDATE, "linkName", linkName));
+        String r = get(getPath(AaiConfig.AaiConsts.AAI_LINK_UPDATE, "linkName", linkName));
         JsonObject jsonObject = JsonParser.parseString(r).getAsJsonObject();
         body.put("resource-version", jsonObject.get("resource-version").toString());
         body.put("link-type", jsonObject.get("link-type").toString());
-        put(getPath(AaiConfig.MsbConsts.AAI_LINK_UPDATE, "linkName", linkName), body);
+        put(getPath(AaiConfig.AaiConsts.AAI_LINK_UPDATE, "linkName", linkName), body);
     }
 
     private JsonObject getVpnBindingInfo(String networkId, String pnfName,
@@ -170,17 +170,17 @@ public class AaiQuery4Ccvpn {
         params.put("pnfName", pnfName);
         params.put("ifName", ifName);
         params.put("status", status);
-        String response = get(getPath(AaiConfig.MsbConsts.AAI_VPN_ADDR, params));
+        String response = get(getPath(AaiConfig.AaiConsts.AAI_VPN_ADDR, params));
         return getInfo(response, "p-interface", "vpn-binding");
     }
 
     private JsonObject getConnectivityInfo(String vpnId) {
-        String response = get(getPath(AaiConfig.MsbConsts.AAI_CONN_ADDR, "vpnId", vpnId));
+        String response = get(getPath(AaiConfig.AaiConsts.AAI_CONN_ADDR, "vpnId", vpnId));
         return getInfo(response, "vpn-binding", "connectivity");
     }
 
     private JsonObject getServiceInstanceByConn(String connectivityId) {
-        String response = get(getPath(AaiConfig.MsbConsts.AAI_SERVICE_INSTANCE_ADDR_4_CCVPN,
+        String response = get(getPath(AaiConfig.AaiConsts.AAI_SERVICE_INSTANCE_ADDR_4_CCVPN,
                 "connectivityId", connectivityId));
         return getInfo(response, "connectivity", "service-instance");
     }
@@ -241,10 +241,6 @@ public class AaiQuery4Ccvpn {
         return null;
     }
 
-    private String getHostAddr() {
-        return MicroServiceConfig.getMsbServerAddrWithHttpPrefix();
-    }
-
     private String extractValueFromJsonArray(JsonArray relationshipData, String keyName) {
         if (relationshipData != null) {
             for (int i = 0; i < relationshipData.size(); ++i) {
@@ -258,10 +254,10 @@ public class AaiQuery4Ccvpn {
     }
 
     private String get(String path) {
-        return JerseyClient.newInstance().path(path).headers(headers).get(getHostAddr());
+        return JerseyClient.newInstance().path(path).headers(headers).get(MicroServiceConfig.getAaiAddr());
     }
 
     private String put(String path, Map<String, Object> body) {
-        return JerseyClient.newInstance().path(path).headers(headers).put(getHostAddr(), Entity.json(body));
+        return JerseyClient.newInstance().path(path).headers(headers).put(MicroServiceConfig.getAaiAddr(), Entity.json(body));
     }
 }
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2.java
index a9d9e53..05fba60 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2.java
@@ -25,6 +25,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import lombok.extern.slf4j.Slf4j;
 import org.onap.holmes.common.aai.config.AaiConfig;
+import org.onap.holmes.common.config.MicroServiceConfig;
 import org.onap.holmes.common.utils.JerseyClient;
 import org.springframework.stereotype.Service;
 
@@ -57,8 +58,8 @@ public class AaiQuery4Ccvpn2 {
     private String getSiteVNFId(String siteService) {
         String response = JerseyClient.newInstance()
                 .headers(headers)
-                .path(AaiConfig.MsbConsts.AAI_SITE_RESOURCES_QUERY)
-                .get(getHostAddr());
+                .path(AaiConfig.AaiConsts.AAI_SITE_RESOURCES_QUERY)
+                .get(MicroServiceConfig.getAaiAddr());
         JsonObject resObj = JsonParser.parseString(response).getAsJsonObject();
         JsonArray siteResources = extractJsonArray(resObj, "site-resource");
         if (siteResources != null) {
@@ -85,9 +86,9 @@ public class AaiQuery4Ccvpn2 {
     private JsonObject getServiceInstanceByVnfId(String vnfId) {
         String resStr = JerseyClient.newInstance()
                 .headers(headers)
-                .path(getPath(AaiConfig.MsbConsts.AAI_SITE_VNF_QUERY,
+                .path(getPath(AaiConfig.AaiConsts.AAI_SITE_VNF_QUERY,
                 "vnfId", vnfId))
-                .get(getHostAddr());
+                .get(MicroServiceConfig.getAaiAddr());
         return getInfo(resStr, "service-instance");
     }
 
@@ -101,7 +102,7 @@ public class AaiQuery4Ccvpn2 {
         String res = JerseyClient.newInstance()
                 .headers(headers)
                 .path(getPath(serviceInstancePath))
-                .get(getHostAddr());
+                .get(MicroServiceConfig.getAaiAddr());
         JsonObject instance = JsonParser.parseString(res).getAsJsonObject();
         String[] params = new String[2];
         Pattern pattern = Pattern.compile("/aai/v\\d+/business/customers/customer/(.+)" +
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQueryMdons.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQueryMdons.java
index d6ba800..60b53f9 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQueryMdons.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQueryMdons.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 - 2022 Fujitsu Limited, ZTE Corporation
+ * Copyright 2020 - 2023 Fujitsu Limited, 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
@@ -17,6 +17,9 @@ package org.onap.holmes.common.aai;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
 import org.onap.holmes.common.aai.config.AaiConfig;
 import org.onap.holmes.common.config.MicroServiceConfig;
 import org.onap.holmes.common.exception.CorrelationException;
@@ -25,9 +28,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.core.MultivaluedHashMap;
-import jakarta.ws.rs.core.MultivaluedMap;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java
index bc6575f..beb6792 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java
@@ -43,76 +43,40 @@ public class AaiConfig {
 
         }
 
-        private static final String AAI_PREF = "/aai/";
+        private static final String AAI_PREF = "/aai/" + AAI_API_VERSION;
 
-        public static final String AAI_VNF_ADDR = AAI_PREF + "v11/network/generic-vnfs/generic-vnf";
+        public static final String AAI_VNF_ADDR = AAI_PREF +"/network/generic-vnfs/generic-vnf";
 
-        public static final String AAI_TP_UPDATE = AAI_PREF + AAI_API_VERSION + AAI_PNF_URL_SUF;
+        public static final String AAI_TP_UPDATE = AAI_PREF + AAI_PNF_URL_SUF;
 
-        public static final String AAI_LINK_QUERY = AAI_PREF + AAI_API_VERSION + AAI_PNF_URL_SUF;
+        public static final String AAI_LINK_QUERY = AAI_PREF + AAI_PNF_URL_SUF;
 
-        public static final String AAI_LINK_UPDATE = AAI_PREF + AAI_API_VERSION + "/network/logical-links/logical-link/{linkName}";
+        public static final String AAI_LINK_UPDATE = AAI_PREF + "/network/logical-links/logical-link/{linkName}";
 
-        public static final String AAI_TP_ADDR = AAI_PREF + AAI_API_VERSION + "/network/pnfs/pnf/{node-Id}/p-interfaces/p-interface/{tp-id}";
+        public static final String AAI_TP_ADDR = AAI_PREF + "/network/pnfs/pnf/{node-Id}/p-interfaces/p-interface/{tp-id}";
 
-        public static final String AAI_VPN_ADDR = AAI_PREF + AAI_API_VERSION + AAI_PNF_URL_SUF;
+        public static final String AAI_VPN_ADDR = AAI_PREF + AAI_PNF_URL_SUF;
 
-        public static final String AAI_CONN_ADDR = AAI_PREF + AAI_API_VERSION + "/network/vpn-bindings/vpn-binding/{vpnId}";
+        public static final String AAI_CONN_ADDR = AAI_PREF + "/network/vpn-bindings/vpn-binding/{vpnId}";
 
-        public static final String AAI_SERVICE_INSTANCE_ADDR_4_CCVPN = AAI_PREF + AAI_API_VERSION + "/network/connectivities/connectivity/{connectivityId}";
+        public static final String AAI_SERVICE_INSTANCE_ADDR_4_CCVPN = AAI_PREF + "/network/connectivities/connectivity/{connectivityId}";
 
-        public static final String AAI_SERVICE_INSTANCES_ADDR_4_CCVPN = AAI_PREF + AAI_API_VERSION + "/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}";
+        public static final String AAI_SERVICE_INSTANCES_ADDR_4_CCVPN = AAI_PREF + "/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}";
 
-        public static final String AAI_VM_ADDR = AAI_PREF + "v11/search/nodes-query?search-node-type=vserver&filter=";
+        public static final String AAI_VM_ADDR = AAI_PREF + "/search/nodes-query?search-node-type=vserver&filter=";
 
         public static final String AAI_SERVICE = AAI_SERVICE_INSTANCES_ADDR_4_CCVPN + "/service-instances/service-instance/{instance-id}";
 
-        public static final String AAI_PNF = AAI_PREF + AAI_API_VERSION + "/network/pnfs/pnf/{pnfName}";
+        public static final String AAI_PNF = AAI_PREF + "/network/pnfs/pnf/{pnfName}";
 
         public static final String AAI_PNF_VALUE = AAI_PNF + "?depth=all";
 
-        public static final String AAI_PNF_ID = AAI_PREF + AAI_API_VERSION + "/network/pnfs?pnf-id={pnfId}";
-    }
-
-
-    public static class MsbConsts {
-
-        private MsbConsts() {
-
-        }
-
-        private static final String AAI_MSB_PREF = "/api";
-
-        private static final String AAI_NETWORK = "/aai-network/";
-
-        private static final String AAI_BUSINESS = "/aai-business/";
-
-        private static final String AAI_SEARCH = "/aai-search/";
-
-        public static final String AAI_VNF_ADDR = AAI_NETWORK + AAI_API_VERSION + "/generic-vnfs/generic-vnf";
-
-        public static final String AAI_TP_UPDATE = AAI_NETWORK + AAI_API_VERSION + AAI_PNF_URL_SUF;
-
-        public static final String AAI_LINK_QUERY = AAI_NETWORK + AAI_API_VERSION + AAI_PNF_URL_SUF;
-
-        public static final String AAI_LINK_UPDATE = AAI_NETWORK + AAI_API_VERSION + "/network/logical-links/logical-link/{linkName}";
-
-        public static final String AAI_TP_ADDR = AAI_NETWORK + AAI_API_VERSION + "/pnfs/pnf/{node-Id}/p-interfaces/p-interface/{tp-id}";
-
-        public static final String AAI_VPN_ADDR = AAI_NETWORK + AAI_API_VERSION + AAI_PNF_URL_SUF;
-
-        public static final String AAI_CONN_ADDR = AAI_NETWORK + AAI_API_VERSION + "/network/vpn-bindings/vpn-binding/{vpnId}";
-
-        public static final String AAI_SERVICE_INSTANCE_ADDR_4_CCVPN = AAI_NETWORK + AAI_API_VERSION + "/network/connectivities/connectivity/{connectivityId}";
-
-        public static final String AAI_SERVICE_INSTANCES_ADDR_4_CCVPN = AAI_BUSINESS + AAI_API_VERSION + "/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}";
-
-        public static final String AAI_VM_ADDR = AAI_SEARCH + AAI_API_VERSION + "/nodes-query?search-node-type=vserver&filter=";
+        public static final String AAI_PNF_ID = AAI_PREF + "/network/pnfs?pnf-id={pnfId}";
 
-        public static final String AAI_SITE_RESOURCES_QUERY = AAI_MSB_PREF + AAI_NETWORK + AAI_API_VERSION +
-                "/site-resources";
+        public static final String AAI_SITE_VNF_QUERY = AAI_PREF +
+                "/network/generic-vnfs/generic-vnf/{vnfId}";
 
-        public static final String AAI_SITE_VNF_QUERY = AAI_MSB_PREF + AAI_NETWORK + AAI_API_VERSION +
-                "/generic-vnfs/generic-vnf/{vnfId}";
+        public static final String AAI_SITE_RESOURCES_QUERY = AAI_PREF + AAI_API_VERSION +
+                "/network/site-resources";
     }
 }
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/entity/RelationshipList.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/entity/RelationshipList.java
index faf5297..6e03fb5 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/entity/RelationshipList.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/entity/RelationshipList.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,11 @@
 
 package org.onap.holmes.common.aai.entity;
 
-import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Setter
 @Getter
 public class RelationshipList {
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/AlarmInfo.java b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/AlarmInfo.java
index 47aeb0d..a6825b2 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/AlarmInfo.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/AlarmInfo.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.onap.holmes.common.api.entity;
 
 import com.google.gson.annotations.SerializedName;
-import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/CorrelationResult.java b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/CorrelationResult.java
index f3e2562..f012a3b 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/CorrelationResult.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/CorrelationResult.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,14 @@
  */
 package org.onap.holmes.common.api.entity;
 
-import java.io.Serializable;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 import org.onap.holmes.common.api.stat.Alarm;
 
+import java.io.Serializable;
+
 @Setter
 @Getter
 @NoArgsConstructor
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/CorrelationRule.java b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/CorrelationRule.java
index 14a3f07..6361c20 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/CorrelationRule.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/CorrelationRule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 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.
@@ -16,13 +16,12 @@
 package org.onap.holmes.common.api.entity;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 import java.util.Properties;
 
-import lombok.Getter;
-import lombok.Setter;
-
 @Getter
 @Setter
 public class CorrelationRule implements Cloneable {
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceEntity.java b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceEntity.java
index 4bfb3cf..bfaec3c 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceEntity.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceEntity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,10 @@
 package org.onap.holmes.common.api.entity;
 
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.util.List;
 
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceNode.java b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceNode.java
index a8fc04d..08ccddf 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceNode.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 package org.onap.holmes.common.api.entity;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceNode4Query.java b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceNode4Query.java
index 98e5506..22f5de9 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceNode4Query.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceNode4Query.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,10 @@
  */
 package org.onap.holmes.common.api.entity;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 @Getter
 @Setter
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceRegisterEntity.java b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceRegisterEntity.java
index eba7544..508164e 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceRegisterEntity.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/ServiceRegisterEntity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
 
 package org.onap.holmes.common.api.entity;
 
-import java.util.ArrayList;
-import java.util.List;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Setter
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/AlarmAdditionalField.java b/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/AlarmAdditionalField.java
index b07a558..8b15d5f 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/AlarmAdditionalField.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/AlarmAdditionalField.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,11 @@
 package org.onap.holmes.common.api.stat;
 
 
-import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+
 @Setter
 @Getter
 public class AlarmAdditionalField implements Serializable {
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/VesAlarm.java b/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/VesAlarm.java
index 09daf54..da378a9 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/VesAlarm.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/VesAlarm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,13 @@
 
 package org.onap.holmes.common.api.stat;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.TimeZone;
-import lombok.Getter;
-import lombok.Setter;
 
 @Getter
 @Setter
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
index 191d897..df3a7df 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
@@ -18,6 +18,7 @@ package org.onap.holmes.common.config;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import org.apache.commons.lang3.StringUtils;
 import org.onap.holmes.common.constant.AlarmConst;
 import org.onap.holmes.common.utils.JerseyClient;
 import org.slf4j.Logger;
@@ -35,8 +36,14 @@ public class MicroServiceConfig {
     final static public String MSB_ADDR = "MSB_ADDR";
     final static public String MSB_IAG_SERVICE_HOST = "MSB_IAG_SERVICE_HOST";
     final static public String MSB_IAG_SERVICE_PORT = "MSB_IAG_SERVICE_PORT";
-
-    final static public String AAI_HOSTNAME = "aai.onap";
+    final static public String BASE_URL = "BASE_URL";
+    final static public String PRE_ADDR = "PRE_ADDR";
+    final static public String POST_ADDR = "POST_ADDR";
+    final static public String AAI_ADDR = "AAI_BASEADDR";
+    final static public String PROTOCOL_HTTP = "http";
+    final static public String PROTOCOL_HTTPS = "https";
+    final static public int PLAIN_PORT = 80;
+    final static public int TLS_PORT = 443;
 
     final static public Logger log = LoggerFactory.getLogger(MicroServiceConfig.class);
 
@@ -88,7 +95,15 @@ public class MicroServiceConfig {
     }
 
     public static String getAaiAddr() {
-        return AlarmConst.HTTPS + AAI_HOSTNAME + ":8443";
+        boolean tlsEnabled = Boolean.valueOf(getEnv("ENABLE_ENCRYPT"));
+
+        return String.format("%s://%s%s%s.%s:%d",
+                tlsEnabled ? PROTOCOL_HTTPS : PROTOCOL_HTTP,
+                nullToEmptyString(getEnv(PRE_ADDR)),
+                nullToEmptyString(getEnv(AAI_ADDR)),
+                nullToEmptyString(getEnv(POST_ADDR)),
+                nullToEmptyString(getEnv(BASE_URL)),
+                tlsEnabled ? TLS_PORT : PLAIN_PORT);
     }
 
     public static String[] getMsbIpAndPort() {
@@ -118,4 +133,8 @@ public class MicroServiceConfig {
         return new String[]{ip, port};
     }
 
+    private static String nullToEmptyString(String input) {
+        return input == null ? StringUtils.EMPTY : input;
+    }
+
 }
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/DcaeConfigurations.java b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/DcaeConfigurations.java
index 4b90dd7..04b2d0b 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/DcaeConfigurations.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/DcaeConfigurations.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,7 @@
 
 package org.onap.holmes.common.dcae.entity;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public class DcaeConfigurations extends HashMap<String, Object>{
 
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java
index ee041e0..3cf18b7 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package org.onap.holmes.common.dmaap;
 
+import jakarta.ws.rs.client.Entity;
 import lombok.Getter;
 import lombok.Setter;
 import org.onap.holmes.common.dmaap.entity.PolicyMsg;
 import org.onap.holmes.common.utils.JerseyClient;
 import org.springframework.stereotype.Service;
 
-import jakarta.ws.rs.client.Entity;
 import java.util.concurrent.TimeUnit;
 
 @Getter
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/entity/PolicyMsg.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/entity/PolicyMsg.java
index 6c3189c..d8d4678 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/entity/PolicyMsg.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/entity/PolicyMsg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,12 @@
 package org.onap.holmes.common.dmaap.entity;
 
 import com.google.gson.annotations.SerializedName;
-import java.util.HashMap;
-import java.util.Map;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Getter
 @Setter
 public class PolicyMsg {
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/AlarmInfoMapper.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/AlarmInfoMapper.java
index e9755e8..fb39f43 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/AlarmInfoMapper.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/AlarmInfoMapper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2022 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ import org.jdbi.v3.core.mapper.RowMapper;
 import org.jdbi.v3.core.statement.StatementContext;
 import org.onap.holmes.common.api.entity.AlarmInfo;
 
-
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/LanguageUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/LanguageUtil.java
index 5c2c12c..cf49b84 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/LanguageUtil.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/LanguageUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,11 @@
  */
 package org.onap.holmes.common.utils;
 
-import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
 import org.onap.holmes.common.constant.AlarmConst;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
+
 public class LanguageUtil {
 
     private LanguageUtil() {
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/Md5Util.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/Md5Util.java
index c630239..c39d371 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/Md5Util.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/Md5Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ package org.onap.holmes.common.utils;
 import com.google.common.hash.HashCode;
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
+
 import java.nio.charset.Charset;
 
 public class Md5Util {
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/MsbRegister.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/MsbRegister.java
index 21136a8..78ac59b 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/MsbRegister.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/MsbRegister.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.
@@ -16,6 +16,8 @@
 
 package org.onap.holmes.common.utils;
 
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MediaType;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.holmes.common.config.MicroServiceConfig;
@@ -26,8 +28,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.core.MediaType;
 import java.util.concurrent.TimeUnit;
 
 import static org.onap.holmes.common.utils.JerseyClient.PROTOCOL_HTTP;
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/RestExceptionHandler.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/RestExceptionHandler.java
index e32efaf..c04ffc4 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/RestExceptionHandler.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/RestExceptionHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 - 2022 ZTE Corporation.
+ * Copyright 2021 - 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.
@@ -16,13 +16,12 @@
 
 package org.onap.holmes.common.utils;
 
+import jakarta.ws.rs.WebApplicationException;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import jakarta.ws.rs.WebApplicationException;
-
 @RestControllerAdvice
 public class RestExceptionHandler {
 
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/AddHeadersHttpServletRequestWrapper.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/AddHeadersHttpServletRequestWrapper.java
index d61797b..bfe67d1 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/AddHeadersHttpServletRequestWrapper.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/AddHeadersHttpServletRequestWrapper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 ZTE Corporation.
+ * Copyright 2018-2023 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package org.onap.holmes.common.utils.transactionid;
 
-import java.util.HashMap;
-import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
+import java.util.HashMap;
+import java.util.Map;
 
 public class AddHeadersHttpServletRequestWrapper extends HttpServletRequestWrapper {
     final private Map<String, String> additionalHeaders = new HashMap<>();
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java
index 725084a..3451b85 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018-2021 ZTE Corporation.
+ * Copyright 2018-2022 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.
@@ -36,9 +36,6 @@ import java.util.UUID;
 public class TransactionIdFilter implements Filter {
 
     public static final Marker INVOKE_SYNCHRONOUS;
-    public static final Marker ENTRY = MarkerFactory.getMarker("ENTRY");
-    public static final Marker EXIT = MarkerFactory.getMarker("EXIT");
-
     private static final String DEFAULT_REQUEST_ID = UUID.randomUUID().toString();
 
     static {
@@ -57,7 +54,6 @@ public class TransactionIdFilter implements Filter {
         HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest;
         AddHeadersHttpServletRequestWrapper requestWithTransactionId = new AddHeadersHttpServletRequestWrapper(
                 httpServletRequest);
-        log.warn(ENTRY, "Entering.");
 
         String requestID = ensureTransactionIdIsPresent(requestWithTransactionId);
         HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse;
@@ -76,11 +72,9 @@ public class TransactionIdFilter implements Filter {
         MDC.put("RequestID", requestID);
         MDC.put("InvocationID", invocationID);
 
-        log.warn(INVOKE_SYNCHRONOUS, "Invoking synchronously ... ");
         try {
             filterChain.doFilter(requestWithTransactionId, httpServletResponse);
         } finally {
-            log.debug(EXIT, "Exiting.");
             MDC.remove("RequestID");
             MDC.remove("InvocationID");
         }
@@ -97,7 +91,6 @@ public class TransactionIdFilter implements Filter {
 
         if (StringUtils.isBlank(requestId)) {
             requestId = TransactionIdUtils.getUUID();
-            log.info(INVOKE_SYNCHRONOUS, "This warning has a 'MY_MARKER' annotation.");
             log.info("Request ID ({} header) not exist. It was generated: {}",
                     TransactionIdUtils.REQUEST_ID_HEADER, requestId);
             request.addHeader(TransactionIdUtils.REQUEST_ID_HEADER, requestId);
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java
index 9ba284f..8b176eb 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 - 2022 Fujitsu Limited, ZTE Corporation.
+ * Copyright 2020 - 2023 Fujitsu Limited, 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
@@ -53,12 +53,14 @@ public class AaiQueryMdonsTest {
 
     private static JsonObject data;
 
-    private static final String AAI_ADDR = "https://aai.onap:8443/aai/v19/";
+    private static final String AAI_ADDR = "https://aai.onap:443/aai/v19/";
 
     @BeforeClass
     public static void beforeClass() {
         System.setProperty(MSB_ADDR, "127.0.0.1:80");
         System.setProperty("ENABLE_ENCRYPT", "true");
+        System.setProperty(MicroServiceConfig.AAI_ADDR, "aai");
+        System.setProperty(MicroServiceConfig.BASE_URL, "onap");
 
         File file = new File(AaiQueryMdonsTest.class.getClassLoader().getResource("./aai-mdons.json").getFile());
         BufferedReader reader = null;
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/config/AaiConfigTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/config/AaiConfigTest.java
index 68e9f84..377029c 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/config/AaiConfigTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/config/AaiConfigTest.java
@@ -24,8 +24,8 @@ public class AaiConfigTest {
 
     @Test
     public void testAaiConfig_get_static_fields() {
-        String aaiVnfAddr = "/aai/v11/network/generic-vnfs/generic-vnf";
-        String aaiVmAddr = "/aai/v11/search/nodes-query?search-node-type=vserver&filter=";
+        String aaiVnfAddr = "/aai/v19/network/generic-vnfs/generic-vnf";
+        String aaiVmAddr = "/aai/v19/search/nodes-query?search-node-type=vserver&filter=";
         String xTransactionId = "9999";
         String xFromAppId = "jimmy-postman";
         assertThat(aaiVnfAddr, equalTo(AaiConfig.AaiConsts.AAI_VNF_ADDR));
diff --git a/pom.xml b/pom.xml
index 19a1f22..a0de13b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2017-2022 ZTE Corporation. Licensed under the Apache License, Version
+<!-- Copyright 2017-2023 ZTE Corporation. 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
@@ -20,7 +20,7 @@
     <artifactId>holmes-common-parent</artifactId>
     <packaging>pom</packaging>
 
-    <version>1.4.4-SNAPSHOT</version>
+    <version>1.4.5-SNAPSHOT</version>
     <name>holmes-common</name>
     <modules>
         <module>holmes-actions</module>
-- 
2.16.6


From 839fbb5f6d868df469743473b1e52a241124c369 Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Mon, 20 Mar 2023 15:22:28 +0800
Subject: [PATCH 05/16] Change the value of AAI env var to AAI_ADDR

Issue-ID: HOLMES-327
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: Ia29ee5b90547ce9f4c92c254acafcc4416348c4d
---
 .../holmes/common/config/MicroServiceConfig.java   | 280 ++++++++++-----------
 1 file changed, 140 insertions(+), 140 deletions(-)

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
index df3a7df..621e23b 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
@@ -1,140 +1,140 @@
-/**
- * Copyright  2017-2021 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.config;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import org.apache.commons.lang3.StringUtils;
-import org.onap.holmes.common.constant.AlarmConst;
-import org.onap.holmes.common.utils.JerseyClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.onap.holmes.common.utils.CommonUtils.getEnv;
-
-public class MicroServiceConfig {
-
-    final static public String CONSUL_ADDR_SUF = ":8500/v1/catalog/service/";
-    final static public String CONSUL_HOST = "CONSUL_HOST";
-    final static public String HOSTNAME = "HOSTNAME";
-    final static public String POD_IP = "POD_IP";
-    final static public String CONFIG_BINDING_SERVICE = "CONFIG_BINDING_SERVICE";
-    final static public String MSB_ADDR = "MSB_ADDR";
-    final static public String MSB_IAG_SERVICE_HOST = "MSB_IAG_SERVICE_HOST";
-    final static public String MSB_IAG_SERVICE_PORT = "MSB_IAG_SERVICE_PORT";
-    final static public String BASE_URL = "BASE_URL";
-    final static public String PRE_ADDR = "PRE_ADDR";
-    final static public String POST_ADDR = "POST_ADDR";
-    final static public String AAI_ADDR = "AAI_BASEADDR";
-    final static public String PROTOCOL_HTTP = "http";
-    final static public String PROTOCOL_HTTPS = "https";
-    final static public int PLAIN_PORT = 80;
-    final static public int TLS_PORT = 443;
-
-    final static public Logger log = LoggerFactory.getLogger(MicroServiceConfig.class);
-
-    public static String getConsulAddrInfo() {
-        return "http://" + getEnv(CONSUL_HOST) + CONSUL_ADDR_SUF;
-    }
-
-    public static String getServiceAddrInfoFromDcaeConsulByHostName(String hostname) {
-        String ret = null;
-        String queryString = getConsulAddrInfo() + hostname;
-        log.info("Query the " + hostname + " address using the URL: " + queryString);
-        try {
-            JsonArray addrArray = JsonParser.parseString(execQuery(queryString)).getAsJsonArray();
-            if (addrArray.size() > 0) {
-                JsonObject addrJson = addrArray.get(0).getAsJsonObject();
-                if (addrJson != null && addrJson.get("ServiceAddress") != null
-                        && addrJson.get("ServicePort") != null) {
-                    ret = "http://" + addrJson.get("ServiceAddress").getAsString() + ":" + addrJson
-                            .get("ServicePort").getAsString();
-                }
-            } else {
-                log.info("No service info is returned from DCAE Consul. Hostname: {}", hostname);
-            }
-        } catch (Exception e) {
-            log.warn(e.getMessage(), e);
-        }
-        log.info("The " + hostname + " address is " + ret);
-        return ret;
-    }
-
-    private static String execQuery(String queryString) {
-        return JerseyClient.newInstance().get(queryString);
-    }
-
-    public static String getServiceConfigInfoFromCBS(String hostname) {
-        String url = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(CONFIG_BINDING_SERVICE)) + "/service_component/" + hostname;
-        String ret = execQuery(url);
-        log.info("The query url is: " + url + ". The corresponding configurations are " + ret);
-        return ret;
-    }
-
-    public static String getMsbServerAddrWithHttpPrefix() {
-        String[] addrInfo = getMsbIpAndPort();
-        String ret = addrInfo[0] + ":" + addrInfo[1];
-        if (!ret.startsWith(AlarmConst.HTTP) || !ret.startsWith(AlarmConst.HTTPS)) {
-            ret = AlarmConst.HTTP + ret;
-        }
-        return ret;
-    }
-
-    public static String getAaiAddr() {
-        boolean tlsEnabled = Boolean.valueOf(getEnv("ENABLE_ENCRYPT"));
-
-        return String.format("%s://%s%s%s.%s:%d",
-                tlsEnabled ? PROTOCOL_HTTPS : PROTOCOL_HTTP,
-                nullToEmptyString(getEnv(PRE_ADDR)),
-                nullToEmptyString(getEnv(AAI_ADDR)),
-                nullToEmptyString(getEnv(POST_ADDR)),
-                nullToEmptyString(getEnv(BASE_URL)),
-                tlsEnabled ? TLS_PORT : PLAIN_PORT);
-    }
-
-    public static String[] getMsbIpAndPort() {
-        return new String[]{getEnv(MSB_IAG_SERVICE_HOST), getEnv(MSB_IAG_SERVICE_PORT)};
-    }
-
-    public static String[] getMicroServiceIpAndPort() {
-        String info = getEnv(POD_IP);
-        if (info != null) {
-            return split(info);
-        } else {
-            return split(getEnv(HOSTNAME));
-        }
-    }
-
-    private static String[] split(String addr) {
-        String ip;
-        String port = "80";
-        if (addr.lastIndexOf(":") == -1) {
-            ip = addr;
-        } else if (addr.lastIndexOf(":") < 5 && addr.indexOf("://") != -1) {
-            ip = addr.substring(addr.indexOf("//") + 2);    //remove the http(s):// prefix
-        } else {
-            ip = addr.substring(addr.indexOf("://") != -1 ? addr.indexOf("//") + 2 : 0, addr.lastIndexOf(":"));
-            port = addr.substring(addr.lastIndexOf(":") + 1);
-        }
-        return new String[]{ip, port};
-    }
-
-    private static String nullToEmptyString(String input) {
-        return input == null ? StringUtils.EMPTY : input;
-    }
-
-}
+/**
+ * Copyright  2017-2021 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.config;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.apache.commons.lang3.StringUtils;
+import org.onap.holmes.common.constant.AlarmConst;
+import org.onap.holmes.common.utils.JerseyClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.onap.holmes.common.utils.CommonUtils.getEnv;
+
+public class MicroServiceConfig {
+
+    final static public String CONSUL_ADDR_SUF = ":8500/v1/catalog/service/";
+    final static public String CONSUL_HOST = "CONSUL_HOST";
+    final static public String HOSTNAME = "HOSTNAME";
+    final static public String POD_IP = "POD_IP";
+    final static public String CONFIG_BINDING_SERVICE = "CONFIG_BINDING_SERVICE";
+    final static public String MSB_ADDR = "MSB_ADDR";
+    final static public String MSB_IAG_SERVICE_HOST = "MSB_IAG_SERVICE_HOST";
+    final static public String MSB_IAG_SERVICE_PORT = "MSB_IAG_SERVICE_PORT";
+    final static public String BASE_URL = "BASE_URL";
+    final static public String PRE_ADDR = "PRE_ADDR";
+    final static public String POST_ADDR = "POST_ADDR";
+    final static public String AAI_ADDR = "AAI_ADDR";
+    final static public String PROTOCOL_HTTP = "http";
+    final static public String PROTOCOL_HTTPS = "https";
+    final static public int PLAIN_PORT = 80;
+    final static public int TLS_PORT = 443;
+
+    final static public Logger log = LoggerFactory.getLogger(MicroServiceConfig.class);
+
+    public static String getConsulAddrInfo() {
+        return "http://" + getEnv(CONSUL_HOST) + CONSUL_ADDR_SUF;
+    }
+
+    public static String getServiceAddrInfoFromDcaeConsulByHostName(String hostname) {
+        String ret = null;
+        String queryString = getConsulAddrInfo() + hostname;
+        log.info("Query the " + hostname + " address using the URL: " + queryString);
+        try {
+            JsonArray addrArray = JsonParser.parseString(execQuery(queryString)).getAsJsonArray();
+            if (addrArray.size() > 0) {
+                JsonObject addrJson = addrArray.get(0).getAsJsonObject();
+                if (addrJson != null && addrJson.get("ServiceAddress") != null
+                        && addrJson.get("ServicePort") != null) {
+                    ret = "http://" + addrJson.get("ServiceAddress").getAsString() + ":" + addrJson
+                            .get("ServicePort").getAsString();
+                }
+            } else {
+                log.info("No service info is returned from DCAE Consul. Hostname: {}", hostname);
+            }
+        } catch (Exception e) {
+            log.warn(e.getMessage(), e);
+        }
+        log.info("The " + hostname + " address is " + ret);
+        return ret;
+    }
+
+    private static String execQuery(String queryString) {
+        return JerseyClient.newInstance().get(queryString);
+    }
+
+    public static String getServiceConfigInfoFromCBS(String hostname) {
+        String url = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(CONFIG_BINDING_SERVICE)) + "/service_component/" + hostname;
+        String ret = execQuery(url);
+        log.info("The query url is: " + url + ". The corresponding configurations are " + ret);
+        return ret;
+    }
+
+    public static String getMsbServerAddrWithHttpPrefix() {
+        String[] addrInfo = getMsbIpAndPort();
+        String ret = addrInfo[0] + ":" + addrInfo[1];
+        if (!ret.startsWith(AlarmConst.HTTP) || !ret.startsWith(AlarmConst.HTTPS)) {
+            ret = AlarmConst.HTTP + ret;
+        }
+        return ret;
+    }
+
+    public static String getAaiAddr() {
+        boolean tlsEnabled = Boolean.valueOf(getEnv("ENABLE_ENCRYPT"));
+
+        return String.format("%s://%s%s%s.%s:%d",
+                tlsEnabled ? PROTOCOL_HTTPS : PROTOCOL_HTTP,
+                nullToEmptyString(getEnv(PRE_ADDR)),
+                nullToEmptyString(getEnv(AAI_ADDR)),
+                nullToEmptyString(getEnv(POST_ADDR)),
+                nullToEmptyString(getEnv(BASE_URL)),
+                tlsEnabled ? TLS_PORT : PLAIN_PORT);
+    }
+
+    public static String[] getMsbIpAndPort() {
+        return new String[]{getEnv(MSB_IAG_SERVICE_HOST), getEnv(MSB_IAG_SERVICE_PORT)};
+    }
+
+    public static String[] getMicroServiceIpAndPort() {
+        String info = getEnv(POD_IP);
+        if (info != null) {
+            return split(info);
+        } else {
+            return split(getEnv(HOSTNAME));
+        }
+    }
+
+    private static String[] split(String addr) {
+        String ip;
+        String port = "80";
+        if (addr.lastIndexOf(":") == -1) {
+            ip = addr;
+        } else if (addr.lastIndexOf(":") < 5 && addr.indexOf("://") != -1) {
+            ip = addr.substring(addr.indexOf("//") + 2);    //remove the http(s):// prefix
+        } else {
+            ip = addr.substring(addr.indexOf("://") != -1 ? addr.indexOf("//") + 2 : 0, addr.lastIndexOf(":"));
+            port = addr.substring(addr.lastIndexOf(":") + 1);
+        }
+        return new String[]{ip, port};
+    }
+
+    private static String nullToEmptyString(String input) {
+        return input == null ? StringUtils.EMPTY : input;
+    }
+
+}
-- 
2.16.6


From 260902528c22fc2d59086b39958fa4f5e9c64b4c Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Thu, 23 Mar 2023 09:45:39 +0800
Subject: [PATCH 06/16] Bumped the version of the common module.

Issue-ID: HOLMES-612
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: I956d08e29e8511b8536b508ae646957f779995c8
---
 version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.properties b/version.properties
index 4761c30..050b3ce 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=4
-patch=4
+patch=5
 
 base_version=${major}.${minor}.${patch}
 
-- 
2.16.6


From 6bc2f1eb5ff3f271c9584a0c48498354d2fcc4cc Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Thu, 23 Mar 2023 10:46:02 +0800
Subject: [PATCH 07/16] Released version 1.4.5

Issue-ID: HOLMES-612
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: I0737ba8932dcd0ece2fafec5d2b3e409fb4e5161
---
 releases/maven-1.4.5.yaml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 releases/maven-1.4.5.yaml

diff --git a/releases/maven-1.4.5.yaml b/releases/maven-1.4.5.yaml
new file mode 100644
index 0000000..c3227dd
--- /dev/null
+++ b/releases/maven-1.4.5.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: 'maven'
+version: '1.4.5'
+project: 'holmes-common'
+log_dir: 'holmes-common-maven-stage-master/1448/'
\ No newline at end of file
-- 
2.16.6


From 6e0fd04861ecd2a00ca2d158b0639454eae94702 Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Fri, 24 Mar 2023 09:43:46 +0800
Subject: [PATCH 08/16] Removed redundant env vars

Issue-ID: HOLMES-613
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: I754658a0ce3172dffd4e4dd28a95922d5eb7d991
---
 holmes-actions/pom.xml                                        |  2 +-
 .../org/onap/holmes/common/config/MicroServiceConfig.java     | 11 +++--------
 .../java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2Test.java  |  3 ---
 .../java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java   |  4 ----
 .../java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java    |  4 +---
 pom.xml                                                       |  2 +-
 6 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index cec3209..b09b882 100644
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.onap.holmes.common</groupId>
         <artifactId>holmes-common-parent</artifactId>
-        <version>1.4.5-SNAPSHOT</version>
+        <version>1.4.6-SNAPSHOT</version>
     </parent>
 
     <name>holmes-common-service</name>
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
index 621e23b..4702d7b 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
@@ -33,13 +33,10 @@ public class MicroServiceConfig {
     final static public String HOSTNAME = "HOSTNAME";
     final static public String POD_IP = "POD_IP";
     final static public String CONFIG_BINDING_SERVICE = "CONFIG_BINDING_SERVICE";
-    final static public String MSB_ADDR = "MSB_ADDR";
     final static public String MSB_IAG_SERVICE_HOST = "MSB_IAG_SERVICE_HOST";
     final static public String MSB_IAG_SERVICE_PORT = "MSB_IAG_SERVICE_PORT";
-    final static public String BASE_URL = "BASE_URL";
-    final static public String PRE_ADDR = "PRE_ADDR";
-    final static public String POST_ADDR = "POST_ADDR";
     final static public String AAI_ADDR = "AAI_ADDR";
+    final static public String NAMESPACE = "NAMESPACE";
     final static public String PROTOCOL_HTTP = "http";
     final static public String PROTOCOL_HTTPS = "https";
     final static public int PLAIN_PORT = 80;
@@ -97,12 +94,10 @@ public class MicroServiceConfig {
     public static String getAaiAddr() {
         boolean tlsEnabled = Boolean.valueOf(getEnv("ENABLE_ENCRYPT"));
 
-        return String.format("%s://%s%s%s.%s:%d",
+        return String.format("%s://%s.%s:%d",
                 tlsEnabled ? PROTOCOL_HTTPS : PROTOCOL_HTTP,
-                nullToEmptyString(getEnv(PRE_ADDR)),
                 nullToEmptyString(getEnv(AAI_ADDR)),
-                nullToEmptyString(getEnv(POST_ADDR)),
-                nullToEmptyString(getEnv(BASE_URL)),
+                nullToEmptyString(getEnv(NAMESPACE)),
                 tlsEnabled ? TLS_PORT : PLAIN_PORT);
     }
 
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2Test.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2Test.java
index 9b9d75c..18b0fe0 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2Test.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2Test.java
@@ -44,8 +44,6 @@ import java.util.Map;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNull.nullValue;
-import static org.onap.holmes.common.config.MicroServiceConfig.MSB_ADDR;
-
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({JerseyClient.class})
@@ -61,7 +59,6 @@ public class AaiQuery4Ccvpn2Test {
 
     @BeforeClass
     static public void beforeClass() {
-        System.setProperty(MSB_ADDR, "127.0.0.1:80");
 
         File file = new File(AaiQuery4Ccvpn2Test.class.getClassLoader().getResource("./ccvpn2.data.json").getFile());
         BufferedReader reader = null;
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
index 55e7b6b..0430e28 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
@@ -36,8 +36,6 @@ import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.anyString;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
-import static org.onap.holmes.common.config.MicroServiceConfig.MSB_ADDR;
-
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(JerseyClient.class)
@@ -56,8 +54,6 @@ public class AaiQuery4CcvpnTest {
 
     @BeforeClass
     static public void beforeClass() {
-        System.setProperty(MSB_ADDR, "127.0.0.1:80");
-
         File file = new File(AaiQuery4CcvpnTest.class.getClassLoader().getResource("./ccvpn.data.json").getFile());
         BufferedReader reader = null;
         try {
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java
index 8b176eb..6c038c2 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java
@@ -38,7 +38,6 @@ import java.util.Map;
 
 import static org.easymock.EasyMock.anyObject;
 import static org.junit.Assert.assertEquals;
-import static org.onap.holmes.common.config.MicroServiceConfig.MSB_ADDR;
 
 @RunWith(PowerMockRunner.class)
 @PowerMockIgnore("javax.net.ssl.*")
@@ -57,10 +56,9 @@ public class AaiQueryMdonsTest {
 
     @BeforeClass
     public static void beforeClass() {
-        System.setProperty(MSB_ADDR, "127.0.0.1:80");
         System.setProperty("ENABLE_ENCRYPT", "true");
         System.setProperty(MicroServiceConfig.AAI_ADDR, "aai");
-        System.setProperty(MicroServiceConfig.BASE_URL, "onap");
+        System.setProperty(MicroServiceConfig.NAMESPACE, "onap");
 
         File file = new File(AaiQueryMdonsTest.class.getClassLoader().getResource("./aai-mdons.json").getFile());
         BufferedReader reader = null;
diff --git a/pom.xml b/pom.xml
index a0de13b..2af85ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <artifactId>holmes-common-parent</artifactId>
     <packaging>pom</packaging>
 
-    <version>1.4.5-SNAPSHOT</version>
+    <version>1.4.6-SNAPSHOT</version>
     <name>holmes-common</name>
     <modules>
         <module>holmes-actions</module>
-- 
2.16.6


From 9d09c27ef186cc455a0766ee80adfaf03a7582f9 Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Fri, 24 Mar 2023 09:51:30 +0800
Subject: [PATCH 09/16] Bumped the version to 1.4.6

Issue-ID: HOLMES-613
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: I0b5779d25c54f2364a10fe6bc2c30bcac992a842
---
 version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.properties b/version.properties
index 050b3ce..8786bbb 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=4
-patch=5
+patch=6
 
 base_version=${major}.${minor}.${patch}
 
-- 
2.16.6


From 521b9e9a199c58108482316f13a32e58020c2caf Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Fri, 24 Mar 2023 10:02:52 +0800
Subject: [PATCH 10/16] Released Ver 1.4.6

Issue-ID: HOLMES-613
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: Ibf0fed96d068ee96d3a197f6307f9e10ffe2bd51
---
 releases/maven-1.4.6.yaml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 releases/maven-1.4.6.yaml

diff --git a/releases/maven-1.4.6.yaml b/releases/maven-1.4.6.yaml
new file mode 100644
index 0000000..64991f9
--- /dev/null
+++ b/releases/maven-1.4.6.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: 'maven'
+version: '1.4.6'
+project: 'holmes-common'
+log_dir: 'holmes-common-maven-stage-master/1450/'
\ No newline at end of file
-- 
2.16.6


From 86debb28ef983f8176da06258e8f09c8783cddc7 Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Fri, 25 Aug 2023 09:22:32 +0800
Subject: [PATCH 11/16] Updated the repo to support JDK 17

1. Removed oparent.
2. Supported JDK 17.

Issue-ID: HOLMES-629
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: I4635dff74a9654cf02600aba9650a67af1ba818a
---
 holmes-actions/pom.xml                             |  23 +-
 .../onap/holmes/common/aai/AaiQuery4CcvpnTest.java |   4 +-
 .../service/impl/EngineEntityServiceImplTest.java  |   3 +-
 pom.xml                                            | 401 +++++++++++----------
 4 files changed, 224 insertions(+), 207 deletions(-)

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index b09b882..f132e80 100644
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.onap.holmes.common</groupId>
         <artifactId>holmes-common-parent</artifactId>
-        <version>1.4.6-SNAPSHOT</version>
+        <version>1.4.7-SNAPSHOT</version>
     </parent>
 
     <name>holmes-common-service</name>
@@ -143,11 +143,24 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <release>11</release>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <argLine>
+                        --add-opens=java.base/java.lang=ALL-UNNAMED
+                        --add-opens=java.base/java.net=ALL-UNNAMED
+                        --add-opens=java.base/java.util=ALL-UNNAMED
+                        --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
+                        --add-opens=java.base/java.util.stream=ALL-UNNAMED
+                        --add-opens=java.base/java.io=ALL-UNNAMED
+                    </argLine>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
index 0430e28..0df99b5 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018-2021 ZTE Corporation.
+ * Copyright 2018-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
@@ -25,6 +25,7 @@ import org.onap.holmes.common.exception.CorrelationException;
 import org.onap.holmes.common.utils.JerseyClient;
 import org.powermock.api.easymock.PowerMock;
 import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
@@ -39,6 +40,7 @@ import static org.junit.Assert.assertThat;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(JerseyClient.class)
+@SuppressStaticInitializationFor("org.onap.holmes.common.utils.JerseyClient")
 public class AaiQuery4CcvpnTest {
 
     @Rule
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/engine/service/impl/EngineEntityServiceImplTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/engine/service/impl/EngineEntityServiceImplTest.java
index cb16650..3687299 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/engine/service/impl/EngineEntityServiceImplTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/engine/service/impl/EngineEntityServiceImplTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 ZTE Corporation.
+ * Copyright 2020 - 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.
@@ -118,6 +118,7 @@ class EngineEntityDaoStub implements EngineEntityDao {
 
     @Override
     public void updateEntity(EngineEntity entity) {
+        entitySet.remove(entity);
         entitySet.add(entity);
     }
 
diff --git a/pom.xml b/pom.xml
index 2af85ea..14384fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,200 +1,201 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2017-2023 ZTE Corporation. 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 the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>3.0.0</version>
-    </parent>
-
-    <groupId>org.onap.holmes.common</groupId>
-    <artifactId>holmes-common-parent</artifactId>
-    <packaging>pom</packaging>
-
-    <version>1.4.6-SNAPSHOT</version>
-    <name>holmes-common</name>
-    <modules>
-        <module>holmes-actions</module>
-    </modules>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.test.failure.ignore>false</maven.test.failure.ignore>
-        <maven.test.skip>false</maven.test.skip>
-
-        <finalName>${project.artifactId}-${project.version}</finalName>
-        <release.dir>${basedir}/target</release.dir>
-        <bundle.name>${project.artifactId}-${project.version}</bundle.name>
-
-        <powermock.version>2.0.7</powermock.version>
-        <springboot.version>2.7.2</springboot.version>
-        <spring-framework.version>5.3.13</spring-framework.version>
-        <jdbi.version>3.19.0</jdbi.version>
-
-        <dropwizard.version>2.0.9</dropwizard.version>
-        <swagger.version>1.6.4</swagger.version>
-        <lombok.version>1.18.4</lombok.version>
-        <jersey.version>3.0.5</jersey.version>
-        <jersey.scope>compile</jersey.scope>
-        <jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.version>
-        <slf4j.version>1.7.25</slf4j.version>
-        <jacoco.version>0.8.5</jacoco.version>
-        <jackson.version>2.13.3</jackson.version>
-        <sonar.coverage.jacoco.xmlReportPaths>
-            ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
-        </sonar.coverage.jacoco.xmlReportPaths>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${springboot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-jdbc</artifactId>
-                <version>${spring-framework.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-web</artifactId>
-                <version>${spring-framework.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jdbi</groupId>
-                <artifactId>jdbi3-postgres</artifactId>
-                <version>${jdbi.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jdbi</groupId>
-                <artifactId>jdbi3-sqlobject</artifactId>
-                <version>${jdbi.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>4.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.msb.java-sdk</groupId>
-                <artifactId>msb-java-sdk</artifactId>
-                <version>1.2.5</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-databind</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.containers</groupId>
-                <artifactId>jersey-container-servlet-core</artifactId>
-                <version>${jersey.version}</version>
-                <scope>${jersey.scope}</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-common</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-client</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <version>${lombok.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.8.2</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-core</artifactId>
-                <version>1.3</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.powermock</groupId>
-                <artifactId>powermock-module-junit4</artifactId>
-                <version>${powermock.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.easymock</groupId>
-                <artifactId>easymock</artifactId>
-                <version>4.2</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.powermock</groupId>
-                <artifactId>powermock-api-easymock</artifactId>
-                <version>${powermock.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>29.0-jre</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.code.gson</groupId>
-                <artifactId>gson</artifactId>
-                <version>2.8.9</version>
-            </dependency>
-            <dependency>
-                <groupId>jakarta.ws.rs</groupId>
-                <artifactId>jakarta.ws.rs-api</artifactId>
-                <version>${jakarta.ws.rs.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
-                <executions>
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2017-2023 ZTE Corporation. 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 the License. -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.onap.holmes.common</groupId>
+    <artifactId>holmes-common-parent</artifactId>
+    <packaging>pom</packaging>
+
+    <version>1.4.7-SNAPSHOT</version>
+    <name>holmes-common</name>
+    <modules>
+        <module>holmes-actions</module>
+    </modules>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.test.failure.ignore>false</maven.test.failure.ignore>
+        <maven.test.skip>false</maven.test.skip>
+
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <release.dir>${basedir}/target</release.dir>
+        <bundle.name>${project.artifactId}-${project.version}</bundle.name>
+
+        <powermock.version>2.0.7</powermock.version>
+        <springboot.version>2.7.2</springboot.version>
+        <spring-framework.version>5.3.13</spring-framework.version>
+        <jdbi.version>3.19.0</jdbi.version>
+
+        <dropwizard.version>2.0.9</dropwizard.version>
+        <swagger.version>1.6.4</swagger.version>
+        <lombok.version>1.18.28</lombok.version>
+        <jersey.version>3.0.5</jersey.version>
+        <jersey.scope>compile</jersey.scope>
+        <jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.version>
+        <slf4j.version>1.7.25</slf4j.version>
+        <jacoco.version>0.8.5</jacoco.version>
+        <jackson.version>2.13.3</jackson.version>
+
+        <jacoco.version>0.8.5</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+        </sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
+        <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${springboot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-jdbc</artifactId>
+                <version>${spring-framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-web</artifactId>
+                <version>${spring-framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jdbi</groupId>
+                <artifactId>jdbi3-postgres</artifactId>
+                <version>${jdbi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jdbi</groupId>
+                <artifactId>jdbi3-sqlobject</artifactId>
+                <version>${jdbi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>4.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.msb.java-sdk</groupId>
+                <artifactId>msb-java-sdk</artifactId>
+                <version>1.2.5</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-databind</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.containers</groupId>
+                <artifactId>jersey-container-servlet-core</artifactId>
+                <version>${jersey.version}</version>
+                <scope>${jersey.scope}</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.core</groupId>
+                <artifactId>jersey-common</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.core</groupId>
+                <artifactId>jersey-client</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.13.2</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-core</artifactId>
+                <version>1.3</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-module-junit4</artifactId>
+                <version>${powermock.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.easymock</groupId>
+                <artifactId>easymock</artifactId>
+                <version>4.2</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-easymock</artifactId>
+                <version>${powermock.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>30.0-jre</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>2.8.9</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.ws.rs</groupId>
+                <artifactId>jakarta.ws.rs-api</artifactId>
+                <version>${jakarta.ws.rs.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco.version}</version>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+
-- 
2.16.6


From ade480b317fe7bcf9ce94ef34e6c42b71a0ea1a3 Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Mon, 4 Sep 2023 19:03:50 +0800
Subject: [PATCH 12/16] Removed MSB Dependencies

Issue-ID: HOLMES-629
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: Ia74c8456822ba71f465a7142431327a884c50a70
---
 holmes-actions/pom.xml                             |  34 +++---
 .../holmes/common/{utils => msb}/MsbRegister.java  |  12 +-
 .../common/msb/entity/CustomDateSerializer.java    |  35 ++++++
 .../holmes/common/msb/entity/KeyValuePair.java     |  49 +++++++++
 .../common/msb/entity/MicroServiceFullInfo.java    |  71 ++++++++++++
 .../holmes/common/msb/entity/MicroServiceInfo.java |  49 +++++++++
 .../org/onap/holmes/common/msb/entity/Node.java    |  97 +++++++++++++++++
 .../onap/holmes/common/msb/entity/NodeInfo.java    |  80 ++++++++++++++
 .../org/onap/holmes/common/msb/entity/Service.java | 121 +++++++++++++++++++++
 .../common/{utils => msb}/MsbRegisterTest.java     |  15 +--
 .../msb/entity/CustomDateSerializerTest.java       |  32 ++++++
 .../holmes/common/msb/entity/KeyValuePairTest.java |  43 ++++++++
 .../msb/entity/MicroServiceFullInfoTest.java       | 114 +++++++++++++++++++
 .../common/msb/entity/MicroServiceInfoTest.java    |  64 +++++++++++
 .../holmes/common/msb/entity/NodeInfoTest.java     |  47 ++++++++
 .../onap/holmes/common/msb/entity/NodeTest.java    |  56 ++++++++++
 .../onap/holmes/common/msb/entity/ServiceTest.java |  59 ++++++++++
 pom.xml                                            |  28 +++--
 18 files changed, 962 insertions(+), 44 deletions(-)
 rename holmes-actions/src/main/java/org/onap/holmes/common/{utils => msb}/MsbRegister.java (89%)
 create mode 100644 holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/CustomDateSerializer.java
 create mode 100644 holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/KeyValuePair.java
 create mode 100644 holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/MicroServiceFullInfo.java
 create mode 100644 holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/MicroServiceInfo.java
 create mode 100644 holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/Node.java
 create mode 100644 holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/NodeInfo.java
 create mode 100644 holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/Service.java
 rename holmes-actions/src/test/java/org/onap/holmes/common/{utils => msb}/MsbRegisterTest.java (96%)
 create mode 100644 holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/CustomDateSerializerTest.java
 create mode 100644 holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/KeyValuePairTest.java
 create mode 100644 holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/MicroServiceFullInfoTest.java
 create mode 100644 holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/MicroServiceInfoTest.java
 create mode 100644 holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/NodeInfoTest.java
 create mode 100644 holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/NodeTest.java
 create mode 100644 holmes-actions/src/test/java/org/onap/holmes/common/msb/entity/ServiceTest.java

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index f132e80..01c7b8c 100644
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -7,7 +7,7 @@
 	OR CONDITIONS OF ANY KIND, either express or implied. See the License for
 	the specific language governing permissions and limitations under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.holmes.common</groupId>
@@ -19,25 +19,6 @@
     <packaging>jar</packaging>
     <artifactId>holmes-actions</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>org.onap.msb.java-sdk</groupId>
-            <artifactId>msb-java-sdk</artifactId>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.eclipsesource.jaxrs</groupId>
-                    <artifactId>jersey-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -125,6 +106,19 @@
             <artifactId>jakarta.ws.rs-api</artifactId>
             <version>${jakarta.ws.rs.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.13.0</version>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/MsbRegister.java b/holmes-actions/src/main/java/org/onap/holmes/common/msb/MsbRegister.java
similarity index 89%
rename from holmes-actions/src/main/java/org/onap/holmes/common/utils/MsbRegister.java
rename to holmes-actions/src/main/java/org/onap/holmes/common/msb/MsbRegister.java
index 78ac59b..cc83ae5 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/MsbRegister.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/msb/MsbRegister.java
@@ -14,7 +14,7 @@
  * 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;
@@ -22,8 +22,10 @@ import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -60,14 +62,14 @@ public class MsbRegister {
         MicroServiceFullInfo microServiceFullInfo = null;
         int retry = 0;
         while (null == microServiceFullInfo && retry < totalRetryTimes) {
-            int time  = interval * ++retry;
+            int time = interval * ++retry;
             try {
                 log.info("Holmes Service Registration. Times: " + retry);
                 microServiceFullInfo = client
                         .header("Accept", MediaType.APPLICATION_JSON)
                         .queryParam("createOrUpdate", true)
                         .post(String.format("%s://%s:%s/api/microservices/v1/services",
-                                isHttpsEnabled ? PROTOCOL_HTTPS : PROTOCOL_HTTP, msbAddrInfo[0], msbAddrInfo[1]),
+                                        isHttpsEnabled ? PROTOCOL_HTTPS : PROTOCOL_HTTP, msbAddrInfo[0], msbAddrInfo[1]),
                                 Entity.entity(msinfo, MediaType.APPLICATION_JSON),
                                 MicroServiceFullInfo.class);
 
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/CustomDateSerializer.java b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/CustomDateSerializer.java
new file mode 100644
index 0000000..4f6c012
--- /dev/null
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/CustomDateSerializer.java
@@ -0,0 +1,35 @@
+/**
+ * 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 com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class CustomDateSerializer extends JsonSerializer<Date> {
+    public CustomDateSerializer() {
+    }
+
+    public void serialize(Date value, JsonGenerator jsonGenerator, SerializerProvider provider) throws IOException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        jsonGenerator.writeString(sdf.format(value));
+    }
+}
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/KeyValuePair.java b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/KeyValuePair.java
new file mode 100644
index 0000000..d35b69e
--- /dev/null
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/KeyValuePair.java
@@ -0,0 +1,49 @@
+/**
+ * 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 java.io.Serializable;
+
+public class KeyValuePair implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String key;
+    private String value;
+
+    public String getKey() {
+        return this.key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public KeyValuePair() {
+    }
+
+    public KeyValuePair(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+}
\ No newline at end of file
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/MicroServiceFullInfo.java b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/MicroServiceFullInfo.java
new file mode 100644
index 0000000..644f814
--- /dev/null
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/MicroServiceFullInfo.java
@@ -0,0 +1,71 @@
+/**
+ * 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 java.io.Serializable;
+import java.util.Iterator;
+
+public class MicroServiceFullInfo extends Service<NodeInfo> implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String status = "1";
+
+    public MicroServiceFullInfo() {
+    }
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String toString() {
+        StringBuffer buf = new StringBuffer();
+        buf.append("MicroService List:").append("\r\n");
+        buf.append("serviceName:").append(this.getServiceName()).append("\r\n");
+        buf.append("version:").append(this.getVersion()).append("\r\n");
+        buf.append("url:").append(this.getUrl()).append("\r\n");
+        buf.append("protocol:").append(this.getProtocol()).append("\r\n");
+        buf.append("visualRange:").append(this.getVisualRange()).append("\r\n");
+        buf.append("nodes:").append("\r\n");
+        Iterator nodes = this.getNodes().iterator();
+
+        while (nodes.hasNext()) {
+            NodeInfo nodeInstace = (NodeInfo) nodes.next();
+            buf.append("  nodeId-").append(nodeInstace.getNodeId()).append("\r\n");
+            buf.append("  ip-").append(nodeInstace.getIp()).append("\r\n");
+            buf.append("  port-").append(nodeInstace.getPort()).append("\r\n");
+            buf.append("  ttl-").append(nodeInstace.getTtl()).append("\r\n");
+            buf.append("  Created_at-").append(nodeInstace.getCreated_at()).append("\r\n");
+            buf.append("  Updated_at-").append(nodeInstace.getUpdated_at()).append("\r\n");
+            buf.append("  Expiration-").append(nodeInstace.getExpiration()).append("\r\n");
+        }
+
+        buf.append("metadata:").append("\r\n");
+        if (this.getMetadata() != null && this.getMetadata().size() > 0) {
+            nodes = this.getMetadata().iterator();
+            while (nodes.hasNext()) {
+                KeyValuePair keyValuePair = (KeyValuePair) nodes.next();
+                buf.append("  key-").append(keyValuePair.getKey()).append("\r\n");
+                buf.append("  value-").append(keyValuePair.getValue()).append("\r\n");
+            }
+        }
+
+        return buf.toString();
+    }
+}
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/MicroServiceInfo.java b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/MicroServiceInfo.java
new file mode 100644
index 0000000..16fd0b3
--- /dev/null
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/MicroServiceInfo.java
@@ -0,0 +1,49 @@
+/**
+ * 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 java.io.Serializable;
+import java.util.Iterator;
+
+public class MicroServiceInfo extends Service<Node> implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    public MicroServiceInfo() {
+    }
+
+    public String toString() {
+        StringBuilder buf = new StringBuilder();
+        buf.append("MicroService List:").append("\r\n");
+        buf.append("serviceName:").append(this.getServiceName()).append("\r\n");
+        buf.append("version:").append(this.getVersion()).append("\r\n");
+        buf.append("url:").append(this.getUrl()).append("\r\n");
+        buf.append("protocol:").append(this.getProtocol()).append("\r\n");
+        buf.append("visualRange:").append(this.getVisualRange()).append("\r\n");
+        buf.append("enable_ssl:").append(this.isEnable_ssl()).append("\r\n");
+        buf.append("nodes:").append("\r\n");
+        Iterator nodes = this.getNodes().iterator();
+
+        while (nodes.hasNext()) {
+            Node nodeInstace = (Node) nodes.next();
+            buf.append("  ip-").append(nodeInstace.getIp()).append("\r\n");
+            buf.append("  port-").append(nodeInstace.getPort()).append("\r\n");
+            buf.append("  ttl-").append(nodeInstace.getTtl()).append("\r\n");
+        }
+
+        return buf.toString();
+    }
+}
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/Node.java b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/Node.java
new file mode 100644
index 0000000..1e17a05
--- /dev/null
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/Node.java
@@ -0,0 +1,97 @@
+/**
+ * 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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import java.io.Serializable;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Node implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String ip;
+    private String port;
+    private String ttl = "";
+    private String checkType = "";
+    private String checkUrl = "";
+    private String checkInterval;
+    private String checkTimeOut;
+
+    public Node() {
+    }
+
+    public String getIp() {
+        return this.ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public String getPort() {
+        return this.port;
+    }
+
+    public void setPort(String port) {
+        this.port = port;
+    }
+
+    public String getTtl() {
+        return this.ttl;
+    }
+
+    public void setTtl(String ttl) {
+        this.ttl = ttl;
+    }
+
+    public String getCheckType() {
+        return this.checkType;
+    }
+
+    public void setCheckType(String checkType) {
+        this.checkType = checkType;
+    }
+
+    public String getCheckUrl() {
+        return this.checkUrl;
+    }
+
+    public void setCheckUrl(String checkUrl) {
+        this.checkUrl = checkUrl;
+    }
+
+    public String getCheckInterval() {
+        return this.checkInterval;
+    }
+
+    public void setCheckInterval(String checkInterval) {
+        this.checkInterval = checkInterval;
+    }
+
+    public String getCheckTimeOut() {
+        return this.checkTimeOut;
+    }
+
+    public void setCheckTimeOut(String checkTimeOut) {
+        this.checkTimeOut = checkTimeOut;
+    }
+
+    public String toString() {
+        return this.ip + ":" + this.port + "  ttl:" + this.ttl;
+    }
+}
+
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/NodeInfo.java b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/NodeInfo.java
new file mode 100644
index 0000000..de2378d
--- /dev/null
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/NodeInfo.java
@@ -0,0 +1,80 @@
+/**
+ * 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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.util.Date;
+
+@JsonIgnoreProperties(
+        ignoreUnknown = true
+)
+public class NodeInfo extends Node {
+    private static final long serialVersionUID = 8955786461351557306L;
+    private String nodeId;
+    private String status;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    private Date expiration;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    private Date created_at;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    private Date updated_at;
+
+    public NodeInfo() {
+    }
+
+    public Date getExpiration() {
+        return this.expiration;
+    }
+
+    public void setExpiration(Date expiration) {
+        this.expiration = expiration;
+    }
+
+    public Date getCreated_at() {
+        return this.created_at;
+    }
+
+    public void setCreated_at(Date created_at) {
+        this.created_at = created_at;
+    }
+
+    public Date getUpdated_at() {
+        return this.updated_at;
+    }
+
+    public void setUpdated_at(Date updated_at) {
+        this.updated_at = updated_at;
+    }
+
+    public String getNodeId() {
+        return this.nodeId;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/Service.java b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/Service.java
new file mode 100644
index 0000000..a852d24
--- /dev/null
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/msb/entity/Service.java
@@ -0,0 +1,121 @@
+/**
+ * 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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Set;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Service<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String serviceName;
+    private String version = "";
+    private String url = "";
+    private String protocol = "";
+    private String visualRange = "1";
+    private String lb_policy = "";
+    private String path = "";
+    private Set<T> nodes;
+    private List<KeyValuePair> metadata;
+    private boolean enable_ssl = false;
+
+    public Service() {
+    }
+
+    public boolean isEnable_ssl() {
+        return this.enable_ssl;
+    }
+
+    public void setEnable_ssl(boolean enable_ssl) {
+        this.enable_ssl = enable_ssl;
+    }
+
+    public String getPath() {
+        return this.path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getLb_policy() {
+        return this.lb_policy;
+    }
+
+    public void setLb_policy(String lb_policy) {
+        this.lb_policy = lb_policy;
+    }
+
+    public List<KeyValuePair> getMetadata() {
+        return this.metadata;
+    }
+
+    public void setMetadata(List<KeyValuePair> metadata) {
+        this.metadata = metadata;
+    }
+
+    public Set<T> getNodes() {
+        return this.nodes;
+    }
+
+    public void setNodes(Set<T> nodes) {
+        this.nodes = nodes;
+    }
+
+    public String getServiceName() {
+        return this.serviceName;
+    }
+
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
+    public String getVersion() {
+        return this.version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getUrl() {
+        return this.url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getProtocol() {
+        return this.protocol;
+    }
+
+    public void setProtocol(String protocol) {
+        this.protocol = protocol;
+    }
+
+    public String getVisualRange() {
+        return this.visualRange;
+    }
+
+    public void setVisualRange(String visualRange) {
+        this.visualRange = visualRange;
+    }
+}
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
similarity index 96%
rename from holmes-actions/src/test/java/org/onap/holmes/common/utils/MsbRegisterTest.java
rename to 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
diff --git a/pom.xml b/pom.xml
index 14384fc..3de6290 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
         <jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.version>
         <slf4j.version>1.7.25</slf4j.version>
         <jacoco.version>0.8.5</jacoco.version>
-        <jackson.version>2.13.3</jackson.version>
+        <jackson.version>2.15.2</jackson.version>
 
         <jacoco.version>0.8.5</jacoco.version>
         <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
@@ -90,17 +90,6 @@
                 <artifactId>javax.servlet-api</artifactId>
                 <version>4.0.1</version>
             </dependency>
-            <dependency>
-                <groupId>org.onap.msb.java-sdk</groupId>
-                <artifactId>msb-java-sdk</artifactId>
-                <version>1.2.5</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-databind</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.containers</groupId>
                 <artifactId>jersey-container-servlet-core</artifactId>
@@ -167,6 +156,21 @@
                 <artifactId>jakarta.ws.rs-api</artifactId>
                 <version>${jakarta.ws.rs.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>3.13.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
-- 
2.16.6


From 5200ae428eb894fac15db1b1af0bb9e7a9f3c9ae Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Tue, 24 Oct 2023 19:36:40 +0800
Subject: [PATCH 13/16] Updated the version of direction dependencies

Issue-ID: HOLMES-633
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: I7c977f9ef88c5284e1212cbc4b66c93a60e60c6d
---
 .../org/onap/holmes/common/dmaap/store/UniqueRequestIdCache.java    | 2 --
 pom.xml                                                             | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/store/UniqueRequestIdCache.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/store/UniqueRequestIdCache.java
index 6a65b0c..6e28fdc 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/store/UniqueRequestIdCache.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/store/UniqueRequestIdCache.java
@@ -19,11 +19,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import javax.inject.Singleton;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Component
-@Singleton
 public class UniqueRequestIdCache extends ConcurrentHashMap<String, String> {
 
     private static final Logger log = LoggerFactory.getLogger(UniqueRequestIdCache.class);
diff --git a/pom.xml b/pom.xml
index 3de6290..0dacb29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,8 +32,8 @@
         <bundle.name>${project.artifactId}-${project.version}</bundle.name>
 
         <powermock.version>2.0.7</powermock.version>
-        <springboot.version>2.7.2</springboot.version>
-        <spring-framework.version>5.3.13</spring-framework.version>
+        <springboot.version>3.1.4</springboot.version>
+        <spring-framework.version>6.0.12</spring-framework.version>
         <jdbi.version>3.19.0</jdbi.version>
 
         <dropwizard.version>2.0.9</dropwizard.version>
@@ -144,7 +144,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>30.0-jre</version>
+                <version>32.1.2-jre</version>
             </dependency>
             <dependency>
                 <groupId>com.google.code.gson</groupId>
-- 
2.16.6


From 288b8bc763d4c4e4bef01b293d3ee09b8f817bba Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Mon, 30 Oct 2023 17:06:17 +0800
Subject: [PATCH 14/16] Updated slf4j to 2.0.9

Issue-ID: HOLMES-633
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: Ib7da8e391b7f8a50d9a67db6acb00f6d0a94660a
---
 holmes-actions/pom.xml                                            | 5 ++++-
 .../src/main/java/org/onap/holmes/common/utils/LanguageUtil.java  | 2 +-
 .../src/main/java/org/onap/holmes/common/utils/UserUtil.java      | 2 +-
 .../utils/transactionid/AddHeadersHttpServletRequestWrapper.java  | 4 ++--
 .../holmes/common/utils/transactionid/TransactionIdFilter.java    | 8 ++++----
 .../test/java/org/onap/holmes/common/utils/LanguageUtilTest.java  | 2 +-
 .../src/test/java/org/onap/holmes/common/utils/UserUtilTest.java  | 2 +-
 .../common/utils/transactionid/TransactionIdFilterTest.java       | 6 +++---
 pom.xml                                                           | 8 +++++++-
 9 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 01c7b8c..954e0dc 100644
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -104,7 +104,10 @@
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
-            <version>${jakarta.ws.rs.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/LanguageUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/LanguageUtil.java
index cf49b84..2ea606e 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/LanguageUtil.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/LanguageUtil.java
@@ -17,7 +17,7 @@ package org.onap.holmes.common.utils;
 
 import org.onap.holmes.common.constant.AlarmConst;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Locale;
 
 public class LanguageUtil {
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/UserUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/UserUtil.java
index 5400b20..6a4ad15 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/UserUtil.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/UserUtil.java
@@ -17,7 +17,7 @@ package org.onap.holmes.common.utils;
 
 import org.onap.holmes.common.constant.AlarmConst;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class UserUtil {
 
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/AddHeadersHttpServletRequestWrapper.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/AddHeadersHttpServletRequestWrapper.java
index bfe67d1..70f5e2f 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/AddHeadersHttpServletRequestWrapper.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/AddHeadersHttpServletRequestWrapper.java
@@ -15,8 +15,8 @@
  */
 package org.onap.holmes.common.utils.transactionid;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java
index 3451b85..7c15240 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java
@@ -22,10 +22,10 @@ import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.UUID;
 
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/LanguageUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/LanguageUtilTest.java
index 06759ec..2e5e6ca 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/LanguageUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/LanguageUtilTest.java
@@ -21,7 +21,7 @@ import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertThat;
 
 import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java
index 7b452f0..8cdeabb 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java
@@ -22,7 +22,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.powermock.api.easymock.PowerMock;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertThat;
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilterTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilterTest.java
index cfbf747..e56c6a9 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilterTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilterTest.java
@@ -15,9 +15,9 @@
  */
 package org.onap.holmes.common.utils.transactionid;
 
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/pom.xml b/pom.xml
index 0dacb29..a947783 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
         <jersey.version>3.0.5</jersey.version>
         <jersey.scope>compile</jersey.scope>
         <jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.version>
-        <slf4j.version>1.7.25</slf4j.version>
+        <slf4j.version>2.0.9</slf4j.version>
         <jacoco.version>0.8.5</jacoco.version>
         <jackson.version>2.15.2</jackson.version>
 
@@ -156,6 +156,12 @@
                 <artifactId>jakarta.ws.rs-api</artifactId>
                 <version>${jakarta.ws.rs.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>6.0.0</version>
+                <scope>provided</scope>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>
-- 
2.16.6


From 5a8bf0afa932d6d41359716685d8220f2e6af04f Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Mon, 30 Oct 2023 17:08:55 +0800
Subject: [PATCH 15/16] Bumped the version number to 1.4.7

Issue-ID: HOLMES-633
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: I41c45eb6787a4a5a6831bc1993e1ca0df0f2eb24
---
 version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.properties b/version.properties
index 8786bbb..b69668f 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=4
-patch=6
+patch=7
 
 base_version=${major}.${minor}.${patch}
 
-- 
2.16.6


From d209cf72b970780ff9434a4bfd0d45b49150c6f5 Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Mon, 30 Oct 2023 17:25:22 +0800
Subject: [PATCH 16/16] Released Version 1.4.7

Issue-ID: HOLMES-633
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: Id06a358adaeabc06271ac011cd7ca24890cba753
---
 releases/maven-1.4.7.yaml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 releases/maven-1.4.7.yaml

diff --git a/releases/maven-1.4.7.yaml b/releases/maven-1.4.7.yaml
new file mode 100644
index 0000000..a81c033
--- /dev/null
+++ b/releases/maven-1.4.7.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: 'maven'
+version: '1.4.7'
+project: 'holmes-common'
+log_dir: 'holmes-common-maven-stage-master/1471/'
\ No newline at end of file
-- 
2.16.6