From 3baea8e7e5ac5039d27ecd2d504f4ea24034f730 Mon Sep 17 00:00:00 2001 From: Rupinder Date: Mon, 1 Jun 2020 14:27:56 +0530 Subject: [PATCH] lower code smells Issue-ID: APPC-1859 Change-Id: I6d0a7563199355a446345f568415a78856c0cfa6 Signed-off-by: Rupinder --- .../onap/appc/requesthandler/impl/RequestValidatorImpl.java | 10 +++++----- .../appc/interfaces/service/InterfacesServiceProviderImpl.java | 4 ++-- .../interfaces/service/executorImpl/ServiceExecutorImpl.java | 10 +++++----- .../src/main/java/org/onap/appc/oam/AppcOam.java | 1 - .../onap/appc/seqgen/provider/SequenceGeneratorProvider.java | 2 +- .../org/onap/appc/listener/LCM/model/DmaapIncomingMessage.java | 2 +- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/RequestValidatorImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/RequestValidatorImpl.java index 6605d1e83..5e43d39a4 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/RequestValidatorImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/RequestValidatorImpl.java @@ -434,12 +434,12 @@ public class RequestValidatorImpl extends AbstractRequestValidatorImpl { return vnfContext; } - private SvcLogicContext getVnfdata(String vnf_id, String prefix, SvcLogicContext ctx) throws VNFNotFoundException { + private SvcLogicContext getVnfdata(String vnfId, String prefix, SvcLogicContext ctx) throws VNFNotFoundException { if (logger.isTraceEnabled()) { - logger.trace("Entering to getVnfdata with vnfid = " + ObjectUtils.toString(vnf_id) + ", prefix = " + logger.trace("Entering to getVnfdata with vnfid = " + ObjectUtils.toString(vnfId) + ", prefix = " + ObjectUtils.toString(prefix) + ", SvcLogicContext" + ObjectUtils.toString(ctx)); } - String key = "vnf-id = '" + vnf_id + "'"; + String key = "vnf-id = '" + vnfId + "'"; logger.debug("inside getVnfdata=== " + key); try { Date beginTimestamp = new Date(); @@ -452,9 +452,9 @@ public class RequestValidatorImpl extends AbstractRequestValidatorImpl { LoggingConstants.TargetNames.AAI, LoggingConstants.TargetServiceNames.AAIServiceNames.QUERY, status, "", response.name(), this.getClass().getCanonicalName()); if (SvcLogicResource.QueryStatus.NOT_FOUND.equals(response)) { - throw new VNFNotFoundException("VNF not found for vnf_id = " + vnf_id, vnf_id); + throw new VNFNotFoundException("VNF not found for vnf_id = " + vnfId, vnfId); } else if (SvcLogicResource.QueryStatus.FAILURE.equals(response)) { - throw new RuntimeException("Error Querying AAI with vnfID = " + vnf_id); + throw new RuntimeException("Error Querying AAI with vnfID = " + vnfId); } logger.info("AAIResponse: " + response.toString()); } catch (SvcLogicException e) { diff --git a/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/InterfacesServiceProviderImpl.java b/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/InterfacesServiceProviderImpl.java index ba05de733..22822d89e 100644 --- a/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/InterfacesServiceProviderImpl.java +++ b/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/InterfacesServiceProviderImpl.java @@ -50,7 +50,7 @@ public class InterfacesServiceProviderImpl implements InterfacesServiceService{ log.info("Received Request: " + input.getRequest().getRequestId() + " Action : " + input.getRequest().getAction() + " with RequestData :" + input.getRequest().getRequestData() + " and data-Type : " + input.getRequest().getRequestDataType()); - String request_id = input.getRequest().getRequestId(); + String requestId = input.getRequest().getRequestId(); String action = input.getRequest().getAction(); ResponseInfoBuilder responseInfoBuilder = new ResponseInfoBuilder(); ExecuteServiceOutputBuilder executeServicebuilder = new ExecuteServiceOutputBuilder(); @@ -59,7 +59,7 @@ public class InterfacesServiceProviderImpl implements InterfacesServiceService{ try{ String response = serviceExecutor.execute(action, input.getRequest().getRequestData(), input.getRequest().getRequestDataType()); responseInfoBuilder.setBlock(response); - responseInfoBuilder.setRequestId(request_id); + responseInfoBuilder.setRequestId(requestId); statusBuilder.setCode("400"); statusBuilder.setMessage("success"); } diff --git a/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/executorImpl/ServiceExecutorImpl.java b/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/executorImpl/ServiceExecutorImpl.java index f82402f45..405dfcfef 100644 --- a/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/executorImpl/ServiceExecutorImpl.java +++ b/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/executorImpl/ServiceExecutorImpl.java @@ -92,8 +92,8 @@ public class ServiceExecutorImpl { AaiService aaiService = getAaiService(aaiClient); SvcLogicContext ctx = getSvcLogicContext(); - Map params = new HashMap(); - List inProgressVServerIds = new ArrayList(); + Map params = new HashMap<>(); + List inProgressVServerIds = new ArrayList<>(); String currentVnfcVserverId = new String(); String currentRequestVnfcName = scopeOverlap.getCurrentRequest().getActionIdentifiers().getVnfcName(); String currentRequestVServerId = scopeOverlap.getCurrentRequest().getActionIdentifiers().getvServerId(); @@ -101,10 +101,10 @@ public class ServiceExecutorImpl { params.put("vnfId", scopeOverlap.getVnfId()); try { aaiService.getGenericVnfInfo(params, ctx); - int vm_count = Integer.parseInt(ctx.getAttribute("vm-count")); + int vmCount = Integer.parseInt(ctx.getAttribute("vm-count")); for(Request inprogressRequest:inProgressRequests){ if(inprogressRequest.getActionIdentifiers().getVnfcName() != null){ - for (int i = 0; i < vm_count; i++) { + for (int i = 0; i < vmCount; i++) { if (ctx.getAttribute("vm[" + i + "].vnfc-name") != null && ctx.getAttribute("vm[" + i + "].vnfc-name") .equals(inprogressRequest.getActionIdentifiers().getVnfcName())) { String newInProgressVserverId = ctx.getAttribute("vm[" + i + "].vserver-id"); @@ -118,7 +118,7 @@ public class ServiceExecutorImpl { if(inProgVserverIds.getActionIdentifiers().getvServerId() != null) inProgressVServerIds.add(inProgVserverIds.getActionIdentifiers().getvServerId()); if(currentRequestVnfcName != null){ - for (int i = 0; i < vm_count; i++) { + for (int i = 0; i < vmCount; i++) { if (ctx.getAttribute("vm[" + i + "].vnfc-name") != null && ctx.getAttribute("vm[" + i + "].vnfc-name") .equals(currentRequestVnfcName)) { currentVnfcVserverId = ctx.getAttribute("vm[" + i + "].vserver-id"); diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/AppcOam.java b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/AppcOam.java index 50c6d49c7..1f7c98911 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/AppcOam.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/AppcOam.java @@ -80,7 +80,6 @@ import org.onap.appc.statemachine.impl.readers.AppcOamMetaDataReader.AppcOperati import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.concurrent.Future; /** * RPC class of APP-C OAM API. diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/onap/appc/seqgen/provider/SequenceGeneratorProvider.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/onap/appc/seqgen/provider/SequenceGeneratorProvider.java index 777053698..cc7a144e1 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/onap/appc/seqgen/provider/SequenceGeneratorProvider.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/onap/appc/seqgen/provider/SequenceGeneratorProvider.java @@ -89,7 +89,7 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato protected BindingAwareBroker.RpcRegistration rpcRegistration; private final EELFLogger log = EELFManager.getInstance().getLogger(SequenceGeneratorProvider.class); private final ExecutorService executor; - private final static String APP_NAME = "SequenceGeneratorProvider"; + private static final String APP_NAME = "SequenceGeneratorProvider"; public SequenceGeneratorProvider(DataBroker dataBroker2, NotificationPublishService notificationProviderService, RpcProviderRegistry rpcRegistry2) { diff --git a/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/model/DmaapIncomingMessage.java b/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/model/DmaapIncomingMessage.java index 8b45e4b28..91d3ede03 100644 --- a/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/model/DmaapIncomingMessage.java +++ b/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/model/DmaapIncomingMessage.java @@ -33,7 +33,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class DmaapIncomingMessage extends DmaapMessage{ - private final static String defaultCambriaPartition = "APP-C"; + private static final String defaultCambriaPartition = "APP-C"; public DmaapIncomingMessage() { super(); -- 2.16.6