[IOT-1604] Fix cloud routing code
authorJung Seungho <shonest.jung@samsung.com>
Fri, 25 Nov 2016 05:58:59 +0000 (14:58 +0900)
committerJee Hyeok Kim <jihyeok13.kim@samsung.com>
Wed, 18 Jan 2017 05:38:25 +0000 (05:38 +0000)
commit37446f9d945fc5fbf84652df607ce0728004a0bf
tree686f6ba5c6eb4393e6ea0ebd49228def0bd05711
parent3f773ec8b437bb24898d0db8f7d78307ded60981
[IOT-1604] Fix cloud routing code

- Fix on do GET request to discovered resource server.
- changed DiResource to RouteResource
- code clean up

https://jira.iotivity.org/browse/IOT-1604

Change-Id: If1ccc98bb4d8e288d5264d1cadaf540ef0ca4794
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14781
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit f1e992e402ce526f3b2d9b4dd769d91a9f8888d8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16087
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
15 files changed:
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/CloudInterfaceServer.java
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/Constants.java
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/DeviceServerSystem.java
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/RouteResource.java [moved from cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/DiResource.java with 79% similarity]
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/account/Account.java
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/rd/DevicePresence.java
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/rd/ResourceDirectory.java
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/rd/ResourceFind.java
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/rd/ResourcePresence.java
cloud/interface/src/test/java/org/iotivity/cloud/ciserver/resources/RouteResourceTest.java [moved from cloud/interface/src/test/java/org/iotivity/cloud/ciserver/resources/DiResourceTest.java with 96% similarity]
cloud/interface/src/test/java/org/iotivity/cloud/ciserver/resources/proxy/rd/ResourceDirectoryTest.java
cloud/interface/src/test/java/org/iotivity/cloud/ciserver/resources/proxy/rd/ResourceFindTest.java
cloud/stack/src/main/java/org/iotivity/cloud/base/OICConstants.java
cloud/stack/src/main/java/org/iotivity/cloud/base/connector/CoapClient.java
cloud/stack/src/main/java/org/iotivity/cloud/base/device/CoapDevice.java