From 1a20d72df964ebb1fa5daa0b7be44bfc2857b34c Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Thu, 7 Aug 2025 20:54:46 +0200 Subject: [PATCH] Remove unused variables - remove unused variables Issue-ID: SO-4217 Signed-off-by: Fiete Ostkamp Change-Id: I8c34f2c45b36e0f594d49fee8215b0d0194660ee --- .../catalogdb/CatalogDbAdapterBaseTest.java | 5 +- .../catalogdb/catalogrest/ServiceMapperTest.java | 1 - .../onap/so/adapters/vnf/MsoVnfAdapterImpl.java | 3 - .../org/onap/so/adapters/vnf/VfRollbackTest.java | 7 +- .../org/onap/so/heatbridge/HeatBridgeImplTest.java | 2 - .../onap/so/adapters/sdnc/tasks/SDNCService.java | 3 - .../client/ApplicationControllerClient.java | 1 - .../service/ApplicationControllerTask.java | 3 - .../client/ApplicationControllerSupportTest.java | 4 +- .../tasks/BBInputSetupTest.java | 1 - .../so/bpmn/common/GenerateVfModuleNameIT.java | 15 +- .../so/bpmn/moi/tasks/AssignRANNssiBBTasks.java | 1 - .../moi/util/SliceProfileAaiToMoiMapperUtil.java | 1 - .../appc/tasks/AppcOrchestratorPreProcessor.java | 3 - .../workflow/tasks/WorkflowActionTest.java | 1 - common/clients/pom.xml | 237 ++++++++++----------- common/utils/pom.xml | 111 +++++----- .../java/org/onap/so/utils/ExternalTaskUtils.java | 2 +- .../onap/aaiclient/client/aai/AAIObjectType.java | 4 +- .../ManagedObject3gppServiceInstances.java | 1 - .../apihandlerinfra/OrchestrationRequestsTest.java | 7 - 21 files changed, 186 insertions(+), 227 deletions(-) diff --git a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/CatalogDbAdapterBaseTest.java b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/CatalogDbAdapterBaseTest.java index 2c0648ad66..97ae149a6c 100644 --- a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/CatalogDbAdapterBaseTest.java +++ b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/CatalogDbAdapterBaseTest.java @@ -20,6 +20,7 @@ package org.onap.so.adapters.catalogdb; +import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; @@ -39,7 +40,9 @@ public class CatalogDbAdapterBaseTest { protected int port; @Test - public void testNothing() {} + public void testNothing() { + assertTrue(true); + } @DynamicPropertySource static void configureProperties(DynamicPropertyRegistry registry) { diff --git a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/ServiceMapperTest.java b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/ServiceMapperTest.java index d46fd9c7ba..581c79372b 100644 --- a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/ServiceMapperTest.java +++ b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/ServiceMapperTest.java @@ -111,7 +111,6 @@ public class ServiceMapperTest { HeatTemplate moduleHeatTemplate = new HeatTemplate(); moduleHeatTemplate.setArtifactChecksum("artifactChecksum"); moduleHeatTemplate.setArtifactUuid("artifactUuid"); - List childTemplates; // moduleHeatTemplate.setChildTemplates(childTemplates); moduleHeatTemplate.setDescription("description"); Set parameters = new HashSet<>(); diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java index 92d1c5f684..8b7d1a1027 100644 --- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java +++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java @@ -375,9 +375,7 @@ public class MsoVnfAdapterImpl { logger.debug("orchestrating a VNF - *NOT* a module!"); requestTypeString = requestTypeString.substring(1); } - // let's parse out the request type we're being sent - boolean isBaseRequest = false; boolean isVolumeRequest = false; if (requestTypeString.startsWith("VOLUME")) { isVolumeRequest = true; @@ -478,7 +476,6 @@ public class MsoVnfAdapterImpl { logger.trace("Found vfModuleCust entry {}", vfmc.toString()); } if (vf.getIsBase()) { - isBaseRequest = true; logger.debug("This is a BASE VF request!"); } else { logger.debug("This is *not* a BASE VF request!"); diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/VfRollbackTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/VfRollbackTest.java index df2d798cda..3baafe6395 100644 --- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/VfRollbackTest.java +++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/VfRollbackTest.java @@ -4,9 +4,9 @@ * ================================================================================ 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. @@ -15,6 +15,7 @@ package org.onap.so.adapters.vnf; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import org.junit.Test; public class VfRollbackTest { @@ -61,6 +62,6 @@ public class VfRollbackTest { @Test public void testtoString() { - assert (vfRollback.toString() != null); + assertNotNull(vfRollback.toString()); } } diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/heatbridge/HeatBridgeImplTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/heatbridge/HeatBridgeImplTest.java index cf3e1c5ee1..1584503902 100644 --- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/heatbridge/HeatBridgeImplTest.java +++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/heatbridge/HeatBridgeImplTest.java @@ -723,7 +723,6 @@ public class HeatBridgeImplTest { when(port.getMacAddress()).thenReturn("78:4f:43:68:e2:78"); when(port.getNetworkId()).thenReturn("890a203a-23gg-56jh-df67-731656a8f13a"); when(port.getDeviceId()).thenReturn("test-device-id"); - String pfPciId = "0000:08:00.0"; Network network = mock(Network.class); when(network.getId()).thenReturn("test-network-id"); @@ -764,7 +763,6 @@ public class HeatBridgeImplTest { when(port.getMacAddress()).thenReturn("78:4f:43:68:e2:78"); when(port.getNetworkId()).thenReturn("890a203a-23gg-56jh-df67-731656a8f13a"); when(port.getDeviceId()).thenReturn(null); - String pfPciId = "0000:08:00.0"; Network network = mock(Network.class); when(network.getId()).thenReturn("test-network-id"); diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/tasks/SDNCService.java b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/tasks/SDNCService.java index 9343c968ba..503c2820c4 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/tasks/SDNCService.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/tasks/SDNCService.java @@ -45,9 +45,6 @@ public class SDNCService extends ExternalTaskUtils { @Autowired private RestTemplate restTemplate; - @Autowired - private Environment env; - private static final ObjectMapper objMapper = new ObjectMapper(); public SDNCService() { diff --git a/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerClient.java b/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerClient.java index 99b83f1de3..d7880e77be 100644 --- a/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerClient.java +++ b/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerClient.java @@ -154,7 +154,6 @@ public class ApplicationControllerClient { public Status runCommand(Action action, org.onap.appc.client.lcm.model.ActionIdentifiers actionIdentifiers, org.onap.appc.client.lcm.model.Payload payload, String requestID, ApplicationControllerCallback listener, String requestorId) throws ApplicationControllerOrchestratorException { - Status status; Object requestObject; requestObject = createRequest(action, actionIdentifiers, payload, requestID, requestorId); appCSupport.logLCMMessage(requestObject); diff --git a/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/service/ApplicationControllerTask.java b/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/service/ApplicationControllerTask.java index 2b5e4b2553..a27a82c39f 100644 --- a/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/service/ApplicationControllerTask.java +++ b/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/service/ApplicationControllerTask.java @@ -20,9 +20,6 @@ public class ApplicationControllerTask extends ExternalTaskUtils { private static final Logger logger = LoggerFactory.getLogger(ApplicationControllerTask.class); - @Autowired - public Environment env; - @Autowired public ApplicationControllerTaskImpl applicationControllerTaskImpl; diff --git a/adapters/so-appc-orchestrator/src/test/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerSupportTest.java b/adapters/so-appc-orchestrator/src/test/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerSupportTest.java index 2dd2fd7ac8..0c13deaa04 100644 --- a/adapters/so-appc-orchestrator/src/test/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerSupportTest.java +++ b/adapters/so-appc-orchestrator/src/test/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerSupportTest.java @@ -67,8 +67,8 @@ public class ApplicationControllerSupportTest { String errorMessage = "errormessage"; AppcClientException exception = new AppcClientException(errorMessage); Status status = applicationControllerSupport.buildStatusFromAppcException(exception); - assertThat(status.getCode() == 200); - assertThat((status.getMessage()).equals(("Exception on APPC request: " + errorMessage))); + assertThat(status.getCode()).isEqualTo(200); + assertThat(status.getMessage()).isEqualTo("Exception on APPC request: " + errorMessage); } private Status createStatus(int code) { diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java index bc751c3b3c..9ca60aad0d 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java @@ -2580,7 +2580,6 @@ public class BBInputSetupTest { requestAction, lookupKeyMap.get(ResourceKey.SERVICE_INSTANCE_ID)); doReturn(service).when(SPY_bbInputSetupUtils) .getCatalogServiceByModelUUID(gBB.getServiceInstance().getModelInfoServiceInstance().getModelUuid()); - String generatedId = "12131"; SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType); } diff --git a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/GenerateVfModuleNameIT.java b/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/GenerateVfModuleNameIT.java index ff0b318df9..74aff74bb4 100644 --- a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/GenerateVfModuleNameIT.java +++ b/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/GenerateVfModuleNameIT.java @@ -39,21 +39,8 @@ public class GenerateVfModuleNameIT extends BaseIntegrationTest { @Test public void TestGenerateVfModuleNameSuvvess() { - // - String request = - "" + EOL + " " + EOL - + " CREATE_VF_MODULE" + EOL + " PORTAL" + EOL - + " " + EOL + " " + EOL + " STMTN5MMSC22" - + EOL + " STMTN5MMSC22-MMSC::module-0-0" + EOL - + " MMSC::module-0" + EOL - + " 973ed047-d251-4fb9-bf1a-65b8949e0a73" + EOL - + " 1.0" + EOL - + " 00000000-0000-0000-0000-000000000000" + EOL - + " MDTWNJ21" + EOL - + " fba1bd1e195a404cacb9ce17a9b2b421" + EOL + " " + EOL - + " " + EOL - + "" + EOL; + // MockGetGenericVnfById(wireMockServer, ".*", "GenericFlows/getGenericVnfByNameResponse.xml"); RuntimeService runtimeService = processEngine.getRuntimeService(); Map variables = new HashMap(); diff --git a/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/tasks/AssignRANNssiBBTasks.java b/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/tasks/AssignRANNssiBBTasks.java index 6c22a16df0..51c94e5a97 100644 --- a/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/tasks/AssignRANNssiBBTasks.java +++ b/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/tasks/AssignRANNssiBBTasks.java @@ -268,7 +268,6 @@ public class AssignRANNssiBBTasks { // SliceProfile List sliceProfileList = new ArrayList(); - ServiceInstance serviceInstanceObj; List listOfNssiRelationship = serviceInstance.getRelationshipList().getRelationship(); List listOfNssiRelationshipAR = listOfNssiRelationship.stream() diff --git a/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/util/SliceProfileAaiToMoiMapperUtil.java b/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/util/SliceProfileAaiToMoiMapperUtil.java index cd83951fd6..196ece3028 100644 --- a/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/util/SliceProfileAaiToMoiMapperUtil.java +++ b/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/util/SliceProfileAaiToMoiMapperUtil.java @@ -47,7 +47,6 @@ public class SliceProfileAaiToMoiMapperUtil { String environmentContext = null; String serviceType = null; String operationalState = "LOCKED"; - String orchistrationStatus = "Assigned"; for (org.onap.so.moi.SliceProfile moiSliceProfile : moiRequestAttributes.getSliceProfileList()) { serviceInstanceLocationId = getPlmnId(moiSliceProfile.getPlmnInfoList().get(0).getPlmnId()); diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/appc/tasks/AppcOrchestratorPreProcessor.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/appc/tasks/AppcOrchestratorPreProcessor.java index 224924d12f..a5d23da144 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/appc/tasks/AppcOrchestratorPreProcessor.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/appc/tasks/AppcOrchestratorPreProcessor.java @@ -116,15 +116,12 @@ public class AppcOrchestratorPreProcessor { execution.setVariable("vserverIdList", null); execution.setVariable("vmIndex", 0); execution.setVariable("vmIdListSize", 0); - - String vfModuleId = null; VfModule vfModule = null; try { vfModule = extractPojosForBB.extractByKey(execution, ResourceKey.VF_MODULE_ID); } catch (BBObjectNotFoundException e) { } if (vfModule != null) { - vfModuleId = vfModule.getVfModuleId(); } if (action.equals(Action.Snapshot)) { try { diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java index a044944f29..c6015cd45c 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java @@ -2009,7 +2009,6 @@ public class WorkflowActionTest extends BaseTaskTest { @Test public void selectExecutionListMacroResumeTest() throws Exception { String gAction = "createInstance"; - String resource = "Service"; String bpmnRequest = readBpmnRequestFromFile(MACRO_ASSIGN_JSON); initExecution(gAction, bpmnRequest, false); execution.setVariable("requestUri", "v6/serviceInstances/123"); diff --git a/common/clients/pom.xml b/common/clients/pom.xml index 955a0491e6..fa7bbf9a77 100644 --- a/common/clients/pom.xml +++ b/common/clients/pom.xml @@ -1,125 +1,124 @@ - - 4.0.0 - - org.onap.so - common - 1.16.0-SNAPSHOT - + + 4.0.0 + + org.onap.so + common + 1.16.0-SNAPSHOT + - org.onap.so.common - clients + org.onap.so.common + clients - - 1.1.5 - 3.22.2 - 4.1.30.Final - + + 1.1.5 + 3.22.2 + 4.1.30.Final + - - - org.onap.so - utils - ${project.version} - - - org.onap.so - clients-base - ${project.version} - - - org.glassfish.jersey.core - jersey-client - - - org.glassfish.jersey.inject - jersey-hk2 - - - org.onap.ccsdk.cds.blueprintsprocessor.modules - blueprint-proto - ${ccsdk.version} - - - io.springfox - springfox-boot-starter - - - org.apache.kafka - kafka-clients - - - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - io.grpc - grpc-protobuf - ${grpc.version} - - - com.google.code.findbugs - jsr305 - - - - - io.grpc - grpc-netty - ${grpc.version} - - - org.apache.kafka - kafka-clients - ${kafka-clients.version} - - - uk.org.webcompere - system-stubs-jupiter - 1.1.0 - test - - - io.grpc - grpc-testing - ${grpc.version} - test - - - org.json - json - test - - - org.mockito - mockito-junit-jupiter - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.projectlombok - lombok - provided - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.vintage - junit-vintage-engine - test - - + + + org.onap.so + utils + ${project.version} + + + org.onap.so + clients-base + ${project.version} + + + org.glassfish.jersey.core + jersey-client + + + org.glassfish.jersey.inject + jersey-hk2 + + + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-proto + ${ccsdk.version} + + + io.springfox + springfox-boot-starter + + + org.apache.kafka + kafka-clients + + + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + io.grpc + grpc-protobuf + ${grpc.version} + + + com.google.code.findbugs + jsr305 + + + + + io.grpc + grpc-netty + ${grpc.version} + + + org.apache.kafka + kafka-clients + ${kafka-clients.version} + + + uk.org.webcompere + system-stubs-jupiter + 1.1.0 + test + + + io.grpc + grpc-testing + ${grpc.version} + test + + + org.json + json + test + + + org.mockito + mockito-junit-jupiter + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.projectlombok + lombok + provided + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.vintage + junit-vintage-engine + test + + diff --git a/common/utils/pom.xml b/common/utils/pom.xml index cfa5e5b765..ea656d39d8 100644 --- a/common/utils/pom.xml +++ b/common/utils/pom.xml @@ -1,61 +1,60 @@ - - 4.0.0 - - org.onap.so - common - 1.16.0-SNAPSHOT - + + 4.0.0 + + org.onap.so + common + 1.16.0-SNAPSHOT + - utils + utils - - - org.onap.so - logger - ${project.version} - - - com.jayway.jsonpath - json-path - 2.5.0 - - - com.sun.xml.bind - jaxb-core - 2.3.0 - - - com.sun.xml.bind - jaxb-impl - 2.3.0 - - - org.camunda.bpm - camunda-external-task-client - - - org.mockito - mockito-junit-jupiter - test - - - org.projectlombok - lombok - provided - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.vintage - junit-vintage-engine - test - - + + + org.onap.so + logger + ${project.version} + + + com.jayway.jsonpath + json-path + 2.5.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + + org.camunda.bpm + camunda-external-task-client + + + org.mockito + mockito-junit-jupiter + test + + + org.projectlombok + lombok + provided + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.vintage + junit-vintage-engine + test + + diff --git a/common/utils/src/main/java/org/onap/so/utils/ExternalTaskUtils.java b/common/utils/src/main/java/org/onap/so/utils/ExternalTaskUtils.java index d414135570..df9a175464 100644 --- a/common/utils/src/main/java/org/onap/so/utils/ExternalTaskUtils.java +++ b/common/utils/src/main/java/org/onap/so/utils/ExternalTaskUtils.java @@ -12,7 +12,7 @@ public abstract class ExternalTaskUtils { private static final Logger logger = LoggerFactory.getLogger(ExternalTaskUtils.class); @Autowired - Environment env; + protected Environment env; private final RetrySequenceLevel retrySequenceLevel; diff --git a/graph-inventory/aai-fluent-uri-builder/src/main/java/org/onap/aaiclient/client/aai/AAIObjectType.java b/graph-inventory/aai-fluent-uri-builder/src/main/java/org/onap/aaiclient/client/aai/AAIObjectType.java index ec8538d9eb..08814a0cb9 100644 --- a/graph-inventory/aai-fluent-uri-builder/src/main/java/org/onap/aaiclient/client/aai/AAIObjectType.java +++ b/graph-inventory/aai-fluent-uri-builder/src/main/java/org/onap/aaiclient/client/aai/AAIObjectType.java @@ -29,11 +29,11 @@ import java.util.regex.Pattern; import org.onap.aai.annotations.Metadata; import org.onap.aaiclient.client.graphinventory.GraphInventoryObjectName; import org.onap.aaiclient.client.graphinventory.GraphInventoryObjectType; -import org.onap.aaiclient.client.aai.entities.uri.AAIFluentTypeReverseLookup; import org.reflections.Reflections; import org.reflections.scanners.SubTypesScanner; import org.reflections.util.ClasspathHelper; import org.reflections.util.ConfigurationBuilder; +import org.onap.aaiclient.client.aai.entities.uri.AAIFluentTypeReverseLookup; import com.google.common.base.CaseFormat; /** @@ -76,9 +76,7 @@ public class AAIObjectType implements AAIObjectBase, AAIObjectName, GraphInvento java.util.Collection packages = ClasspathHelper.forPackage(""); Reflections r = new Reflections(new ConfigurationBuilder().setUrls(packages).setScanners(new SubTypesScanner())); - Set> resources = r.getSubTypesOf(AAIObjectType.class); - for (Class customTypeClass : resources) { AAIObjectType customType; try { diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManagedObject3gppServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManagedObject3gppServiceInstances.java index 505ad09cc7..8a33f89ba0 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManagedObject3gppServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManagedObject3gppServiceInstances.java @@ -446,7 +446,6 @@ public class ManagedObject3gppServiceInstances { InfraActiveRequests aq = new InfraActiveRequests(); try { String serviceInstanceName = null; - String serviceInstanceId = null; if (action.name().equals("ranSlice")) { serviceInstanceName = "ran_nssi_" + requestId; aq.setServiceInstanceName(serviceInstanceName); diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java index 54e09ef615..1505e23a28 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java @@ -435,15 +435,8 @@ public class OrchestrationRequestsTest extends BaseTest { HttpEntity entity = new HttpEntity(requestJSON, headers); UriComponentsBuilder builder; - ResponseEntity response; - Request request; - - // Test valid status - request = ORCHESTRATION_LIST.getRequestList().get(1).getRequest(); builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort( "/onap/so/infra/orchestrationRequests/v7/" + "5ffbabd6-b793-4377-a1ab-082670fbc7ac" + "/unlock")); - - response = restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class); // Cannot assert anything further here, already have a wiremock in place // which ensures that the post was // properly called to update. -- 2.16.6