From e24a1b81a1e76d052be6d57995f18a1b7b7221ec Mon Sep 17 00:00:00 2001 From: luxin Date: Fri, 9 Mar 2018 15:28:51 +0800 Subject: Format these files Change-Id: I84e728438699f33748335d913df814a8d57279f1 Issue-ID: VFC-725 Signed-off-by: luxin --- .../vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgr.java | 1 - .../onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java | 7 +------ .../vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java | 1 - .../vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoa.java | 1 - 4 files changed, 1 insertion(+), 9 deletions(-) (limited to 'huawei/vnfmadapter/VnfmadapterService/service/src/main/java') diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgr.java index d0a06a25..1a93f281 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgr.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgr.java @@ -47,7 +47,6 @@ public class AuthMgr { restJson.put(Constant.RETCODE, Constant.REST_FAIL); try { String userName = params.getString(Constant.USERNAME); - restJson = getStatusResult(userName); } catch(JSONException e) { LOG.error("function=login, msg=Params error occurs, e={}.", e); diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java index 2e7e28ca..f90126c8 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java @@ -46,7 +46,7 @@ import net.sf.json.JSONObject; * auth tokens interface is provided by platform * not in nfvo for vnfm * differences from other interface - *

+ *

* * @author * @version VFC 1.0 Aug 24, 2016 @@ -91,16 +91,13 @@ public class AuthRoa { LOG.warn("authResult: {}", authResult); if(authResult.getInt(Constant.RETCODE) == Constant.REST_SUCCESS) { JSONObject data = authResult.getJSONObject("data"); - resp.setStatus(Constant.HTTP_OK); return data.toString(); } else if(authResult.getInt(Constant.RETCODE) == Constant.HTTP_INNERERROR) { Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(authResult.getString("data")).build(); - return String.format(ParamConstants.GET_TOKEN_FAIL_RESP, authResult.getString("data")); } else { Response.status(Response.Status.UNAUTHORIZED).entity(authResult.getString("data")).build(); - return String.format(ParamConstants.GET_TOKEN_FAIL_RESP, authResult.getString("data")); } } @@ -109,7 +106,6 @@ public class AuthRoa { * Provide interface for delete authInfo *
* - * @param context * @param userName * @param roarand * @return @@ -132,7 +128,6 @@ public class AuthRoa { * Provide interface for handshake authInfo *
* - * @param context * @param roattr * @return * @since VFC 1.0 diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java index 27a5ae3e..f0934c91 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java @@ -38,7 +38,6 @@ public class SwaggerRoa { /** * API doc. * - * @param filename * @return * @throws IOException */ diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoa.java index fe9f9530..6ad35f6a 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoa.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoa.java @@ -46,7 +46,6 @@ public class VnfAdapterResourceRoa { * Provide function of grant resource. *
* - * @param context * @return * @since VFC 1.0 */ -- cgit 1.2.3-korg