From 2ef3886c9b0223f4813ac1385318d6f2e600a4a8 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Mon, 30 Apr 2018 19:06:20 +0300 Subject: Remove dead code asdctool Change-Id: I467f70b442a02a15b8a18b160309bac9a8ab3f9a Issue-ID: SDC-1270 Signed-off-by: Tal Gitelman --- .../be/components/impl/ComponentInstanceBusinessLogic.java | 4 ---- .../openecomp/sdc/be/components/impl/GroupBusinessLogic.java | 5 ----- .../sdc/be/components/impl/ResourceBusinessLogic.java | 5 ----- .../sdc/be/components/lifecycle/LifecycleBusinessLogic.java | 12 ------------ 4 files changed, 26 deletions(-) (limited to 'catalog-be/src/main/java') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java index 2eca73c560..9d9d00818c 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java @@ -1390,10 +1390,6 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic { && ComponentTypeEnum.SERVICE == componentTypeEnum; } - private StorageOperationStatus concatServiceNameToVLINetworkRolePropertyValue(ToscaOperationFacade toscaOperationFacade, ComponentTypeEnum componentTypeEnum, String componentId, String resourceInstanceId, ComponentInstanceProperty property) { - return concatServiceNameToVLINetworkRolePropertiesValues(toscaOperationFacade, componentTypeEnum, componentId, resourceInstanceId, Arrays.asList(property)); - } - // US833308 VLI in service - specific network_role property value logic private StorageOperationStatus concatServiceNameToVLINetworkRolePropertiesValues(ToscaOperationFacade toscaOperationFacade, ComponentTypeEnum componentTypeEnum, String componentId, String resourceInstanceId, List properties) { for (ComponentInstanceProperty property: properties) { diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogic.java index 63b72b932e..a2fd6c4953 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogic.java @@ -1465,11 +1465,6 @@ public class GroupBusinessLogic extends BaseBusinessLogic { component.getComponentType().toString()); } - private Boolean onFailedToLockComponent(ResponseFormat responseFormat) { - throw new ComponentException(responseFormat); - } - - public Either, ResponseFormat> createGroups(Component component, final List groupDefinitions) { Map groups = new HashMap<>(); diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java index bbdb14f1c8..bac9bb62a5 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java @@ -4816,11 +4816,6 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { } } - private void auditCreateResource(User user, Resource persistedResource, AuditingActionEnum actionEnum) { - ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.CREATED); - componentsUtils.auditResource(responseFormat, user, persistedResource, actionEnum); - } - private Either createResourceTransaction(Resource resource, User user, boolean isNormative, boolean inTransaction) { // validate resource name uniqueness diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java index 75b0bd934a..5e65edecbb 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java @@ -344,18 +344,6 @@ public class LifecycleBusinessLogic { return Either.left(eitherResourceResponse.left().value()); } - private Either validateHighestVersion(User modifier, LifeCycleTransition lifeCycleTransition, Resource resource, String resourceCurrVersion) { - ResponseFormat errorResponse; - if (!resource.isHighestVersion()) { - log.debug("resource version {} is not the last version of resource {}", resource.getVersion(), resource.getName()); - errorResponse = componentUtils.getResponseFormat(ActionStatus.COMPONENT_HAS_NEWER_VERSION, resource.getName(), ComponentTypeEnum.RESOURCE.name().toLowerCase()); - componentUtils.auditResource(errorResponse, modifier, resource, lifeCycleTransition.getAuditingAction(), ResourceAuditData.newBuilder() - .state(resource.getLifecycleState().name()).version(resourceCurrVersion).build()); - return Either.right(errorResponse); - } - return Either.left(true); - } - private Either validateHighestVersion(User modifier, LifeCycleTransition lifeCycleTransition, Component component, String resourceCurrVersion, ComponentTypeEnum componentType) { ResponseFormat errorResponse; if (!component.isHighestVersion()) { -- cgit 1.2.3-korg