3 files changed, 14 insertions, 64 deletions

diff --git a/security-util-lib/src/main/java/org/onap/sdc/security/AuthenticationCookie.java b/security-util-lib/src/main/java/org/onap/sdc/security/AuthenticationCookie.java
index 9440eea..b8f3afa 100644
--- a/security-util-lib/src/main/java/org/onap/sdc/security/AuthenticationCookie.java
+++ b/security-util-lib/src/main/java/org/onap/sdc/security/AuthenticationCookie.java
@@ -21,9 +21,13 @@
 package org.onap.sdc.security;
 
 import java.util.Set;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
+@EqualsAndHashCode
+@ToString
 public class AuthenticationCookie  {
 
     @Getter @Setter
@@ -72,35 +76,5 @@ public class AuthenticationCookie  {
         this.lastName = lastName;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof AuthenticationCookie)) return false;
 
-        AuthenticationCookie that = (AuthenticationCookie) o;
-
-        if (getMaxSessionTime() != that.getMaxSessionTime()) return false;
-        if (getCurrentSessionTime() != that.getCurrentSessionTime()) return false;
-        if (getUserID() != null ? !getUserID().equals(that.getUserID()) : that.getUserID() != null) return false;
-        return getRoles() != null ? getRoles().containsAll(that.getRoles()) : that.getRoles() == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = getUserID() != null ? getUserID().hashCode() : 0;
-        result = 31 * result + (getRoles() != null ? getRoles().hashCode() : 0);
-        result = 31 * result + (int) (getMaxSessionTime() ^ (getMaxSessionTime() >>> 32));
-        result = 31 * result + (int) (getCurrentSessionTime() ^ (getCurrentSessionTime() >>> 32));
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "AuthenticationCookie{" +
-                "userID='" + userID + '\'' +
-                ", roles=" + roles +
-                ", maxSessionTime=" + maxSessionTime +
-                ", currentSessionTime=" + currentSessionTime +
-                '}';
-    }
 }
diff --git a/security-util-lib/src/main/java/org/onap/sdc/security/filters/SampleFilter.java b/security-util-lib/src/main/java/org/onap/sdc/security/filters/SampleFilter.java
index 853c40d..0578c1d 100644
--- a/security-util-lib/src/main/java/org/onap/sdc/security/filters/SampleFilter.java
+++ b/security-util-lib/src/main/java/org/onap/sdc/security/filters/SampleFilter.java
@@ -38,8 +38,8 @@ public class SampleFilter extends SessionValidationFilter {
     private static class Configuration implements ISessionValidationFilterConfiguration {
 
         private String securityKey = "AGLDdG4D04BKm2IxIWEr8o==";
-        private long maxSessionTimeOut = 24*60*60*1000;
-        private long sessionIdleTimeOut = 60*60*1000;
+        private long maxSessionTimeOut = 24*60*60*1_000L;
+        private long sessionIdleTimeOut = 60*60*1_000L;
         private String redirectURL = "http://portal.api.simpledemo.onap.org:8989/ECOMPPORTAL/login.htm";
         private List<String> excludedUrls = new ArrayList<>(Arrays.asList("/config","/configmgr","/rest","/kibanaProxy","/healthcheck","/upload.*"));
         private String cookieName = "kuku";
diff --git a/security-util-lib/src/main/java/org/onap/sdc/security/logging/elements/HttpResponse.java b/security-util-lib/src/main/java/org/onap/sdc/security/logging/elements/HttpResponse.java
index 57aaf3c..61f440c 100644
--- a/security-util-lib/src/main/java/org/onap/sdc/security/logging/elements/HttpResponse.java
+++ b/security-util-lib/src/main/java/org/onap/sdc/security/logging/elements/HttpResponse.java
@@ -20,11 +20,19 @@
 
 package org.onap.sdc.security.logging.elements;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.ToString;
 import org.apache.commons.lang3.StringUtils;
 
+@ToString
+@AllArgsConstructor
 public class HttpResponse<T> {
+    @Getter
     private final T response;
+    @Getter
     private final int statusCode;
+    @Getter
     private final String description;
 
     public HttpResponse(T response, int statusCode) {
@@ -32,37 +40,5 @@ public class HttpResponse<T> {
         this.statusCode = statusCode;
         this.description = StringUtils.EMPTY;
     }
-    
-    public HttpResponse(T response, int statusCode, String description) {
-        this.response = response;
-        this.statusCode = statusCode;
-        this.description = description;
-    }
-
-    public T getResponse() {
-        return response;
-    }
 
-    public int getStatusCode() {
-        return statusCode;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("HttpResponse [response=");
-        builder.append(response);
-        builder.append(", statusCode=");
-        builder.append(statusCode);
-        builder.append(", description=");
-        builder.append(description);
-        builder.append("]");
-        return builder.toString();
-    }
-    
-    
 }