From: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Date: Fri, 30 Oct 2015 20:48:15 +0000 (-0400)
Subject: Augment annotation to Map.entrySet()
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=bc1d8e7f6b3cf47f06693c0955fe560089792b3d;p=deliverable%2Ftracecompass.git

Augment annotation to Map.entrySet()

We already annotated Map.entrySet() to return a

  @NonNull Set<Map.Entry<K, V>>

But actually, the returned Set should not contain any null elements,
since then entry objects will always exist, even if the key and/or
value is null. So we could augment the annotation to:

  @NonNull Set<@NonNull Map.Entry<K, V>>

K and V in this case need to remain unannotated, their type should
match the Map's declaration.

Change-Id: Id436fd3cfc4f679198070e5efdbb9d2d3ce478ae
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/59422
Reviewed-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
---

diff --git a/common/org.eclipse.tracecompass.common.core/annotations/java/util/Map.eea b/common/org.eclipse.tracecompass.common.core/annotations/java/util/Map.eea
index 44f25b374d..f538bf972f 100644
--- a/common/org.eclipse.tracecompass.common.core/annotations/java/util/Map.eea
+++ b/common/org.eclipse.tracecompass.common.core/annotations/java/util/Map.eea
@@ -1,7 +1,7 @@
 class java/util/Map
 entrySet
  ()Ljava/util/Set<Ljava/util/Map$Entry<TK;TV;>;>;
- ()L1java/util/Set<Ljava/util/Map$Entry<TK;TV;>;>;
+ ()L1java/util/Set<L1java/util/Map$Entry<TK;TV;>;>;
 get
  (Ljava/lang/Object;)TV;
  (Ljava/lang/Object;)T0V;