Merge "Convert models to JUnit 5"

[policy/models.git] / models-interactions / model-actors / actorServiceProvider / src / main / java / org / onap / policy / controlloop / actorserviceprovider / parameters / HttpParams.java

diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpParams.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpParams.java
index 695ffe4..be1f0f8 100644 (file)
--- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpParams.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpParams.java
@@ -20,8 +20,8 @@
 
 package org.onap.policy.controlloop.actorserviceprovider.parameters;
 
-import lombok.Builder;
 import lombok.Data;
+import lombok.experimental.SuperBuilder;
 import org.onap.policy.common.parameters.BeanValidator;
 import org.onap.policy.common.parameters.ValidationResult;
 import org.onap.policy.common.parameters.annotations.Min;
@@ -32,14 +32,14 @@ import org.onap.policy.common.parameters.annotations.NotNull;
  * Parameters used by Operators that connect to a server via HTTP.
  */
 @NotNull
-@NotBlank
 @Data
-@Builder(toBuilder = true)
+@SuperBuilder(toBuilder = true)
 public class HttpParams {
 
     /**
      * Name of the HttpClient, as found in the HttpClientFactory.
      */
+    @NotBlank
     private String clientName;
 
     /**
@@ -48,12 +48,13 @@ public class HttpParams {
     private String path;
 
     /**
-     * Amount of time, in seconds to wait for the HTTP request to complete, where zero
-     * indicates that it should wait forever. The default is zero.
+     * Amount of time, in seconds, to wait for the HTTP request to complete.
+     * <p/>
+     * Note: this should NOT have a default value, as it receives its default value from
+     * {@link HttpActorParams}.
      */
-    @Min(0)
-    @Builder.Default
-    private long timeoutSec = 0;
+    @Min(1)
+    private int timeoutSec;
 
 
     /**