/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pdpx.main.parameters;
import lombok.Getter;
-import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+import org.onap.policy.common.endpoints.parameters.RestClientParameters;
import org.onap.policy.common.endpoints.parameters.RestServerParameters;
import org.onap.policy.common.endpoints.parameters.TopicParameterGroup;
-import org.onap.policy.common.parameters.GroupValidationResult;
-import org.onap.policy.common.parameters.ParameterGroup;
+import org.onap.policy.common.parameters.BeanValidationResult;
+import org.onap.policy.common.parameters.ParameterGroupImpl;
import org.onap.policy.common.parameters.ValidationStatus;
-import org.onap.policy.common.utils.validation.ParameterValidationUtils;
+import org.onap.policy.common.parameters.annotations.NotBlank;
+import org.onap.policy.common.parameters.annotations.NotNull;
+import org.onap.policy.common.parameters.annotations.Valid;
+import org.onap.policy.models.base.Validated;
/**
* Class to hold all parameters needed for xacml pdp component.
*
*/
@Getter
-public class XacmlPdpParameterGroup implements ParameterGroup {
- private static final String PARAM_REST_SERVER = "restServerParameters";
- private static final String PARAM_POLICY_API = "policyApiParameters";
- private static final String PARAM_TOPIC_PARAMETER_GROUP = "topicParameterGroup";
- private static final String PARAM_APPLICATION_PATH = "applicationPath";
-
- @Setter
- private String name;
+@NotNull
+@NotBlank
+public class XacmlPdpParameterGroup extends ParameterGroupImpl {
+ public static final String PARAM_POLICY_API = "policyApiParameters";
+ private String pdpGroup;
+ private String pdpType;
+ @Valid
private RestServerParameters restServerParameters;
- private RestServerParameters policyApiParameters;
+ @Valid
+ private RestClientParameters policyApiParameters;
+ @Valid
private TopicParameterGroup topicParameterGroup;
- private String applicationPath;
+ @Valid
+ private XacmlApplicationParameters applicationParameters;
/**
* Create the xacml pdp parameter group.
*
* @param name the parameter group name
+ * @param pdpGroup the pdp group name
*/
- public XacmlPdpParameterGroup(final String name, final RestServerParameters restServerParameters,
- final RestServerParameters policyApiParameters, final TopicParameterGroup topicParameterGroup,
- final String applicationPath) {
- this.name = name;
+ public XacmlPdpParameterGroup(final String name, final String pdpGroup, final String pdpType,
+ final RestServerParameters restServerParameters, final RestClientParameters policyApiParameters,
+ final TopicParameterGroup topicParameterGroup, final XacmlApplicationParameters applicationParameters) {
+ super(name);
+ this.pdpGroup = pdpGroup;
+ this.pdpType = pdpType;
this.restServerParameters = restServerParameters;
this.policyApiParameters = policyApiParameters;
this.topicParameterGroup = topicParameterGroup;
- this.applicationPath = applicationPath;
+ this.applicationParameters = applicationParameters;
}
/**
* @return the result of the validation
*/
@Override
- public GroupValidationResult validate() {
- final GroupValidationResult validationResult = new GroupValidationResult(this);
- if (!ParameterValidationUtils.validateStringParameter(name)) {
- validationResult.setResult("name", ValidationStatus.INVALID, "must be a non-blank string");
- }
- if (restServerParameters == null) {
- validationResult.setResult(PARAM_REST_SERVER, ValidationStatus.INVALID,
- "must have restServerParameters to configure xacml pdp rest server");
- } else {
- validationResult.setResult(PARAM_REST_SERVER, restServerParameters.validate());
- }
- if (policyApiParameters == null) {
- validationResult.setResult(PARAM_POLICY_API, ValidationStatus.INVALID,
- "must have policyApiParameters to configure xacml pdp rest server");
- } else {
- // set the name - this only really matters for validation messages
- policyApiParameters.setName(PARAM_POLICY_API);
- validationResult.setResult(PARAM_POLICY_API, policyApiParameters.validate());
- }
- if (topicParameterGroup == null) {
- validationResult.setResult(PARAM_TOPIC_PARAMETER_GROUP, ValidationStatus.INVALID,
- "must have topicParameterGroup to configure xacml pdp topic sink and source");
- } else {
- validationResult.setResult(PARAM_TOPIC_PARAMETER_GROUP, topicParameterGroup.validate());
- }
- //
- // Validate the application path directory
- //
- if (applicationPath == null || applicationPath.isEmpty()) {
- validationResult.setResult(PARAM_APPLICATION_PATH, ValidationStatus.INVALID,
- "must have application path for applications to store policies and data.");
+ public BeanValidationResult validate() {
+ final BeanValidationResult validationResult = super.validate();
+
+ if (policyApiParameters != null && StringUtils.isBlank(policyApiParameters.getHostname())) {
+ var sub = new BeanValidationResult(PARAM_POLICY_API, policyApiParameters);
+ sub.addResult("hostname", policyApiParameters.getHostname(), ValidationStatus.INVALID, Validated.IS_NULL);
+ validationResult.addResult(sub);
}
+
return validationResult;
}
}