X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-core%2Fesr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fresource%2FSdncManager.java;h=6e17d0e28c74ac96550621e09cce63d2e40b14b6;hb=50439f3a9d1c1d99fc644ae71c68971e8e46b0e7;hp=770cf5cddc663c4546ce7c6e46bb3640216fd689;hpb=aba957d99b0d0d21c77d80efe98a3450b6635c1a;p=aai%2Fesr-server.git diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/SdncManager.java b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/SdncManager.java index 770cf5c..6e17d0e 100644 --- a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/SdncManager.java +++ b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/SdncManager.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 ZTE Corporation. + * 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. @@ -23,8 +23,8 @@ import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import org.eclipse.jetty.http.HttpStatus; -import org.onap.aai.esr.entity.db.SdncData; -import org.onap.aai.esr.entity.rest.SdncRestData; +import org.onap.aai.esr.entity.aai.SdncData; +import org.onap.aai.esr.entity.rest.ThirdPartySdncRestData; import org.onap.aai.esr.exception.ExtsysException; import org.onap.aai.esr.handle.SdncHandler; import org.onap.aai.esr.util.ExtsysDbUtil; @@ -78,12 +78,13 @@ public class SdncManager { } if (list == null || list.size() <= 0) { LOGGER.info("query all sdnc end.no match condition record"); - return RestResponseUtil.getSuccessResponse(new ArrayList()); + return RestResponseUtil.getSuccessResponse(new ArrayList()); } else { LOGGER.info("query all sdnc end.size:" + list.size()); - ArrayList restList = new ArrayList(); + ArrayList restList = new ArrayList(); for (int i = 0; i < list.size(); i++) { - restList.add(new SdncRestData(list.get(i))); +// restList.add(new ThirdPartySdncRestData(list.get(i))); + restList.add(new ThirdPartySdncRestData()); } return RestResponseUtil.getSuccessResponse(restList); } @@ -119,7 +120,8 @@ public class SdncManager { return RestResponseUtil.getSuccessResponse(null); } else { LOGGER.info("query sdnc end.info:" + ExtsysDbUtil.objectToString(list)); - return RestResponseUtil.getSuccessResponse(new SdncRestData(list.get(0))); +// return RestResponseUtil.getSuccessResponse(new ThirdPartySdncRestData(list.get(0))); + return RestResponseUtil.getSuccessResponse(new ThirdPartySdncRestData()); } } @@ -176,7 +178,8 @@ public class SdncManager { return RestResponseUtil.getErrorResponse(error); } LOGGER.info(" update sdnc end !"); - return RestResponseUtil.getSuccessResponse(new SdncRestData(newData)); +// return RestResponseUtil.getSuccessResponse(new ThirdPartySdncRestData(newData)); + return RestResponseUtil.getSuccessResponse(new ThirdPartySdncRestData()); } /** @@ -205,6 +208,7 @@ public class SdncManager { return RestResponseUtil.getErrorResponse(error); } LOGGER.info(" add sdnc end !"); - return RestResponseUtil.getCreateSussceeResponse(new SdncRestData(sdncData)); +// return RestResponseUtil.getCreateSussceeResponse(new ThirdPartySdncRestData(sdncData)); + return RestResponseUtil.getCreateSussceeResponse(new ThirdPartySdncRestData()); } }