diff options
| author |   Liam Fallon <liam.fallon@est.tech> | 2021-02-25 16:36:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-02-25 16:36:11 +0000 |
| commit | 726bec7cd5e1b0f5c45b3ec58bc64e344240e8c9 (patch) | |
| tree | 48caa531e517884df09cce62d1f308acef54c368 | |
| parent | 45a5f2dea6b31ca1fd7aa9b6450573dc8b4234c1 (diff) | |
| parent | 9d05da454d5adaa894b52e22affd0f155353206b (diff) | |
Merge "Fix Null key issue in PfReferenceTimestampKey"
| -rw-r--r-- | models-base/src/main/java/org/onap/policy/models/base/PfReferenceKey.java | 6 | ||||
| -rw-r--r-- | models-base/src/test/java/org/onap/policy/models/base/PfReferenceTimestampKeyTest.java | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfReferenceKey.java b/models-base/src/main/java/org/onap/policy/models/base/PfReferenceKey.java index 9a986481b..b25d4632b 100644 --- a/models-base/src/main/java/org/onap/policy/models/base/PfReferenceKey.java +++ b/models-base/src/main/java/org/onap/policy/models/base/PfReferenceKey.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019,2021 Nordix Foundation. * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -253,7 +253,9 @@ public class PfReferenceKey extends PfKey { @Override public boolean isNullKey() { - return this.equals(PfReferenceKey.getNullKey()); + return (PfReferenceKey.NULL_KEY_NAME.equals(this.getParentKeyName()) && PfReferenceKey.NULL_KEY_VERSION + .equals(this.getParentKeyVersion()) && PfReferenceKey.NULL_KEY_NAME.equals(this.getParentLocalName()) + && PfReferenceKey.NULL_KEY_NAME.equals(this.getLocalName())); } /** diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfReferenceTimestampKeyTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfReferenceTimestampKeyTest.java index c4762a201..061760aeb 100644 --- a/models-base/src/test/java/org/onap/policy/models/base/PfReferenceTimestampKeyTest.java +++ b/models-base/src/test/java/org/onap/policy/models/base/PfReferenceTimestampKeyTest.java @@ -67,9 +67,12 @@ public class PfReferenceTimestampKeyTest { assertThatThrownBy(() -> new PfReferenceTimestampKey(new PfConceptKey(), null, null)) .hasMessage("parameter \"localName\" is null"); + assertTrue(new PfReferenceTimestampKey().isNullKey()); + assertFalse(new PfReferenceTimestampKey("ParentKeyName", VERSION001, PfKey.NULL_KEY_NAME, + LOCAL_NAME, Instant.EPOCH).isNullKey()); + String id = "NULL:0.0.0:NULL:NULL:" + timeStamp; assertThat(new PfReferenceTimestampKey(id).getTimeStamp().getTime()).isEqualTo(timeStamp); - } @Test |