summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2017-09-26 14:09:28 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2017-09-26 14:10:41 +0800
commit81900c828480aff7b255424603deb48c7b8b7209 (patch)
tree7178de5ffdd3c643d26cee51a5ad57ad3ef33b29
parent9d433d0d8cb7dd510c3bf3250f9a1b2df72ead05 (diff)
lower the cyclomatic complexity
major: L135 Change-Id: Id2ca98c75b6e8e1efd8094a9f1999306e4d08e1d Signed-off-by: Harry Huang <huangxiangyu5@huawei.com> Issue-Id: VNFSDK-85
-rw-r--r--vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbRegistration.java135
1 files changed, 66 insertions, 69 deletions
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbRegistration.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbRegistration.java
index 50f46583..1278c2ee 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbRegistration.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbRegistration.java
@@ -38,9 +38,9 @@ import org.slf4j.LoggerFactory;
public class MsbRegistration {
private static final Logger LOGGER = LoggerFactory.getLogger(MsbRegistration.class);
-
+
private static MsbRegistration oMsbRegistration = new MsbRegistration();
-
+
private static final String MSB_REGISTION_FILE = "etc/microservice/marketplace_rest.json";
private static final String MSB_REGISTION_URL = "/openoapi/microservices/v1/services?createOrUpdate=false";
private static final String MSB_UN_REGISTION_URL = "/openoapi/microservices/v1/services/{0}/version/{1}/nodes/{2}/{3}";
@@ -49,12 +49,12 @@ public class MsbRegistration {
private static final String PORT = "port";
private static final String SERVICE_NAME = "serviceName";
private static final String VERSION = "version";
-
+
private boolean bRegistrationStatus = false;
-
+
private MsbRegistration () {
}
-
+
public static MsbRegistration getInstance()
{
return oMsbRegistration;
@@ -63,43 +63,43 @@ public class MsbRegistration {
* Interface to handle MSB Registration
* @return
*/
- public int register()
- {
+ public int register()
+ {
File file = new File(MSB_REGISTION_FILE);
- if(!file.exists())
+ if(!file.exists())
{
- LOGGER.info("Stop registering as can't find msb registion file:" + file.getAbsolutePath());
+ LOGGER.info("Stop registering as can't find msb registion file:" + file.getAbsolutePath());
return CommonConstant.MsbRegisterCode.MSDB_REGISTER_FILE_NOT_EXISTS;
}
Map<?, ?> msbRegistionBodyMap = getMsbRegistrationData();
if(null == msbRegistionBodyMap)
{
- LOGGER.info("Reading data from msb registion file failed:" + file.getAbsolutePath());
+ LOGGER.info("Reading data from msb registion file failed:" + file.getAbsolutePath());
return CommonConstant.MsbRegisterCode.MSDB_REGISTER_FILE_NOT_EXISTS;
}
LOGGER.info("Registering body: " + JsonUtil.toJson(msbRegistionBodyMap));
bRegistrationStatus = sendRequest(msbRegistionBodyMap);
-
- return bRegistrationStatus
- ? CommonConstant.MsbRegisterCode.MSDB_REGISTER_SUCESS
+
+ return bRegistrationStatus
+ ? CommonConstant.MsbRegisterCode.MSDB_REGISTER_SUCESS
: CommonConstant.MsbRegisterCode.MSDB_REGISTER_FAILED;
}
- private Map<?, ?> getMsbRegistrationData()
- {
+ private Map<?, ?> getMsbRegistrationData()
+ {
Map<?, ?> msbRegistionBodyMap = null;
- try
+ try
{
ObjectMapper mapper = new ObjectMapper();
byte[] bytes = Files.readAllBytes(Paths.get(MSB_REGISTION_FILE));
msbRegistionBodyMap = mapper.readValue(bytes, Map.class);
-
+
replaceLocalIp(msbRegistionBodyMap);
- }
- catch(IOException e)
+ }
+ catch(IOException e)
{
LOGGER.error("Failed to get microservice bus registration body, " + e);
}
@@ -111,84 +111,80 @@ public class MsbRegistration {
* @param msbRegistionBodyMap
* @return
*/
- private boolean sendRequest(Map<?, ?> msbRegistionBodyMap)
+ private boolean sendRequest(Map<?, ?> msbRegistionBodyMap)
{
LOGGER.info("Start registering to microservice bus");
- String rawData = JsonUtil.toJson(msbRegistionBodyMap);
+ String rawData = JsonUtil.toJson(msbRegistionBodyMap);
MsbDetails oMsbDetails = MsbDetailsHolder.getMsbDetails();
if(null == oMsbDetails) {
LOGGER.info("MSB Details is NULL , Registration Failed !!!");
return false;
- }
+ }
RestResponse oResponse = RestfulClient.sendPostRequest(oMsbDetails.getDefaultServer().getHost(),
oMsbDetails.getDefaultServer().getPort(),
MSB_REGISTION_URL, rawData);
-
+
if(null == oResponse){
LOGGER.info("Null Unregister Response for " + MSB_REGISTION_URL);
return false;
- }
- LOGGER.info("Response Code Received for MBS Registration:" + oResponse.getStatusCode());
+ }
+ LOGGER.info("Response Code Received for MBS Registration:" + oResponse.getStatusCode());
return isSuccess(oResponse.getStatusCode()) ? true : false;
}
-
- public int unRegister()
+
+ public int unRegister()
{
if(!bRegistrationStatus){
- return CommonConstant.MsbRegisterCode.MSDB_REGISTER_SUCESS;
+ return CommonConstant.MsbRegisterCode.MSDB_REGISTER_SUCESS;
}
-
+
MsbDetails oMsbDetails = MsbDetailsHolder.getMsbDetails();
if(null == oMsbDetails){
LOGGER.info("MSB Details is NULL , Registration Failed !!!");
return CommonConstant.MsbRegisterCode.MSDB_REGISTER_FAILED;
}
-
+
File file = new File(MSB_REGISTION_FILE);
if(!file.exists()){
- LOGGER.info("Stop registering as can't find msb registion file:" + file.getAbsolutePath());
- return CommonConstant.MsbRegisterCode.MSDB_REGISTER_FILE_NOT_EXISTS;
- }
-
- Map<?, ?> msbRegistionBodyMap = getMsbRegistrationData();
- if(null == msbRegistionBodyMap){
- LOGGER.info("Reading data from msb registion file failed:" + file.getAbsolutePath());
+ LOGGER.info("Stop registering as can't find msb registion file:" + file.getAbsolutePath());
return CommonConstant.MsbRegisterCode.MSDB_REGISTER_FILE_NOT_EXISTS;
}
-
- String serviceName = (String)msbRegistionBodyMap.get(SERVICE_NAME);
- String version = (String)msbRegistionBodyMap.get(VERSION);
-
- @SuppressWarnings("unchecked")
- List<Map<String, String>> nodes = (List<Map<String, String>>)msbRegistionBodyMap.get(NODES);
- if((null == serviceName ) || (null == version ) || (null == nodes ))
- {
- LOGGER.info("Readed data is Invalid from msb registion file:" + file.getAbsolutePath());
+
+ try {
+ Map<?, ?> msbRegistionBodyMap = getMsbRegistrationData();
+
+ String serviceName = (String)msbRegistionBodyMap.get(SERVICE_NAME);
+ String version = (String)msbRegistionBodyMap.get(VERSION);
+
+ @SuppressWarnings("unchecked")
+ List<Map<String, String>> nodes = (List<Map<String, String>>)msbRegistionBodyMap.get(NODES);
+
+ Map<String, String> node = nodes.get(0);
+ String ip = node.get(IP);
+ String port = node.get(PORT);
+
+ String url = MessageFormat.format(MSB_UN_REGISTION_URL, serviceName, version, ip, port);
+ LOGGER.info("Start Unregister to microservice bus, url: " + url);
+
+ RestResponse oResponse = RestfulClient.delete(oMsbDetails.getDefaultServer().getHost(),
+ Integer.parseInt(oMsbDetails.getDefaultServer().getPort()),url);
+
+ if(null == oResponse) {
+ LOGGER.info("Null Unregister Response for " + url);
+ return CommonConstant.MsbRegisterCode.MSDB_REGISTER_FAILED;
+ }
+ LOGGER.info("Unregister Response " + oResponse.getStatusCode());
+ return isSuccess(oResponse.getStatusCode()) ?
+ CommonConstant.MsbRegisterCode.MSDB_REGISTER_SUCESS :
+ CommonConstant.MsbRegisterCode.MSDB_REGISTER_FAILED;
+ } catch(NullPointerException e) {
+ LOGGER.info("Readed data is Invalid from msb registion file:" + file.getAbsolutePath(), e);
return CommonConstant.MsbRegisterCode.MSDB_REGISTER_FILE_NOT_EXISTS;
}
-
- Map<String, String> node = nodes.get(0);
- String ip = node.get(IP);
- String port = node.get(PORT);
-
- String url = MessageFormat.format(MSB_UN_REGISTION_URL, serviceName, version, ip, port);
- LOGGER.info("Start Unregister to microservice bus, url: " + url);
-
- RestResponse oResponse = RestfulClient.delete(oMsbDetails.getDefaultServer().getHost(),
- Integer.parseInt(oMsbDetails.getDefaultServer().getPort()),url);
-
- if(null == oResponse) {
- LOGGER.info("Null Unregister Response for " + url);
- return CommonConstant.MsbRegisterCode.MSDB_REGISTER_FAILED;
- }
- LOGGER.info("Unregister Response " + oResponse.getStatusCode());
- return isSuccess(oResponse.getStatusCode()) ?
- CommonConstant.MsbRegisterCode.MSDB_REGISTER_SUCESS :
- CommonConstant.MsbRegisterCode.MSDB_REGISTER_FAILED;
}
@SuppressWarnings("unchecked")
- private void replaceLocalIp(Map<?, ?> msbRegistionBodyMap)
+ private void replaceLocalIp(Map<?, ?> msbRegistionBodyMap)
{
List<Map<String, String>> nodes = (List<Map<String, String>>)msbRegistionBodyMap.get(NODES);
Map<String, String> node = nodes.get(0);
@@ -203,15 +199,16 @@ public class MsbRegistration {
node.put(IP, ipAddress);
LOGGER.info("Local ip: " + ipAddress);
- }
- catch(UnknownHostException e)
+ }
+ catch(UnknownHostException e)
{
LOGGER.error("Unable to get IP address, " + e);
}
}
- private boolean isSuccess(int httpCode)
+ private boolean isSuccess(int httpCode)
{
return (httpCode == 200 || httpCode == 201) ? true : false;
}
}
+