diff options
Diffstat (limited to 'sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java')
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java index e3af94f..bfeabf7 100644 --- a/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java @@ -90,10 +90,12 @@ public abstract class EntityQuery { } boolean isSearchCriteriaMatched(Metadata metadata, String toscaType, String uuidKeyName, String cuuidKeyName) { - return Objects.nonNull(metadata) + return Objects.nonNull(metadata) && isStringMatchingOrNull(metadata.getValue(uuidKeyName), getUUID()) && isStringMatchingOrNull(metadata.getValue(cuuidKeyName), getCustomizationUUID()) - && isStringMatchingOrNull(toscaType, getToscaType()); + && isStringMatchingOrNull(toscaType, getToscaType()) || + Objects.isNull(metadata) + && isStringMatchingOrNull(toscaType, getToscaType()); } boolean isSearchCriteriaMatched(Metadata metadata, String toscaType) { |