Adjust the entity name of esr-server which used in esr-server rest API.
Change-Id: I1b748b66710f58f95be5a9dce9800cdfefa08109
Issue-ID: AAI-288
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>
+++ /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.entity.rest;
-
-
-public class BaseRestData {
-
- private String instanceId;
-
- private String systemName;
-
- private String vendor;
-
- private String version;
-
- private String type;
-
- private String url;
-
- private String username;
-
- private String password;
-
- private String systemStatus;
-
- private String systemType;
-
- public String getInstanceId() {
- return instanceId;
- }
-
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
-
- public String getSystemName() {
- return systemName;
- }
-
- public void setSystemName(String systemName) {
- this.systemName = systemName;
- }
-
- public String getVendor() {
- return vendor;
- }
-
- public void setVendor(String vendor) {
- this.vendor = vendor;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getSystemStatus() {
- return systemStatus;
- }
-
- public void setSystemStatus(String systemStatus) {
- this.systemStatus = systemStatus;
- }
-
- public String getSystemType() {
- return systemType;
- }
-
- public void setSystemType(String systemType) {
- this.systemType = systemType;
- }
-
-
-}
package org.onap.aai.esr.entity.rest;
-public class EmsRestData extends BaseRestData{
+public class EmsRegisterInfo {
private String emsId;
*/
package org.onap.aai.esr.entity.rest;
-public class ThirdPartySdncRestData {
+public class ThirdpartySdncRegisterInfo {
private String thirdpartySdncId;
this.protocol = protocol;
}
- public ThirdPartySdncRestData() {
+ public ThirdpartySdncRegisterInfo() {
}
*/
package org.onap.aai.esr.entity.rest;
-public class VimRestData extends BaseRestData {
+public class VimRegisterInfo {
private String cloudOwner;
*/
package org.onap.aai.esr.entity.rest;
-public class VnfmRestData{
+public class VnfmRegisterInfo{
private String vnfmId;
import io.swagger.annotations.ApiResponses;
import org.eclipse.jetty.http.HttpStatus;
-import org.onap.aai.esr.entity.rest.EmsRestData;
+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;
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
response = String.class)})
@Timed
- public Response updateEms(@ApiParam(value = "ems", required = true) EmsRestData ems,
+ public Response updateEms(@ApiParam(value = "ems", required = true) EmsRegisterInfo ems,
@ApiParam(value = "ems id", required = true) @PathParam("emsId") String emsId) {
LOGGER.info("start update ems .id:" + emsId + " info:" + ExtsysUtil.objectToString(ems));
- return RestResponseUtil.getSuccessResponse(new EmsRestData());
+ return RestResponseUtil.getSuccessResponse(new EmsRegisterInfo());
}
/**
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
response = String.class)})
@Timed
- public Response registerEms(@ApiParam(value = "ems", required = true) EmsRestData ems) {
+ public Response registerEms(@ApiParam(value = "ems", required = true) EmsRegisterInfo ems) {
LOGGER.info("start add ems" + " info:" + ExtsysUtil.objectToString(ems));
return EmsManagerWrapper.getInstance().registerEms(ems);
}
import io.swagger.annotations.ApiResponses;
import org.eclipse.jetty.http.HttpStatus;
-import org.onap.aai.esr.entity.rest.ThirdPartySdncRestData;
+import org.onap.aai.esr.entity.rest.ThirdpartySdncRegisterInfo;
import org.onap.aai.esr.util.ExtsysUtil;
import org.onap.aai.esr.wrapper.ThirdpatySdncWrapper;
import org.slf4j.Logger;
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
response = String.class)})
@Timed
- public Response updateThirdpartySdnc(@ApiParam(value = "thirdpartySdnc", required = true) ThirdPartySdncRestData thirdPartySdnc,
+ public Response updateThirdpartySdnc(@ApiParam(value = "thirdpartySdnc", required = true) ThirdpartySdncRegisterInfo thirdPartySdnc,
@ApiParam(value = "sdnc id", required = true) @PathParam("thirdPartySdncId") String thirdPartySdncId) {
LOGGER.info("start update sdnc .id:" + thirdPartySdncId + " info:" + ExtsysUtil.objectToString(thirdPartySdnc));
return ThirdpatySdncWrapper.getInstance().updateThirdpartySdnc(thirdPartySdnc);
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
response = String.class)})
@Timed
- public Response registerThirdpatySdnc(@ApiParam(value = "thirdPartySdnc", required = true) ThirdPartySdncRestData thirdPartySdnc) {
+ public Response registerThirdpatySdnc(@ApiParam(value = "thirdPartySdnc", required = true) ThirdpartySdncRegisterInfo thirdPartySdnc) {
LOGGER.info("start register sdnc" + " info:" + ExtsysUtil.objectToString(thirdPartySdnc));
return ThirdpatySdncWrapper.getInstance().registerThirdpartySdnc(thirdPartySdnc);
}
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.eclipse.jetty.http.HttpStatus;
-import org.onap.aai.esr.entity.rest.VimRestData;
+import org.onap.aai.esr.entity.rest.VimRegisterInfo;
import org.onap.aai.esr.util.ExtsysUtil;
import org.onap.aai.esr.wrapper.VimManagerWrapper;
import org.slf4j.Logger;
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
response = String.class)})
@Timed
- public Response updatevims(@ApiParam(value = "vim", required = true) VimRestData vim,
+ public Response updatevims(@ApiParam(value = "vim", required = true) VimRegisterInfo vim,
@ApiParam(value = "vim id", required = true) @PathParam("vimId") String vimId) {
LOGGER.info("start update vim .id:" + vimId + " info:" + ExtsysUtil.objectToString(vim));
return VimManagerWrapper.getInstance().updateVim(vim);
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
response = String.class)})
@Timed
- public Response registerVims(@ApiParam(value = "vim", required = true) VimRestData vim) {
+ public Response registerVims(@ApiParam(value = "vim", required = true) VimRegisterInfo vim) {
LOGGER.info("start add vim" + " info:" + ExtsysUtil.objectToString(vim));
return VimManagerWrapper.getInstance().registerVim(vim);
}
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.eclipse.jetty.http.HttpStatus;
-import org.onap.aai.esr.entity.rest.VnfmRestData;
+import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
import org.onap.aai.esr.util.ExtsysUtil;
import org.onap.aai.esr.wrapper.VnfmManagerWrapper;
import org.slf4j.Logger;
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
response = String.class)})
@Timed
- public Response updateVnfm(@ApiParam(value = "vnfm", required = true) VnfmRestData vnfm,
+ public Response updateVnfm(@ApiParam(value = "vnfm", required = true) VnfmRegisterInfo vnfm,
@ApiParam(value = "vnfm id", required = true) @PathParam("vnfmId") String vnfmId) {
LOGGER.info("start update vnfm .id:" + vnfmId + " info:" + ExtsysUtil.objectToString(vnfm));
return VnfmManagerWrapper.getInstance().updateVnfm(vnfm, vnfmId);
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
response = String.class)})
@Timed
- public Response registerVnfm(@ApiParam(value = "vnfm", required = true) VnfmRestData vnfm) {
+ public Response registerVnfm(@ApiParam(value = "vnfm", required = true) VnfmRegisterInfo vnfm) {
return VnfmManagerWrapper.getInstance().registerVnfm(vnfm);
}
}
import javax.ws.rs.core.Response;
-import org.onap.aai.esr.entity.rest.EmsRestData;
+import org.onap.aai.esr.entity.rest.EmsRegisterInfo;
import org.onap.aai.esr.entity.rest.RegisterResponse;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
return emsManagerWrapper;
}
- public Response registerEms(EmsRestData ems) {
+ public Response registerEms(EmsRegisterInfo ems) {
//TODO
RegisterResponse result = null;
return Response.ok(result).build();
}
- public Response updateEms(EmsRestData ems) {
+ public Response updateEms(EmsRegisterInfo ems) {
//TODO
return Response.ok().build();
}
public Response queryEmsList() {
//TODO
- ArrayList<EmsRestData> emsList = new ArrayList<EmsRestData>();
+ ArrayList<EmsRegisterInfo> emsList = new ArrayList<EmsRegisterInfo>();
return Response.ok(emsList).build();
}
public Response queryEmsById(String emsId) {
- EmsRestData ems = new EmsRestData();
+ EmsRegisterInfo ems = new EmsRegisterInfo();
//TODO
return Response.ok(ems).build();
}
import javax.ws.rs.core.Response;
import org.onap.aai.esr.entity.rest.RegisterResponse;
-import org.onap.aai.esr.entity.rest.ThirdPartySdncRestData;
+import org.onap.aai.esr.entity.rest.ThirdpartySdncRegisterInfo;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
return thirdpatySdncWrapper;
}
- public Response registerThirdpartySdnc(ThirdPartySdncRestData thirdpartySdnc) {
+ public Response registerThirdpartySdnc(ThirdpartySdncRegisterInfo thirdpartySdnc) {
//TODO
RegisterResponse result = null;
return Response.ok(result).build();
}
- public Response updateThirdpartySdnc(ThirdPartySdncRestData thirdpartySdnc) {
+ public Response updateThirdpartySdnc(ThirdpartySdncRegisterInfo thirdpartySdnc) {
//TODO
return Response.ok().build();
}
public Response queryThirdpartySdncList() {
//TODO
- ArrayList<ThirdPartySdncRestData> thirdpartySdncList = new ArrayList<ThirdPartySdncRestData>();
+ ArrayList<ThirdpartySdncRegisterInfo> thirdpartySdncList = new ArrayList<ThirdpartySdncRegisterInfo>();
return Response.ok(thirdpartySdncList).build();
}
public Response queryThirdpartySdncById(String thirdpartySdncId) {
- ThirdPartySdncRestData thirdpartySdnc = new ThirdPartySdncRestData();
+ ThirdpartySdncRegisterInfo thirdpartySdnc = new ThirdpartySdncRegisterInfo();
//TODO
return Response.ok(thirdpartySdnc).build();
}
import javax.ws.rs.core.Response;
import org.onap.aai.esr.entity.rest.RegisterResponse;
-import org.onap.aai.esr.entity.rest.VimRestData;
+import org.onap.aai.esr.entity.rest.VimRegisterInfo;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
return vimManagerWrapper;
}
- public Response registerVim(VimRestData vim) {
+ public Response registerVim(VimRegisterInfo vim) {
//TODO
RegisterResponse result = null;
return Response.ok(result).build();
}
- public Response updateVim(VimRestData vim) {
+ public Response updateVim(VimRegisterInfo vim) {
//TODO
return Response.ok().build();
}
public Response queryVimList() {
//TODO
- ArrayList<VimRestData> vimList = new ArrayList<VimRestData>();
+ ArrayList<VimRegisterInfo> vimList = new ArrayList<VimRegisterInfo>();
return Response.ok(vimList).build();
}
public Response queryVimById(String vimId) {
- VimRestData vim = new VimRestData();
+ VimRegisterInfo vim = new VimRegisterInfo();
//TODO
return Response.ok(vim).build();
}
import javax.ws.rs.core.Response;
import org.onap.aai.esr.entity.rest.RegisterResponse;
-import org.onap.aai.esr.entity.rest.VnfmRestData;
+import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
return vnfmManagerWrapper;
}
- public Response registerVnfm(VnfmRestData vnfm) {
+ public Response registerVnfm(VnfmRegisterInfo vnfm) {
//TODO
RegisterResponse result = null;
return Response.ok(result).build();
}
- public Response updateVnfm(VnfmRestData vnfm, String vnfmId) {
+ public Response updateVnfm(VnfmRegisterInfo vnfm, String vnfmId) {
//TODO
return Response.ok().build();
}
public Response queryVnfmList() {
- ArrayList<VnfmRestData> vnfmList = new ArrayList<VnfmRestData>();
+ ArrayList<VnfmRegisterInfo> vnfmList = new ArrayList<VnfmRegisterInfo>();
//TODO
return Response.ok(vnfmList).build();
}
public Response queryVnfmById(String vnfmId) {
- VnfmRestData vnfm = new VnfmRestData();
+ VnfmRegisterInfo vnfm = new VnfmRegisterInfo();
//TODO
return Response.ok(vnfm).build();
}
Code Review / aai / esr-server.git / commitdiff