1 files changed, 12 insertions, 140 deletions
diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarderParameterGroup.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarderParameterGroup.java
index 5c547673..4ce35f20 100644
--- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarderParameterGroup.java
+++ b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarderParameterGroup.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2019 AT&T Intellectual Property.
+ *  Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,19 +22,25 @@
 
 package org.onap.policy.distribution.forwarding.xacml.pdp;
 
-import org.onap.policy.common.parameters.GroupValidationResult;
-import org.onap.policy.common.parameters.ValidationStatus;
-import org.onap.policy.common.utils.validation.ParameterValidationUtils;
+import lombok.Getter;
+
+import org.onap.policy.common.parameters.annotations.Min;
+import org.onap.policy.common.parameters.annotations.NotBlank;
+import org.onap.policy.common.parameters.annotations.NotNull;
 import org.onap.policy.distribution.main.parameters.PolicyForwarderConfigurationParameterGroup;
 
 /**
  * Holds the parameters for the{@link XacmlPdpPolicyForwarder}.
  */
+@Getter
+@NotNull
+@NotBlank
 public class XacmlPdpPolicyForwarderParameterGroup extends PolicyForwarderConfigurationParameterGroup {
     public static final String POLICY_FORWARDER_PLUGIN_CLASS = XacmlPdpPolicyForwarder.class.getName();
 
     private boolean useHttps;
     private String hostname;
+    @Min(value = 1)
     private int port;
     private String userName;
     private String password;
@@ -41,142 +48,7 @@ public class XacmlPdpPolicyForwarderParameterGroup extends PolicyForwarderConfig
     private boolean isManaged;
     private String pdpGroup;
 
-    /**
-     * Construct an instance.
-     *
-     * @param builder the builder create the instance from
-     */
-    private XacmlPdpPolicyForwarderParameterGroup(final XacmlPdpPolicyForwarderParameterGroupBuilder builder) {
-        this.useHttps = builder.useHttps;
-        this.hostname = builder.hostname;
-        this.port = builder.port;
-        this.userName = builder.userName;
-        this.password = builder.password;
-        this.clientAuth = builder.clientAuth;
-        this.isManaged = builder.isManaged;
-        this.pdpGroup = builder.pdpGroup;
-    }
-
-    public boolean isUseHttps() {
-        return useHttps;
-    }
-
-    public String getHostname() {
-        return hostname;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public String getClientAuth() {
-        return clientAuth;
-    }
-
-    public boolean isManaged() {
-        return isManaged;
+    public XacmlPdpPolicyForwarderParameterGroup() {
+        super(XacmlPdpPolicyForwarderParameterGroup.class.getSimpleName());
     }
-
-    public String getPdpGroup() {
-        return pdpGroup;
-    }
-
-    /**
-     * Builder for XacmlPdpPolicyForwarderParameterGroup.
-     */
-    public static class XacmlPdpPolicyForwarderParameterGroupBuilder {
-        private boolean useHttps = false;
-        private String hostname;
-        private int port;
-        private String userName;
-        private String password;
-        private String clientAuth;
-        private boolean isManaged = true;
-        private String pdpGroup;
-
-        public XacmlPdpPolicyForwarderParameterGroupBuilder setUseHttps(final boolean useHttps) {
-            this.useHttps = useHttps;
-            return this;
-        }
-
-        public XacmlPdpPolicyForwarderParameterGroupBuilder setHostname(final String hostname) {
-            this.hostname = hostname;
-            return this;
-        }
-
-        public XacmlPdpPolicyForwarderParameterGroupBuilder setPort(final int port) {
-            this.port = port;
-            return this;
-        }
-
-        public XacmlPdpPolicyForwarderParameterGroupBuilder setUserName(final String userName) {
-            this.userName = userName;
-            return this;
-        }
-
-        public XacmlPdpPolicyForwarderParameterGroupBuilder setPassword(final String password) {
-            this.password = password;
-            return this;
-        }
-
-        public XacmlPdpPolicyForwarderParameterGroupBuilder setClientAuth(final String clientAuth) {
-            this.clientAuth = clientAuth;
-            return this;
-        }
-
-        public XacmlPdpPolicyForwarderParameterGroupBuilder setIsManaged(final boolean isManaged) {
-            this.isManaged = isManaged;
-            return this;
-        }
-
-        public XacmlPdpPolicyForwarderParameterGroupBuilder setPdpGroup(final String pdpGroup) {
-            this.pdpGroup = pdpGroup;
-            return this;
-        }
-
-        /**
-         * Creates a new XacmlPapServletPolicyForwarderParameterGroup instance.
-         */
-        public XacmlPdpPolicyForwarderParameterGroup build() {
-            return new XacmlPdpPolicyForwarderParameterGroup(this);
-        }
-    }
-
-    @Override
-    public GroupValidationResult validate() {
-        final GroupValidationResult validationResult = new GroupValidationResult(this);
-        if (!ParameterValidationUtils.validateStringParameter(hostname)) {
-            validationResult.setResult("hostname", ValidationStatus.INVALID,
-                    "must be a non-blank string containing hostname/ipaddress");
-        }
-        if (!ParameterValidationUtils.validateIntParameter(port)) {
-            validationResult.setResult("port", ValidationStatus.INVALID, "must be a positive integer containing port");
-        }
-        if (!ParameterValidationUtils.validateStringParameter(userName)) {
-            validationResult.setResult("userName", ValidationStatus.INVALID,
-                    "must be a non-blank string containing userName");
-        }
-        if (!ParameterValidationUtils.validateStringParameter(password)) {
-            validationResult.setResult("password", ValidationStatus.INVALID,
-                    "must be a non-blank string containing password");
-        }
-        if (!ParameterValidationUtils.validateStringParameter(clientAuth)) {
-            validationResult.setResult("clientAuth", ValidationStatus.INVALID,
-                    "must be a non-blank string containing clientAuth");
-        }
-        if (!ParameterValidationUtils.validateStringParameter(pdpGroup)) {
-            validationResult.setResult("pdpGroup", ValidationStatus.INVALID,
-                    "must be a non-blank string containing pdpGroup");
-        }
-        return validationResult;
-    }
-
 }