1 files changed, 12 insertions, 29 deletions

diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderParameterGroup.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderParameterGroup.java
index 79ab4f7f..e932d61c 100644
--- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderParameterGroup.java
+++ b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderParameterGroup.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 Intel Corp. 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,45 +22,27 @@
 
 package org.onap.policy.distribution.forwarding.file;
 
-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 lombok.Setter;
+
+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 FilePolicyForwarder}.
  */
+@Getter
+@Setter
+@NotNull
+@NotBlank
 public class FilePolicyForwarderParameterGroup extends PolicyForwarderConfigurationParameterGroup {
     public static final String POLICY_FORWARDER_PLUGIN_CLASS = FilePolicyForwarder.class.getName();
 
     private String path;
     private boolean verbose;
 
-    /**
-     * Constructor for instantiating {@link FilePolicyForwarderParameterGroup} class.
-     *
-     * @param builder the apex forwarder parameter builder
-     */
-    public FilePolicyForwarderParameterGroup(final FilePolicyForwarderParameterBuilder builder) {
-        this.path = builder.getPath();
-        this.verbose = builder.isVerbose();
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public boolean isVerbose() {
-        return verbose;
-    }
-
-    @Override
-    public GroupValidationResult validate() {
-        final GroupValidationResult validationResult = new GroupValidationResult(this);
-        if (!ParameterValidationUtils.validateStringParameter(path)) {
-            validationResult.setResult("path", ValidationStatus.INVALID,
-                    "must be a non-blank string containing path directory");
-        }
-        return validationResult;
+    public FilePolicyForwarderParameterGroup() {
+        super(FilePolicyForwarderParameterGroup.class.getSimpleName());
     }
 }