Modified Exception and Doxygen in SceneManager Local-side Excepiton

- InvalidAddMemberRequestException -> RCSBadRequestException
- Adds API doxygen of excepiton

Change-Id: Ie520f84bc6895c57e0bef9ed0ee6adb97154681d
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5527
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/scene-manager/include/Scene.h b/service/scene-manager/include/Scene.h
index abc7397..231c2e5 100755 (executable)
--- a/service/scene-manager/include/Scene.h
+++ b/service/scene-manager/include/Scene.h
@@ -43,20 +43,6 @@ namespace OIC
         class Scene
         {
         public:
-
-            /**
-             * @class InvalidAddMemberRequestException
-             *
-             * @brief If request of adding member is invalid, throw InvalidMemberRequestException.
-             * Adding member is invalid that scene member resource is already registered.
-             */
-            class InvalidAddMemberRequestException: public RCSException
-            {
-            public:
-                InvalidAddMemberRequestException(std::string&& what) :
-                    RCSException{ std::move(what) } {}
-            };
-
             typedef std::shared_ptr< Scene > Ptr;
 
             /**
@@ -83,8 +69,7 @@ namespace OIC
              * @return A shared pointer of SceneAction instance
              *
              * @throws RCSInvalidParameterException if pRCSRemoteResourceObject is nullptr
-             * @throws InvalidAddMemberRequestException
-             *         if scene member resource is already registered
+             * @throws RCSBadRequestException if scene member resource is already registered
              *
              * @note SceneAction instance is only produced by Scene class
              *
@@ -103,7 +88,7 @@ namespace OIC
              * @return A shared pointer of SceneAction instance
              *
              * @throws RCSInvalidParameterException if pRCSRemoteResourceObject is nullptr
-             * @throws InvalidAddMemberRequestException if SceneMember is already registered
+             * @throws RCSBadRequestException if SceneMember is already registered
              *
              * @note SceneAction instance is only produced by Scene class
              *

diff --git a/service/scene-manager/include/SceneCollection.h b/service/scene-manager/include/SceneCollection.h
index 0d13e75..ecc96d8 100755 (executable)
--- a/service/scene-manager/include/SceneCollection.h
+++ b/service/scene-manager/include/SceneCollection.h
@@ -57,6 +57,9 @@ namespace OIC
              *
              * @return A shared pointer of Scene instance
              *
+             * @throw RCSInvalidParameterException if scene name is empty
+             * @throw RCSInvalidParameterException if scene name is dupltcated
+             *
              * @note Scene instance is only produced by SceneCollection class
              * @note Scene's name must unique in one SceneCollection resource
              */

diff --git a/service/scene-manager/src/Scene.cpp b/service/scene-manager/src/Scene.cpp
index f407a01..3948f88 100755 (executable)
--- a/service/scene-manager/src/Scene.cpp
+++ b/service/scene-manager/src/Scene.cpp
@@ -57,7 +57,7 @@ namespace OIC
             {
                 m_sceneCollectionResource->addSceneMember(sceneMemberResObj);
             }
-            catch(std::exception& e)
+            catch(RCSBadRequestException& e)
             {
                 auto sceneMemberRes = m_sceneCollectionResource->findSceneMembers(m_name);
 
@@ -70,7 +70,7 @@ namespace OIC
 
                 if(it != sceneMemberRes.end())
                 {
-                    throw InvalidAddMemberRequestException(
+                    throw RCSBadRequestException(
                             "It is already registered member. Please set Execution Parameter!");
                 }
 

diff --git a/service/scene-manager/src/SceneCollection.cpp b/service/scene-manager/src/SceneCollection.cpp
index c72d26b..6899fc9 100755 (executable)
--- a/service/scene-manager/src/SceneCollection.cpp
+++ b/service/scene-manager/src/SceneCollection.cpp
@@ -38,6 +38,7 @@ namespace OIC
             }
 
             m_sceneCollectionResource->addScene(sceneName);
+
             return Scene::Ptr(new Scene(sceneName, m_sceneCollectionResource));
         }
 

diff --git a/service/scene-manager/unittests/SceneActionTest.cpp b/service/scene-manager/unittests/SceneActionTest.cpp
index 11203f4..9e78053 100755 (executable)
--- a/service/scene-manager/unittests/SceneActionTest.cpp
+++ b/service/scene-manager/unittests/SceneActionTest.cpp
@@ -113,7 +113,7 @@ TEST_F(SceneActionTest, createSceneActionByAlreadyExistedRCSRemoteResourceObject
     createSceneCollectionAndScene();
     createSceneAction();
     ASSERT_THROW(pScene1->addNewSceneAction(
-            pRemoteResource1, KEY, "off"), Scene::InvalidAddMemberRequestException);
+            pRemoteResource1, KEY, "off"), RCSBadRequestException);
 }
 
 TEST_F(SceneActionTest, getSceneActionInstance)
@@ -156,4 +156,4 @@ TEST_F(SceneActionTest, getRemoteResourceObject)
     createSceneAction();
 
     ASSERT_EQ(pSceneAction1->getRemoteResourceObject(), pRemoteResource1);
-}
\ No newline at end of file
+}