Repository: jclouds-labs Updated Branches: refs/heads/2.0.x dfe70318d -> e4e8da3a2
back-port jclouds#1130 to labs Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/e4e8da3a Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/e4e8da3a Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/e4e8da3a Branch: refs/heads/2.0.x Commit: e4e8da3a293d9b750b427e9ee5e3644f3eac7837 Parents: dfe7031 Author: Andrea Turli <[email protected]> Authored: Wed Aug 16 11:39:29 2017 +0200 Committer: Andrea Turli <[email protected]> Committed: Wed Aug 16 11:39:29 2017 +0200 ---------------------------------------------------------------------- .../main/java/org/jclouds/packet/domain/Facility.java | 4 ++-- packet/src/test/resources/facilities-first.json | 8 ++++++-- packet/src/test/resources/facilities-last.json | 4 +++- packet/src/test/resources/facilities.json | 12 +++++++++--- 4 files changed, 20 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e4e8da3a/packet/src/main/java/org/jclouds/packet/domain/Facility.java ---------------------------------------------------------------------- diff --git a/packet/src/main/java/org/jclouds/packet/domain/Facility.java b/packet/src/main/java/org/jclouds/packet/domain/Facility.java index 3124c7e..2921d9c 100644 --- a/packet/src/main/java/org/jclouds/packet/domain/Facility.java +++ b/packet/src/main/java/org/jclouds/packet/domain/Facility.java @@ -32,10 +32,10 @@ public abstract class Facility { public abstract String code(); public abstract List<String> features(); @Nullable - public abstract String address(); + public abstract Href address(); @SerializedNames({"id", "name", "code", "features", "address"}) - public static Facility create(final String id, String name, String code, List<String> features, String address) { + public static Facility create(final String id, String name, String code, List<String> features, Href address) { return new AutoValue_Facility(id, name, code, features == null ? ImmutableList.<String> of() : ImmutableList.copyOf(features), address); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e4e8da3a/packet/src/test/resources/facilities-first.json ---------------------------------------------------------------------- diff --git a/packet/src/test/resources/facilities-first.json b/packet/src/test/resources/facilities-first.json index 5decf9a..c075c9c 100644 --- a/packet/src/test/resources/facilities-first.json +++ b/packet/src/test/resources/facilities-first.json @@ -8,7 +8,9 @@ "baremetal", "storage" ], - "address": null + "address": { + "href": "e1e9c52e-a0bc-4117-b996-0fc94843ea09" + } }, { "id": "8e6470b3-b75e-47d1-bb93-45b225750975", @@ -17,7 +19,9 @@ "features": [ "storage" ], - "address": null + "address": { + "href": "e1e9c52e-a0bc-4117-b996-0fc94843ea09" + } } ], "meta": { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e4e8da3a/packet/src/test/resources/facilities-last.json ---------------------------------------------------------------------- diff --git a/packet/src/test/resources/facilities-last.json b/packet/src/test/resources/facilities-last.json index f5e6d1c..3bc8b7e 100644 --- a/packet/src/test/resources/facilities-last.json +++ b/packet/src/test/resources/facilities-last.json @@ -5,7 +5,9 @@ "name": "Sunnyvale, CA", "code": "sjc1", "features": [], - "address": null + "address": { + "href": "e1e9c52e-a0bc-4117-b996-0fc94843ea09" + } } ], "meta": { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e4e8da3a/packet/src/test/resources/facilities.json ---------------------------------------------------------------------- diff --git a/packet/src/test/resources/facilities.json b/packet/src/test/resources/facilities.json index ed6ab4f..e2fc51f 100644 --- a/packet/src/test/resources/facilities.json +++ b/packet/src/test/resources/facilities.json @@ -8,7 +8,9 @@ "baremetal", "storage" ], - "address": null + "address": { + "href": "e1e9c52e-a0bc-4117-b996-0fc94843ea09" + } }, { "id": "8e6470b3-b75e-47d1-bb93-45b225750975", @@ -17,14 +19,18 @@ "features": [ "storage" ], - "address": null + "address": { + "href": "e1e9c52e-a0bc-4117-b996-0fc94843ea09" + } }, { "id": "2b70eb8f-fa18-47c0-aba7-222a842362fd", "name": "Sunnyvale, CA", "code": "sjc1", "features": [], - "address": null + "address": { + "href": "e1e9c52e-a0bc-4117-b996-0fc94843ea09" + } } ] }
