common: Add annotations to HashMultimap#create methods

The returned HashMultimap is always @NonNull.

Change-Id: Ic6be32944771b175101c202d0d16780ba3372d0d
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/68360
Reviewed-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Tested-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Hudson CI

diff --git a/common/org.eclipse.tracecompass.common.core/annotations/com/google/common/collect/HashMultimap.eea b/common/org.eclipse.tracecompass.common.core/annotations/com/google/common/collect/HashMultimap.eea
new file mode 100644 (file)
index 0000000..d10d4c7
--- /dev/null
+++ b/common/org.eclipse.tracecompass.common.core/annotations/com/google/common/collect/HashMultimap.eea
@@ -0,0 +1,10 @@
+class com/google/common/collect/HashMultimap
+create
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()Lcom/google/common/collect/HashMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>()L1com/google/common/collect/HashMultimap<TK;TV;>;
+create
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(II)Lcom/google/common/collect/HashMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(II)L1com/google/common/collect/HashMultimap<TK;TV;>;
+create
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)Lcom/google/common/collect/HashMultimap<TK;TV;>;
+ <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Lcom/google/common/collect/Multimap<+TK;+TV;>;)L1com/google/common/collect/HashMultimap<TK;TV;>;

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAnalysisManager.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAnalysisManager.java
index 6a8aa256db83693df001cfdd0b972a8ff3f97a3f..032d0e73f33b0d6c5d4b1cc31941785c14d394aa 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAnalysisManager.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAnalysisManager.java
@@ -22,7 +22,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
 import org.eclipse.tracecompass.internal.tmf.core.Activator;
 import org.eclipse.tracecompass.internal.tmf.core.analysis.TmfAnalysisModuleSources;
 import org.eclipse.tracecompass.internal.tmf.core.analysis.TmfAnalysisParameterProviders;
@@ -42,7 +41,7 @@ import com.google.common.collect.Multimap;
 @NonNullByDefault
 public class TmfAnalysisManager {
 
-    private static final Multimap<String, IAnalysisModuleHelper> fAnalysisModules = NonNullUtils.checkNotNull(HashMultimap.create());
+    private static final Multimap<String, IAnalysisModuleHelper> fAnalysisModules = HashMultimap.create();
     private static final Map<String, List<Class<? extends IAnalysisParameterProvider>>> fParameterProviders = new HashMap<>();
     private static final Map<Class<? extends IAnalysisParameterProvider>, IAnalysisParameterProvider> fParamProviderInstances = new HashMap<>();
     private static final List<IAnalysisModuleSource> fSources = new ArrayList<>();