diff options
Diffstat (limited to 'cps-ncmp-service/src/main/java/org/onap')
-rw-r--r-- | cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/models/DmiPluginRegistration.java | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/models/DmiPluginRegistration.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/models/DmiPluginRegistration.java index a604f34484..9faf7331e7 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/models/DmiPluginRegistration.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/models/DmiPluginRegistration.java @@ -53,8 +53,6 @@ public class DmiPluginRegistration { private List<String> removedCmHandles; - public static final String PLEASE_SUPPLY_CORRECT_PLUGIN_INFORMATION = "Please supply correct plugin information."; - /** * Validates plugin service names. * @@ -67,19 +65,22 @@ public class DmiPluginRegistration { String errorMessage = null; - if (isNullEmptyOrBlank(combinedServiceName) - && isNullEmptyOrBlank(dataServiceName) - && isNullEmptyOrBlank(modelsServiceName)) { - errorMessage = "No DMI plugin service names"; - } - - if (!isNullEmptyOrBlank(combinedServiceName) - && (!isNullEmptyOrBlank(dataServiceName) || !isNullEmptyOrBlank(modelsServiceName))) { - errorMessage = "Invalid combination of plugin service names"; + if (isNullEmptyOrBlank(combinedServiceName)) { + if ((isNullEmptyOrBlank(dataServiceName) && isNullEmptyOrBlank(modelsServiceName))) { + errorMessage = "No DMI plugin service names"; + } else { + if (isNullEmptyOrBlank(dataServiceName) || isNullEmptyOrBlank(modelsServiceName)) { + errorMessage = "Cannot register just a Data or Model plugin service name"; + } + } + } else { + if (!isNullEmptyOrBlank(dataServiceName) || !isNullEmptyOrBlank(modelsServiceName)) { + errorMessage = "Cannot register combined plugin service name and other service names"; + } } if (errorMessage != null) { - throw new NcmpException(errorMessage, PLEASE_SUPPLY_CORRECT_PLUGIN_INFORMATION); + throw new NcmpException(errorMessage, "Please supply correct plugin information."); } } |