Add annotations for Map.keySet() and .values()

The returned Set and Collection always exist (would be empty
if there are no entries in the map), so can be marked @NonNull.

The generic types K or V keep the same modifiers as the map definition.

Change-Id: If826108fbbd9abb19c7f87f9ef6e27c047425461
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/59423
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 f538bf972f1c73797277471f351a8c22537ce3e2..1075c454d17bb416502066a7cfc3b45d497486cf 100644 (file)
--- a/common/org.eclipse.tracecompass.common.core/annotations/java/util/Map.eea
+++ b/common/org.eclipse.tracecompass.common.core/annotations/java/util/Map.eea
@@ -5,6 +5,12 @@ entrySet
 get
  (Ljava/lang/Object;)TV;
  (Ljava/lang/Object;)T0V;
+keySet
+ ()Ljava/util/Set<TK;>;
+ ()L1java/util/Set<TK;>;
 remove
  (Ljava/lang/Object;)TV;
  (Ljava/lang/Object;)T0V;
+values
+ ()Ljava/util/Collection<TV;>;
+ ()L1java/util/Collection<TV;>;

diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/analysis/TestRequirementAnalysis.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/analysis/TestRequirementAnalysis.java
index 7edc99f03fcefa09a2b40c75b4ce100dcac21271..f0fa61d20189f7b0c84d9d830c5af8818cd991cf 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/analysis/TestRequirementAnalysis.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/analysis/TestRequirementAnalysis.java
@@ -12,12 +12,10 @@
 
 package org.eclipse.tracecompass.tmf.tests.stubs.analysis;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.tmf.core.analysis.TmfAbstractAnalysisModule;
 import org.eclipse.tracecompass.tmf.core.analysis.TmfAnalysisRequirement;
 import org.eclipse.tracecompass.tmf.core.analysis.TmfAnalysisRequirement.ValuePriorityLevel;
@@ -81,8 +79,6 @@ public class TestRequirementAnalysis extends TmfAbstractAnalysisModule {
         fieldReqs.addValue(TID, ValuePriorityLevel.MANDATORY);
         requirements.put(FIELD_TYPE, fieldReqs);
 
-        @SuppressWarnings("null")
-        @NonNull Collection<TmfAnalysisRequirement> values = requirements.values();
-        return values;
+        return requirements.values();
     }
 }