diff options
Diffstat (limited to 'mso-api-handlers/mso-api-handler-infra/src/main')
4 files changed, 21 insertions, 24 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java index ba69355d5e..9e92c293bf 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java @@ -165,13 +165,11 @@ public class OrchestrationRequests { @QueryParam("includeCloudRequest") boolean includeCloudRequest, @QueryParam(value = "format") String format) throws ApiException { - long startTime = System.currentTimeMillis(); - MultivaluedMap<String, String> queryParams = ui.getQueryParameters(); - List<InfraActiveRequests> activeRequests = null; + List<InfraActiveRequests> activeRequests; - GetOrchestrationListResponse orchestrationList = null; + GetOrchestrationListResponse orchestrationList; Map<String, List<String>> orchestrationMap; String apiVersion = version.substring(1); @@ -222,12 +220,10 @@ public class OrchestrationRequests { public Response unlockOrchestrationRequest(String requestJSON, @PathParam("requestId") String requestId, @PathParam("version") String version) throws ApiException { - long startTime = System.currentTimeMillis(); logger.debug("requestId is: {}", requestId); - ServiceInstancesRequest sir = null; + ServiceInstancesRequest sir; - InfraActiveRequests infraActiveRequest = null; - Request request = null; + InfraActiveRequests infraActiveRequest; try { ObjectMapper mapper = new ObjectMapper(); diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java index bba8064f7c..b57bb5d1d8 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java @@ -4,6 +4,8 @@ * ================================================================================ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Modifications Copyright (c) 2019 Samsung + * ================================================================================ * 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 @@ -91,13 +93,13 @@ public class WorkflowSpecificationsHandler { List<Workflow> workflows = catalogDbClient.findWorkflowByModelUUID(vnfModelVersionId); List<Workflow> nativeWorkflows = catalogDbClient.findWorkflowBySource(NATIVE_WORKFLOW); - if (nativeWorkflows != null && nativeWorkflows.size() != 0) { + if (nativeWorkflows != null && !nativeWorkflows.isEmpty()) { workflows.addAll(nativeWorkflows); } WorkflowSpecifications workflowSpecifications = mapWorkflowsToWorkflowSpecifications(workflows); - String jsonResponse = null; + String jsonResponse; try { ObjectMapper mapper = new ObjectMapper(); jsonResponse = mapper.writeValueAsString(workflowSpecifications); @@ -116,11 +118,11 @@ public class WorkflowSpecificationsHandler { } protected WorkflowSpecifications mapWorkflowsToWorkflowSpecifications(List<Workflow> workflows) { - if (workflows == null || workflows.size() == 0) { + if (workflows == null || workflows.isEmpty()) { return null; } WorkflowSpecifications workflowSpecifications = new WorkflowSpecifications(); - List<WorkflowSpecificationList> workflowSpecificationList = new ArrayList<WorkflowSpecificationList>(); + List<WorkflowSpecificationList> workflowSpecificationList = new ArrayList<>(); for (Workflow workflow : workflows) { WorkflowSpecificationList workflowSpecificationListItem = new WorkflowSpecificationList(); @@ -153,10 +155,10 @@ public class WorkflowSpecificationsHandler { private List<ActivitySequence> buildActivitySequence(Workflow workflow) { List<WorkflowActivitySpecSequence> workflowActivitySpecSequences = workflow.getWorkflowActivitySpecSequence(); - if (workflowActivitySpecSequences == null || workflowActivitySpecSequences.size() == 0) { + if (workflowActivitySpecSequences == null || workflowActivitySpecSequences.isEmpty()) { return null; } - List<ActivitySequence> activitySequences = new ArrayList<ActivitySequence>(); + List<ActivitySequence> activitySequences = new ArrayList<>(); for (WorkflowActivitySpecSequence workflowActivitySpecSequence : workflowActivitySpecSequences) { if (workflowActivitySpecSequence != null) { ActivitySpec activitySpec = workflowActivitySpecSequence.getActivitySpec(); @@ -174,17 +176,17 @@ public class WorkflowSpecificationsHandler { private List<WorkflowInputParameter> buildWorkflowInputParameters(Workflow workflow) { List<WorkflowActivitySpecSequence> workflowActivitySpecSequences = workflow.getWorkflowActivitySpecSequence(); - if (workflowActivitySpecSequences == null || workflowActivitySpecSequences.size() == 0) { - return new ArrayList<WorkflowInputParameter>(); + if (workflowActivitySpecSequences == null || workflowActivitySpecSequences.isEmpty()) { + return new ArrayList<>(); } - Map<String, WorkflowInputParameter> workflowInputParameterMap = new HashMap<String, WorkflowInputParameter>(); + Map<String, WorkflowInputParameter> workflowInputParameterMap = new HashMap<>(); for (WorkflowActivitySpecSequence workflowActivitySpecSequence : workflowActivitySpecSequences) { if (workflowActivitySpecSequence != null) { ActivitySpec activitySpec = workflowActivitySpecSequence.getActivitySpec(); if (activitySpec != null) { List<ActivitySpecUserParameters> activitySpecUserParameters = activitySpec.getActivitySpecUserParameters(); - if (activitySpecUserParameters != null && activitySpecUserParameters.size() != 0) { + if (activitySpecUserParameters != null && !activitySpecUserParameters.isEmpty()) { for (ActivitySpecUserParameters activitySpecUserParameter : activitySpecUserParameters) { UserParameters userParameter = activitySpecUserParameter.getUserParameters(); if (userParameter != null) { @@ -199,7 +201,7 @@ public class WorkflowSpecificationsHandler { } if (workflowInputParameterMap.size() == 0) { - return new ArrayList<WorkflowInputParameter>(); + return new ArrayList<>(); } List<WorkflowInputParameter> workflowInputParameterList = workflowInputParameterMap.values().stream().collect(Collectors.toList()); @@ -220,7 +222,7 @@ public class WorkflowSpecificationsHandler { private List<Validation> buildValidationList(UserParameters userParameter) { List<Validation> validationList = null; if (userParameter.getMaxLength() != null || userParameter.getAllowableChars() != null) { - validationList = new ArrayList<Validation>(); + validationList = new ArrayList<>(); Validation validation = new Validation(); if (userParameter.getMaxLength() != null) { validation.setMaxLength(userParameter.getMaxLength().toString()); diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequest.java index b2933df030..216588432b 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequest.java @@ -75,8 +75,7 @@ public class ModelDistributionRequest { @Transactional public Response updateModelDistributionStatus(String requestJSON, @PathParam("version") String version, @PathParam("distributionId") String distributionId) throws ApiException { - long startTime = System.currentTimeMillis(); - Distribution distributionRequest = null; + Distribution distributionRequest; try { ObjectMapper mapper = new ObjectMapper(); @@ -146,7 +145,7 @@ public class ModelDistributionRequest { } re.setServiceException(se); - String requestErrorStr = null; + String requestErrorStr; try { ObjectMapper mapper = new ObjectMapper(); mapper.setSerializationInclusion(Include.NON_DEFAULT); diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironment.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironment.java index fe81a07212..5eb4a67fa6 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironment.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironment.java @@ -145,7 +145,7 @@ public class CreateVnfOperationalEnvironment { throws TenantIsolationException { List<ServiceEndPoint> endpointList = serviceEndPointList.getServiceEndPointList(); logger.debug("Number of service endpoints from GRM: {}", endpointList.size()); - List<ServiceEndPointRequest> serviceEndPointRequestList = new ArrayList<ServiceEndPointRequest>(); + List<ServiceEndPointRequest> serviceEndPointRequestList = new ArrayList<>(); for (ServiceEndPoint serviceEndpoint : endpointList) { serviceEndPointRequestList.add(buildServiceEndpoint(serviceEndpoint)); } |