Committed by
Thomas Vachuska
Fix ONOS-5091
Change-Id: I11762eb799c1f93536f472807167cdba20a7c8e6 (cherry picked from commit 45f806cc)
Showing
4 changed files
with
5 additions
and
5 deletions
... | @@ -82,7 +82,7 @@ public final class GroupCodec extends JsonCodec<Group> { | ... | @@ -82,7 +82,7 @@ public final class GroupCodec extends JsonCodec<Group> { |
82 | .put(DEVICE_ID, group.deviceId().toString()); | 82 | .put(DEVICE_ID, group.deviceId().toString()); |
83 | 83 | ||
84 | if (group.appId() != null) { | 84 | if (group.appId() != null) { |
85 | - result.put(APP_ID, group.appId().toString()); | 85 | + result.put(APP_ID, group.appId().name()); |
86 | } | 86 | } |
87 | 87 | ||
88 | if (group.appCookie() != null) { | 88 | if (group.appCookie() != null) { | ... | ... |
... | @@ -62,7 +62,7 @@ | ... | @@ -62,7 +62,7 @@ |
62 | "appId": { | 62 | "appId": { |
63 | "type": "string", | 63 | "type": "string", |
64 | "description": "application identifier", | 64 | "description": "application identifier", |
65 | - "example": "1" | 65 | + "example": "org.onosproject.rest" |
66 | }, | 66 | }, |
67 | "appCookie": { | 67 | "appCookie": { |
68 | "type": "string", | 68 | "type": "string", | ... | ... |
... | @@ -75,7 +75,7 @@ | ... | @@ -75,7 +75,7 @@ |
75 | "appId": { | 75 | "appId": { |
76 | "type": "string", | 76 | "type": "string", |
77 | "description": "application identifier", | 77 | "description": "application identifier", |
78 | - "example": "1" | 78 | + "example": "org.onosproject.rest" |
79 | }, | 79 | }, |
80 | "appCookie": { | 80 | "appCookie": { |
81 | "type": "string", | 81 | "type": "string", | ... | ... |
... | @@ -280,9 +280,9 @@ public class GroupsResourceTest extends ResourceTest { | ... | @@ -280,9 +280,9 @@ public class GroupsResourceTest extends ResourceTest { |
280 | 280 | ||
281 | // check application id | 281 | // check application id |
282 | final String jsonAppId = jsonGroup.get("appId").asString(); | 282 | final String jsonAppId = jsonGroup.get("appId").asString(); |
283 | - final String appId = group.appId().toString(); | 283 | + final String appId = group.appId().name(); |
284 | if (!jsonAppId.equals(appId)) { | 284 | if (!jsonAppId.equals(appId)) { |
285 | - reason = "appId " + group.appId().toString(); | 285 | + reason = "appId " + group.appId().name(); |
286 | return false; | 286 | return false; |
287 | } | 287 | } |
288 | 288 | ... | ... |
-
Please register or login to post a comment