From 46c8422501ac8321e11493693f2ad5b2ea8e1293 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 16 Apr 2019 11:08:38 +0000 Subject: [PATCH] Fix null not accepted on PDP message Issue-ID: POLICY-1648 Change-Id: I580d1c433cd3a5730b115ef6353770f17939cf3a Signed-off-by: liamfallon --- .../java/org/onap/policy/models/pdp/persistence/concepts/JpaPdp.java | 2 +- .../org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdp.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdp.java index 627641825..528d6fbe7 100644 --- a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdp.java +++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdp.java @@ -193,7 +193,7 @@ public class JpaPdp extends PfConcept implements PfAuthorative, Serializabl "PDP health status may not be null")); } - if (StringUtils.isBlank(message)) { + if (message != null && StringUtils.isBlank(message)) { result.addValidationMessage(new PfValidationMessage(key, this.getClass(), ValidationResult.INVALID, "message may not be blank")); } diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java index 5a27210fc..ebdf31c2f 100644 --- a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java +++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java @@ -149,6 +149,8 @@ public class JpaPdpTest { testJpaPdp.setKey(savedKey); assertTrue(testJpaPdp.validate(new PfValidationResult()).isOk()); + testJpaPdp.setMessage(null); + assertTrue(testJpaPdp.validate(new PfValidationResult()).isOk()); testJpaPdp.setMessage(""); assertFalse(testJpaPdp.validate(new PfValidationResult()).isOk()); testJpaPdp.setMessage("Valid Message"); -- 2.16.6