diff options
| author |   lukegleeson <luke.gleeson@est.tech> | 2022-08-17 18:06:59 +0100 |
|---|---|---|
| committer | lukegleeson <luke.gleeson@est.tech> | 2022-08-22 10:57:05 +0100 |
| commit | 8919af5959249181b09e235e386dfd483e87402e (patch) | |
| tree | 650efce0de99d06018637c673d935957d61a9620 /cps-ncmp-service/src | |
| parent | 060499cb5a89a0fd3d8480132ed82d2e291839dc (diff) | |
Fix: CM Handles for only hasAllModules Query
hasAllModules was returning no CMHandles when queried by itself, only when paired with another query condition e.g. hasAllProperties
This fix means endpoint works as expected.
Reverted null check
Issue-ID: CPS-977
Signed-off-by: lukegleeson <luke.gleeson@est.tech>
Change-Id: Idafad4c9877941d121f5cbb98617c56a35a1cc94
Diffstat (limited to 'cps-ncmp-service/src')
| -rw-r--r-- | cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/CmHandleQueries.java | 2 | ||||
| -rw-r--r-- | cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/inventory/CmHandleQueriesSpec.groovy | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/CmHandleQueries.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/CmHandleQueries.java index 92387bab32..3dbb4a1472 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/CmHandleQueries.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/CmHandleQueries.java @@ -91,7 +91,7 @@ public class CmHandleQueries { final Map<String, NcmpServiceCmHandle> firstQuery, final Map<String, NcmpServiceCmHandle> secondQuery) { if (firstQuery == NO_QUERY_TO_EXECUTE && secondQuery == NO_QUERY_TO_EXECUTE) { - return Collections.emptyMap(); + return NO_QUERY_TO_EXECUTE; } else if (firstQuery == NO_QUERY_TO_EXECUTE) { return secondQuery; } else if (secondQuery == NO_QUERY_TO_EXECUTE) { diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/inventory/CmHandleQueriesSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/inventory/CmHandleQueriesSpec.groovy index 10a5d62461..7d7258dc4c 100644 --- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/inventory/CmHandleQueriesSpec.groovy +++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/inventory/CmHandleQueriesSpec.groovy @@ -82,7 +82,7 @@ class CmHandleQueriesSpec extends Specification { 'the first query contains entries and second query is null' | ['PNFDemo': pnfDemoCmHandle, 'PNFDemo2': pnfDemo2CmHandle] | null || ['PNFDemo': pnfDemoCmHandle, 'PNFDemo2': pnfDemo2CmHandle] 'the second query contains entries and first query is null' | null | ['PNFDemo': pnfDemoCmHandle, 'PNFDemo3': pnfDemo3CmHandle] || ['PNFDemo': pnfDemoCmHandle, 'PNFDemo3': pnfDemo3CmHandle] 'both queries are empty' | [:] | [:] || [:] - 'both queries are null' | null | null || [:] + 'both queries are null' | null | null || null } def 'Get Cm Handles By State'() { |