From 4b76b6de0d39d6c5aca8635c78574c520f1053e9 Mon Sep 17 00:00:00 2001 From: Keong Lim Date: Thu, 21 Mar 2019 15:34:15 +1100 Subject: AAI-1523 Batch reformat aai-auth Use maven plugins from AAI-2198 to do batch reformat of aai-auth to consistent code style. Change-Id: I7ea7c6e991b81b3d8b167bdd0889aa5674a42001 Issue-ID: AAI-1523 Signed-off-by: Keong Lim --- aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java | 6 ++++-- aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java | 13 ++++++++++--- .../src/main/java/org/onap/aaiauth/util/AuthConstants.java | 3 ++- 3 files changed, 16 insertions(+), 6 deletions(-) (limited to 'aai-auth/src/main/java') diff --git a/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java b/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java index 8f9b03d4..a5b3b674 100644 --- a/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java +++ b/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java @@ -9,7 +9,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -18,6 +18,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.aaiauth.auth; import org.apache.http.cookie.Cookie; @@ -39,7 +40,8 @@ public class Auth { } /** - * Returns true if the user is allowed to access a function. + * Returns true if the user is allowed to access a function. + * * @param authUser * - String value of the user. * @param authAction diff --git a/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java b/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java index 2e9424c9..e40c2d96 100644 --- a/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java +++ b/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java @@ -9,7 +9,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -18,17 +18,19 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.aaiauth.auth; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; + import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.onap.aaiauth.util.AuthConstants; +import org.onap.aaiauth.util.AuthConstants; public class AuthCore { @@ -53,8 +55,9 @@ public class AuthCore { /** * Loads the auth file and caches a list of authorized users. + * * @param authFilename - * - Absolute path of the file where authorized users are listed. + * - Absolute path of the file where authorized users are listed. */ public synchronized void loadUsers(String authFilename) throws Exception { users = new HashMap<>(); @@ -142,6 +145,7 @@ public class AuthCore { /** * Returns true if the user has permissions for the function, otherwise returns false. + * * @param checkFunc * - String value of the function. */ @@ -176,6 +180,7 @@ public class AuthCore { /** * Remove the function from the user's list of allowed functions. + * * @param delFunc * - String value of the function. */ @@ -187,6 +192,7 @@ public class AuthCore { /** * Returns true if the user has permissions to use the function, otherwise returns false. + * * @param afunc * - String value of the function. */ @@ -207,6 +213,7 @@ public class AuthCore { /** * Returns true if the user is allowed to access a function. + * * @param username * - String value of user * @param authFunction diff --git a/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java b/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java index 15f8eba6..92fddfea 100644 --- a/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java +++ b/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java @@ -9,7 +9,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -18,6 +18,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.aaiauth.util; public class AuthConstants { -- cgit 1.2.3-korg