From c8fcbbc2a9cc964ba1d4b872562b8f4185047308 Mon Sep 17 00:00:00 2001 From: Tomasz Golabek Date: Tue, 9 Jul 2019 08:42:59 +0200 Subject: Added oparent to sdc main Removed errors regarding to a missing license and others. Started locally and executed basic api tests Change-Id: Iea37613defc97f7b40613d60c10990841cb2a209 Issue-ID: SDC-2419 Signed-off-by: Tomasz Golabek --- .../java/org/openecomp/sdc/security/Passwords.java | 2 +- .../org/openecomp/sdc/security/SecurityUtil.java | 20 +++++++++++++++++++ .../org/openecomp/sdc/security/PasswordsTest.java | 23 ++++++++++++++++++++-- .../openecomp/sdc/security/SecurityUtilTest.java | 22 ++++++++++++++++++++- 4 files changed, 63 insertions(+), 4 deletions(-) (limited to 'security-utils/src') diff --git a/security-utils/src/main/java/org/openecomp/sdc/security/Passwords.java b/security-utils/src/main/java/org/openecomp/sdc/security/Passwords.java index f22bc481b4..48c8523354 100644 --- a/security-utils/src/main/java/org/openecomp/sdc/security/Passwords.java +++ b/security-utils/src/main/java/org/openecomp/sdc/security/Passwords.java @@ -33,7 +33,7 @@ import java.util.Random; public class Passwords { - private static Logger log = LoggerFactory.getLogger( Passwords.class.getName()); + private static Logger log = LoggerFactory.getLogger( Passwords.class); private static final Random RANDOM = new SecureRandom(); private static final int SALT = 0; private static final int HASH = 1; diff --git a/security-utils/src/main/java/org/openecomp/sdc/security/SecurityUtil.java b/security-utils/src/main/java/org/openecomp/sdc/security/SecurityUtil.java index fbd93f9152..bc20e0e991 100644 --- a/security-utils/src/main/java/org/openecomp/sdc/security/SecurityUtil.java +++ b/security-utils/src/main/java/org/openecomp/sdc/security/SecurityUtil.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.sdc.security; import fj.data.Either; diff --git a/security-utils/src/test/java/org/openecomp/sdc/security/PasswordsTest.java b/security-utils/src/test/java/org/openecomp/sdc/security/PasswordsTest.java index 6d6e3cea8a..9310917ba1 100644 --- a/security-utils/src/test/java/org/openecomp/sdc/security/PasswordsTest.java +++ b/security-utils/src/test/java/org/openecomp/sdc/security/PasswordsTest.java @@ -1,8 +1,27 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.sdc.security; import org.junit.Test; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -74,4 +93,4 @@ public class PasswordsTest { } -} \ No newline at end of file +} diff --git a/security-utils/src/test/java/org/openecomp/sdc/security/SecurityUtilTest.java b/security-utils/src/test/java/org/openecomp/sdc/security/SecurityUtilTest.java index a5cdff7bc1..e114a468e4 100644 --- a/security-utils/src/test/java/org/openecomp/sdc/security/SecurityUtilTest.java +++ b/security-utils/src/test/java/org/openecomp/sdc/security/SecurityUtilTest.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.sdc.security; import org.junit.Test; @@ -27,4 +47,4 @@ public class SecurityUtilTest { System.out.println( obfuscated ); assertEquals( obfuscated , expectedkey ); } -} \ No newline at end of file +} -- cgit 1.2.3-korg