Merge "Immediately finish if guard is disabled"

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 3a14c3b..4d53f63 100644 (file)
--- 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<SoResponse> {
      * 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 9920656..80f20b5 100644 (file)
--- 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();