From dc303fab9fa88751b406ab2d7db654b7df16f11d Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Wed, 9 Mar 2016 18:02:28 -0500 Subject: [PATCH] common: Annotate HashBasedTable.create() All variants of this method return a new table, so it can be annotated @NonNull. Remove now-unnecessary checkNotNull() checks where this was called. Change-Id: I6aca62e89b0fba51fd2b0ad047ae4582b7807ecb Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/68105 Reviewed-by: Hudson CI --- .../graph/ui/criticalpath/view/CriticalPathView.java | 4 ++-- .../com/google/common/collect/HashBasedTable.eea | 10 ++++++++++ .../handlers/TraceEventHandlerExecutionGraph.java | 2 +- .../core/analysis/graph/model/LttngSystemModel.java | 4 ++-- .../kernel/core/analysis/vm/model/VirtualCPU.java | 3 +-- .../vm/module/VirtualMachineStateProvider.java | 3 +-- 6 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 common/org.eclipse.tracecompass.common.core/annotations/com/google/common/collect/HashBasedTable.eea diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.ui/src/org/eclipse/tracecompass/internal/analysis/graph/ui/criticalpath/view/CriticalPathView.java b/analysis/org.eclipse.tracecompass.analysis.graph.ui/src/org/eclipse/tracecompass/internal/analysis/graph/ui/criticalpath/view/CriticalPathView.java index 8af721017e..2ceed26e2a 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.ui/src/org/eclipse/tracecompass/internal/analysis/graph/ui/criticalpath/view/CriticalPathView.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.ui/src/org/eclipse/tracecompass/internal/analysis/graph/ui/criticalpath/view/CriticalPathView.java @@ -82,9 +82,9 @@ public class CriticalPathView extends AbstractTimeGraphView { COLUMN_PROCESS }; - private final Table> fLinks = NonNullUtils.checkNotNull(HashBasedTable.create()); + private final Table> fLinks = HashBasedTable.create(); /** The trace to entry list hash map */ - private final Table fObjectStatistics = NonNullUtils.checkNotNull(HashBasedTable.create()); + private final Table fObjectStatistics = HashBasedTable.create(); private final CriticalPathContentProvider fContentProvider = new CriticalPathContentProvider(); diff --git a/common/org.eclipse.tracecompass.common.core/annotations/com/google/common/collect/HashBasedTable.eea b/common/org.eclipse.tracecompass.common.core/annotations/com/google/common/collect/HashBasedTable.eea new file mode 100644 index 0000000000..60ed4ac9ab --- /dev/null +++ b/common/org.eclipse.tracecompass.common.core/annotations/com/google/common/collect/HashBasedTable.eea @@ -0,0 +1,10 @@ +class com/google/common/collect/HashBasedTable +create + ()Lcom/google/common/collect/HashBasedTable; + ()L1com/google/common/collect/HashBasedTable; +create + (II)Lcom/google/common/collect/HashBasedTable; + (II)L1com/google/common/collect/HashBasedTable; +create + (Lcom/google/common/collect/Table<+TR;+TC;+TV;>;)Lcom/google/common/collect/HashBasedTable; + (Lcom/google/common/collect/Table<+TR;+TC;+TV;>;)L1com/google/common/collect/HashBasedTable; diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/graph/handlers/TraceEventHandlerExecutionGraph.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/graph/handlers/TraceEventHandlerExecutionGraph.java index d72c238ff8..bdf8b8d802 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/graph/handlers/TraceEventHandlerExecutionGraph.java +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/graph/handlers/TraceEventHandlerExecutionGraph.java @@ -74,7 +74,7 @@ public class TraceEventHandlerExecutionGraph extends BaseHandler { */ public TraceEventHandlerExecutionGraph(LttngKernelExecGraphProvider provider) { super(provider); - fKernel = NonNullUtils.checkNotNull(HashBasedTable.create()); + fKernel = HashBasedTable.create(); fTcpNodes = new HashMap<>(); fMatchProcessing = new IMatchProcessingUnit() { diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/graph/model/LttngSystemModel.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/graph/model/LttngSystemModel.java index 5bb46fe9d6..6d553fa934 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/graph/model/LttngSystemModel.java +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/graph/model/LttngSystemModel.java @@ -34,8 +34,8 @@ import com.google.common.collect.Table; */ public class LttngSystemModel { - private final Table fCurrentTids = NonNullUtils.checkNotNull(HashBasedTable.create()); - private final Table> fIntCtxStacks = NonNullUtils.checkNotNull(HashBasedTable.create()); + private final Table fCurrentTids = HashBasedTable.create(); + private final Table> fIntCtxStacks = HashBasedTable.create(); private final Map fWorkerMap = new HashMap<>(); /** diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/model/VirtualCPU.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/model/VirtualCPU.java index 2e2a3be3a6..7f7922c601 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/model/VirtualCPU.java +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/model/VirtualCPU.java @@ -13,7 +13,6 @@ package org.eclipse.tracecompass.internal.lttng2.kernel.core.analysis.vm.model; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.common.core.NonNullUtils; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; @@ -26,7 +25,7 @@ import com.google.common.collect.Table; */ public class VirtualCPU { - private static final Table VIRTUAL_CPU_TABLE = NonNullUtils.checkNotNull(HashBasedTable.create()); + private static final Table VIRTUAL_CPU_TABLE = HashBasedTable.create(); private final VirtualMachine fVm; private final Long fCpuId; diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/module/VirtualMachineStateProvider.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/module/VirtualMachineStateProvider.java index 5652bca0c6..b398f8b588 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/module/VirtualMachineStateProvider.java +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/module/VirtualMachineStateProvider.java @@ -22,7 +22,6 @@ import org.eclipse.tracecompass.analysis.os.linux.core.kernelanalysis.KernelAnal import org.eclipse.tracecompass.analysis.os.linux.core.kernelanalysis.KernelThreadInformationProvider; import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread; import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout; -import org.eclipse.tracecompass.common.core.NonNullUtils; import org.eclipse.tracecompass.internal.lttng2.kernel.core.Activator; import org.eclipse.tracecompass.internal.lttng2.kernel.core.analysis.vm.VcpuStateValues; import org.eclipse.tracecompass.internal.lttng2.kernel.core.analysis.vm.VmAttributes; @@ -100,7 +99,7 @@ public class VirtualMachineStateProvider extends AbstractTmfStateProvider { super(experiment, "Virtual Machine State Provider"); //$NON-NLS-1$ fModel = new QemuKvmVmModel(experiment); - Table table = NonNullUtils.checkNotNull(HashBasedTable.create()); + Table table = HashBasedTable.create(); fEventNames = table; fLayouts = new HashMap<>(); } -- 2.34.1