From: m.dalakov Date: Wed, 29 Nov 2017 08:38:26 +0000 (+0200) Subject: [SECIOTSRK-700] *fix & generate java doc X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef49f4eacad6630165e6e7468a1bba94559b10b4;p=platform%2Fcore%2Fsecurity%2Fsuspicious-activity-monitor.git [SECIOTSRK-700] *fix & generate java doc --- diff --git a/servers/alive/pom.xml b/servers/alive/pom.xml index 621c647..a4fab0e 100644 --- a/servers/alive/pom.xml +++ b/servers/alive/pom.xml @@ -1,5 +1,5 @@ diff --git a/servers/alive/src/main/java/com/samsung/alive/Alive.java b/servers/alive/src/main/java/com/samsung/alive/Alive.java index 29cbb9d..220ddab 100644 --- a/servers/alive/src/main/java/com/samsung/alive/Alive.java +++ b/servers/alive/src/main/java/com/samsung/alive/Alive.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/main/java/com/samsung/alive/exception/AliveDevicesServiceError.java b/servers/alive/src/main/java/com/samsung/alive/exception/AliveDevicesServiceError.java index 82b7322..d49bfd1 100644 --- a/servers/alive/src/main/java/com/samsung/alive/exception/AliveDevicesServiceError.java +++ b/servers/alive/src/main/java/com/samsung/alive/exception/AliveDevicesServiceError.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/main/java/com/samsung/alive/exception/NoUserFound.java b/servers/alive/src/main/java/com/samsung/alive/exception/NoUserFound.java index afbae9f..5518ebb 100644 --- a/servers/alive/src/main/java/com/samsung/alive/exception/NoUserFound.java +++ b/servers/alive/src/main/java/com/samsung/alive/exception/NoUserFound.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/main/java/com/samsung/alive/rest/AliveRestController.java b/servers/alive/src/main/java/com/samsung/alive/rest/AliveRestController.java index a545e13..af0f41f 100644 --- a/servers/alive/src/main/java/com/samsung/alive/rest/AliveRestController.java +++ b/servers/alive/src/main/java/com/samsung/alive/rest/AliveRestController.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/main/java/com/samsung/alive/service/AliveDevicesService.java b/servers/alive/src/main/java/com/samsung/alive/service/AliveDevicesService.java index d5c87ff..0a7caca 100644 --- a/servers/alive/src/main/java/com/samsung/alive/service/AliveDevicesService.java +++ b/servers/alive/src/main/java/com/samsung/alive/service/AliveDevicesService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -33,6 +33,7 @@ public interface AliveDevicesService { * @param user user * @param password password * @return code and access token + * @throws AliveDevicesServiceError the alive devices service error */ Optional signup(User user, String password) throws AliveDevicesServiceError; diff --git a/servers/alive/src/main/java/com/samsung/alive/service/CloudService.java b/servers/alive/src/main/java/com/samsung/alive/service/CloudService.java index 13775e7..04c60b7 100644 --- a/servers/alive/src/main/java/com/samsung/alive/service/CloudService.java +++ b/servers/alive/src/main/java/com/samsung/alive/service/CloudService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -27,6 +27,7 @@ public interface CloudService { /** * Sign in * + * @param pair Code and AccessTokenPair * @return status */ boolean signIn(CodeAndAccessTokenPair pair); diff --git a/servers/alive/src/main/java/com/samsung/alive/service/impl/AliveDevicesServiceImpl.java b/servers/alive/src/main/java/com/samsung/alive/service/impl/AliveDevicesServiceImpl.java index 987a846..6557cc1 100644 --- a/servers/alive/src/main/java/com/samsung/alive/service/impl/AliveDevicesServiceImpl.java +++ b/servers/alive/src/main/java/com/samsung/alive/service/impl/AliveDevicesServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/main/java/com/samsung/alive/service/impl/CloudServiceImpl.java b/servers/alive/src/main/java/com/samsung/alive/service/impl/CloudServiceImpl.java index f2c8095..07c63f0 100644 --- a/servers/alive/src/main/java/com/samsung/alive/service/impl/CloudServiceImpl.java +++ b/servers/alive/src/main/java/com/samsung/alive/service/impl/CloudServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/main/java/com/samsung/alive/service/impl/CodeAndAccessTokenPair.java b/servers/alive/src/main/java/com/samsung/alive/service/impl/CodeAndAccessTokenPair.java index 8c4d8ae..9e01f7e 100644 --- a/servers/alive/src/main/java/com/samsung/alive/service/impl/CodeAndAccessTokenPair.java +++ b/servers/alive/src/main/java/com/samsung/alive/service/impl/CodeAndAccessTokenPair.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/main/java/com/samsung/alive/utils/rest/dsm/DsmApi.java b/servers/alive/src/main/java/com/samsung/alive/utils/rest/dsm/DsmApi.java index 413c540..02abefd 100644 --- a/servers/alive/src/main/java/com/samsung/alive/utils/rest/dsm/DsmApi.java +++ b/servers/alive/src/main/java/com/samsung/alive/utils/rest/dsm/DsmApi.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/main/java/com/samsung/alive/utils/rest/dsm/DsmApiError.java b/servers/alive/src/main/java/com/samsung/alive/utils/rest/dsm/DsmApiError.java index 4d9d779..43928e3 100644 --- a/servers/alive/src/main/java/com/samsung/alive/utils/rest/dsm/DsmApiError.java +++ b/servers/alive/src/main/java/com/samsung/alive/utils/rest/dsm/DsmApiError.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/main/java/com/samsung/alive/utils/rest/dsm/DsmApiImpl.java b/servers/alive/src/main/java/com/samsung/alive/utils/rest/dsm/DsmApiImpl.java index f6d7920..7d405bd 100644 --- a/servers/alive/src/main/java/com/samsung/alive/utils/rest/dsm/DsmApiImpl.java +++ b/servers/alive/src/main/java/com/samsung/alive/utils/rest/dsm/DsmApiImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/main/resources/logback.xml b/servers/alive/src/main/resources/logback.xml index d0d58d1..f16ace5 100644 --- a/servers/alive/src/main/resources/logback.xml +++ b/servers/alive/src/main/resources/logback.xml @@ -1,5 +1,5 @@ diff --git a/servers/alive/src/main/resources/root-context.xml b/servers/alive/src/main/resources/root-context.xml index eabe288..6254cdc 100644 --- a/servers/alive/src/main/resources/root-context.xml +++ b/servers/alive/src/main/resources/root-context.xml @@ -1,5 +1,5 @@ diff --git a/servers/alive/src/main/resources/spring-database.xml b/servers/alive/src/main/resources/spring-database.xml index e780a94..dd9cc06 100644 --- a/servers/alive/src/main/resources/spring-database.xml +++ b/servers/alive/src/main/resources/spring-database.xml @@ -1,5 +1,5 @@ diff --git a/servers/alive/src/test/java/com/samsung/alive/AliveTest.java b/servers/alive/src/test/java/com/samsung/alive/AliveTest.java index 8cba14d..8158a6a 100644 --- a/servers/alive/src/test/java/com/samsung/alive/AliveTest.java +++ b/servers/alive/src/test/java/com/samsung/alive/AliveTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/test/java/com/samsung/alive/rest/AliveRestControllerTest.java b/servers/alive/src/test/java/com/samsung/alive/rest/AliveRestControllerTest.java index b58f741..2edff27 100644 --- a/servers/alive/src/test/java/com/samsung/alive/rest/AliveRestControllerTest.java +++ b/servers/alive/src/test/java/com/samsung/alive/rest/AliveRestControllerTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/test/java/com/samsung/alive/service/impl/AliveDevicesServiceImplTest.java b/servers/alive/src/test/java/com/samsung/alive/service/impl/AliveDevicesServiceImplTest.java index 546256b..be49be6 100644 --- a/servers/alive/src/test/java/com/samsung/alive/service/impl/AliveDevicesServiceImplTest.java +++ b/servers/alive/src/test/java/com/samsung/alive/service/impl/AliveDevicesServiceImplTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/test/java/com/samsung/alive/utils/rest/DsmApiImplTest.java b/servers/alive/src/test/java/com/samsung/alive/utils/rest/DsmApiImplTest.java index 87b091e..4a943b4 100644 --- a/servers/alive/src/test/java/com/samsung/alive/utils/rest/DsmApiImplTest.java +++ b/servers/alive/src/test/java/com/samsung/alive/utils/rest/DsmApiImplTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/alive/src/test/resources/logback.xml b/servers/alive/src/test/resources/logback.xml index 612152f..bdc3a58 100644 --- a/servers/alive/src/test/resources/logback.xml +++ b/servers/alive/src/test/resources/logback.xml @@ -1,5 +1,5 @@ diff --git a/servers/alive/src/test/resources/root-context.xml b/servers/alive/src/test/resources/root-context.xml index f8eaac8..8fe3312 100644 --- a/servers/alive/src/test/resources/root-context.xml +++ b/servers/alive/src/test/resources/root-context.xml @@ -1,5 +1,5 @@ diff --git a/servers/alive/src/test/resources/spring-database.xml b/servers/alive/src/test/resources/spring-database.xml index ad6bcfc..26174a5 100644 --- a/servers/alive/src/test/resources/spring-database.xml +++ b/servers/alive/src/test/resources/spring-database.xml @@ -1,5 +1,5 @@ diff --git a/servers/api-integration-tests/pom.xml b/servers/api-integration-tests/pom.xml index e8672b0..ceaf9f4 100644 --- a/servers/api-integration-tests/pom.xml +++ b/servers/api-integration-tests/pom.xml @@ -1,6 +1,6 @@ diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Alive.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Alive.java index a439f3a..5acf474 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Alive.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Alive.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -20,7 +20,7 @@ import org.apache.log4j.Logger; * @brief The type Alive. * @date Created : 9/4/2017 * @date Modified : 9/4/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/AppConfigInit.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/AppConfigInit.java index 99433a8..5047ad9 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/AppConfigInit.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/AppConfigInit.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -17,7 +17,7 @@ import org.springframework.core.env.Environment; * @brief Init application configuration * @date Created : 9/4/2017 * @date Modified : 9/4/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/DBConfigInit.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/DBConfigInit.java index bd3a4e5..75d7e65 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/DBConfigInit.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/DBConfigInit.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -23,7 +23,7 @@ import static com.samsung.ci.basic.api.AppConfigInit.*; * @brief Init DB configuration * @date Created : 9/7/2017 * @date Modified : 9/7/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/MQListenerAPI.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/MQListenerAPI.java index cc04214..083ccd6 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/MQListenerAPI.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/MQListenerAPI.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -35,7 +35,7 @@ import kafka.utils.ZkUtils; * user, delete user if not admin, login as admin, delete user if admin * @date Created : 9/12/2017 * @date Modified : 9/12/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. * diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/MQPublisherAPI.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/MQPublisherAPI.java index cc4a3ff..6eb4e8b 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/MQPublisherAPI.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/MQPublisherAPI.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import com.samsung.ci.basic.utils.Cbor; * @brief The type Mq publisher api. * @date Created : 9/12/2017 * @date Modified : 9/12/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Reports.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Reports.java index e532f18..9f1adf3 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Reports.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Reports.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import static io.restassured.RestAssured.given; * @brief Base class for Reports * @date Created : 10/3/2017 * @date Modified : 10/3/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Request.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Request.java index aa433cb..6bff0b9 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Request.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Request.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -19,7 +19,7 @@ import static io.restassured.RestAssured.given; * @brief Base class for request * @date Created : 9/4/2017 * @date Modified : 9/4/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Rest.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Rest.java index 378b23f..0b3bf2b 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Rest.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/Rest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -20,7 +20,7 @@ import static io.restassured.RestAssured.given; * @brief Base class for rest * @date Created : 9/4/2017 * @date Modified : 9/4/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/Device.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/Device.java index 4bff60d..364df52 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/Device.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/Device.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -14,7 +14,7 @@ package com.samsung.ci.basic.model; * @brief Model for device * @date Created : 9/21/2017 * @date Modified : 9/21/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/JSONDevice.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/JSONDevice.java index 8724c5b..faacae7 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/JSONDevice.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/JSONDevice.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -14,7 +14,7 @@ package com.samsung.ci.basic.model; * @brief Model for device * @date Created : 9/21/2017 * @date Modified : 9/21/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/User.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/User.java index 9421d4c..1a43e01 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/User.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/User.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -14,7 +14,7 @@ package com.samsung.ci.basic.model; * @brief Model for device * @date Created : 9/21/2017 * @date Modified : 9/21/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/utils/Cbor.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/utils/Cbor.java index a81574b..bc1362f 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/utils/Cbor.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/utils/Cbor.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import java.io.IOException; * @brief The type Cbor. * @date Created : 9/21/2017 * @date Modified : 9/21/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/utils/Utils.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/utils/Utils.java index 78bca24..abd5f1f 100644 --- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/utils/Utils.java +++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/utils/Utils.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -21,7 +21,7 @@ import org.springframework.core.io.Resource; * @brief The type Utils.java * @date Created : 9/21/2017 * @date Modified : 9/21/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/alive/AliveActualizeDevicesStatusTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/alive/AliveActualizeDevicesStatusTest.java index 1756223..b41973c 100644 --- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/alive/AliveActualizeDevicesStatusTest.java +++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/alive/AliveActualizeDevicesStatusTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -19,7 +19,7 @@ import com.samsung.ci.test.useractions.BasicUserAction; * @brief The type Iot actualize status test. * @date Created : 2/10/2017 * @date Modified : 2/10/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/DeviceRegistrationAndUnregistrationWithoutCloudTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/DeviceRegistrationAndUnregistrationWithoutCloudTest.java index 6d20217..9dd4553 100644 --- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/DeviceRegistrationAndUnregistrationWithoutCloudTest.java +++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/DeviceRegistrationAndUnregistrationWithoutCloudTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -29,7 +29,7 @@ import io.restassured.response.Response; * @brief The type Device registration and unregistration without cloud test. * @date Created : 9/21/2017 * @date Modified : 9/21/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/PolicyWitoutCloudTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/PolicyWitoutCloudTest.java index 9039f9c..eaef9dd 100644 --- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/PolicyWitoutCloudTest.java +++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/PolicyWitoutCloudTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -31,7 +31,7 @@ import com.samsung.ci.test.useractions.BasicUserAction; * @brief The type Policy witout cloud test. * @date Created : 9/21/2017 * @date Modified : 9/21/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/ReportsWithOutCloudTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/ReportsWithOutCloudTest.java index 9dc70bd..58ec3bc 100644 --- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/ReportsWithOutCloudTest.java +++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/ReportsWithOutCloudTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -38,7 +38,7 @@ import io.restassured.response.Response; * @brief The type Reports with out cloud test. * @date Created : 9/21/2017 * @date Modified : 9/21/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/RestRuleReportsTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/RestRuleReportsTest.java index d644871..cc0c506 100644 --- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/RestRuleReportsTest.java +++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/RestRuleReportsTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -33,7 +33,7 @@ import io.restassured.response.Response; * @brief The type Test rest rule reports. * @date Created : 10/23/2017 * @date Modified : 11/3/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/TIAReportsTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/TIAReportsTest.java index ca6ea6f..58b0c78 100644 --- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/TIAReportsTest.java +++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/TIAReportsTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -37,7 +37,7 @@ import io.restassured.response.Response; * @brief The type TIAReportsTest. * @date Created : 10/3/2017 * @date Modified : 10/3/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/AuthorizedWithoutCloudTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/AuthorizedWithoutCloudTest.java index 2118940..0d4ea9f 100644 --- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/AuthorizedWithoutCloudTest.java +++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/AuthorizedWithoutCloudTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -17,7 +17,7 @@ import org.junit.jupiter.api.Test; * @brief Authorized without cloud scenario * @date Created : 9/6/2017 * @date Modified : 9/6/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/BasicUserAction.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/BasicUserAction.java index d7e4c53..4fb95d4 100644 --- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/BasicUserAction.java +++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/BasicUserAction.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.equalTo; * @brief Basic user action * @date Created : 9/4/2017 * @date Modified : 9/4/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/DeviceApiWithoutCloudTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/DeviceApiWithoutCloudTest.java index 384973c..f1252eb 100644 --- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/DeviceApiWithoutCloudTest.java +++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/DeviceApiWithoutCloudTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; * @brief Device API for test different device types * @date Created : 10/23/2017 * @date Modified : 11/6/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/UserDSMActionTest.java b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/UserDSMActionTest.java index 90bf4d8..1a39dcc 100644 --- a/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/UserDSMActionTest.java +++ b/servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/UserDSMActionTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import io.restassured.response.Response; * @brief User registration scenario * @date Created : 9/7/2017 * @date Modified : 9/7/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/pom.xml b/servers/commons/pom.xml index 6fc06b4..7c46876 100644 --- a/servers/commons/pom.xml +++ b/servers/commons/pom.xml @@ -1,6 +1,6 @@ diff --git a/servers/commons/src/main/java/com/samsung/commons/domain/Agent.java b/servers/commons/src/main/java/com/samsung/commons/domain/Agent.java index 3ecdfd3..cf1ac6d 100644 --- a/servers/commons/src/main/java/com/samsung/commons/domain/Agent.java +++ b/servers/commons/src/main/java/com/samsung/commons/domain/Agent.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import java.io.Serializable; * @brief Agent DAO class * @date Created : 6/29/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/domain/CustomUserDetails.java b/servers/commons/src/main/java/com/samsung/commons/domain/CustomUserDetails.java index 55a5507..fd39dd5 100644 --- a/servers/commons/src/main/java/com/samsung/commons/domain/CustomUserDetails.java +++ b/servers/commons/src/main/java/com/samsung/commons/domain/CustomUserDetails.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -24,7 +24,7 @@ import java.util.Collection; * @brief CustomUserDetails DAO table * @date Created : 1/9/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/domain/Device.java b/servers/commons/src/main/java/com/samsung/commons/domain/Device.java index 096e9a7..30cc55f 100644 --- a/servers/commons/src/main/java/com/samsung/commons/domain/Device.java +++ b/servers/commons/src/main/java/com/samsung/commons/domain/Device.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import static javax.persistence.CascadeType.ALL; * @brief Device DAO class * @date Created : 6/26/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ @@ -206,6 +206,7 @@ public class Device implements Serializable { * @param policy the device's policy instance * @param user the user * @param parentUuid the parent uuid + * @param mode the mode */ public Device(String uuid, String name, String type, String model, Integer status, Policy policy, User user, String parentUuid, String mode) { @@ -233,6 +234,7 @@ public class Device implements Serializable { * @param user the user * @param removed the removed * @param parentUuid the parent uuid + * @param mode the mode */ public Device(String uuid, String name, String type, String model, Integer status, Policy policy, User user, boolean removed, String parentUuid, String mode) { diff --git a/servers/commons/src/main/java/com/samsung/commons/domain/IotCloudUser.java b/servers/commons/src/main/java/com/samsung/commons/domain/IotCloudUser.java index 5f5ea3a..6802f86 100644 --- a/servers/commons/src/main/java/com/samsung/commons/domain/IotCloudUser.java +++ b/servers/commons/src/main/java/com/samsung/commons/domain/IotCloudUser.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import java.io.Serializable; * @brief Domain class for IotCloudUser * @date Created : 7/13/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/domain/Policy.java b/servers/commons/src/main/java/com/samsung/commons/domain/Policy.java index 06cdb2d..c8fac8e 100644 --- a/servers/commons/src/main/java/com/samsung/commons/domain/Policy.java +++ b/servers/commons/src/main/java/com/samsung/commons/domain/Policy.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -33,7 +33,7 @@ import com.samsung.commons.utils.Utils; * @brief DAO class for Policy table * @date Created : 1/9/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/domain/Report.java b/servers/commons/src/main/java/com/samsung/commons/domain/Report.java index 43f201f..490c8f7 100644 --- a/servers/commons/src/main/java/com/samsung/commons/domain/Report.java +++ b/servers/commons/src/main/java/com/samsung/commons/domain/Report.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -20,7 +20,7 @@ import javax.persistence.*; * @brief Report DAO table * @date Created : 1/9/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/domain/ReportType.java b/servers/commons/src/main/java/com/samsung/commons/domain/ReportType.java index 5736552..10260be 100644 --- a/servers/commons/src/main/java/com/samsung/commons/domain/ReportType.java +++ b/servers/commons/src/main/java/com/samsung/commons/domain/ReportType.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -24,7 +24,7 @@ import javax.persistence.*; * @brief ReportType DAO table * @date Created : 1/9/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/domain/Role.java b/servers/commons/src/main/java/com/samsung/commons/domain/Role.java index f159e09..56847a9 100644 --- a/servers/commons/src/main/java/com/samsung/commons/domain/Role.java +++ b/servers/commons/src/main/java/com/samsung/commons/domain/Role.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -19,7 +19,7 @@ import java.io.Serializable; * @brief Role DAO table * @date Created : 1/9/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/domain/Rule.java b/servers/commons/src/main/java/com/samsung/commons/domain/Rule.java index 9e5c0d4..9857ff7 100644 --- a/servers/commons/src/main/java/com/samsung/commons/domain/Rule.java +++ b/servers/commons/src/main/java/com/samsung/commons/domain/Rule.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -28,7 +28,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder; * @brief Rule DAO table * @date Created : 10/3/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/domain/User.java b/servers/commons/src/main/java/com/samsung/commons/domain/User.java index 978e138..4f2cd80 100644 --- a/servers/commons/src/main/java/com/samsung/commons/domain/User.java +++ b/servers/commons/src/main/java/com/samsung/commons/domain/User.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -29,7 +29,7 @@ import javax.persistence.Table; * @brief User DAO table * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/model/MQPolicy.java b/servers/commons/src/main/java/com/samsung/commons/model/MQPolicy.java index 9a4302c..4ba66f9 100644 --- a/servers/commons/src/main/java/com/samsung/commons/model/MQPolicy.java +++ b/servers/commons/src/main/java/com/samsung/commons/model/MQPolicy.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; * @brief Policy model for Message Queue. * @date Created : 7/18/2017 * @date Modified : 8/21/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/model/Notification.java b/servers/commons/src/main/java/com/samsung/commons/model/Notification.java index b719dbb..3691e7a 100644 --- a/servers/commons/src/main/java/com/samsung/commons/model/Notification.java +++ b/servers/commons/src/main/java/com/samsung/commons/model/Notification.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull; * @brief Notification model for Message Queue. * @date Created : 7/18/2017 * @date Modified : 8/21/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/repository/AgentRepository.java b/servers/commons/src/main/java/com/samsung/commons/repository/AgentRepository.java index 49dd15f..a66c3f0 100644 --- a/servers/commons/src/main/java/com/samsung/commons/repository/AgentRepository.java +++ b/servers/commons/src/main/java/com/samsung/commons/repository/AgentRepository.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import java.util.List; * @brief Agent repository * @date Created : 6/26/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/repository/DeviceRepository.java b/servers/commons/src/main/java/com/samsung/commons/repository/DeviceRepository.java index a79ccd0..d9a7169 100644 --- a/servers/commons/src/main/java/com/samsung/commons/repository/DeviceRepository.java +++ b/servers/commons/src/main/java/com/samsung/commons/repository/DeviceRepository.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -25,7 +25,7 @@ import com.samsung.commons.domain.User; * @brief Device repository * @date Created : 6/26/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/repository/IotCloudUserRepository.java b/servers/commons/src/main/java/com/samsung/commons/repository/IotCloudUserRepository.java index 60f9684..7c3ce41 100644 --- a/servers/commons/src/main/java/com/samsung/commons/repository/IotCloudUserRepository.java +++ b/servers/commons/src/main/java/com/samsung/commons/repository/IotCloudUserRepository.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -20,7 +20,7 @@ import org.springframework.transaction.annotation.Transactional; * @brief IotCloudUser repository * @date Created : 7/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/repository/PolicyRepository.java b/servers/commons/src/main/java/com/samsung/commons/repository/PolicyRepository.java index 2dd5fbd..0ad2bdd 100644 --- a/servers/commons/src/main/java/com/samsung/commons/repository/PolicyRepository.java +++ b/servers/commons/src/main/java/com/samsung/commons/repository/PolicyRepository.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -20,7 +20,7 @@ import org.springframework.stereotype.Repository; * @brief Policy repository * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/repository/ReportRepository.java b/servers/commons/src/main/java/com/samsung/commons/repository/ReportRepository.java index 69ffb18..646fcda 100644 --- a/servers/commons/src/main/java/com/samsung/commons/repository/ReportRepository.java +++ b/servers/commons/src/main/java/com/samsung/commons/repository/ReportRepository.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -26,7 +26,7 @@ import java.util.List; * @brief Report repository * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/repository/ReportTypeRepository.java b/servers/commons/src/main/java/com/samsung/commons/repository/ReportTypeRepository.java index e1bc13b..2a1fa88 100644 --- a/servers/commons/src/main/java/com/samsung/commons/repository/ReportTypeRepository.java +++ b/servers/commons/src/main/java/com/samsung/commons/repository/ReportTypeRepository.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -21,7 +21,7 @@ import com.samsung.commons.domain.ReportType; * @brief Report type repository * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/repository/RoleRepository.java b/servers/commons/src/main/java/com/samsung/commons/repository/RoleRepository.java index 3b916b5..cdbc216 100644 --- a/servers/commons/src/main/java/com/samsung/commons/repository/RoleRepository.java +++ b/servers/commons/src/main/java/com/samsung/commons/repository/RoleRepository.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import com.samsung.commons.domain.Role; * @brief Role repository * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/repository/RuleRepository.java b/servers/commons/src/main/java/com/samsung/commons/repository/RuleRepository.java index 3a60b00..8485fca 100644 --- a/servers/commons/src/main/java/com/samsung/commons/repository/RuleRepository.java +++ b/servers/commons/src/main/java/com/samsung/commons/repository/RuleRepository.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -21,7 +21,7 @@ import com.samsung.commons.domain.Rule; * @brief Rule repository * @date Created : 10/3/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/repository/UserDetailsRepository.java b/servers/commons/src/main/java/com/samsung/commons/repository/UserDetailsRepository.java index b29c2ce..eb95f13 100644 --- a/servers/commons/src/main/java/com/samsung/commons/repository/UserDetailsRepository.java +++ b/servers/commons/src/main/java/com/samsung/commons/repository/UserDetailsRepository.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -21,7 +21,7 @@ import org.springframework.transaction.annotation.Transactional; * @brief User Details repository * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/repository/UserRepository.java b/servers/commons/src/main/java/com/samsung/commons/repository/UserRepository.java index 1d7f2b4..986c749 100644 --- a/servers/commons/src/main/java/com/samsung/commons/repository/UserRepository.java +++ b/servers/commons/src/main/java/com/samsung/commons/repository/UserRepository.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -25,7 +25,7 @@ import java.util.List; * @brief User repository * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/AgentService.java b/servers/commons/src/main/java/com/samsung/commons/service/AgentService.java index f8e62ca..f3dda7b 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/AgentService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/AgentService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -21,7 +21,7 @@ import java.util.List; * @brief Agent service * @date Created : 6/29/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/CommonService.java b/servers/commons/src/main/java/com/samsung/commons/service/CommonService.java index b7f6a88..e607f61 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/CommonService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/CommonService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -16,7 +16,7 @@ package com.samsung.commons.service; * @brief Common service * @date Created : 1/9/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/DeviceService.java b/servers/commons/src/main/java/com/samsung/commons/service/DeviceService.java index 05c0498..756c00d 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/DeviceService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/DeviceService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -23,7 +23,7 @@ import java.util.Set; * @brief Device service * @date Created : 6/26/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ @@ -103,6 +103,7 @@ public interface DeviceService extends CommonService { * @param user user * @param route the route * @return {@link Device} + * @param mode the mode */ Device init(String uuid, String name, String type, String model, int status, User user, String route, String mode); diff --git a/servers/commons/src/main/java/com/samsung/commons/service/IotCloudService.java b/servers/commons/src/main/java/com/samsung/commons/service/IotCloudService.java index b7776b9..e2f5eb9 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/IotCloudService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/IotCloudService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -19,7 +19,7 @@ import java.util.List; * @brief IotCloud service * @date Created : 7/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/PolicyService.java b/servers/commons/src/main/java/com/samsung/commons/service/PolicyService.java index 1a671dd..4825234 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/PolicyService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/PolicyService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import com.samsung.commons.domain.Policy; * @brief Policy service * @date Created : 6/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/ReportService.java b/servers/commons/src/main/java/com/samsung/commons/service/ReportService.java index 22e9407..b574878 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/ReportService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/ReportService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import com.samsung.commons.domain.ReportType; * @brief Report service * @date Created : 9/1/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/ReportTypeService.java b/servers/commons/src/main/java/com/samsung/commons/service/ReportTypeService.java index 0728867..df1e817 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/ReportTypeService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/ReportTypeService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import com.samsung.commons.domain.ReportType; * @brief Report type service * @date Created : 9/1/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/RoleService.java b/servers/commons/src/main/java/com/samsung/commons/service/RoleService.java index f3ac965..1ee05e5 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/RoleService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/RoleService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -19,7 +19,7 @@ import com.samsung.commons.domain.Role; * @brief Role service * @date Created : 9/1/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/RuleService.java b/servers/commons/src/main/java/com/samsung/commons/service/RuleService.java index 52863cd..73fe887 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/RuleService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/RuleService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import com.samsung.commons.domain.Rule; * @brief Rule service * @date Created : 10/3/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/UserDetailsService.java b/servers/commons/src/main/java/com/samsung/commons/service/UserDetailsService.java index d2edcda..5d57c28 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/UserDetailsService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/UserDetailsService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import com.samsung.commons.domain.CustomUserDetails; * @brief User Details service * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/UserService.java b/servers/commons/src/main/java/com/samsung/commons/service/UserService.java index ad2d005..b95295d 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/UserService.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/UserService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -20,7 +20,7 @@ import java.util.List; * @brief User service * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/impl/AgentServiceImpl.java b/servers/commons/src/main/java/com/samsung/commons/service/impl/AgentServiceImpl.java index a8a2c8d..72ca479 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/impl/AgentServiceImpl.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/impl/AgentServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -27,7 +27,7 @@ import java.util.List; * @brief Agent service implementation * @date Created : 6/29/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/impl/DeviceServiceImpl.java b/servers/commons/src/main/java/com/samsung/commons/service/impl/DeviceServiceImpl.java index 81c9eb7..248a9f0 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/impl/DeviceServiceImpl.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/impl/DeviceServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -32,7 +32,7 @@ import java.util.Set; * @brief Device service implementation * @date Created : 6/26/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/impl/IotCloudServiceImpl.java b/servers/commons/src/main/java/com/samsung/commons/service/impl/IotCloudServiceImpl.java index ddfa291..af9c342 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/impl/IotCloudServiceImpl.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/impl/IotCloudServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -25,7 +25,7 @@ import java.util.List; * @brief IotCloud service implementation * @date Created : 7/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/impl/PolicyServiceImpl.java b/servers/commons/src/main/java/com/samsung/commons/service/impl/PolicyServiceImpl.java index fb69152..29c2073 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/impl/PolicyServiceImpl.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/impl/PolicyServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -28,7 +28,7 @@ import com.samsung.commons.service.PolicyService; * @brief Policy service implementation * @date Created : 6/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/impl/ReportServiceImpl.java b/servers/commons/src/main/java/com/samsung/commons/service/impl/ReportServiceImpl.java index f146eb6..8252d6c 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/impl/ReportServiceImpl.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/impl/ReportServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -31,7 +31,7 @@ import com.samsung.commons.service.ReportTypeService; * @brief Report service implementation * @date Created : 9/1/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/impl/ReportTypeServiceImpl.java b/servers/commons/src/main/java/com/samsung/commons/service/impl/ReportTypeServiceImpl.java index 0ca8f83..87c6522 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/impl/ReportTypeServiceImpl.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/impl/ReportTypeServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import org.springframework.stereotype.Service; * @brief Report type service implementation * @date Created : 9/1/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/impl/RoleServiceImpl.java b/servers/commons/src/main/java/com/samsung/commons/service/impl/RoleServiceImpl.java index 4ee7a6f..5cb0611 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/impl/RoleServiceImpl.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/impl/RoleServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -24,7 +24,7 @@ import java.util.List; * @brief Role service implementation * @date Created : 9/1/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/impl/RuleServiceImpl.java b/servers/commons/src/main/java/com/samsung/commons/service/impl/RuleServiceImpl.java index f4c96b4..c8aff16 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/impl/RuleServiceImpl.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/impl/RuleServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -23,7 +23,7 @@ import com.samsung.commons.service.RuleService; * @brief Rule service implementation * @date Created : 10/3/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/impl/UserDetailsServiceImpl.java b/servers/commons/src/main/java/com/samsung/commons/service/impl/UserDetailsServiceImpl.java index 51e95c3..f9539b3 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/impl/UserDetailsServiceImpl.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/impl/UserDetailsServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -31,7 +31,7 @@ import java.util.List; * @brief User Details service implementation * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/service/impl/UserServiceImpl.java b/servers/commons/src/main/java/com/samsung/commons/service/impl/UserServiceImpl.java index 2742b63..5c9c163 100644 --- a/servers/commons/src/main/java/com/samsung/commons/service/impl/UserServiceImpl.java +++ b/servers/commons/src/main/java/com/samsung/commons/service/impl/UserServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -30,7 +30,7 @@ import com.samsung.commons.service.UserService; * @brief User service implementation * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/TestUtils.java b/servers/commons/src/main/java/com/samsung/commons/utils/TestUtils.java index 12a2fca..b305488 100644 --- a/servers/commons/src/main/java/com/samsung/commons/utils/TestUtils.java +++ b/servers/commons/src/main/java/com/samsung/commons/utils/TestUtils.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -28,7 +28,7 @@ import java.util.List; * @brief Collection of methods that helps to prepare data for tests * @date Created : 9/5/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/Utils.java b/servers/commons/src/main/java/com/samsung/commons/utils/Utils.java index 588d33d..56f848a 100644 --- a/servers/commons/src/main/java/com/samsung/commons/utils/Utils.java +++ b/servers/commons/src/main/java/com/samsung/commons/utils/Utils.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -31,7 +31,7 @@ import org.springframework.validation.ObjectError; * @brief Common utils methods. * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/sender/HttpSender.java b/servers/commons/src/main/java/com/samsung/commons/utils/sender/HttpSender.java index 6d299c8..7985bb8 100644 --- a/servers/commons/src/main/java/com/samsung/commons/utils/sender/HttpSender.java +++ b/servers/commons/src/main/java/com/samsung/commons/utils/sender/HttpSender.java @@ -1,5 +1,5 @@ -/* - * In Samsung Ukraine R&D Center (SRK under a contract between) +/*gi + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -33,7 +33,7 @@ import static org.springframework.http.HttpMethod.POST; * @brief Http sender * @date Created : 10/30/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ @@ -129,12 +129,6 @@ public class HttpSender { doPost(requestString, null); } - /** - * Post entity - * - * @param requestString request string - * @throws HttpSenderException in case of post troubles - */ public void post(String requestString, Supplier> entitySupplier) throws HttpSenderException { doPost(requestString, entitySupplier); } diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/BadUrlException.java b/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/BadUrlException.java index b712281..2359e5c 100644 --- a/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/BadUrlException.java +++ b/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/BadUrlException.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -16,7 +16,7 @@ package com.samsung.commons.utils.sender.exception; * @brief Malformed URL * @date Created : 10/30/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/HttpSenderException.java b/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/HttpSenderException.java index 5ca03e1..8021214 100644 --- a/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/HttpSenderException.java +++ b/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/HttpSenderException.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -16,7 +16,7 @@ package com.samsung.commons.utils.sender.exception; * @brief Root HttpSender exception * @date Created : 10/30/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/NotAvailableException.java b/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/NotAvailableException.java index dd86ed1..1f091ca 100644 --- a/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/NotAvailableException.java +++ b/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/NotAvailableException.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -15,7 +15,7 @@ package com.samsung.commons.utils.sender.exception; * @brief Resource is not available * @date Created : 10/30/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/PostFailedException.java b/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/PostFailedException.java index a3c69e6..db1481e 100644 --- a/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/PostFailedException.java +++ b/servers/commons/src/main/java/com/samsung/commons/utils/sender/exception/PostFailedException.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import org.springframework.http.HttpStatus; * @brief Post failed * @date Created : 10/30/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/sync/AsyncCode.java b/servers/commons/src/main/java/com/samsung/commons/utils/sync/AsyncCode.java index b547392..8893355 100644 --- a/servers/commons/src/main/java/com/samsung/commons/utils/sync/AsyncCode.java +++ b/servers/commons/src/main/java/com/samsung/commons/utils/sync/AsyncCode.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -15,7 +15,7 @@ package com.samsung.commons.utils.sync; * @brief Async code with result callback * @date Created : 10/27/2017 * @date Modified : 10/27/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/sync/ResultCallback.java b/servers/commons/src/main/java/com/samsung/commons/utils/sync/ResultCallback.java index fe371b5..ccb4ddc 100644 --- a/servers/commons/src/main/java/com/samsung/commons/utils/sync/ResultCallback.java +++ b/servers/commons/src/main/java/com/samsung/commons/utils/sync/ResultCallback.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -15,7 +15,7 @@ package com.samsung.commons.utils.sync; * @brief Result callback * @date Created : 10/27/2017 * @date Modified : 10/27/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/sync/Synchronous.java b/servers/commons/src/main/java/com/samsung/commons/utils/sync/Synchronous.java index 49818a9..927f388 100644 --- a/servers/commons/src/main/java/com/samsung/commons/utils/sync/Synchronous.java +++ b/servers/commons/src/main/java/com/samsung/commons/utils/sync/Synchronous.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -24,7 +24,7 @@ import static java.util.Optional.ofNullable; * @brief Synchronous class * @date Created : 10/27/2017 * @date Modified : 10/27/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/DomainEqualsHashCodeTest.java b/servers/commons/src/test/java/com/samsung/commons/DomainEqualsHashCodeTest.java index ad91020..da9cc1b 100644 --- a/servers/commons/src/test/java/com/samsung/commons/DomainEqualsHashCodeTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/DomainEqualsHashCodeTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/DomainToStringTest.java b/servers/commons/src/test/java/com/samsung/commons/DomainToStringTest.java index 6c42b25..79b3f24 100644 --- a/servers/commons/src/test/java/com/samsung/commons/DomainToStringTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/DomainToStringTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/EqualsVerifierTest.java b/servers/commons/src/test/java/com/samsung/commons/EqualsVerifierTest.java index fd06531..c803be0 100644 --- a/servers/commons/src/test/java/com/samsung/commons/EqualsVerifierTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/EqualsVerifierTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/IncreaseCoverageTest.java b/servers/commons/src/test/java/com/samsung/commons/IncreaseCoverageTest.java index 09279a3..a51afab 100644 --- a/servers/commons/src/test/java/com/samsung/commons/IncreaseCoverageTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/IncreaseCoverageTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/UtilsTest.java b/servers/commons/src/test/java/com/samsung/commons/UtilsTest.java index 987b247..c25476d 100644 --- a/servers/commons/src/test/java/com/samsung/commons/UtilsTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/UtilsTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/domain/agent/AgentTest.java b/servers/commons/src/test/java/com/samsung/commons/domain/agent/AgentTest.java index aeecfff..0d9ada5 100644 --- a/servers/commons/src/test/java/com/samsung/commons/domain/agent/AgentTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/domain/agent/AgentTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -29,7 +29,7 @@ import org.mockito.MockitoAnnotations; * @file AgentTest.java * @brief Unit tests for Agent domain class * @date Created : 27/06/17 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/domain/device/DeviceTest.java b/servers/commons/src/test/java/com/samsung/commons/domain/device/DeviceTest.java index 64a6a74..260bd24 100644 --- a/servers/commons/src/test/java/com/samsung/commons/domain/device/DeviceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/domain/device/DeviceTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -30,7 +30,7 @@ import org.mockito.MockitoAnnotations; * @file DeviceTest.java * @brief Unit tests for Device domain class * @date Created : 27/06/17 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/domain/device/statistics/ReportTest.java b/servers/commons/src/test/java/com/samsung/commons/domain/device/statistics/ReportTest.java index a1860ff..6a7bf05 100644 --- a/servers/commons/src/test/java/com/samsung/commons/domain/device/statistics/ReportTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/domain/device/statistics/ReportTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -27,7 +27,7 @@ import com.google.gson.JsonObject; * @file Report.java * @brief Tests for Report domain class. * @date Created : 26/08/16 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/domain/device/statistics/ReportTypeTest.java b/servers/commons/src/test/java/com/samsung/commons/domain/device/statistics/ReportTypeTest.java index 166933b..60fee2b 100644 --- a/servers/commons/src/test/java/com/samsung/commons/domain/device/statistics/ReportTypeTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/domain/device/statistics/ReportTypeTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/domain/policy/PolicyTest.java b/servers/commons/src/test/java/com/samsung/commons/domain/policy/PolicyTest.java index 1d1a6e8..050ec98 100644 --- a/servers/commons/src/test/java/com/samsung/commons/domain/policy/PolicyTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/domain/policy/PolicyTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -31,7 +31,7 @@ import com.samsung.commons.domain.Policy; * @brief Unit test for POLICY domain class * @date Created : 19/07/16 * @date Modified : 19/07/16 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/domain/user/CustomUserDetailsTest.java b/servers/commons/src/test/java/com/samsung/commons/domain/user/CustomUserDetailsTest.java index a215539..bd7fb28 100644 --- a/servers/commons/src/test/java/com/samsung/commons/domain/user/CustomUserDetailsTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/domain/user/CustomUserDetailsTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -25,7 +25,7 @@ import static org.mockito.Mockito.*; * @brief Unit -tests for CustomUserDetails class * @date Created : 21/03/16 * @date Modified : 21/03/16 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/domain/user/RoleTest.java b/servers/commons/src/test/java/com/samsung/commons/domain/user/RoleTest.java index fb821e4..de101f2 100644 --- a/servers/commons/src/test/java/com/samsung/commons/domain/user/RoleTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/domain/user/RoleTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; * @brief Unit -tests for Role class * @date Created : 21/03/16 * @date Modified : 21/03/16 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/domain/user/UserTest.java b/servers/commons/src/test/java/com/samsung/commons/domain/user/UserTest.java index bfb6074..5f573fb 100644 --- a/servers/commons/src/test/java/com/samsung/commons/domain/user/UserTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/domain/user/UserTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -25,7 +25,7 @@ import java.util.Date; * @brief Unit -tests for User class * @date Created : 21/03/16 * @date Modified : 19/07/16 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/pojo/PojoTestForMQRestDomain.java b/servers/commons/src/test/java/com/samsung/commons/pojo/PojoTestForMQRestDomain.java index dcc7922..490c8ee 100644 --- a/servers/commons/src/test/java/com/samsung/commons/pojo/PojoTestForMQRestDomain.java +++ b/servers/commons/src/test/java/com/samsung/commons/pojo/PojoTestForMQRestDomain.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/pojo/PojoTestForMQRestModel.java b/servers/commons/src/test/java/com/samsung/commons/pojo/PojoTestForMQRestModel.java index 723b462..b3ae337 100644 --- a/servers/commons/src/test/java/com/samsung/commons/pojo/PojoTestForMQRestModel.java +++ b/servers/commons/src/test/java/com/samsung/commons/pojo/PojoTestForMQRestModel.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/repository/AgentRepositoryTest.java b/servers/commons/src/test/java/com/samsung/commons/repository/AgentRepositoryTest.java index 358265a..cc9fc61 100644 --- a/servers/commons/src/test/java/com/samsung/commons/repository/AgentRepositoryTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/repository/AgentRepositoryTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -26,7 +26,7 @@ import org.springframework.test.context.web.WebAppConfiguration; * @file AgentRepositoryTest.java * @brief Unit tests for Agent repository * @date Created : 29/06/17 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/repository/DeviceRepositoryTest.java b/servers/commons/src/test/java/com/samsung/commons/repository/DeviceRepositoryTest.java index ec46a41..c055b47 100644 --- a/servers/commons/src/test/java/com/samsung/commons/repository/DeviceRepositoryTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/repository/DeviceRepositoryTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -29,7 +29,7 @@ import org.springframework.test.context.web.WebAppConfiguration; * @file DeviceRepositoryTest.java * @brief Unit tests for Device repository * @date Created : 27/06/17 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/repository/RoleRepositoryTest.java b/servers/commons/src/test/java/com/samsung/commons/repository/RoleRepositoryTest.java index c28d6a8..d164b68 100644 --- a/servers/commons/src/test/java/com/samsung/commons/repository/RoleRepositoryTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/repository/RoleRepositoryTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/repository/UserRepositoryTest.java b/servers/commons/src/test/java/com/samsung/commons/repository/UserRepositoryTest.java index 30ae808..5d2fa5e 100644 --- a/servers/commons/src/test/java/com/samsung/commons/repository/UserRepositoryTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/repository/UserRepositoryTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/service/AgentServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/AgentServiceTest.java index 04cbe1c..0084687 100644 --- a/servers/commons/src/test/java/com/samsung/commons/service/AgentServiceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/service/AgentServiceTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -37,7 +37,7 @@ import com.samsung.commons.domain.User; * @file AgentServiceTest.java * @brief Unit tests for Agent service * @date Created : 29/06/17 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/service/DeviceServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/DeviceServiceTest.java index ccb0f05..561762c 100644 --- a/servers/commons/src/test/java/com/samsung/commons/service/DeviceServiceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/service/DeviceServiceTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -46,7 +46,7 @@ import com.samsung.commons.repository.ReportTypeRepository; * @brief Unit tests for Device service * @date Created : 30/06/16 * @date Modified : 30/06/16 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/service/IoTCloudServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/IoTCloudServiceTest.java index 5ff6af1..1bc8e62 100644 --- a/servers/commons/src/test/java/com/samsung/commons/service/IoTCloudServiceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/service/IoTCloudServiceTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -38,7 +38,7 @@ import com.samsung.commons.service.impl.IotCloudServiceImpl; * @brief UT for UserService * @date Created : 23/07/16 * @date Modified: 23/07/16 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright: (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/service/PolicyServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/PolicyServiceTest.java index 23efabd..ad7bb55 100644 --- a/servers/commons/src/test/java/com/samsung/commons/service/PolicyServiceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/service/PolicyServiceTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -47,7 +47,7 @@ import com.samsung.commons.service.impl.PolicyServiceImpl; * @file PolicyServiceTest.java * @brief Unit tests for Policy service * @date Created : 30/06/16 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/service/ReportTypeServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/ReportTypeServiceTest.java index 33e2268..8e54eee 100644 --- a/servers/commons/src/test/java/com/samsung/commons/service/ReportTypeServiceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/service/ReportTypeServiceTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -24,7 +24,7 @@ import static org.junit.Assert.*; * @brief UT for ReportType service * @date Created : 26/07/16 * @date Created : 26/07/16 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright: (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/service/RoleServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/RoleServiceTest.java index fc96008..fab03ab 100644 --- a/servers/commons/src/test/java/com/samsung/commons/service/RoleServiceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/service/RoleServiceTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -26,7 +26,7 @@ import static org.junit.Assert.*; * @brief Unit test for RoleService * @date Created : 23/07/16 * @date Modified: 23/07/16 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright: (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/service/UserDetailsServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/UserDetailsServiceTest.java index c736269..8bf7423 100644 --- a/servers/commons/src/test/java/com/samsung/commons/service/UserDetailsServiceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/service/UserDetailsServiceTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -41,7 +41,7 @@ import com.samsung.commons.service.impl.UserDetailsServiceImpl; * @file UserDetailsServiceTest.java * @brief UT for UserDetails service * @date Created : 27/07/16 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright: (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/service/UserServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/UserServiceTest.java index d62f436..f485fa3 100644 --- a/servers/commons/src/test/java/com/samsung/commons/service/UserServiceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/service/UserServiceTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -59,7 +59,7 @@ import com.samsung.commons.service.impl.UserServiceImpl; * @brief UT for UserService * @date Created : 23/07/16 * @date Modified: 23/07/16 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright: (c) Samsung Electronics Co, Ltd 2016. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/service/impl/ReportServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/impl/ReportServiceTest.java index d7eb2ba..64e8f42 100644 --- a/servers/commons/src/test/java/com/samsung/commons/service/impl/ReportServiceTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/service/impl/ReportServiceTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/service/impl/RuleServiceImplTest.java b/servers/commons/src/test/java/com/samsung/commons/service/impl/RuleServiceImplTest.java index 69ba6d7..bdce7d3 100644 --- a/servers/commons/src/test/java/com/samsung/commons/service/impl/RuleServiceImplTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/service/impl/RuleServiceImplTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/utils/TestUtilsTest.java b/servers/commons/src/test/java/com/samsung/commons/utils/TestUtilsTest.java index b9852ed..0a48ef3 100644 --- a/servers/commons/src/test/java/com/samsung/commons/utils/TestUtilsTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/utils/TestUtilsTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/utils/sender/HttpSenderTest.java b/servers/commons/src/test/java/com/samsung/commons/utils/sender/HttpSenderTest.java index 4a47cae..17984a1 100644 --- a/servers/commons/src/test/java/com/samsung/commons/utils/sender/HttpSenderTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/utils/sender/HttpSenderTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ diff --git a/servers/commons/src/test/java/com/samsung/commons/utils/sync/SynchronousTest.java b/servers/commons/src/test/java/com/samsung/commons/utils/sync/SynchronousTest.java index 633df93..f02d6b1 100644 --- a/servers/commons/src/test/java/com/samsung/commons/utils/sync/SynchronousTest.java +++ b/servers/commons/src/test/java/com/samsung/commons/utils/sync/SynchronousTest.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -23,7 +23,7 @@ import static org.junit.Assert.assertThat; * @brief Tests for Synchronous * @date Created : 10/27/2017 * @date Modified : 10/27/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/commons/src/test/resources/root-context.xml b/servers/commons/src/test/resources/root-context.xml index 901d39f..3ed479f 100644 --- a/servers/commons/src/test/resources/root-context.xml +++ b/servers/commons/src/test/resources/root-context.xml @@ -1,5 +1,5 @@ diff --git a/servers/commons/src/test/resources/spring-database.xml b/servers/commons/src/test/resources/spring-database.xml index 2af0e1b..405c985 100644 --- a/servers/commons/src/test/resources/spring-database.xml +++ b/servers/commons/src/test/resources/spring-database.xml @@ -1,5 +1,5 @@ diff --git a/servers/dsm/pom.xml b/servers/dsm/pom.xml index caef2c3..f905443 100644 --- a/servers/dsm/pom.xml +++ b/servers/dsm/pom.xml @@ -1,5 +1,5 @@ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/controller/AccountController.java b/servers/dsm/src/main/java/com/samsung/dsm/controller/AccountController.java index 21b3b00..da1606e 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/controller/AccountController.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/controller/AccountController.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -41,7 +41,7 @@ import static com.samsung.commons.utils.Utils.returnView; * @brief Account controller * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/controller/AdminController.java b/servers/dsm/src/main/java/com/samsung/dsm/controller/AdminController.java index 583282a..3af7973 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/controller/AdminController.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/controller/AdminController.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -42,7 +42,7 @@ import com.samsung.dsm.security.authentication.PasswordEncoder; * @brief Admin controller * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardController.java b/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardController.java index 139084e..c78be77 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardController.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardController.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -31,7 +31,7 @@ import com.samsung.dsm.model.view.ViewDashboard; * @brief Dashboard controller * @date Created : 6/21/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardDevicesController.java b/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardDevicesController.java index d18fbff..7b9fe02 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardDevicesController.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardDevicesController.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -61,7 +61,7 @@ import com.samsung.dsm.utils.mq.MQApi; * @brief Dashboard devices controller * @date Created : 6/21/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/controller/HomeController.java b/servers/dsm/src/main/java/com/samsung/dsm/controller/HomeController.java index 19bc78a..7ec2c63 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/controller/HomeController.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/controller/HomeController.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import static com.samsung.commons.utils.Utils.returnView; * @brief Home controller * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/controller/UserController.java b/servers/dsm/src/main/java/com/samsung/dsm/controller/UserController.java index 1295f1f..71f3fa3 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/controller/UserController.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/controller/UserController.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * @brief User controller * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthAccessToken.java b/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthAccessToken.java index 06ba009..f171702 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthAccessToken.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthAccessToken.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -23,7 +23,7 @@ import org.hibernate.annotations.Type; * @brief OAuth access token DAO table * @date Created : 7/6/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthClientDetails.java b/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthClientDetails.java index c7a6ef2..0e253ec 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthClientDetails.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthClientDetails.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -23,7 +23,7 @@ import javax.persistence.Table; * @brief OAuth client details DAO table * @date Created : 7/6/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthClientToken.java b/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthClientToken.java index a19fc9d..a1451e4 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthClientToken.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthClientToken.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -25,7 +25,7 @@ import org.hibernate.annotations.Type; * @brief OAuth client DAO table * @date Created : 7/6/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthCode.java b/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthCode.java index f27f1f3..665f290 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthCode.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthCode.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -25,7 +25,7 @@ import org.hibernate.annotations.Type; * @brief OAuth code DAO table * @date Created : 7/6/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthRefreshToken.java b/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthRefreshToken.java index 0d3ebad..c0ee4dc 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthRefreshToken.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/domain/oauth/OAuthRefreshToken.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -23,7 +23,7 @@ import org.hibernate.annotations.Type; * @brief OAuth refresh token DAO table * @date Created : 7/6/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/request/ApplyPolicy.java b/servers/dsm/src/main/java/com/samsung/dsm/model/request/ApplyPolicy.java index 3de9ffc..45158b7 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/request/ApplyPolicy.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/request/ApplyPolicy.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -19,7 +19,7 @@ import org.hibernate.validator.constraints.NotEmpty; * @brief Model for policy setting. * @date Created : 7/13/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/request/EditUser.java b/servers/dsm/src/main/java/com/samsung/dsm/model/request/EditUser.java index 542a76d..2f91954 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/request/EditUser.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/request/EditUser.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -20,7 +20,7 @@ import org.hibernate.validator.constraints.Length; * @brief Model of the edited user. * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/request/NewUser.java b/servers/dsm/src/main/java/com/samsung/dsm/model/request/NewUser.java index 09fdbeb..ca42ea4 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/request/NewUser.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/request/NewUser.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -21,7 +21,7 @@ import org.hibernate.validator.constraints.Length; * @brief Model for new users registration. * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/request/ResetPassword.java b/servers/dsm/src/main/java/com/samsung/dsm/model/request/ResetPassword.java index 20e7ea8..02fa377 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/request/ResetPassword.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/request/ResetPassword.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import javax.validation.constraints.Size; * @brief Model for password reseting. * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/RestAgent.java b/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/RestAgent.java index 1fe920f..b285dbd 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/RestAgent.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/RestAgent.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -14,7 +14,7 @@ package com.samsung.dsm.model.restapi; * @brief The type Rest agent. * @date Created : 7/14/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/RestDevice.java b/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/RestDevice.java index a3e1ab1..295f579 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/RestDevice.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/RestDevice.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -14,7 +14,7 @@ package com.samsung.dsm.model.restapi; * @brief The type Rest device. * @date Created : 7/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/RestEntity.java b/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/RestEntity.java index 6f0e471..0ab7763 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/RestEntity.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/RestEntity.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -16,7 +16,7 @@ package com.samsung.dsm.model.restapi; * @brief Marker interface for all the REST entities. * @date Created : 7/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/converter/AgentConverter.java b/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/converter/AgentConverter.java index b1fc2a1..5b4934d 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/converter/AgentConverter.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/converter/AgentConverter.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -19,7 +19,7 @@ import com.samsung.dsm.model.restapi.RestAgent; * @brief Agent converter for REST * @date Created : 7/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/converter/DeviceConverter.java b/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/converter/DeviceConverter.java index af9070c..b8c648b 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/converter/DeviceConverter.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/converter/DeviceConverter.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import org.springframework.stereotype.Service; * @brief Device converter for REST * @date Created : 7/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/converter/DomainToRestConverter.java b/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/converter/DomainToRestConverter.java index f27a162..91508ed 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/converter/DomainToRestConverter.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/restapi/converter/DomainToRestConverter.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -21,7 +21,7 @@ import com.samsung.dsm.model.restapi.RestEntity; * @brief Simple converter for conversion of Domain object to Rest Entity object * @date Created : 7/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/view/BaseView.java b/servers/dsm/src/main/java/com/samsung/dsm/model/view/BaseView.java index d9a28b9..11308bb 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/view/BaseView.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/view/BaseView.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -23,7 +23,7 @@ import com.samsung.commons.domain.ReportType; * @brief Common view methods * @date Created : 7/18/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/view/DeviceOverview.java b/servers/dsm/src/main/java/com/samsung/dsm/model/view/DeviceOverview.java index 5bbbcf9..0f94a4e 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/view/DeviceOverview.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/view/DeviceOverview.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -25,7 +25,7 @@ import com.samsung.dsm.policy.parser.PolicyParserFactory; * @brief Device overview model * @date Created : 7/25/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewAgent.java b/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewAgent.java index ea65741..586b19d 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewAgent.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewAgent.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import com.samsung.dsm.policy.parser.PolicyParserFactory; * @brief Agent view model * @date Created : 7/5/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewDashboard.java b/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewDashboard.java index 103c789..ebe072f 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewDashboard.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewDashboard.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -20,7 +20,7 @@ import java.util.List; * @brief Dashboard view model * @date Created : 7/18/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewDevice.java b/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewDevice.java index 8d3e1e2..e84379d 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewDevice.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewDevice.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -24,7 +24,7 @@ import com.samsung.dsm.policy.parser.PolicyParserFactory; * @brief Device view model * @date Created : 7/5/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewPolicyGroup.java b/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewPolicyGroup.java index a5b7d0b..467a549 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewPolicyGroup.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewPolicyGroup.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -25,7 +25,7 @@ import com.samsung.dsm.policy.parser.PolicyParserFactory; * @brief Policy group view model * @date Created : 7/5/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewReport.java b/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewReport.java index 3c12168..c020cbf 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewReport.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/model/view/ViewReport.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -26,7 +26,7 @@ import com.samsung.dsm.report.analyzer.impl.RuleAnalyzer; * @brief Report view model * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/policy/PolicyConfig.java b/servers/dsm/src/main/java/com/samsung/dsm/policy/PolicyConfig.java index 19f5c5a..b08359b 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/policy/PolicyConfig.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/policy/PolicyConfig.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -21,7 +21,7 @@ import static java.util.Arrays.copyOf; * @brief Policy model * @date Created : 6/16/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/policy/PolicyConfigException.java b/servers/dsm/src/main/java/com/samsung/dsm/policy/PolicyConfigException.java index ac9eea3..5f99fb3 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/policy/PolicyConfigException.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/policy/PolicyConfigException.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -14,7 +14,7 @@ package com.samsung.dsm.policy; * @brief Policy config exception * @date Created : 10/17/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/policy/parser/JSONPolicyConfigParser.java b/servers/dsm/src/main/java/com/samsung/dsm/policy/parser/JSONPolicyConfigParser.java index b64ba58..3648a65 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/policy/parser/JSONPolicyConfigParser.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/policy/parser/JSONPolicyConfigParser.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import com.samsung.dsm.policy.PolicyConfig; * @brief JSON policy parser * @date Created : 6/15/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/policy/parser/PolicyConfigParser.java b/servers/dsm/src/main/java/com/samsung/dsm/policy/parser/PolicyConfigParser.java index a5e9bbe..a8b2bc0 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/policy/parser/PolicyConfigParser.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/policy/parser/PolicyConfigParser.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -17,7 +17,7 @@ import com.samsung.dsm.policy.PolicyConfig; * @brief JSON policy parser * @date Created : 9/1/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/policy/parser/PolicyParserFactory.java b/servers/dsm/src/main/java/com/samsung/dsm/policy/parser/PolicyParserFactory.java index 39cee00..1991b4f 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/policy/parser/PolicyParserFactory.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/policy/parser/PolicyParserFactory.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -15,7 +15,7 @@ package com.samsung.dsm.policy.parser; * @brief Policy parser factory * @date Created : 7/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/report/ReportConfig.java b/servers/dsm/src/main/java/com/samsung/dsm/report/ReportConfig.java index 6238a88..b712009 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/report/ReportConfig.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/report/ReportConfig.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -17,7 +17,7 @@ import java.util.Arrays; * @brief Report model * @date Created : 6/19/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/report/analyzer/ReportAnalyzerKeys.java b/servers/dsm/src/main/java/com/samsung/dsm/report/analyzer/ReportAnalyzerKeys.java index bdefb3c..2d25625 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/report/analyzer/ReportAnalyzerKeys.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/report/analyzer/ReportAnalyzerKeys.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -14,7 +14,7 @@ package com.samsung.dsm.report.analyzer; * @brief The type Report analyzer keys * @date Created : 8/21/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/report/analyzer/impl/RuleAnalyzer.java b/servers/dsm/src/main/java/com/samsung/dsm/report/analyzer/impl/RuleAnalyzer.java index 3d8992e..828225f 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/report/analyzer/impl/RuleAnalyzer.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/report/analyzer/impl/RuleAnalyzer.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -36,7 +36,7 @@ import com.samsung.dsm.rule.parser.RuleConfigParser; * @brief The type Rule analyzer * @date Created : 10/5/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/report/parser/JSONReportConfigParser.java b/servers/dsm/src/main/java/com/samsung/dsm/report/parser/JSONReportConfigParser.java index eaeea8e..21709d4 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/report/parser/JSONReportConfigParser.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/report/parser/JSONReportConfigParser.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import com.samsung.dsm.report.ReportConfig; * @brief JSON report parser * @date Created : 6/19/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/report/parser/ReportConfigParser.java b/servers/dsm/src/main/java/com/samsung/dsm/report/parser/ReportConfigParser.java index e332087..1f1b47c 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/report/parser/ReportConfigParser.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/report/parser/ReportConfigParser.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -17,7 +17,7 @@ import com.samsung.dsm.report.ReportConfig; * @brief JSON report parser * @date Created : 6/19/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/repository/OAuthAccessTokenRepository.java b/servers/dsm/src/main/java/com/samsung/dsm/repository/OAuthAccessTokenRepository.java index babaedc..52ad6a8 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/repository/OAuthAccessTokenRepository.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/repository/OAuthAccessTokenRepository.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -21,7 +21,7 @@ import com.samsung.dsm.domain.oauth.OAuthAccessToken; * @brief OAuth Access Token repository * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/accesstoken/AccessTokenApi.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/accesstoken/AccessTokenApi.java index b893729..117e4ef 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rest/accesstoken/AccessTokenApi.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/accesstoken/AccessTokenApi.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -35,7 +35,7 @@ import com.samsung.dsm.service.LoginAuthCodeService; * @brief Access Token API * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/accesstoken/LoginServiceGeneralException.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/accesstoken/LoginServiceGeneralException.java index 9dd8eb6..82516f3 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rest/accesstoken/LoginServiceGeneralException.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/accesstoken/LoginServiceGeneralException.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import static org.springframework.http.HttpStatus.UNAUTHORIZED; * @brief The type Login service general exception. * @date Created : 7/14/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceApi.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceApi.java index 92bbd50..c757f6b 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceApi.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceApi.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -37,7 +37,7 @@ import static org.springframework.http.HttpStatus.OK; * @brief Device Rest API. * @date Created : 7/10/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceNotFoundByUuid.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceNotFoundByUuid.java index b2972d2..5db2aff 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceNotFoundByUuid.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceNotFoundByUuid.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import static org.springframework.http.HttpStatus.NOT_FOUND; * @brief The type Device not found by uuid. * @date Created : 7/10/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/iotcloud/IotCloudApi.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/iotcloud/IotCloudApi.java index 3424a4f..b6188ec 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rest/iotcloud/IotCloudApi.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/iotcloud/IotCloudApi.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -30,7 +30,7 @@ import com.samsung.commons.service.IotCloudService; * @brief ICloud REST API. * @date Created : 7/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/iotcloud/IotCloudAssociatedUserNotExists.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/iotcloud/IotCloudAssociatedUserNotExists.java index ea70249..0eac1ec 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rest/iotcloud/IotCloudAssociatedUserNotExists.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/iotcloud/IotCloudAssociatedUserNotExists.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import static org.springframework.http.HttpStatus.NOT_FOUND; * @brief The type Iot cloud associated user not exists. * @date Created : 7/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/iotcloud/IotCloudUserExists.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/iotcloud/IotCloudUserExists.java index d590fcb..b4ae26f 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rest/iotcloud/IotCloudUserExists.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/iotcloud/IotCloudUserExists.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import static org.springframework.http.HttpStatus.CONFLICT; * @brief The type Iot cloud user exists. * @date Created : 7/13/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/policy/PolicyApi.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/policy/PolicyApi.java index 4d492c4..d679b93 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rest/policy/PolicyApi.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/policy/PolicyApi.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -33,7 +33,7 @@ import com.samsung.commons.service.PolicyService; * @brief Policy REST API. * @date Created : 7/21/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/policy/PolicyNotFoundByDeviceUuidAndAgentUuid.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/policy/PolicyNotFoundByDeviceUuidAndAgentUuid.java index 15e843c..e57eb49 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rest/policy/PolicyNotFoundByDeviceUuidAndAgentUuid.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/policy/PolicyNotFoundByDeviceUuidAndAgentUuid.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import static org.springframework.http.HttpStatus.NOT_FOUND; * @brief The type Policy not found by device uuid and agent uuid. * @date Created : 7/21/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/report/ReportApi.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/report/ReportApi.java index ccba8af..83f923b 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rest/report/ReportApi.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/report/ReportApi.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -56,7 +56,7 @@ import com.samsung.dsm.report.analyzer.impl.RuleAnalyzer; * @brief Report REST API. * @date Created : 7/17/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/rule/RuleApi.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/rule/RuleApi.java index c0f9c00..2c43570 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rest/rule/RuleApi.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/rule/RuleApi.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -35,7 +35,7 @@ import com.samsung.dsm.rule.parser.RuleConfigParser; * @brief REST rule API * @date Created : 10/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rule/parser/JSONRuleConfigParser.java b/servers/dsm/src/main/java/com/samsung/dsm/rule/parser/JSONRuleConfigParser.java index 1ad98b1..9754115 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rule/parser/JSONRuleConfigParser.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rule/parser/JSONRuleConfigParser.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -17,7 +17,7 @@ import com.google.gson.GsonBuilder; * @brief The type Json rule config parser. * @date Created : 10/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rule/parser/RuleConfig.java b/servers/dsm/src/main/java/com/samsung/dsm/rule/parser/RuleConfig.java index ddc062d..e91b343 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rule/parser/RuleConfig.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rule/parser/RuleConfig.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -21,7 +21,7 @@ import com.google.common.base.Objects; * @brief The type Rule config. * @date Created : 10/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rule/parser/RuleConfigParser.java b/servers/dsm/src/main/java/com/samsung/dsm/rule/parser/RuleConfigParser.java index 56fde32..f165d44 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/rule/parser/RuleConfigParser.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/rule/parser/RuleConfigParser.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -14,7 +14,7 @@ package com.samsung.dsm.rule.parser; * @brief The interface Rule config parser. * @date Created : 10/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/security/authentication/PasswordEncoder.java b/servers/dsm/src/main/java/com/samsung/dsm/security/authentication/PasswordEncoder.java index 6b8d8a2..95ae9f2 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/security/authentication/PasswordEncoder.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/security/authentication/PasswordEncoder.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -15,7 +15,7 @@ package com.samsung.dsm.security.authentication; * @brief Password encoder interface * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/security/authentication/impl/BCPasswordEncoder.java b/servers/dsm/src/main/java/com/samsung/dsm/security/authentication/impl/BCPasswordEncoder.java index f45a912..9a37cf2 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/security/authentication/impl/BCPasswordEncoder.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/security/authentication/impl/BCPasswordEncoder.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -20,7 +20,7 @@ import com.samsung.dsm.security.authentication.PasswordEncoder; * @brief Password encoder interface * @date Created : 9/1/2016 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/service/AccessTokenService.java b/servers/dsm/src/main/java/com/samsung/dsm/service/AccessTokenService.java index cb42266..2d4094b 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/service/AccessTokenService.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/service/AccessTokenService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -20,7 +20,7 @@ import com.samsung.dsm.domain.oauth.OAuthAccessToken; * @brief The interface Access token service. * @date Created : 8/21/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/service/LoginAuthCodeService.java b/servers/dsm/src/main/java/com/samsung/dsm/service/LoginAuthCodeService.java index a694c9e..5f3053c 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/service/LoginAuthCodeService.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/service/LoginAuthCodeService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -14,7 +14,7 @@ package com.samsung.dsm.service; * @brief The interface Login auth code service. * @date Created : 8/21/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/service/OAuth2AuthorizationService.java b/servers/dsm/src/main/java/com/samsung/dsm/service/OAuth2AuthorizationService.java index 8130836..6dd091d 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/service/OAuth2AuthorizationService.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/service/OAuth2AuthorizationService.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -16,7 +16,7 @@ import org.springframework.security.core.Authentication; * @brief Generates auth code * @date Created : 7/7/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/service/impl/AccessTokenServiceImpl.java b/servers/dsm/src/main/java/com/samsung/dsm/service/impl/AccessTokenServiceImpl.java index 8f7b3e2..f11e845 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/service/impl/AccessTokenServiceImpl.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/service/impl/AccessTokenServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -24,7 +24,7 @@ import org.springframework.stereotype.Service; * @brief The implementation Access token service. * @date Created : 7/17/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/service/impl/OAuth2AuthorizationServiceImpl.java b/servers/dsm/src/main/java/com/samsung/dsm/service/impl/OAuth2AuthorizationServiceImpl.java index 64bc867..4bb071f 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/service/impl/OAuth2AuthorizationServiceImpl.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/service/impl/OAuth2AuthorizationServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -39,7 +39,7 @@ import com.samsung.dsm.service.OAuth2AuthorizationService; * @brief Generates auth code * @date Created : 7/7/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/service/impl/auth/LoginAuthCodeServiceClientCredentials.java b/servers/dsm/src/main/java/com/samsung/dsm/service/impl/auth/LoginAuthCodeServiceClientCredentials.java index 8744fa3..632e37d 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/service/impl/auth/LoginAuthCodeServiceClientCredentials.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/service/impl/auth/LoginAuthCodeServiceClientCredentials.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -14,7 +14,7 @@ package com.samsung.dsm.service.impl.auth; * @brief The type Login auth code service client credentials. * @date Created : 7/7/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/service/impl/auth/LoginAuthCodeServiceImpl.java b/servers/dsm/src/main/java/com/samsung/dsm/service/impl/auth/LoginAuthCodeServiceImpl.java index 42116fb..6b8afd8 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/service/impl/auth/LoginAuthCodeServiceImpl.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/service/impl/auth/LoginAuthCodeServiceImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -26,7 +26,7 @@ import com.samsung.dsm.service.OAuth2AuthorizationService; * @brief The type Login auth code service. * @date Created : 7/7/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/utils/alive/AliveApi.java b/servers/dsm/src/main/java/com/samsung/dsm/utils/alive/AliveApi.java index d3c28c0..b218b36 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/utils/alive/AliveApi.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/utils/alive/AliveApi.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -14,7 +14,7 @@ package com.samsung.dsm.utils.alive; * @brief The interface Alive api sender. * @date Created : 10/30/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/utils/alive/AliveApiImpl.java b/servers/dsm/src/main/java/com/samsung/dsm/utils/alive/AliveApiImpl.java index 9610859..b4f35cd 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/utils/alive/AliveApiImpl.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/utils/alive/AliveApiImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import static java.lang.String.format; * @brief The implementation Alive api sender. * @date Created : 10/30/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/utils/alive/AliveApiSenderException.java b/servers/dsm/src/main/java/com/samsung/dsm/utils/alive/AliveApiSenderException.java index 03d682a..41258e33 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/utils/alive/AliveApiSenderException.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/utils/alive/AliveApiSenderException.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -14,7 +14,7 @@ package com.samsung.dsm.utils.alive; * @brief The type Alive api sender exception. * @date Created : 10/30/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/utils/mq/MQApi.java b/servers/dsm/src/main/java/com/samsung/dsm/utils/mq/MQApi.java index b05b51a..ed649f8 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/utils/mq/MQApi.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/utils/mq/MQApi.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -17,7 +17,7 @@ import com.samsung.commons.model.Notification; * @brief MQApi class * @date Created : 10/27/2017 * @date Modified : 10/27/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/java/com/samsung/dsm/utils/mq/MQApiImpl.java b/servers/dsm/src/main/java/com/samsung/dsm/utils/mq/MQApiImpl.java index 1fe322d..91d57ce 100644 --- a/servers/dsm/src/main/java/com/samsung/dsm/utils/mq/MQApiImpl.java +++ b/servers/dsm/src/main/java/com/samsung/dsm/utils/mq/MQApiImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -27,7 +27,7 @@ import com.samsung.commons.model.Notification; * @brief MQApiImpl class * @date Created : 10/27/2017 * @date Modified : 10/27/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/dsm/src/main/resources/apache-tiles.xml b/servers/dsm/src/main/resources/apache-tiles.xml index 37458a1..6f2bcd1 100644 --- a/servers/dsm/src/main/resources/apache-tiles.xml +++ b/servers/dsm/src/main/resources/apache-tiles.xml @@ -1,5 +1,5 @@ diff --git a/servers/dsm/src/main/resources/root-context.xml b/servers/dsm/src/main/resources/root-context.xml index e79a98b..e37ce04 100644 --- a/servers/dsm/src/main/resources/root-context.xml +++ b/servers/dsm/src/main/resources/root-context.xml @@ -1,5 +1,5 @@ diff --git a/servers/dsm/src/main/resources/servlet-context.xml b/servers/dsm/src/main/resources/servlet-context.xml index 0a910f3..1e27cc2 100644 --- a/servers/dsm/src/main/resources/servlet-context.xml +++ b/servers/dsm/src/main/resources/servlet-context.xml @@ -1,5 +1,5 @@ diff --git a/servers/dsm/src/main/resources/spring-database.xml b/servers/dsm/src/main/resources/spring-database.xml index 53953ef..16875e8 100644 --- a/servers/dsm/src/main/resources/spring-database.xml +++ b/servers/dsm/src/main/resources/spring-database.xml @@ -1,5 +1,5 @@ diff --git a/servers/dsm/src/main/resources/spring-security.xml b/servers/dsm/src/main/resources/spring-security.xml index c5782cd..cf05b47 100644 --- a/servers/dsm/src/main/resources/spring-security.xml +++ b/servers/dsm/src/main/resources/spring-security.xml @@ -1,5 +1,5 @@ diff --git a/servers/dsm/src/main/webapp/WEB-INF/tiles/templates/template.jsp b/servers/dsm/src/main/webapp/WEB-INF/tiles/templates/template.jsp index f6a83c7..fa0bd11 100644 --- a/servers/dsm/src/main/webapp/WEB-INF/tiles/templates/template.jsp +++ b/servers/dsm/src/main/webapp/WEB-INF/tiles/templates/template.jsp @@ -1,7 +1,7 @@ diff --git a/servers/dsm/src/test/resources/spring-database.xml b/servers/dsm/src/test/resources/spring-database.xml index 4a748ed..42c3ce3 100644 --- a/servers/dsm/src/test/resources/spring-database.xml +++ b/servers/dsm/src/test/resources/spring-database.xml @@ -1,5 +1,5 @@ diff --git a/servers/dsm/src/test/resources/spring-security.xml b/servers/dsm/src/test/resources/spring-security.xml index 52508c3..ad13b38 100644 --- a/servers/dsm/src/test/resources/spring-security.xml +++ b/servers/dsm/src/test/resources/spring-security.xml @@ -1,5 +1,5 @@ diff --git a/servers/mq/pom.xml b/servers/mq/pom.xml index 9425a24..a83eb1b 100644 --- a/servers/mq/pom.xml +++ b/servers/mq/pom.xml @@ -1,5 +1,5 @@ diff --git a/servers/mq/src/main/java/com/samsung/servermq/HealthCheck.java b/servers/mq/src/main/java/com/samsung/servermq/HealthCheck.java index 2a57d01..2a82b08 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/HealthCheck.java +++ b/servers/mq/src/main/java/com/samsung/servermq/HealthCheck.java @@ -16,7 +16,7 @@ import java.net.URL; * @brief Base class for request * @date Created : 11/7/2017 * @date Modified : - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/ServerMQ.java b/servers/mq/src/main/java/com/samsung/servermq/ServerMQ.java index e006ac6..4c8dd5f 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/ServerMQ.java +++ b/servers/mq/src/main/java/com/samsung/servermq/ServerMQ.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -21,7 +21,7 @@ import static com.samsung.servermq.HealthCheck.checkDependencies; * @brief The type Server mq. * @date Created : 8/21/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/KafkaConsumerWrapper.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/KafkaConsumerWrapper.java index c5e772b..f44c96a 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/KafkaConsumerWrapper.java +++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/KafkaConsumerWrapper.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -47,7 +47,7 @@ import kafka.utils.ZkUtils; * @brief This class provides a set of APIs to use Kafka consumer APIs for receiving * @date Created : 8/21/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/KafkaErrorMessages.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/KafkaErrorMessages.java index 45b63ea..64b98ef 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/KafkaErrorMessages.java +++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/KafkaErrorMessages.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -18,7 +18,7 @@ import java.util.Map; * @brief Kafka possible error codes * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/KafkaProducerWrapper.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/KafkaProducerWrapper.java index d0f0d8f..3860aff 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/KafkaProducerWrapper.java +++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/KafkaProducerWrapper.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -21,7 +21,7 @@ import org.apache.log4j.Logger; * @brief This class provides a set of APIs to use Kafka producer APIs for publishing messages * @date Created : 8/21/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/MessageQueueListener.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/MessageQueueListener.java index cae8925..976a057 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/MessageQueueListener.java +++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/MessageQueueListener.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import com.samsung.servermq.iotivity.extractor.PostDataExtractor; * @brief The type Message queue listener * @date Created : 8/21/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/MessageQueuePublisher.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/MessageQueuePublisher.java index d882dc1..50aca7d 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/MessageQueuePublisher.java +++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/MessageQueuePublisher.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import com.samsung.servermq.utils.Cbor; * @brief The type Message queue publisher * @date Created : 8/21/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved. */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/Publisher.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/Publisher.java index a0501cb..2c2d87b 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/Publisher.java +++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/Publisher.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -17,7 +17,7 @@ import java.util.Map; * @brief The interface Publisher. * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/PostDataExtractor.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/PostDataExtractor.java index 3d29061..6689a32 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/PostDataExtractor.java +++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/PostDataExtractor.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -15,7 +15,7 @@ package com.samsung.servermq.iotivity.extractor; * @brief The interface Post data extractor. * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/DeviceRegistrationPostDataExtractor.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/DeviceRegistrationPostDataExtractor.java index 4e80016..d32788f 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/DeviceRegistrationPostDataExtractor.java +++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/DeviceRegistrationPostDataExtractor.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -27,7 +27,7 @@ import com.samsung.servermq.utils.MessageQueueUtils; * @brief The type Device registration post data extractor. * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/DeviceUnRegistrationPostDataExtractor.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/DeviceUnRegistrationPostDataExtractor.java index 58d7b56..5d616a6 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/DeviceUnRegistrationPostDataExtractor.java +++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/DeviceUnRegistrationPostDataExtractor.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -24,7 +24,7 @@ import com.samsung.servermq.utils.MessageQueueUtils; * @brief The type Device un registration post data extractor. * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/PolicyPostDataExtractor.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/PolicyPostDataExtractor.java index ae2be72..584c877 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/PolicyPostDataExtractor.java +++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/PolicyPostDataExtractor.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -25,7 +25,7 @@ import com.samsung.servermq.utils.rest.DsmApi; * @brief The type Policy post data extractor. * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/ReportPostDataExtractor.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/ReportPostDataExtractor.java index 66f1101..04b6efc 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/ReportPostDataExtractor.java +++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/extractor/impl/ReportPostDataExtractor.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -29,7 +29,7 @@ import com.samsung.servermq.iotivity.report.PrepareReport; * @brief The type Report post data extractor. * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/iotivity/report/PrepareReport.java b/servers/mq/src/main/java/com/samsung/servermq/iotivity/report/PrepareReport.java index dba0af6..32ae9ab 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/iotivity/report/PrepareReport.java +++ b/servers/mq/src/main/java/com/samsung/servermq/iotivity/report/PrepareReport.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -15,7 +15,7 @@ package com.samsung.servermq.iotivity.report; * @brief The type Prepare report. * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/rest/DSMRestController.java b/servers/mq/src/main/java/com/samsung/servermq/rest/DSMRestController.java index 5c77260..1df8f60 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/rest/DSMRestController.java +++ b/servers/mq/src/main/java/com/samsung/servermq/rest/DSMRestController.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -40,7 +40,7 @@ import com.samsung.servermq.iotivity.Publisher; * @brief The type DSM rest controller. * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/utils/Cbor.java b/servers/mq/src/main/java/com/samsung/servermq/utils/Cbor.java index 3f4c3b1..f6614e5 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/utils/Cbor.java +++ b/servers/mq/src/main/java/com/samsung/servermq/utils/Cbor.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -22,7 +22,7 @@ import com.fasterxml.jackson.dataformat.cbor.CBORFactory; * @brief The type Cbor. * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/utils/MessageQueueKeys.java b/servers/mq/src/main/java/com/samsung/servermq/utils/MessageQueueKeys.java index 11d11ab..86a2a0a 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/utils/MessageQueueKeys.java +++ b/servers/mq/src/main/java/com/samsung/servermq/utils/MessageQueueKeys.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -14,7 +14,7 @@ package com.samsung.servermq.utils; * @brief List keys for extracting data from clouds messages * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/utils/MessageQueueUtils.java b/servers/mq/src/main/java/com/samsung/servermq/utils/MessageQueueUtils.java index 613df2c..be858ff 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/utils/MessageQueueUtils.java +++ b/servers/mq/src/main/java/com/samsung/servermq/utils/MessageQueueUtils.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -20,7 +20,7 @@ import org.apache.log4j.Logger; * @brief This class provides a set of APIs of utilities for MessageQueue. * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/utils/rest/DsmApi.java b/servers/mq/src/main/java/com/samsung/servermq/utils/rest/DsmApi.java index 2de537d..425a48b 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/utils/rest/DsmApi.java +++ b/servers/mq/src/main/java/com/samsung/servermq/utils/rest/DsmApi.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -15,7 +15,7 @@ package com.samsung.servermq.utils.rest; * @brief The interface Server sender. * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved */ diff --git a/servers/mq/src/main/java/com/samsung/servermq/utils/rest/DsmApiImpl.java b/servers/mq/src/main/java/com/samsung/servermq/utils/rest/DsmApiImpl.java index aee03f2..93da37f 100644 --- a/servers/mq/src/main/java/com/samsung/servermq/utils/rest/DsmApiImpl.java +++ b/servers/mq/src/main/java/com/samsung/servermq/utils/rest/DsmApiImpl.java @@ -1,5 +1,5 @@ /* - * In Samsung Ukraine R&D Center (SRK under a contract between) + * In Samsung Ukraine RnD Center (SRK under a contract between) * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved. */ @@ -21,7 +21,7 @@ import static java.lang.String.format; * @brief The type DSM api implementation. * @date Created : 7/6/2017 * @date Modified : 11/2/2017 - * @copyright In Samsung Ukraine R&D Center (SRK under a contract between) + * @copyright In Samsung Ukraine RnD Center (SRK under a contract between) * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea) * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved */ diff --git a/servers/mq/src/main/resources/iotivity.xml b/servers/mq/src/main/resources/iotivity.xml index 3646452..73297d3 100644 --- a/servers/mq/src/main/resources/iotivity.xml +++ b/servers/mq/src/main/resources/iotivity.xml @@ -1,5 +1,5 @@ diff --git a/servers/mq/src/main/resources/logback.xml b/servers/mq/src/main/resources/logback.xml index acf8657..bde9606 100644 --- a/servers/mq/src/main/resources/logback.xml +++ b/servers/mq/src/main/resources/logback.xml @@ -1,5 +1,5 @@ diff --git a/servers/mq/src/main/resources/root-context.xml b/servers/mq/src/main/resources/root-context.xml index c87bc3f..48b5a17 100644 --- a/servers/mq/src/main/resources/root-context.xml +++ b/servers/mq/src/main/resources/root-context.xml @@ -1,5 +1,5 @@ diff --git a/servers/mq/src/main/resources/spring-database.xml b/servers/mq/src/main/resources/spring-database.xml index 9c03d43..6591f63 100644 --- a/servers/mq/src/main/resources/spring-database.xml +++ b/servers/mq/src/main/resources/spring-database.xml @@ -1,5 +1,5 @@ diff --git a/servers/mq/src/test/resources/iotivity.xml b/servers/mq/src/test/resources/iotivity.xml index 6db38a6..44e2331 100644 --- a/servers/mq/src/test/resources/iotivity.xml +++ b/servers/mq/src/test/resources/iotivity.xml @@ -1,5 +1,5 @@ diff --git a/servers/mq/src/test/resources/logback.xml b/servers/mq/src/test/resources/logback.xml index dda999c..ae17436 100644 --- a/servers/mq/src/test/resources/logback.xml +++ b/servers/mq/src/test/resources/logback.xml @@ -1,5 +1,5 @@ diff --git a/servers/mq/src/test/resources/root-context.xml b/servers/mq/src/test/resources/root-context.xml index f68ff9f..fe8b49e 100644 --- a/servers/mq/src/test/resources/root-context.xml +++ b/servers/mq/src/test/resources/root-context.xml @@ -1,5 +1,5 @@ diff --git a/servers/mq/src/test/resources/spring-database.xml b/servers/mq/src/test/resources/spring-database.xml index f10eaed..46f1687 100644 --- a/servers/mq/src/test/resources/spring-database.xml +++ b/servers/mq/src/test/resources/spring-database.xml @@ -1,5 +1,5 @@ diff --git a/servers/pom.xml b/servers/pom.xml index 41258e34..29ce18d 100644 --- a/servers/pom.xml +++ b/servers/pom.xml @@ -1,5 +1,5 @@ @@ -70,6 +70,35 @@ ${project.build.sourceEncoding} + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0-M1 + + + + file + X + + + brief + X + + + date + X + + + copyright + X + + + par + X + + + + diff --git a/servers/settings.xml b/servers/settings.xml index 5b3d87e..c293c22 100644 --- a/servers/settings.xml +++ b/servers/settings.xml @@ -1,6 +1,6 @@