From 1296352d8eafee57f982a4342ad79ada4aa56d28 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Tue, 15 Oct 2019 08:19:50 -0500 Subject: Sonar Fixes, Formatting Issue-ID: AAF-1019 Change-Id: Ica49d9e7323aad9622ff9d95cc21b87430c22c54 Signed-off-by: Instrumental --- .../src/main/java/org/onap/aaf/org/DefaultOrg.java | 14 +++++++------- .../java/org/onap/aaf/org/DefaultOrgIdentity.java | 8 ++++---- .../java/org/onap/aaf/org/DefaultOrgWarnings.java | 4 ++-- .../src/main/java/org/onap/aaf/org/Identities.java | 22 +++++++++++----------- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'auth/auth-deforg/src/main/java/org/onap') diff --git a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java index fa9b5213..46d3db9b 100644 --- a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java +++ b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java @@ -48,7 +48,7 @@ public class DefaultOrg implements Organization { final String domain; final String atDomain; final String realm; - + private final String root_ns; private final String NAME; @@ -65,7 +65,7 @@ public class DefaultOrg implements Organization { atDomain = '@'+domain; NAME=env.getProperty(realm + ".name","Default Organization"); root_ns = env.getProperty(Config.AAF_ROOT_NS,Config.AAF_ROOT_NS_DEF); - + try { String defFile; String temp=env.getProperty(defFile = (getClass().getName()+".file")); @@ -84,7 +84,7 @@ public class DefaultOrg implements Organization { } fIdentities.createNewFile(); } - + } } else { fIdentities = new File(temp); @@ -122,7 +122,7 @@ public class DefaultOrg implements Organization { } else { revoked = null; } - + } catch (IOException e) { throw new OrganizationException(e); } @@ -262,11 +262,11 @@ public class DefaultOrg implements Organization { /** * ( # Start of group * (?=.*[a-z,A-Z]) # must contain one character - * - * (?=.*\d) # must contain one digit from 0-9 + * + * (?=.*\d) # must contain one digit from 0-9 * OR * (?=.*[@#$%]) # must contain one special symbols in the list SPEC_CHARS - * + * * . # match anything with previous condition checking * {6,20} # length at least 6 characters and maximum of 20 * ) # End of group diff --git a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrgIdentity.java b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrgIdentity.java index f2b9d8c9..f1576c4f 100644 --- a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrgIdentity.java +++ b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrgIdentity.java @@ -7,9 +7,9 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); * * 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 - * * + * * * * Unless required by applicable law or agreed to in writing, software * * distributed under the License is distributed on an "AS IS" BASIS, * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -33,10 +33,10 @@ import org.onap.aaf.cadi.config.Config; import org.onap.aaf.org.Identities.Data; /** - * Org Users are essential representations of Identities within the Org. Since this is a highly individual + * Org Users are essential representations of Identities within the Org. Since this is a highly individual * thing for most Orgs, i.e. some use LDAP, some need feed, some use something else, this object will allow * the Organization to connect to their own Identity systems... - * + * * */ public class DefaultOrgIdentity implements Identity { diff --git a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrgWarnings.java b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrgWarnings.java index d544b709..a0b408a2 100644 --- a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrgWarnings.java +++ b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrgWarnings.java @@ -7,9 +7,9 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); * * 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 - * * + * * * * Unless required by applicable law or agreed to in writing, software * * distributed under the License is distributed on an "AS IS" BASIS, * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/auth/auth-deforg/src/main/java/org/onap/aaf/org/Identities.java b/auth/auth-deforg/src/main/java/org/onap/aaf/org/Identities.java index 9f65b418..f5a1149f 100644 --- a/auth/auth-deforg/src/main/java/org/onap/aaf/org/Identities.java +++ b/auth/auth-deforg/src/main/java/org/onap/aaf/org/Identities.java @@ -7,9 +7,9 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); * * 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 - * * + * * * * Unless required by applicable law or agreed to in writing, software * * distributed under the License is distributed on an "AS IS" BASIS, * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,29 +29,29 @@ import org.onap.aaf.auth.local.DataFile.Token.Field; /* * Example User Data file, which can be modified for many different kinds of Data Feeds. - * - * Note: This has shown to be extremely effective in AT&T, an acknowledged very large organizations, + * + * Note: This has shown to be extremely effective in AT&T, an acknowledged very large organizations, * because there is no need to synchronize records. AAF simply receives a Data Feed in Organization * defined intervals. (You might want to check for validity, such as size, etc), then is copied into * Data Directory. You will want to do so first creating a "lock" file. Assuming the File name is "users.dat", - * the Lock File is "users.lock". - * + * the Lock File is "users.lock". + * * After the movement of the Datafile into place, it is best to remove the Index File, then remove the lock file. - * + * * Note, Any AAF Programs needing this data WILL wait on the Lock file, so you should get fresh Data files * in a "stage" directory, from WEB, or wherever, and then, after it is correct, do the following as fast as feasible. - * + * * a) lock * b) copy from stage * c) remove idx * d) unlock - * + * * If the Index File is either non-existent or out of date from the Data File, it will be reindexed, which * has proven to be a very quick function, even with large numbers of entries. - * + * * This Sample Feed is set for a file with delimiter of "|". 512 is maximum expected line length. The "0" is the * field offset for the "key" to the record, which, for user, should be the unique Organization Identity. - * + * */ public class Identities extends AbsData { public final static Data NO_DATA = new Data(); -- cgit 1.2.3-korg