| commit | a3d67cd8a08f0d31dac24354015c2259d8802316 | [log] [tgz] |
|---|---|---|
| author | Sho SHIMIZU <sshimizu@us.fujitsu.com> | Thu Jun 04 11:46:48 2015 -0700 |
| committer | Sho SHIMIZU <sshimizu@us.fujitsu.com> | Thu Jun 04 12:01:46 2015 -0700 |
| tree | 54afe7af7b632726771565f3636005979ac47422 | |
| parent | 0d94f06bdfd297f397eaf8694529c604d5892fbc [diff] |
Expose empty annotations as SparseAnnotations to move down cast Change-Id: I9e8a7d61b770faaec1b7e0ea1cf78bdb367b68ee
diff --git a/core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java b/core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java index 3911d0e..4215d65 100644 --- a/core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java +++ b/core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java
@@ -29,7 +29,7 @@ */ public final class DefaultAnnotations implements SparseAnnotations { - public static final Annotations EMPTY = DefaultAnnotations.builder().build(); + public static final SparseAnnotations EMPTY = DefaultAnnotations.builder().build(); private final Map<String, String> map;
diff --git a/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java b/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java index bfc1de7..55a14f3 100644 --- a/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java +++ b/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java
@@ -465,7 +465,7 @@ // Produces set of annotations from the given JSON node. private SparseAnnotations annotations(JsonNode node) { if (node == null) { - return (SparseAnnotations) DefaultAnnotations.EMPTY; + return DefaultAnnotations.EMPTY; } DefaultAnnotations.Builder builder = DefaultAnnotations.builder();