From 0417da35628c007d8ee70825d1d177443f901600 Mon Sep 17 00:00:00 2001 From: Rich Tabedzki Date: Tue, 20 Mar 2018 14:21:40 +0000 Subject: Improve code metrics in AAIService module Changes made: * Created unit test cases for classes that did not have coverage JUnit test yet created Change-Id: I0ce02a1f2e48909e44dde691bb56371da09ad834 Issue-ID: CCSDK-149 Signed-off-by: Rich Tabedzki --- .../sli/adaptors/aai/AAIClientRESTExecutor.java | 2 +- .../ccsdk/sli/adaptors/aai/AAIDeclarations.java | 11 -- .../onap/ccsdk/sli/adaptors/aai/AAIService.java | 2 +- .../ccsdk/sli/adaptors/aai/GenericVnfRequest.java | 144 --------------------- 4 files changed, 2 insertions(+), 157 deletions(-) delete mode 100644 aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfRequest.java (limited to 'aai-service/provider/src/main') diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java index 906cd8386..b6eacb7af 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java @@ -722,7 +722,7 @@ public class AAIClientRESTExecutor implements AAIExecutorInterface { } public void logMetricResponse(int responseCode, String responseDescription){ - ml.logResponse(responseCode < 400 ? "SUCCESS" : "FAILURE", Integer.toString(responseCode), responseDescription); + ml.logResponse(responseCode < 400 ? "COMPLETE" : "ERROR", Integer.toString(responseCode), responseDescription); } protected void LOGwriteFirstTrace(String method, String url) { diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java index d1b148d5a..1df3cce45 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java @@ -721,17 +721,6 @@ public abstract class AAIDeclarations implements AAIClient { if(!itemRemoved) return QueryStatus.NOT_FOUND; - -// AAIRequest masterRequest = new GenericVnfRequest(); -// masterRequest.addRequestProperty(GenericVnfRequest.VNF_ID, vnfId); -// relationshipRequest.addMasterRequest(masterRequest); -// Map attributes = objectToProperties(vnf); -// try { -// Boolean result = getExecutor().delete(relationshipRequest, attributes.get(AAIRequest.RESOURCE_VERSION)); -// } catch (AAIServiceException e) { -// return QueryStatus.FAILURE; -// } - try { this.postGenericVnfData(vnf.getVnfId(), vnf); } catch (AAIServiceException exc) { diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java index 9e6e60f94..1e2940ca9 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java @@ -1344,7 +1344,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe } public void logMetricResponse(String requestId, int responseCode, String responseDescription){ - ml.logResponse(responseCode < 400 ? "SUCCESS" : "FAILURE", Integer.toString(responseCode), responseDescription); + ml.logResponse(responseCode < 400 ? "COMPLETE" : "ERROR", Integer.toString(responseCode), responseDescription); } public void logKeyError(String keys){ diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfRequest.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfRequest.java deleted file mode 100644 index 7aabb8dc7..000000000 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfRequest.java +++ /dev/null @@ -1,144 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * 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. - * ============LICENSE_END========================================================= - */ - -package org.onap.ccsdk.sli.adaptors.aai; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Properties; - -import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; -import org.openecomp.aai.inventory.v11.GenericVnf; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -public class GenericVnfRequest extends AAIRequest { - - // tenant (1602) - public static final String GENERIC_VNF_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf"; - public static final String GENERIC_VNF_QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf.query"; - - private final String generic_vnf_path; - private final String generic_vnf_query_path; - - public static final String GENERIC_VNF_ID = "generic_vnf.vnf_id"; - public static final String VNF_ID = "vnf_id"; - - - public GenericVnfRequest() { - generic_vnf_path = configProperties.getProperty(GENERIC_VNF_PATH); - generic_vnf_query_path = configProperties.getProperty(GENERIC_VNF_QUERY_PATH); - } - - - @Override - public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = targetUri+generic_vnf_path; - String key = VNF_ID; - if(requestProperties.containsKey(GENERIC_VNF_ID)) { - key = GENERIC_VNF_ID; - } - - if(!requestProperties.containsKey(key)) { - aaiService.logKeyError(String.format("%s,%s", VNF_ID, GENERIC_VNF_ID)); - } - - String encoded_vnf = encodeQuery(requestProperties.getProperty(key)); - request_url = request_url.replace("{vnf-id}", encoded_vnf) ; - if(resourceVersion != null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - aaiService.LOGwriteDateTrace("vnf-id", requestProperties.getProperty(key)); - - return http_req_url; - } - - @Override - public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = targetUri+generic_vnf_path; - - String key = VNF_ID; - if(requestProperties.containsKey(GENERIC_VNF_ID)) { - key = GENERIC_VNF_ID; - } - - if(!requestProperties.containsKey(key)) { - aaiService.logKeyError(String.format("%s,%s", VNF_ID, GENERIC_VNF_ID)); - } - - String encoded_vnf = encodeQuery(requestProperties.getProperty(key)); - request_url = request_url.replace("{vnf-id}", encoded_vnf) ; - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - aaiService.LOGwriteDateTrace("vnf-id", requestProperties.getProperty(key)); - - return http_req_url; - } - - - @Override - public String toJSONString() { - ObjectMapper mapper = getObjectMapper(); - GenericVnf tenant = (GenericVnf)requestDatum; - String json_text = null; - try { - json_text = mapper.writeValueAsString(tenant); - } catch (JsonProcessingException exc) { - handleException(this, exc); - return null; - } - return json_text; - } - - - @Override - public String[] getArgsList() { - String[] args = {VNF_ID, GENERIC_VNF_ID}; - return args; - } - - - @Override - public Class getModelClass() { - return GenericVnf.class; - } - - - public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException { - - String key = VNF_ID; - if(requestProperties.containsKey(GENERIC_VNF_ID)) { - key = GENERIC_VNF_ID; - } - String encoded_vnf = encodeQuery(requestProperties.getProperty(key)); - request_url = request_url.replace("{vnf-id}", encoded_vnf) ; - - return request_url; - } -} -- cgit 1.2.3-korg