From 036f2fe2bf570a8bdf287836d5fcda84ac5a70ad Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Tue, 10 Mar 2020 10:30:37 -0400 Subject: Fix field names in SO Actor messages Issue-ID: POLICY-2371 Signed-off-by: Jim Hahn Change-Id: I42b6980460c2075544eb7698479b386eff8ef7b5 --- .../main/java/org/onap/policy/controlloop/actor/so/SoOperation.java | 6 +++--- .../java/org/onap/policy/controlloop/actor/so/SoOperationTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java index 3a14c3bde..4d53f6350 100644 --- a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java +++ b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java @@ -123,9 +123,9 @@ public abstract class SoOperation extends HttpOperation { * the VF count from the custom query. */ protected void validateTarget() { - verifyNotNull("model-customization-id", modelCustomizationId); - verifyNotNull("model-invariant-id", modelInvariantId); - verifyNotNull("model-version-id", modelVersionId); + verifyNotNull("modelCustomizationId", modelCustomizationId); + verifyNotNull("modelInvariantId", modelInvariantId); + verifyNotNull("modelVersionId", modelVersionId); } private void verifyNotNull(String type, Object value) { diff --git a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java index 992065638..80f20b59b 100644 --- a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java +++ b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java @@ -91,9 +91,9 @@ public class SoOperationTest extends BasicSoOperation { @Test public void testValidateTarget() { // check when various fields are null - verifyNotNull("model-customization-id", target::getModelCustomizationId, target::setModelCustomizationId); - verifyNotNull("model-invariant-id", target::getModelInvariantId, target::setModelInvariantId); - verifyNotNull("model-version-id", target::getModelVersionId, target::setModelVersionId); + verifyNotNull("modelCustomizationId", target::getModelCustomizationId, target::setModelCustomizationId); + verifyNotNull("modelInvariantId", target::getModelInvariantId, target::setModelInvariantId); + verifyNotNull("modelVersionId", target::getModelVersionId, target::setModelVersionId); // verify it's still valid assertThatCode(() -> new VfModuleCreate(params, config)).doesNotThrowAnyException(); -- cgit 1.2.3-korg