X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fsa%2Fauth%2FSearchDbServiceAuth.java;h=199b5ecdfb6838e9eeaa35b666641a07bea462d5;hb=ecd35f117eb0118f9cbd96fe132a1c359214bfc7;hp=0d96f9e843e65424313f408e51c1433860c0b93b;hpb=d6348739c632fb69c8833078effbb902adc7f702;p=aai%2Fsearch-data-service.git

diff --git a/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java b/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java
index 0d96f9e..199b5ec 100644
--- a/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java
+++ b/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java
@@ -20,40 +20,26 @@
  */
 package org.onap.aai.sa.auth;
 
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.HttpHeaders;
+import javax.servlet.http.Cookie;
+import org.springframework.http.HttpHeaders;
 
 public class SearchDbServiceAuth {
 
-  public SearchDbServiceAuth() {
-  }
-
-  public boolean authBasic(String username, String authFunction) {
-    return SearchDbServiceAuthCore.authorize(username, authFunction);
-  }
-
-  public String authUser(HttpHeaders headers, String authUser, String authFunction) {
-
-
-    SearchDbServiceAuth aaiAuth = new SearchDbServiceAuth();
-
-    StringBuilder username = new StringBuilder();
-
-    username.append(authUser);
-    if (aaiAuth.authBasic(username.toString(), authFunction) == false) {
-      return "AAI_9101";
-
+    public SearchDbServiceAuth() { // Do not instantiate
     }
-    return "OK";
-  }
 
-  public boolean authCookie(Cookie cookie, String authFunction, StringBuilder username) {
+    public boolean authBasic(String username, String authFunction) {
+        return SearchDbServiceAuthCore.authorize(username, authFunction);
+    }
 
-    // String result = "no value";
-    if (cookie == null) {
-      return false;
+    public String authUser(HttpHeaders headers, String authUser, String authFunction) {
+        return new SearchDbServiceAuth().authBasic(authUser, authFunction) ? "OK" : "AAI_9101";
     }
 
-    return SearchDbServiceAuthCore.authorize(username.toString(), authFunction);
-  }
+    public boolean authCookie(Cookie cookie, String authFunction, StringBuilder username) {
+        if (cookie == null) {
+            return false;
+        }
+        return SearchDbServiceAuthCore.authorize(username.toString(), authFunction);
+    }
 }