aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris André <chris.andre@yoppworks.com>2020-04-24 19:43:18 -0400
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-05-17 07:22:34 +0000
commitbd98f6033c9dddb50507c04ff70095955c346273 (patch)
tree93f86751bde53e433d6d42e9b5c65c827223a8a4
parent3309283afc95e598a90461ad44d937f94b33cbfe (diff)
Work around potential NullPointerExceptions in ComponentInstanceOperation
- Rewrite of `updateAttributeValueInResourceInstance` Issue-ID: SDC-2923 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I1becdec8c10515976835e7d8fb0208b9cbad10bb
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperation.java73
1 files changed, 37 insertions, 36 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperation.java
index 38ce067ee5..4284afea0f 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperation.java
@@ -20,6 +20,7 @@
package org.openecomp.sdc.be.model.operations.impl;
+import fj.F;
import org.janusgraph.core.JanusGraph;
import org.janusgraph.core.JanusGraphVertex;
import fj.data.Either;
@@ -261,8 +262,6 @@ public class ComponentInstanceOperation extends AbstractOperation {
* @return
*/
private Either<AttributeValueData, JanusGraphOperationStatus> updateAttributeOfResourceInstance(ComponentInstanceProperty resourceInstanceAttribute, String resourceInstanceId) {
-
- Either<AttributeValueData, JanusGraphOperationStatus> result = null;
Wrapper<JanusGraphOperationStatus> errorWrapper = new Wrapper<>();
UpdateDataContainer<AttributeData, AttributeValueData> updateDataContainer = new UpdateDataContainer<>(GraphEdgeLabels.ATTRIBUTE_IMPL, (() -> AttributeData.class), (() -> AttributeValueData.class), NodeTypeEnum.Attribute,
NodeTypeEnum.AttributeValue);
@@ -271,20 +270,13 @@ public class ComponentInstanceOperation extends AbstractOperation {
AttributeValueData attributeValueData = updateDataContainer.getValueDataWrapper().getInnerElement();
attributeValueData.setHidden(resourceInstanceAttribute.isHidden());
attributeValueData.setValue(resourceInstanceAttribute.getValue());
- Either<AttributeValueData, JanusGraphOperationStatus> updateRes = janusGraphGenericDao
- .updateNode(attributeValueData, AttributeValueData.class);
- if (updateRes.isRight()) {
- JanusGraphOperationStatus status = updateRes.right().value();
- errorWrapper.setInnerElement(status);
- } else {
- result = Either.left(updateRes.left().value());
- }
- }
- if (!errorWrapper.isEmpty()) {
- result = Either.right(errorWrapper.getInnerElement());
- }
- return result;
+ return janusGraphGenericDao.updateNode(
+ attributeValueData, AttributeValueData.class
+ );
+ } else {
+ return Either.right(errorWrapper.getInnerElement());
+ }
}
private Either<AttributeValueData, JanusGraphOperationStatus> addAttributeToResourceInstance(ComponentInstanceProperty attributeInstanceProperty, String resourceInstanceId, Integer index) {
@@ -587,32 +579,41 @@ public class ComponentInstanceOperation extends AbstractOperation {
return new ComponentInstanceProperty(hidden, resourceInstanceAttribute, uid);
}
- public Either<ComponentInstanceProperty, StorageOperationStatus> updateAttributeValueInResourceInstance(ComponentInstanceProperty resourceInstanceAttribute, String resourceInstanceId, boolean inTransaction) {
-
+ public Either<ComponentInstanceProperty, StorageOperationStatus> updateAttributeValueInResourceInstance(
+ ComponentInstanceProperty resourceInstanceAttribute,
+ String resourceInstanceId,
+ boolean inTransaction
+ ) {
+ //TODO This null could bubble up. Shouldn't we set a default value (such as Either.left(StorageOperationStatus.GENERAL_ERROR)) ?
Either<ComponentInstanceProperty, StorageOperationStatus> result = null;
-
try {
- Either<AttributeValueData, JanusGraphOperationStatus> eitherAttributeValue = updateAttributeOfResourceInstance(resourceInstanceAttribute, resourceInstanceId);
-
- if (eitherAttributeValue.isRight()) {
- log.error("Failed to add attribute value {} to resource instance {} in Graph. status is {}", resourceInstanceAttribute, resourceInstanceId, eitherAttributeValue.right().value().name());
- result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(eitherAttributeValue.right().value()));
- return result;
- } else {
- AttributeValueData attributeValueData = eitherAttributeValue.left().value();
-
- ComponentInstanceProperty attributeValueResult = buildResourceInstanceAttribute(attributeValueData, resourceInstanceAttribute);
- log.debug("The returned ResourceInstanceAttribute is {}", attributeValueResult);
-
- result = Either.left(attributeValueResult);
- return result;
- }
- }
-
- finally {
+ result = updateAttributeOfResourceInstance(resourceInstanceAttribute, resourceInstanceId)
+ .bimap(
+ buildResourceInstanceAttribute(resourceInstanceAttribute),
+ handleFailedAttributeAdditionError(resourceInstanceAttribute, resourceInstanceId));
+ } finally {
handleTransactionCommitRollback(inTransaction, result);
}
+ return result;
+ }
+
+ private F<JanusGraphOperationStatus, StorageOperationStatus> handleFailedAttributeAdditionError(
+ ComponentInstanceProperty resourceInstanceAttribute, String resourceInstanceId) {
+ return status -> {
+ log.error("Failed to add attribute value {} to resource instance {} in Graph. status is {}",
+ resourceInstanceAttribute, resourceInstanceId, status.name());
+ return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
+ };
+ }
+ private F<AttributeValueData, ComponentInstanceProperty> buildResourceInstanceAttribute(
+ ComponentInstanceProperty resourceInstanceAttribute) {
+ return attributeValueData -> {
+ ComponentInstanceProperty attributeValueResult =
+ buildResourceInstanceAttribute(attributeValueData, resourceInstanceAttribute);
+ log.debug("The returned ResourceInstanceAttribute is {}", attributeValueResult);
+ return attributeValueResult;
+ };
}
public Either<ComponentInstanceInput, StorageOperationStatus> addInputValueToResourceInstance(ComponentInstanceInput resourceInstanceInput, String resourceInstanceId, Integer index, boolean inTransaction) {