Change the static method in util class to unstatic. romove the unused class.
Change-Id: Ieac5b817e32b7b02c00e1d5b247a82e0aadcab32
Issue-ID: AAI-358
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>
import org.eclipse.jetty.http.HttpStatus;
import org.onap.aai.esr.entity.rest.EmsRegisterInfo;
import org.onap.aai.esr.util.ExtsysUtil;
-import org.onap.aai.esr.util.RestResponseUtil;
import org.onap.aai.esr.wrapper.EmsManagerWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class EmsManagerUtil {
- public static EsrEmsDetail emsRegisterInfo2EsrEms(EmsRegisterInfo emsRegisterInfo) {
+ public EsrEmsDetail emsRegisterInfo2EsrEms(EmsRegisterInfo emsRegisterInfo) {
EsrEmsDetail esrEms = new EsrEmsDetail();
esrEms.setEmsId(ExtsysUtil.generateId());
ArrayList<EsrSystemInfo> authInfos = new ArrayList<EsrSystemInfo>();
return esrEms;
}
- private static ArrayList<EsrSystemInfo> getAuthInfosFromRegisterData(EmsRegisterInfo emsRegisterInfo) {
+ private ArrayList<EsrSystemInfo> getAuthInfosFromRegisterData(EmsRegisterInfo emsRegisterInfo) {
ArrayList<EsrSystemInfo> authInfos = new ArrayList<EsrSystemInfo>();
EsrSystemInfo resouceAuthInfo = new EsrSystemInfo();
EsrSystemInfo performanceAuthInfo = new EsrSystemInfo();
return authInfos;
}
- private static EsrSystemInfo getAuthInfoFromFtpAddr(EmsRegisterInfo emsRegisterInfo, String systemType) {
+ private EsrSystemInfo getAuthInfoFromFtpAddr(EmsRegisterInfo emsRegisterInfo, String systemType) {
EsrSystemInfo authInfo = new EsrSystemInfo();
FtpAddr ftpAddr = new FtpAddr();
if(systemType.equals(SystemType.EMS_RESOUCE.toString())) {
return authInfo;
}
- private static EsrSystemInfo getAuthInfoFromAlarmAddr(EmsRegisterInfo emsRegisterInfo) {
+ private EsrSystemInfo getAuthInfoFromAlarmAddr(EmsRegisterInfo emsRegisterInfo) {
EsrSystemInfo authInfo = new EsrSystemInfo();
AlarmAddr alarmAddr = new AlarmAddr();
alarmAddr = emsRegisterInfo.getAlarmAddr();
return authInfo;
}
- public static EmsRegisterInfo EsrEms2EmsRegisterInfo(EsrEmsDetail esrEms) {
+ public EmsRegisterInfo EsrEms2EmsRegisterInfo(EsrEmsDetail esrEms) {
EmsRegisterInfo emsRegisterInfo = new EmsRegisterInfo();
ArrayList<EsrSystemInfo> esrSystemInfo = new ArrayList<EsrSystemInfo>();
EsrSystemInfo authInfo = new EsrSystemInfo();
return emsRegisterInfo;
}
- private static FtpAddr getFtpAddrFromAuthInfo(EsrSystemInfo authInfo) {
+ private FtpAddr getFtpAddrFromAuthInfo(EsrSystemInfo authInfo) {
FtpAddr ftpAddr = new FtpAddr();
ftpAddr.setFtptype(authInfo.getType());
ftpAddr.setIp(authInfo.getIpAddress());
return ftpAddr;
}
- private static AlarmAddr getAlarmAddrFromAuthInfo(EsrSystemInfo authInfo) {
+ private AlarmAddr getAlarmAddrFromAuthInfo(EsrSystemInfo authInfo) {
AlarmAddr alarmAddr = new AlarmAddr();
alarmAddr.setIp(authInfo.getIpAddress());
alarmAddr.setPassword(authInfo.getPassword());
+++ /dev/null
-/**
- * Copyright 2016-2017 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.
- */
-package org.onap.aai.esr.util;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-public class RestResponseUtil {
-
- /**
- * get http success entity.
- */
- public static Response getSuccessResponse(Object obj) {
- if (obj != null) {
- return Response.ok(obj).build();
- } else {
- return Response.ok().build();
- }
- }
-
- public static Response getCreateSussceeResponse(Object obj) {
- return Response.status(Status.CREATED).entity(obj).build();
- }
-
- /**
- * get http error entity.
- */
- public static Response getErrorResponse(Object obj) {
- if (obj != null) {
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(obj).build();
- } else {
- return Response.serverError().build();
- }
-
- }
-}
public class ThirdpartySdncManagerUtil {
- public static EsrThirdpartySdncDetail sdncRegisterInfo2EsrSdnc(ThirdpartySdncRegisterInfo sdncRegisterInfo) {
+ public EsrThirdpartySdncDetail sdncRegisterInfo2EsrSdnc(ThirdpartySdncRegisterInfo sdncRegisterInfo) {
EsrThirdpartySdncDetail esrThirdpartySdnc = new EsrThirdpartySdncDetail();
sdncRegisterInfo.setThirdpartySdncId(ExtsysUtil.generateId());
esrThirdpartySdnc.setThirdpartySdncId(sdncRegisterInfo.getThirdpartySdncId());
return esrThirdpartySdnc;
}
- private static EsrSystemInfoList getEsrSystemInfoList(ThirdpartySdncRegisterInfo sdncRegisterInfo) {
+ private EsrSystemInfoList getEsrSystemInfoList(ThirdpartySdncRegisterInfo sdncRegisterInfo) {
EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
ArrayList<EsrSystemInfo> esrSystemInfo = new ArrayList<EsrSystemInfo>();
EsrSystemInfo authInfo = new EsrSystemInfo();
return esrSystemInfoList;
}
- public static ThirdpartySdncRegisterInfo esrSdnc2SdncRegisterInfo(EsrThirdpartySdncDetail esrSdnc) {
+ public ThirdpartySdncRegisterInfo esrSdnc2SdncRegisterInfo(EsrThirdpartySdncDetail esrSdnc) {
ThirdpartySdncRegisterInfo registerSdncInfo = new ThirdpartySdncRegisterInfo();
EsrSystemInfo esrSystemInfo = esrSdnc.getEsrSystemInfoList().getEsrSystemInfo().get(0);
registerSdncInfo.setThirdpartySdncId(esrSdnc.getThirdpartySdncId());
public class VimManagerUtil {
- public static CloudRegionDetail vimRegisterInfo2CloudRegion(VimRegisterInfo vimRegisterInfo) {
+ public CloudRegionDetail vimRegisterInfo2CloudRegion(VimRegisterInfo vimRegisterInfo) {
CloudRegionDetail cloudRegion = new CloudRegionDetail();
EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
return cloudRegion;
}
- private static EsrSystemInfo vimAuthInfo2EsrSystemInfoObj(ArrayList<VimAuthInfo> vimAuthInfos) {
+ private EsrSystemInfo vimAuthInfo2EsrSystemInfoObj(ArrayList<VimAuthInfo> vimAuthInfos) {
EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
VimAuthInfo vimAuthInfo = new VimAuthInfo();
vimAuthInfo = vimAuthInfos.get(0);
return esrSystemInfoObj;
}
- private static VimAuthInfo authInfo2VimAuthInfo(EsrSystemInfo authInfo) {
+ private VimAuthInfo authInfo2VimAuthInfo(EsrSystemInfo authInfo) {
VimAuthInfo vimAuthInfo = new VimAuthInfo();
vimAuthInfo.setAuthUrl(authInfo.getServiceUrl());
vimAuthInfo.setCloudDomain(authInfo.getCloudDomain());
return vimAuthInfo;
}
- public static VimRegisterInfo cloudRegion2VimRegisterInfo(CloudRegionDetail cloudRegion) {
+ public VimRegisterInfo cloudRegion2VimRegisterInfo(CloudRegionDetail cloudRegion) {
VimRegisterInfo vimRegisterInfo = new VimRegisterInfo();
VimAuthInfo vimAuthInfo = new VimAuthInfo();
ArrayList<VimAuthInfo> vimAuthInfos = new ArrayList<VimAuthInfo>();
public class VnfmManagerUtil {
- public static EsrVnfmDetail vnfmRegisterInfo2EsrVnfm(VnfmRegisterInfo vnfmRegisterInfo) {
+ public EsrVnfmDetail vnfmRegisterInfo2EsrVnfm(VnfmRegisterInfo vnfmRegisterInfo) {
EsrVnfmDetail esrVnfm = new EsrVnfmDetail();
EsrSystemInfoList esrSystemInfo = new EsrSystemInfoList();
EsrSystemInfo authInfo = new EsrSystemInfo();
* @param vnfmRegisterInfo vnfm register informantion from portal
* @return
*/
- private static EsrSystemInfo getAuthInfoFromVnfmRegisterInfo(VnfmRegisterInfo vnfmRegisterInfo) {
+ private EsrSystemInfo getAuthInfoFromVnfmRegisterInfo(VnfmRegisterInfo vnfmRegisterInfo) {
EsrSystemInfo authInfo = new EsrSystemInfo();
authInfo.setEsrSystemInfoId(ExtsysUtil.generateId());
authInfo.setSystemName(vnfmRegisterInfo.getName());
return authInfo;
}
- public static VnfmRegisterInfo esrVnfm2VnfmRegisterInfo(EsrVnfmDetail esrVnfm) {
+ public VnfmRegisterInfo esrVnfm2VnfmRegisterInfo(EsrVnfmDetail esrVnfm) {
VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo();
EsrSystemInfo authInfo = new EsrSystemInfo();
vnfmRegisterInfo.setVnfmId(esrVnfm.getVnfmId());
public class EmsManagerWrapper {
private static EmsManagerWrapper emsManagerWrapper;
private static final Logger LOG = LoggerFactory.getLogger(EmsManagerWrapper.class);
+ private static EmsManagerUtil emsManagerUtil = new EmsManagerUtil();
/**
* get VnfmManagerWrapper instance.
public Response registerEms(EmsRegisterInfo emsRegisterInfo) {
CommonRegisterResponse result = new CommonRegisterResponse();
EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
- esrEmsDetail = EmsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
+ esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
String emsId = esrEmsDetail.getEmsId();
try {
ExternalSystemProxy.registerEms(emsId, esrEmsDetail);
String esrEmsStr = ExternalSystemProxy.queryEmsDetail(emsId);
LOG.info("Response from AAI by query EMS: " + esrEmsStr);
esrEmsDetail = new Gson().fromJson(esrEmsStr, EsrEmsDetail.class);
- emsRegisterInfo = EmsManagerUtil.EsrEms2EmsRegisterInfo(esrEmsDetail);
+ emsRegisterInfo = emsManagerUtil.EsrEms2EmsRegisterInfo(esrEmsDetail);
return emsRegisterInfo;
} catch (Exception e) {
e.printStackTrace();
EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo();
oriEsrEmsDetail = queryEsrEmsDetail(emsId);
- esrEmsDetail = EmsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
+ esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
String emsResourceVersion = oriEsrEmsDetail.getResourceVersion();
esrEmsDetail.setResourceVersion(emsResourceVersion);
esrEmsDetail.setEmsId(emsId);
private static ThirdpatySdncWrapper thirdpatySdncWrapper;
private static final Logger LOG = LoggerFactory.getLogger(ThirdpatySdncWrapper.class);
+ private static ThirdpartySdncManagerUtil thirdpartySdncManagerUtil = new ThirdpartySdncManagerUtil();
/**
* get ThirdpatySdncWrapper instance.
public Response registerThirdpartySdnc(ThirdpartySdncRegisterInfo thirdpartySdnc) {
CommonRegisterResponse result = new CommonRegisterResponse();
EsrThirdpartySdncDetail esrSdncDetail = new EsrThirdpartySdncDetail();
- esrSdncDetail = ThirdpartySdncManagerUtil.sdncRegisterInfo2EsrSdnc(thirdpartySdnc);
+ esrSdncDetail = thirdpartySdncManagerUtil.sdncRegisterInfo2EsrSdnc(thirdpartySdnc);
String sdncId = esrSdncDetail.getThirdpartySdncId();
try {
ExternalSystemProxy.registerSdnc(sdncId, esrSdncDetail);
EsrThirdpartySdncDetail originalEsrSdncDetail = new EsrThirdpartySdncDetail();
EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo();
originalEsrSdncDetail = queryEsrThirdpartySdncDetail(sdncId);
- esrSdncDetail = ThirdpartySdncManagerUtil.sdncRegisterInfo2EsrSdnc(thirdpartySdnc);
+ esrSdncDetail = thirdpartySdncManagerUtil.sdncRegisterInfo2EsrSdnc(thirdpartySdnc);
String resourceVersion = originalEsrSdncDetail.getResourceVersion();
esrSdncDetail.setResourceVersion(resourceVersion);
esrSdncDetail.setThirdpartySdncId(sdncId);
String esrSdncStr = ExternalSystemProxy.queryThirdpartySdncDetail(sdncId);
LOG.info("Response from AAI by query thirdparty SDNC: " + esrSdncStr);
esrSdncDetail = new Gson().fromJson(esrSdncStr, EsrThirdpartySdncDetail.class);
- sdncRegisterInfo = ThirdpartySdncManagerUtil.esrSdnc2SdncRegisterInfo(esrSdncDetail);
+ sdncRegisterInfo = thirdpartySdncManagerUtil.esrSdnc2SdncRegisterInfo(esrSdncDetail);
return sdncRegisterInfo;
} catch (Exception e) {
e.printStackTrace();
private static VimManagerWrapper vimManagerWrapper;
private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class);
+ private static VimManagerUtil vimManagerUtil = new VimManagerUtil();
/**
* get VimManagerWrapper instance.
"Start register VIM, input VIM info is: " + ExtsysUtil.objectToString(vimRegisterInfo));
CloudRegionDetail cloudRegion = new CloudRegionDetail();
VimRegisterResponse result = new VimRegisterResponse();
- cloudRegion = VimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
+ cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
String cloudOwner = vimRegisterInfo.getCloudOwner();
String cloudRegionId = vimRegisterInfo.getCloudRegionId();
try {
String cloudRegionstr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
LOG.info("Response from AAI by query VIM: " + cloudRegionstr);
cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
- vim = VimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);
+ vim = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);
return Response.ok(vim).build();
} catch (Exception e) {
e.printStackTrace();
try {
String cloudRegionstr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
- registeredVimInfo = VimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);
+ registeredVimInfo = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);
} catch (Exception error) {
error.printStackTrace();
LOG.error("query VIM detail failed ! cloud-owner = " + cloudOwner + ", cloud-region-id = "
String cloudRegionId = vimRegisterInfo.getCloudRegionId();
originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId);
String resourceVersion = originalCloudRegionDetail.getResourceVersion();
- cloudRegionDetail = VimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
+ cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
if(resourceVersion != null) {
cloudRegionDetail.setResourceVersion(resourceVersion);
originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
private static VnfmManagerWrapper vnfmManagerWrapper;
private static final Logger LOG = LoggerFactory.getLogger(VnfmManagerWrapper.class);
+ private static VnfmManagerUtil vnfmManagerUtil = new VnfmManagerUtil();
+
/**
* get VnfmManagerWrapper instance.
*
public Response registerVnfm(VnfmRegisterInfo vnfm) {
CommonRegisterResponse result = new CommonRegisterResponse();
EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
- esrVnfmDetail = VnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+ esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
String vnfmId = esrVnfmDetail.getVnfmId();
try {
ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
EsrVnfmDetail originalEsrVnfmDetail = new EsrVnfmDetail();
EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo();
originalEsrVnfmDetail = queryEsrVnfmDetail(vnfmId);
- esrVnfmDetail = VnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+ esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
String resourceVersion = getResourceVersion(vnfmId);
esrVnfmDetail.setResourceVersion(resourceVersion);
esrVnfmDetail.setVnfmId(vnfmId);
String esrVnfmstr = ExternalSystemProxy.queryVnfmDetail(vnfmId);
LOG.info("Response from AAI by query VNFM: " + esrVnfmstr);
esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class);
- vnfm = VnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
+ vnfm = vnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
return vnfm;
} catch (Exception e) {
e.printStackTrace();