diff options
author | 2021-06-18 19:12:12 +0000 | |
---|---|---|
committer | 2021-06-18 19:12:12 +0000 | |
commit | cec636cf769e3713ede2d2bf2a8e29722e710e98 (patch) | |
tree | a84d3e6efbbc40e94570b2b614f51209e581d5c8 /cps-service/src/main | |
parent | ea21e7db83ae4961a5008560a2e6e53c703845c2 (diff) | |
parent | 657a97124f0890f6bb5fec61a37978a6aa00a29d (diff) |
Merge "Updating exception and explanation for update node leaves"
Diffstat (limited to 'cps-service/src/main')
-rw-r--r-- | cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java | 5 | ||||
-rw-r--r-- | cps-service/src/main/java/org/onap/cps/utils/YangUtils.java | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java b/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java index 762e61ac5..4a9957deb 100644 --- a/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java +++ b/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; +import org.onap.cps.spi.exceptions.DataValidationException; import org.onap.cps.utils.YangUtils; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; @@ -142,6 +143,10 @@ public class DataNodeBuilder { private DataNode buildFromNormalizedNodeTree() { final Collection<DataNode> dataNodeCollection = buildCollectionFromNormalizedNodeTree(); + if (!dataNodeCollection.iterator().hasNext()) { + throw new DataValidationException( + "Unsupported xpath: ", "Unsupported xpath as it is referring to one element"); + } return dataNodeCollection.iterator().next(); } diff --git a/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java index 0b66d37fb..b5c14a072 100644 --- a/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java +++ b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java @@ -94,9 +94,13 @@ public class YangUtils { final var jsonReader = new JsonReader(new StringReader(jsonData)); jsonParserStream.parse(jsonReader); - } catch (final IOException | IllegalStateException | JsonSyntaxException exception) { + } catch (final IOException | JsonSyntaxException exception) { throw new DataValidationException( - "Failed to parse json data: " + jsonData, exception.getMessage(), exception); + "Failed to parse json data: " + jsonData, exception.getMessage(), exception); + } catch (final IllegalStateException illegalStateException) { + throw new DataValidationException( + "Failed to parse json data. Unsupported xpath or json data:" + jsonData, illegalStateException + .getMessage(), illegalStateException); } return normalizedNodeResult.getResult(); } |