global: remove CheckNotNull from incubator and use Objects.requireNonNull instead
This helps with static analysis as Null analysis is performed more efficicently.
Allows developers to customize their error messages.
Change-Id: I9611816de98ae8c7a055cde4bd8c36c4ac62b844
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/182904
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.ui/src/org/eclipse/tracecompass/incubator/internal/kernel/ui/views/swslatency/SWSLatencyScatterView.java b/analyses/org.eclipse.tracecompass.incubator.kernel.ui/src/org/eclipse/tracecompass/incubator/internal/kernel/ui/views/swslatency/SWSLatencyScatterView.java
index a706c55..81668d8 100644
--- a/analyses/org.eclipse.tracecompass.incubator.kernel.ui/src/org/eclipse/tracecompass/incubator/internal/kernel/ui/views/swslatency/SWSLatencyScatterView.java
+++ b/analyses/org.eclipse.tracecompass.incubator.kernel.ui/src/org/eclipse/tracecompass/incubator/internal/kernel/ui/views/swslatency/SWSLatencyScatterView.java
@@ -19,7 +19,6 @@
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.scatter.AbstractSegmentStoreScatterChartTreeViewer2;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.incubator.internal.kernel.core.swslatency.SWSLatencyAnalysis;
import org.eclipse.tracecompass.tmf.ui.viewers.TmfViewer;
import org.eclipse.tracecompass.tmf.ui.viewers.xychart.TmfXYChartViewer;
@@ -54,7 +53,7 @@
@Override
protected TmfXYChartViewer createChartViewer(@Nullable Composite parent) {
- return new SWSLatencyScatterGraphViewer(NonNullUtils.checkNotNull(parent), nullToEmptyString(Messages.SWSLatencyScatterView_title), nullToEmptyString(Messages.SWSLatencyScatterView_xAxis),
+ return new SWSLatencyScatterGraphViewer(Objects.requireNonNull(parent), nullToEmptyString(Messages.SWSLatencyScatterView_title), nullToEmptyString(Messages.SWSLatencyScatterView_xAxis),
nullToEmptyString(Messages.SWSLatencyScatterView_yAxis));
}
diff --git a/analyses/org.eclipse.tracecompass.incubator.lttng2.ust.extras.core/src/org/eclipse/tracecompass/incubator/internal/lttng2/ust/extras/core/pthread/PThreadLockGraphHandler.java b/analyses/org.eclipse.tracecompass.incubator.lttng2.ust.extras.core/src/org/eclipse/tracecompass/incubator/internal/lttng2/ust/extras/core/pthread/PThreadLockGraphHandler.java
index 79460d7..3ff2cea 100644
--- a/analyses/org.eclipse.tracecompass.incubator.lttng2.ust.extras.core/src/org/eclipse/tracecompass/incubator/internal/lttng2/ust/extras/core/pthread/PThreadLockGraphHandler.java
+++ b/analyses/org.eclipse.tracecompass.incubator.lttng2.ust.extras.core/src/org/eclipse/tracecompass/incubator/internal/lttng2/ust/extras/core/pthread/PThreadLockGraphHandler.java
@@ -13,6 +13,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import java.util.regex.Pattern;
import org.eclipse.jdt.annotation.NonNull;
@@ -27,7 +28,6 @@
import org.eclipse.tracecompass.analysis.os.linux.core.execution.graph.OsWorker;
import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread;
import org.eclipse.tracecompass.analysis.os.linux.core.model.ProcessStatus;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
@@ -140,7 +140,7 @@
LastLockOwner lastOwner = fLastLockOwner.get(fieldValue);
if (lastOwner != null && lastOwner.fTid != tid && lastOwner.fVertex.getTs() > lastReqVertex.getTs()) {
// This thread has been blocked, add the proper vertices and links
- TmfGraph graph = NonNullUtils.checkNotNull(fProvider.getAssignedGraph());
+ TmfGraph graph = Objects.requireNonNull(fProvider.getAssignedGraph());
// First add a vertex at the time of lock request
graph.append(worker, lastReqVertex, EdgeType.RUNNING);
// Then add the blocked transition for the current worker
@@ -179,7 +179,7 @@
OsWorker worker = getOrCreateKernelWorker(event, tid);
// Set the previous state to running for the worker and add a vertex at this
// event, so it can be used by any thread that was blocked
- TmfGraph graph = NonNullUtils.checkNotNull(fProvider.getAssignedGraph());
+ TmfGraph graph = Objects.requireNonNull(fProvider.getAssignedGraph());
TmfVertex vertex = new TmfVertex(event.getTimestamp().toNanos());
graph.append(worker, vertex, EdgeType.RUNNING);
fLastLockOwner.put(fieldValue, new LastLockOwner(tid, vertex));
diff --git a/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/timegraph/AbstractTimeGraphMultiViewer.java b/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/timegraph/AbstractTimeGraphMultiViewer.java
index 13e8c83..7d9ee9e 100644
--- a/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/timegraph/AbstractTimeGraphMultiViewer.java
+++ b/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/timegraph/AbstractTimeGraphMultiViewer.java
@@ -11,8 +11,6 @@
package org.eclipse.tracecompass.incubator.internal.tmf.ui.multiview.ui.view.timegraph;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -81,7 +79,6 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.common.core.log.TraceCompassLog;
import org.eclipse.tracecompass.common.core.log.TraceCompassLogUtils;
import org.eclipse.tracecompass.common.core.log.TraceCompassLogUtils.FlowScopeLog;
@@ -817,7 +814,7 @@
if (signal.getSource() == this || fTrace == null) {
return;
}
- TmfTraceContext ctx = TmfTraceManager.getInstance().getTraceContext(checkNotNull(fTrace));
+ TmfTraceContext ctx = TmfTraceManager.getInstance().getTraceContext(Objects.requireNonNull(fTrace));
final long startTime = ctx.getWindowRange().getStartTime().toNanos();
final long endTime = ctx.getWindowRange().getEndTime().toNanos();
Display.getDefault().asyncExec(() -> {
@@ -1628,7 +1625,7 @@
((ITimeGraphEntryComparator) comparator).setDirection(direction);
}
if (direction != SWT.DOWN) {
- comparator = checkNotNull(Collections.reverseOrder(comparator));
+ comparator = Objects.requireNonNull(Collections.reverseOrder(comparator));
}
setEntryComparator(comparator);
fIsRevealSelection = true;
@@ -1665,7 +1662,7 @@
((ITimeGraphEntryComparator) comparator).setDirection(fSortDirection);
}
if (fSortDirection != SWT.DOWN) {
- comparator = checkNotNull(Collections.reverseOrder(comparator));
+ comparator = Objects.requireNonNull(Collections.reverseOrder(comparator));
}
setEntryComparator(comparator);
}
@@ -1743,7 +1740,7 @@
public void run(IProgressMonitor monitor) {
try (FlowScopeLog log = new FlowScopeLogBuilder(LOGGER, Level.FINE, "MultiTimeGraphViewer:BuildThread", "trace", fBuildTrace.getName()).setParentScope(fScope).build()) { //$NON-NLS-1$ //$NON-NLS-2$
- buildEntryList(fBuildTrace, fParentTrace, NonNullUtils.checkNotNull(monitor));
+ buildEntryList(fBuildTrace, fParentTrace, Objects.requireNonNull(monitor));
synchronized (fBuildJobMap) {
fBuildJobMap.remove(fBuildTrace);
}
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/StateMachineBackendAnalysis.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/StateMachineBackendAnalysis.java
index e40b8b2..d2912af 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/StateMachineBackendAnalysis.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/StateMachineBackendAnalysis.java
@@ -11,12 +11,11 @@
package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Collection;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Objects;
import java.util.TreeSet;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -72,7 +71,7 @@
@Override
protected ITmfStateProvider createStateProvider() {
- return new StateMachineProviderEventTypes(checkNotNull(getTrace()));
+ return new StateMachineProviderEventTypes(Objects.requireNonNull(getTrace()));
}
@Override
@@ -90,14 +89,14 @@
* @return The value of the timer
*/
public Long getTimer(long tid, long ts, String timer) {
- ITmfStateSystem ss = checkNotNull(getStateSystem());
+ ITmfStateSystem ss = Objects.requireNonNull(getStateSystem());
int quark;
Long value;
ITmfStateInterval intvl;
long timestamp = ts;
- if (getTrace() != null && ts > checkNotNull(getTrace()).getEndTime().toNanos()) {
- timestamp = checkNotNull(getTrace()).getEndTime().toNanos();
+ if (getTrace() != null && ts > Objects.requireNonNull(getTrace()).getEndTime().toNanos()) {
+ timestamp = Objects.requireNonNull(getTrace()).getEndTime().toNanos();
}
try {
@@ -262,7 +261,7 @@
* @return The state interval of the attribute
*/
public ITmfStateInterval getStateInterval(long tid, long ts, String attribute) {
- ITmfStateSystem ss = checkNotNull(getStateSystem());
+ ITmfStateSystem ss = Objects.requireNonNull(getStateSystem());
int quark;
ITmfStateInterval intvl;
@@ -320,7 +319,7 @@
public List<ITmfStateInterval> getAllStateIntervalInPeriod(long start, long end, String... attributePath) throws TimeRangeException {
// List<ITmfStateInterval> stateIntervalList = new LinkedList<>();
- ITmfStateSystem ss = checkNotNull(getStateSystem());
+ ITmfStateSystem ss = Objects.requireNonNull(getStateSystem());
int quark;
// ITmfStateInterval intvl;
@@ -438,7 +437,7 @@
*/
public Integer getCounter(long tid, long ts, String counter) {
/*
- ITmfStateSystem ss = checkNotNull(getStateSystem());
+ ITmfStateSystem ss = Objects.requireNonNull(getStateSystem());
int quark, value;
ITmfStateInterval intvl;
@@ -461,8 +460,8 @@
*/
long timestamp = ts;
- if (getTrace() != null && ts > checkNotNull(getTrace()).getEndTime().toNanos()) {
- timestamp = checkNotNull(getTrace()).getEndTime().toNanos();
+ if (getTrace() != null && ts > Objects.requireNonNull(getTrace()).getEndTime().toNanos()) {
+ timestamp = Objects.requireNonNull(getTrace()).getEndTime().toNanos();
}
ITmfStateInterval intvl = getStateInterval(tid, timestamp, counter);
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/StateMachineProviderEventTypes.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/StateMachineProviderEventTypes.java
index ddc709b..df03517 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/StateMachineProviderEventTypes.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/StateMachineProviderEventTypes.java
@@ -11,11 +11,10 @@
package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.TreeMap;
import org.eclipse.jdt.annotation.NonNull;
@@ -111,7 +110,7 @@
@Override
protected void eventHandle(ITmfEvent event) {
- ITmfStateSystemBuilder ss = checkNotNull(getStateSystemBuilder());
+ ITmfStateSystemBuilder ss = Objects.requireNonNull(getStateSystemBuilder());
int quark;
/* Since this can be used for any trace types, normalize all the
@@ -129,7 +128,7 @@
Integer nextPrio = ((Long)content.getField(layout.fieldNextPrio()).getValue()).intValue();
Integer prevPrio = ((Long)content.getField(LAYOUT_PREV_PRIO).getValue()).intValue();
- Integer cpu = checkNotNull((Integer)TmfTraceUtils.resolveEventAspectOfClassForEvent(getTrace(), TmfCpuAspect.class, event));
+ Integer cpu = Objects.requireNonNull((Integer)TmfTraceUtils.resolveEventAspectOfClassForEvent(getTrace(), TmfCpuAspect.class, event));
threadByCPU.put(cpu, nextTid);
ThreadInfo prevThreadInfo = getThreadInfoOrCreate(prevTid);
@@ -505,7 +504,7 @@
Long tid = (Long)content.getField(LAYOUT_CONTEXT_VTID).getValue();
/*
- Integer cpu = checkNotNull((Integer)TmfTraceUtils.resolveEventAspectOfClassForEvent(getTrace(), TmfCpuAspect.class, event));
+ Integer cpu = Objects.requireNonNull((Integer)TmfTraceUtils.resolveEventAspectOfClassForEvent(getTrace(), TmfCpuAspect.class, event));
Long tid = threadByCPU.get(cpu);
if (tid == null) {
@@ -599,7 +598,7 @@
public void done() {
int quark;
TmfStateValue value;
- ITmfStateSystemBuilder ss = checkNotNull(getStateSystemBuilder());
+ ITmfStateSystemBuilder ss = Objects.requireNonNull(getStateSystemBuilder());
long traceStartTime = getTrace().getStartTime().toNanos();
long traceEndTime = getTrace().getEndTime().toNanos();
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/EqualityRunner.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/EqualityRunner.java
index 4e215fd..8fc3be7 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/EqualityRunner.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/EqualityRunner.java
@@ -11,6 +11,8 @@
package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.builder;
+import java.util.Objects;
+
/**
* A class representing an equality runner used in the build process
*
@@ -30,10 +32,7 @@
* @return Whether t0 and t1 are equal
*/
public boolean isEqual(T t0, T t1) {
- if (t0 == null) {
- return (t1 == null);
- }
- return t0.equals(t1);
+ return Objects.equals(t0, t1);
}
/**
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/SuffixTree.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/SuffixTree.java
index 8b08d26..6c74ded 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/SuffixTree.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/SuffixTree.java
@@ -17,12 +17,12 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
/**
* TODO Review this class
@@ -119,7 +119,7 @@
private List<T> getLongestCommonPrefix(List<T> l0, List<T> l1, int max) {
int min = Math.min(Math.min(l0.size(), l1.size()), max);
for (int i = 0; i < min; i++) {
- if (!NonNullUtils.checkNotNull(l0.get(i)).equals(l1.get(i))) {
+ if (!Objects.requireNonNull(l0.get(i)).equals(l1.get(i))) {
return l0.subList(0, i);
}
}
@@ -402,7 +402,7 @@
int cmp = 0;
for (int i = 0; cmp == 0 && i < shortest.size(); i++) {
- cmp = NonNullUtils.checkNotNull(l0.get(i)).compareTo(l1.get(i));
+ cmp = Objects.requireNonNull(l0.get(i)).compareTo(l1.get(i));
}
if (cmp == 0 && l0.size() != l1.size()) {
@@ -529,7 +529,7 @@
addSuffixLink(active_node); // rule 2
} else {
// System.out.println("DEBUG: CONTAINS");
- int next = NonNullUtils.checkNotNull(nodes.get(active_node).next.get(active_edge()));
+ int next = Objects.requireNonNull(nodes.get(active_node).next.get(active_edge()));
if (walkDown(next)) {
// System.out.println("DEBUG: WALKDOWN (OBS 2)");
continue; // observation 2
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/StateMachineConstraint.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/StateMachineConstraint.java
index 5d02237..78307f3 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/StateMachineConstraint.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/StateMachineConstraint.java
@@ -13,8 +13,8 @@
import java.util.List;
import java.util.Map;
+import java.util.Objects;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineVariableException;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariable;
import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance;
@@ -70,7 +70,7 @@
*/
public Class<?> getVarClass() {
String varType = getVarName().split("/", 2)[0]; //$NON-NLS-1$
- return NonNullUtils.checkNotNull(StateMachineVariable.VARIABLE_TYPES.get(varType));
+ return Objects.requireNonNull(StateMachineVariable.VARIABLE_TYPES.get(varType));
}
/**
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableAnalysis.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableAnalysis.java
index 40f0eb3..498b43a 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableAnalysis.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableAnalysis.java
@@ -11,8 +11,6 @@
package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -26,6 +24,7 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
@@ -39,7 +38,6 @@
import org.eclipse.tracecompass.analysis.os.linux.core.execution.graph.OsExecutionGraph;
import org.eclipse.tracecompass.analysis.os.linux.core.execution.graph.OsWorker;
import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelAnalysisModule;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.incubator.internal.xaf.core.Activator;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.Attributes;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.BackendStateValue;
@@ -775,7 +773,7 @@
System.out.println("Invalid interruption list " + //$NON-NLS-1$
keyMapToiisMap.get(entryReasonSolutions.getKey()) +
" has been encountered " + //$NON-NLS-1$
- checkNotNull(keyMapToiisMap.get(entryReasonSolutions.getKey())).getCounter() +
+ requireNonNull(keyMapToiisMap.get(entryReasonSolutions.getKey())).getCounter() +
" times"); //$NON-NLS-1$
System.out.println("Interruption lists identified as potential expected list instead of this invalid one:"); //$NON-NLS-1$
String[] columnNames = {
@@ -807,7 +805,7 @@
keyMapToclosestValidIsiListMap.put(entryReasonSolutions.getKey(), validKeyToIsiMap.get(iisPerProbability.iterator().next().element.keyMap()));
InterruptionIntervalSetDiff iisd = null;
- InterruptionIntervalSet iisError = NonNullUtils.checkNotNull(keyMapToiisMap.get(entryReasonSolutions.getKey()));
+ InterruptionIntervalSet iisError = Objects.requireNonNull(keyMapToiisMap.get(entryReasonSolutions.getKey()));
Iterator<ElementProbability<InterruptionIntervalSet>> it = iisPerProbability.iterator();
while (it.hasNext()) {
ElementProbability<InterruptionIntervalSet> proba = it.next();
@@ -903,8 +901,8 @@
StateMachineInstanceGroup group = invalidIsiList.get(0).instance.getStateMachineInstanceGroup();
for (TimestampInterval ti : intervals) {
for (StateMachineBackendAnalysis module : group.getStateMachineBackendAnalysisModules()) {
- if (module.getKernelTrace().getTimeRange().contains(checkNotNull(ti.getStartTime()))
- || module.getKernelTrace().getTimeRange().contains(checkNotNull(ti.getEndTime()))) {
+ if (module.getKernelTrace().getTimeRange().contains(Objects.requireNonNull(ti.getStartTime()))
+ || module.getKernelTrace().getTimeRange().contains(Objects.requireNonNull(ti.getEndTime()))) {
intervalsPerTrace.put(module.getKernelTrace().getPath(), ti);
}
}
@@ -1143,7 +1141,7 @@
}
// Compute it for one of the valid cases
- Iterator<InstanceStepInformation> it = checkNotNull(keyMapToclosestValidIsiListMap.get(keyMap)).iterator();
+ Iterator<InstanceStepInformation> it = Objects.requireNonNull(keyMapToclosestValidIsiListMap.get(keyMap)).iterator();
InterruptionDurationSet validIds = null;
while (validIds == null && it.hasNext()) {
InstanceStepInformation isi = it.next();
@@ -1312,9 +1310,9 @@
workerFound = true;
// Compute the path for the period we're interested into
- TmfVertex vstart = graph.getVertexAt(checkNotNull(ti.getStartTime()), lw);
- TmfVertex vend = graph.getVertexAt(checkNotNull(ti.getEndTime()), lw);
- TmfGraph path = new CriticalPathAlgorithmBounded(graph).compute(checkNotNull(vstart), checkNotNull(vend));
+ TmfVertex vstart = graph.getVertexAt(Objects.requireNonNull(ti.getStartTime()), lw);
+ TmfVertex vend = graph.getVertexAt(Objects.requireNonNull(ti.getEndTime()), lw);
+ TmfGraph path = new CriticalPathAlgorithmBounded(graph).compute(Objects.requireNonNull(vstart), Objects.requireNonNull(vend));
// Then traverse that path to get the data for what happened in there
path.scanLineTraverse(path.getHead(lw), new TmfGraphVisitor() {
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableCounter.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableCounter.java
index 43a311e..8915c83 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableCounter.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableCounter.java
@@ -14,8 +14,8 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map.Entry;
+import java.util.Objects;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.Operator;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
@@ -37,8 +37,8 @@
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionReason;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.ResponsibilityMap;
import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance;
-import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineReport;
import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance.InstanceStepInformation;
+import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineReport;
import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.TimestampInterval;
import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
@@ -169,8 +169,8 @@
public InterruptionEventRunner getInterruptionEventRunner() {
return new DefaultInterruptionEventRunner(
this,
- NonNullUtils.checkNotNull(getCounterAttribute()),
- NonNullUtils.checkNotNull(getInterruptionEventGetter()),
+ Objects.requireNonNull(getCounterAttribute()),
+ Objects.requireNonNull(getInterruptionEventGetter()),
new ResponsibilityMapGetter<InterruptionReason>() {
@Override
public ResponsibilityMap<InterruptionReason> execute(InterruptionIntervalSetDiff iisd) {
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableDeadline.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableDeadline.java
index 913cd51..3bf9ea9 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableDeadline.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableDeadline.java
@@ -14,10 +14,10 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map.Entry;
+import java.util.Objects;
import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout;
import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelTrace;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.Attributes;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.BackendStateValue;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
@@ -37,9 +37,9 @@
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.ResponsibilityMap;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.State;
import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance;
+import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance.InstanceStepInformation;
import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineReport;
import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils;
-import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance.InstanceStepInformation;
import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.TimestampInterval;
import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
@@ -181,7 +181,7 @@
StateMachineReport.R.inc();
try {
- DefaultInterruptionEventRunner dier = new DefaultInterruptionEventRunner(this, NonNullUtils.checkNotNull(Attributes.STATE), new StateInterruptionEventGetter());
+ DefaultInterruptionEventRunner dier = new DefaultInterruptionEventRunner(this, Objects.requireNonNull(Attributes.STATE), new StateInterruptionEventGetter());
smva.doAnalysis(dier);
} catch (StateMachineNoValidCaseException | StateMachineNoInvalidCaseException e) {
e.printStackTrace();
@@ -234,7 +234,7 @@
StateMachineReport.R.inc();
if (entry.getKey() instanceof State) {
- BackendStateValue val = NonNullUtils.checkNotNull(((State) entry.getKey()).getValue());
+ BackendStateValue val = Objects.requireNonNull(((State) entry.getKey()).getValue());
switch (val) {
case UNKNOWN:
StateMachineReport.R.println("Now we can't do a thorough analysis, can we?"); //$NON-NLS-1$
@@ -340,8 +340,8 @@
ITmfEventField content = e.getContent();
data = String.format("%s (%s)", //$NON-NLS-1$
- NonNullUtils.checkNotNull(content.getField(layout.fieldNextComm())).getFormattedValue(),
- NonNullUtils.checkNotNull(content.getField(layout.fieldNextTid())).getFormattedValue());
+ Objects.requireNonNull(content.getField(layout.fieldNextComm())).getFormattedValue(),
+ Objects.requireNonNull(content.getField(layout.fieldNextTid())).getFormattedValue());
} else if (s == BackendStateValue.IRQ) {
IKernelAnalysisEventLayout layout = ((IKernelTrace) e.getTrace()).getKernelEventLayout();
if (!e.getName().equals(layout.eventIrqHandlerEntry())) {
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/CpuFrequency.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/CpuFrequency.java
index 584fec7..2c18686 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/CpuFrequency.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/CpuFrequency.java
@@ -11,7 +11,7 @@
package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
+import java.util.Objects;
/**
* Element representing a CPU Frequency state
@@ -83,7 +83,7 @@
}
return -1;
}
- return freq.compareTo(NonNullUtils.checkNotNull(cps.freq));
+ return freq.compareTo(Objects.requireNonNull(cps.freq));
}
return 0;
}
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/CriticalPathState.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/CriticalPathState.java
index 7567090..fa3b6f0 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/CriticalPathState.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/CriticalPathState.java
@@ -11,9 +11,10 @@
package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
+import java.util.Objects;
+
import org.eclipse.tracecompass.analysis.graph.core.base.TmfEdge;
import org.eclipse.tracecompass.analysis.os.linux.core.execution.graph.OsWorker;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
/**
* Element representing a Critical Path state
@@ -96,7 +97,7 @@
}
return -1;
}
- int cmp = type.compareTo(NonNullUtils.checkNotNull(cps.type));
+ int cmp = type.compareTo(Objects.requireNonNull(cps.type));
if (cmp == 0) {
if (worker == null) {
if (cps.worker == null) {
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionIntervalSetDiff.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionIntervalSetDiff.java
index 36a3a4f..6de30d6 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionIntervalSetDiff.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionIntervalSetDiff.java
@@ -15,10 +15,9 @@
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
-import java.util.TreeMap;
import java.util.Map.Entry;
-
-import org.eclipse.tracecompass.common.core.NonNullUtils;
+import java.util.Objects;
+import java.util.TreeMap;
/**
* A special interval set that represents the difference between intervals or
@@ -327,7 +326,7 @@
* ... get the minimum number of times that interval appears between
* this instance and the other one.
*/
- Integer count = Math.min(entry.getValue(), NonNullUtils.checkNotNull(toSearch.map.get(iiOther)));
+ Integer count = Math.min(entry.getValue(), Objects.requireNonNull(toSearch.map.get(iiOther)));
// Then create a new interval with that same reason
InterruptionInterval newii = new InterruptionInterval(ir);
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/handlers/ManageXaFParametersDialog.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/handlers/ManageXaFParametersDialog.java
index e1db2ec..5ed2400 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/handlers/ManageXaFParametersDialog.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/handlers/ManageXaFParametersDialog.java
@@ -22,6 +22,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
@@ -61,7 +62,6 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariable;
import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.TimestampInterval;
import org.eclipse.tracecompass.tmf.core.signal.TmfSelectionRangeUpdatedSignal;
@@ -344,7 +344,7 @@
// Load parameters
boolean modelProvided = Boolean.parseBoolean(properties.getProperty(XaFParameterProvider.PROPERTY_MODEL_PROVIDED, Boolean.TRUE.toString()));
- String defaultModelLocation = (getDefaultModelFile() == null) ? StringUtils.EMPTY : NonNullUtils.checkNotNull(getDefaultModelFile()).getPath();
+ String defaultModelLocation = (getDefaultModelFile() == null) ? StringUtils.EMPTY : Objects.requireNonNull(getDefaultModelFile()).getPath();
String modelLocation = properties.getProperty(XaFParameterProvider.PROPERTY_MODEL_LOCATION, defaultModelLocation);
Set<String> selectedVariables;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstance.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstance.java
index 876ab74..e772977 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstance.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstance.java
@@ -17,10 +17,10 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.Status;
@@ -91,7 +91,7 @@
* @return The interval of time for which we computed the given variable until the current step
*/
public TimestampInterval getVariableInterval(String variableName) {
- InstanceStepInformation initIsi = instance.getInstanceStepInformation(NonNullUtils.checkNotNull(variablesLastInit.get(variableName)));
+ InstanceStepInformation initIsi = instance.getInstanceStepInformation(Objects.requireNonNull(variablesLastInit.get(variableName)));
// Timestamp of the start of the interval
ITmfTimestamp intervalStart = initIsi.event.getTimestamp();
@@ -302,10 +302,10 @@
}
})
.filter(f -> f != null)
- .filter(f -> !NonNullUtils.checkNotNull(f).getName().startsWith("context.")) //$NON-NLS-1$
+ .filter(f -> !Objects.requireNonNull(f).getName().startsWith("context.")) //$NON-NLS-1$
.map(f -> String.format("%s=%s", //$NON-NLS-1$
- NonNullUtils.checkNotNull(f).getName(),
- NonNullUtils.checkNotNull(f).getValue().toString()
+ Objects.requireNonNull(f).getName(),
+ Objects.requireNonNull(f).getValue().toString()
))
.collect(Collectors.toList())));
path.append("]"); //$NON-NLS-1$
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstanceGroup.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstanceGroup.java
index 37c73b5..e47f040 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstanceGroup.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstanceGroup.java
@@ -18,11 +18,11 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.tracecompass.analysis.os.linux.core.execution.graph.OsExecutionGraph;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraintAdaptive;
@@ -280,7 +280,7 @@
// Using the event TID, we can reduce the number of instances we have to watch
List<StateMachineInstance> instances = null;
if (eventTid != null && instancesPerTid.containsKey(eventTid)) {
- instances = NonNullUtils.checkNotNull(instancesPerTid.get(eventTid));
+ instances = Objects.requireNonNull(instancesPerTid.get(eventTid));
} else {
instances = openInstancesList;
}
@@ -293,7 +293,7 @@
if(hasBeenUsed) {
if (!instance.hasNextNode()) {
if (eventTid != null && instancesPerTid.containsKey(eventTid)) {
- NonNullUtils.checkNotNull(instancesPerTid.get(eventTid)).remove(instance);
+ Objects.requireNonNull(instancesPerTid.get(eventTid)).remove(instance);
}
openInstancesList.remove(instance);
}
@@ -324,7 +324,7 @@
instancesPerTid.put(eventTid, new ArrayList<StateMachineInstance>());
}
- NonNullUtils.checkNotNull(instancesPerTid.get(eventTid)).add(smi);
+ Objects.requireNonNull(instancesPerTid.get(eventTid)).add(smi);
}
}
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineUtils.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineUtils.java
index d7f1d7c..4b8f88e 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineUtils.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineUtils.java
@@ -24,6 +24,7 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -32,7 +33,6 @@
import javax.xml.parsers.ParserConfigurationException;
import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.common.core.xml.XmlUtils;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.Operator;
import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
@@ -193,7 +193,7 @@
for (Element s : statesList) {
// Get the node in the HashMap
String name = s.getAttributes().getNamedItem("id").getNodeValue(); //$NON-NLS-1$
- StateMachineNode stateMachineNode = NonNullUtils.checkNotNull(nodeList.get(name));
+ StateMachineNode stateMachineNode = Objects.requireNonNull(nodeList.get(name));
// Variables
NodeList onentryList = s.getElementsByTagName("onentry"); //$NON-NLS-1$
@@ -216,7 +216,7 @@
Class<?> variableClass = StateMachineVariable.class;
String[] splitVar = varName.split("/", 2); //$NON-NLS-1$
if (splitVar.length > 1 && StateMachineVariable.VARIABLE_TYPES.containsKey(splitVar[0])) {
- variableClass = NonNullUtils.checkNotNull(StateMachineVariable.VARIABLE_TYPES.get(splitVar[0]));
+ variableClass = Objects.requireNonNull(StateMachineVariable.VARIABLE_TYPES.get(splitVar[0]));
}
Constructor<?> variableConstructor = null;
@@ -256,7 +256,7 @@
if (initialTransitions.isEmpty()) {
Node initial = scxml.getAttributes().getNamedItem("initial"); //$NON-NLS-1$
if (initial != null && nodeList.containsKey(initial.getNodeValue())) {
- initialTransitions.addAll(NonNullUtils.checkNotNull(nodeList.get(initial.getNodeValue())).getTransitions());
+ initialTransitions.addAll(Objects.requireNonNull(nodeList.get(initial.getNodeValue())).getTransitions());
}
}
@@ -572,7 +572,7 @@
* @param end The end timestamp as an ITmfTimestamp object
*/
public TimestampInterval(ITmfTimestamp start, ITmfTimestamp end) {
- super(NonNullUtils.checkNotNull(start), NonNullUtils.checkNotNull(end));
+ super(Objects.requireNonNull(start), Objects.requireNonNull(end));
}
/**
@@ -580,8 +580,8 @@
* @param endTime The end timestamp as a long
*/
public TimestampInterval(long startTime, long endTime) {
- super(TmfTimestamp.create(NonNullUtils.checkNotNull(startTime), ITmfTimestamp.NANOSECOND_SCALE),
- TmfTimestamp.create(NonNullUtils.checkNotNull(endTime), ITmfTimestamp.NANOSECOND_SCALE));
+ super(TmfTimestamp.create(Objects.requireNonNull(startTime), ITmfTimestamp.NANOSECOND_SCALE),
+ TmfTimestamp.create(Objects.requireNonNull(endTime), ITmfTimestamp.NANOSECOND_SCALE));
}
/**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/model/CompositeHostModel.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/model/CompositeHostModel.java
index e647e8f..355abee 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/model/CompositeHostModel.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/model/CompositeHostModel.java
@@ -27,7 +27,6 @@
import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelAnalysisModule;
import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelThreadInformationProvider;
import org.eclipse.tracecompass.analysis.os.linux.core.model.ProcessStatus;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.incubator.analysis.core.concepts.AggregatedCallSite;
import org.eclipse.tracecompass.incubator.analysis.core.concepts.ICpuTimeProvider;
import org.eclipse.tracecompass.incubator.analysis.core.concepts.ISamplingDataProvider;
@@ -59,10 +58,10 @@
public class CompositeHostModel implements IHostModel {
private final Multimap<ITmfTrace, Object> fTraceObjectMap = HashMultimap.create();
- private final Set<ICpuTimeProvider> fCpuTimeProviders = NonNullUtils.checkNotNull(Collections.newSetFromMap(new WeakHashMap<ICpuTimeProvider, Boolean>()));
- private final Set<IThreadOnCpuProvider> fThreadOnCpuProviders = NonNullUtils.checkNotNull(Collections.newSetFromMap(new WeakHashMap<IThreadOnCpuProvider, Boolean>()));
- private final Set<ISamplingDataProvider> fSamplingDataProviders = NonNullUtils.checkNotNull(Collections.newSetFromMap(new WeakHashMap<ISamplingDataProvider, Boolean>()));
- private final Set<KernelAnalysisModule> fKernelModules = NonNullUtils.checkNotNull(Collections.newSetFromMap(new WeakHashMap<KernelAnalysisModule, Boolean>()));
+ private final Set<ICpuTimeProvider> fCpuTimeProviders = Objects.requireNonNull(Collections.newSetFromMap(new WeakHashMap<ICpuTimeProvider, Boolean>()));
+ private final Set<IThreadOnCpuProvider> fThreadOnCpuProviders = Objects.requireNonNull(Collections.newSetFromMap(new WeakHashMap<IThreadOnCpuProvider, Boolean>()));
+ private final Set<ISamplingDataProvider> fSamplingDataProviders = Objects.requireNonNull(Collections.newSetFromMap(new WeakHashMap<ISamplingDataProvider, Boolean>()));
+ private final Set<KernelAnalysisModule> fKernelModules = Objects.requireNonNull(Collections.newSetFromMap(new WeakHashMap<KernelAnalysisModule, Boolean>()));
private final String fHostId;
/**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/src/org/eclipse/tracecompass/incubator/callstack/core/tests/lttng2/ust/callstack/AbstractProviderTest.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/src/org/eclipse/tracecompass/incubator/callstack/core/tests/lttng2/ust/callstack/AbstractProviderTest.java
index 4950aaf..e5881d6 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/src/org/eclipse/tracecompass/incubator/callstack/core/tests/lttng2/ust/callstack/AbstractProviderTest.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/src/org/eclipse/tracecompass/incubator/callstack/core/tests/lttng2/ust/callstack/AbstractProviderTest.java
@@ -14,7 +14,6 @@
package org.eclipse.tracecompass.incubator.callstack.core.tests.lttng2.ust.callstack;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -23,9 +22,11 @@
import java.io.File;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack.CallStackStateProvider;
import org.eclipse.tracecompass.internal.lttng2.ust.core.callstack.LttngUstCallStackProvider;
import org.eclipse.tracecompass.lttng2.ust.core.trace.LttngUstTrace;
import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
@@ -35,7 +36,6 @@
import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
import org.eclipse.tracecompass.statesystem.core.statevalue.ITmfStateValue;
import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace;
-import org.eclipse.tracecompass.analysis.profiling.core.callstack.CallStackStateProvider;
import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException;
import org.eclipse.tracecompass.tmf.core.exceptions.TmfTraceException;
@@ -310,7 +310,7 @@
@Override
protected ITmfStateProvider createStateProvider() {
- return new LttngUstCallStackProvider(checkNotNull(getTrace()));
+ return new LttngUstCallStackProvider(Objects.requireNonNull(getTrace()));
}
}
}
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackStateProvider.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackStateProvider.java
index 00bf645..cbfe2d3 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackStateProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackStateProvider.java
@@ -14,7 +14,7 @@
package org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
+import java.util.Objects;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.osgi.util.NLS;
@@ -128,7 +128,7 @@
return;
}
- ITmfStateSystemBuilder ss = checkNotNull(getStateSystemBuilder());
+ ITmfStateSystemBuilder ss = Objects.requireNonNull(getStateSystemBuilder());
handleFunctionEntry(ss, event);
handleFunctionExit(ss, event);
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysis.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysis.java
index c6b3e62..405c782 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysis.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysis.java
@@ -11,8 +11,6 @@
package org.eclipse.tracecompass.incubator.callstack.core.lttng2.ust;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Collections;
import java.util.EnumSet;
import java.util.Objects;
@@ -66,7 +64,7 @@
@Override
protected @NonNull ITmfStateProvider createStateProvider() {
- return new LttngUstCallStackProvider(checkNotNull(getTrace()));
+ return new LttngUstCallStackProvider(Objects.requireNonNull(getTrace()));
}
@Override
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/instrumented/callgraph/AbstractCalledFunction.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/instrumented/callgraph/AbstractCalledFunction.java
index 6bb26eb..35850e6 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/instrumented/callgraph/AbstractCalledFunction.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/instrumented/callgraph/AbstractCalledFunction.java
@@ -11,8 +11,6 @@
package org.eclipse.tracecompass.incubator.internal.callstack.core.instrumented.callgraph;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Comparator;
import java.util.Objects;
@@ -38,11 +36,11 @@
static final Comparator<ISegment> COMPARATOR;
static {
/*
- * checkNotNull() has to be called separately, or else it breaks the
+ * requireNonNull() has to be called separately, or else it breaks the
* type inference.
*/
Comparator<ISegment> comp = Ordering.from(SegmentComparators.INTERVAL_START_COMPARATOR).compound(SegmentComparators.INTERVAL_END_COMPARATOR);
- COMPARATOR = checkNotNull(comp);
+ COMPARATOR = Objects.requireNonNull(comp);
}
/**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/instrumented/callgraph/AggregatedCalledFunction.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/instrumented/callgraph/AggregatedCalledFunction.java
index f457b96..e9d1d54 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/instrumented/callgraph/AggregatedCalledFunction.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/instrumented/callgraph/AggregatedCalledFunction.java
@@ -187,9 +187,9 @@
// AggregatedCalledFunction secondNode) {
// for (Map.Entry<Object, AggregatedCalledFunction> FunctionEntry :
// secondNode.fChildren.entrySet()) {
- // Object childSymbol = NonNullUtils.checkNotNull(FunctionEntry.getKey());
+ // Object childSymbol = Objects.requireNonNull(FunctionEntry.getKey());
// AggregatedCalledFunction secondNodeChild =
- // NonNullUtils.checkNotNull(FunctionEntry.getValue());
+ // Objects.requireNonNull(FunctionEntry.getValue());
// AggregatedCalledFunction aggregatedCalledFunction =
// firstNode.fChildren.get(childSymbol);
// if (aggregatedCalledFunction == null) {
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlSchemaParser.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlSchemaParser.java
index e179c93..1cfb9fd 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlSchemaParser.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlSchemaParser.java
@@ -15,8 +15,8 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Objects;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.tmf.analysis.xml.core.module.ITmfXmlSchemaParser;
import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModuleHelper;
import org.w3c.dom.Document;
@@ -36,7 +36,7 @@
List<IAnalysisModuleHelper> list = new ArrayList<>();
NodeList callstackNodes = doc.getElementsByTagName(CallstackXmlStrings.CALLSTACK);
for (int i = 0; i < callstackNodes.getLength(); i++) {
- Element node = NonNullUtils.checkNotNull((Element) callstackNodes.item(i));
+ Element node = Objects.requireNonNull((Element) callstackNodes.item(i));
IAnalysisModuleHelper helper = new CallstackXmlModuleHelper(xmlFile, node);
list.add(helper);
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/flamegraph/FlameGraphView.java b/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/flamegraph/FlameGraphView.java
index 6df39fb..bcb34a2 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/flamegraph/FlameGraphView.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/flamegraph/FlameGraphView.java
@@ -23,6 +23,7 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Semaphore;
@@ -400,7 +401,7 @@
public void run(IProgressMonitor monitor) {
try (FlowScopeLog log = new FlowScopeLogBuilder(LOGGER, Level.FINE, "FlameGraphView:BuildThread", "trace", fBuildTrace.getName()).setParentScope(fScope).build()) { //$NON-NLS-1$ //$NON-NLS-2$
- buildEntryList(fBuildTrace, fParentTrace, fParameters, NonNullUtils.checkNotNull(monitor));
+ buildEntryList(fBuildTrace, fParentTrace, fParameters, Objects.requireNonNull(monitor));
synchronized (fBuildJobMap) {
fBuildJobMap.remove(fBuildTrace);
}
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/views/functiondensity/FunctionDensityView.java b/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/views/functiondensity/FunctionDensityView.java
index 2a6926d..5bbe967 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/views/functiondensity/FunctionDensityView.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/views/functiondensity/FunctionDensityView.java
@@ -11,6 +11,8 @@
package org.eclipse.tracecompass.incubator.internal.callstack.ui.views.functiondensity;
+import java.util.Objects;
+
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
@@ -20,7 +22,6 @@
import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.density2.AbstractSegmentStoreDensityView;
import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.density2.AbstractSegmentStoreDensityViewer;
import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.table.AbstractSegmentStoreTableViewer;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.tmf.core.segment.SegmentDurationAspect;
import org.eclipse.tracecompass.tmf.core.segment.SegmentEndTimeAspect;
import org.eclipse.tracecompass.tmf.core.segment.SegmentStartTimeAspect;
@@ -78,6 +79,6 @@
@Override
protected AbstractSegmentStoreDensityViewer createSegmentStoreDensityViewer(Composite parent) {
- return new FunctionDensityViewer(NonNullUtils.checkNotNull(parent), getViewSite().getSecondaryId());
+ return new FunctionDensityViewer(Objects.requireNonNull(parent), getViewSite().getSecondaryId());
}
}
\ No newline at end of file
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/AbstractOtf2Analysis.java b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/AbstractOtf2Analysis.java
index f524a01..9ccb41b 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/AbstractOtf2Analysis.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/AbstractOtf2Analysis.java
@@ -11,7 +11,7 @@
package org.eclipse.tracecompass.incubator.internal.otf2.core.analysis;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
+import java.util.Objects;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.incubator.otf2.core.trace.Otf2Trace;
@@ -34,7 +34,7 @@
* the full analysis ID
*/
public AbstractOtf2Analysis(String id) {
- setId(checkNotNull(id));
+ setId(Objects.requireNonNull(id));
}
/**
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/AbstractOtf2StateProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/AbstractOtf2StateProvider.java
index 1717c84..040a4e1 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/AbstractOtf2StateProvider.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/AbstractOtf2StateProvider.java
@@ -11,8 +11,6 @@
package org.eclipse.tracecompass.incubator.internal.otf2.core.analysis;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -86,7 +84,7 @@
* the ID of the corresponding analysis
*/
protected AbstractOtf2StateProvider(@Nullable ITmfTrace trace, String id) {
- super(checkNotNull(trace), id);
+ super(Objects.requireNonNull(trace), id);
fStringId = new HashMap<>();
fRegionStringId = new HashMap<>();
fCommunicatorGroup = new HashMap<>();
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/communicators/Otf2CommunicatorsAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/communicators/Otf2CommunicatorsAnalysis.java
index 7934e7a..402c790 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/communicators/Otf2CommunicatorsAnalysis.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/communicators/Otf2CommunicatorsAnalysis.java
@@ -11,8 +11,7 @@
package org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.communicators;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
+import java.util.Objects;
import org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.AbstractOtf2Analysis;
import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider;
@@ -43,7 +42,7 @@
@Override
protected ITmfStateProvider createStateProvider() {
- return new Otf2CommunicatorsStateProvider(checkNotNull(getTrace()));
+ return new Otf2CommunicatorsStateProvider(Objects.requireNonNull(getTrace()));
}
/**
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/AbstractRosAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/AbstractRosAnalysis.java
index a21bb6e..5341ab4 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/AbstractRosAnalysis.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/AbstractRosAnalysis.java
@@ -11,8 +11,7 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
+import java.util.Objects;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNull;
@@ -42,7 +41,7 @@
* the full analysis ID
*/
public AbstractRosAnalysis(String id) {
- setId(checkNotNull(id));
+ setId(Objects.requireNonNull(id));
}
@Override
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/AbstractRosStateProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/AbstractRosStateProvider.java
index ae50c10..021dc3c 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/AbstractRosStateProvider.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/AbstractRosStateProvider.java
@@ -11,9 +11,8 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Map;
+import java.util.Objects;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jdt.annotation.NonNull;
@@ -71,7 +70,7 @@
* the ID of the corresponding analysis
*/
public AbstractRosStateProvider(ITmfTrace trace, @NonNull String id) {
- super(checkNotNull(trace), id);
+ super(Objects.requireNonNull(trace), id);
fLayout = IRosEventLayout.getDefault();
}
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/connections/RosConnectionsAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/connections/RosConnectionsAnalysis.java
index 7713da7..2356848 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/connections/RosConnectionsAnalysis.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/connections/RosConnectionsAnalysis.java
@@ -11,8 +11,7 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis.connections;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
+import java.util.Objects;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNull;
@@ -54,7 +53,7 @@
if (trace != null) {
layout = trace.getEventLayout();
}
- requirements = ImmutableSet.of(new RosConnectionsAnalysisRequirement(checkNotNull(layout)));
+ requirements = ImmutableSet.of(new RosConnectionsAnalysisRequirement(Objects.requireNonNull(layout)));
fAnalysisRequirements = requirements;
}
return requirements;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/connections/RosConnectionsAnalysisRequirement.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/connections/RosConnectionsAnalysisRequirement.java
index 0a60bbe..f1c3691 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/connections/RosConnectionsAnalysisRequirement.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/connections/RosConnectionsAnalysisRequirement.java
@@ -11,9 +11,8 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis.connections;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Collection;
+import java.util.Objects;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.tracecompass.incubator.internal.ros.core.trace.layout.IRosEventLayout;
@@ -44,7 +43,7 @@
private static Collection<TmfAbstractAnalysisRequirement> getSubRequirements(IRosEventLayout layout) {
// Requirement on new_connection event
TmfAnalysisEventRequirement initEventReq = new TmfAnalysisEventRequirement(
- ImmutableSet.of(checkNotNull(layout.eventNewConnection())),
+ ImmutableSet.of(Objects.requireNonNull(layout.eventNewConnection())),
PriorityLevel.MANDATORY);
return ImmutableSet.of(initEventReq);
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/model/connections/RosConnectionsModelAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/model/connections/RosConnectionsModelAnalysis.java
index c2416d9..4f6393b 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/model/connections/RosConnectionsModelAnalysis.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/model/connections/RosConnectionsModelAnalysis.java
@@ -11,10 +11,9 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis.model.connections;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -101,7 +100,7 @@
}
}
}
- requirements = ImmutableSet.of(new RosConnectionsAnalysisRequirement(checkNotNull(layout)));
+ requirements = ImmutableSet.of(new RosConnectionsAnalysisRequirement(Objects.requireNonNull(layout)));
fAnalysisRequirements = requirements;
}
return requirements;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/model/messagestransport/RosMessagesTransportEventKey.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/model/messagestransport/RosMessagesTransportEventKey.java
index 781a9c5..ae0e00c 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/model/messagestransport/RosMessagesTransportEventKey.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/model/messagestransport/RosMessagesTransportEventKey.java
@@ -11,7 +11,7 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis.model.messagestransport;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
+import java.util.Objects;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.tmf.core.event.matching.TcpEventKey;
@@ -27,7 +27,7 @@
*/
public class RosMessagesTransportEventKey extends TcpEventKey {
- private static final HashFunction HF = checkNotNull(Hashing.goodFastHash(32));
+ private static final HashFunction HF = Objects.requireNonNull(Hashing.goodFastHash(32));
private final NetworkConnection fConnectionInfo;
private final long fFlags;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/nodes/RosNodesAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/nodes/RosNodesAnalysis.java
index ca38c46..8ebac87 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/nodes/RosNodesAnalysis.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/nodes/RosNodesAnalysis.java
@@ -11,8 +11,7 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis.nodes;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
+import java.util.Objects;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNull;
@@ -54,7 +53,7 @@
if (trace != null) {
layout = trace.getEventLayout();
}
- requirements = ImmutableSet.of(new RosNodesAnalysisRequirement(checkNotNull(layout)));
+ requirements = ImmutableSet.of(new RosNodesAnalysisRequirement(Objects.requireNonNull(layout)));
fAnalysisRequirements = requirements;
}
return requirements;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/nodes/RosNodesAnalysisRequirement.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/nodes/RosNodesAnalysisRequirement.java
index 51cf2b2..b176d73 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/nodes/RosNodesAnalysisRequirement.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/nodes/RosNodesAnalysisRequirement.java
@@ -11,9 +11,8 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis.nodes;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Collection;
+import java.util.Objects;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.tracecompass.incubator.internal.ros.core.trace.layout.IRosEventLayout;
@@ -45,19 +44,19 @@
private static Collection<TmfAbstractAnalysisRequirement> getSubRequirements(IRosEventLayout layout) {
// Requirement on init_node event
TmfAnalysisEventRequirement initEventReq = new TmfAnalysisEventRequirement(
- ImmutableSet.of(checkNotNull(layout.eventInitNode())),
+ ImmutableSet.of(Objects.requireNonNull(layout.eventInitNode())),
PriorityLevel.MANDATORY);
// Optional requirement on shutdown_node event
TmfAnalysisEventRequirement shutdownEventReq = new TmfAnalysisEventRequirement(
- ImmutableSet.of(checkNotNull(layout.eventShutdownNode())),
+ ImmutableSet.of(Objects.requireNonNull(layout.eventShutdownNode())),
PriorityLevel.OPTIONAL);
shutdownEventReq.addInformation("The shutdown_node event is optional because it isn't part of tracetools for the moment."); //$NON-NLS-1$
// Requirement for shutdown_node procname field
TmfAnalysisEventFieldRequirement shutdownProcnameReq = new TmfAnalysisEventFieldRequirement(
- checkNotNull(layout.eventShutdownNode()),
- ImmutableSet.of(checkNotNull(layout.contextProcname())),
+ Objects.requireNonNull(layout.eventShutdownNode()),
+ ImmutableSet.of(Objects.requireNonNull(layout.contextProcname())),
PriorityLevel.MANDATORY);
return ImmutableSet.of(initEventReq, shutdownEventReq, shutdownProcnameReq);
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/queues/RosQueuesAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/queues/RosQueuesAnalysis.java
index 242d8fb..a9b8b15 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/queues/RosQueuesAnalysis.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/queues/RosQueuesAnalysis.java
@@ -11,8 +11,7 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis.queues;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
+import java.util.Objects;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNull;
@@ -54,7 +53,7 @@
if (trace != null) {
layout = trace.getEventLayout();
}
- requirements = ImmutableSet.of(new RosQueuesAnalysisRequirement(checkNotNull(layout)));
+ requirements = ImmutableSet.of(new RosQueuesAnalysisRequirement(Objects.requireNonNull(layout)));
fAnalysisRequirements = requirements;
}
return requirements;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/queues/RosQueuesAnalysisRequirement.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/queues/RosQueuesAnalysisRequirement.java
index 577518c..9297dc2 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/queues/RosQueuesAnalysisRequirement.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/queues/RosQueuesAnalysisRequirement.java
@@ -11,9 +11,8 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis.queues;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Collection;
+import java.util.Objects;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.tracecompass.incubator.internal.ros.core.trace.layout.IRosEventLayout;
@@ -45,7 +44,7 @@
// Optional requirement on subscriber_callback_added event
TmfAnalysisEventRequirement subCallbackAddedEventRe = new TmfAnalysisEventRequirement(
- ImmutableSet.of(checkNotNull(layout.eventCallbackStart())),
+ ImmutableSet.of(Objects.requireNonNull(layout.eventCallbackStart())),
PriorityLevel.OPTIONAL);
return ImmutableSet.of(subCallbackAddedEventRe);
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/tasks/RosTasksAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/tasks/RosTasksAnalysis.java
index db5dea1..bf96595 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/tasks/RosTasksAnalysis.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/tasks/RosTasksAnalysis.java
@@ -11,8 +11,8 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis.tasks;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
+import java.util.Objects;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNull;
@@ -54,7 +54,7 @@
if (trace != null) {
layout = trace.getEventLayout();
}
- requirements = ImmutableSet.of(new RosTasksAnalysisRequirement(checkNotNull(layout)));
+ requirements = ImmutableSet.of(new RosTasksAnalysisRequirement(Objects.requireNonNull(layout)));
fAnalysisRequirements = requirements;
}
return requirements;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/tasks/RosTasksAnalysisRequirement.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/tasks/RosTasksAnalysisRequirement.java
index 70261ba..cfc8233 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/tasks/RosTasksAnalysisRequirement.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/tasks/RosTasksAnalysisRequirement.java
@@ -11,9 +11,8 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis.tasks;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Collection;
+import java.util.Objects;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.tracecompass.incubator.internal.ros.core.trace.layout.IRosEventLayout;
@@ -44,7 +43,7 @@
private static Collection<TmfAbstractAnalysisRequirement> getSubRequirements(IRosEventLayout layout) {
// Requirement on task_start event
TmfAnalysisEventRequirement taskStartReq = new TmfAnalysisEventRequirement(
- ImmutableSet.of(checkNotNull(layout.eventTaskStart())),
+ ImmutableSet.of(Objects.requireNonNull(layout.eventTaskStart())),
PriorityLevel.MANDATORY);
return ImmutableSet.of(taskStartReq);
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/timers/RosTimersAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/timers/RosTimersAnalysis.java
index 13ac262..1c91fab 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/timers/RosTimersAnalysis.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/timers/RosTimersAnalysis.java
@@ -11,8 +11,7 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis.timers;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
+import java.util.Objects;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNull;
@@ -54,7 +53,7 @@
if (trace != null) {
layout = trace.getEventLayout();
}
- requirements = ImmutableSet.of(new RosTimersAnalysisRequirement(checkNotNull(layout)));
+ requirements = ImmutableSet.of(new RosTimersAnalysisRequirement(Objects.requireNonNull(layout)));
fAnalysisRequirements = requirements;
}
return requirements;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/timers/RosTimersAnalysisRequirement.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/timers/RosTimersAnalysisRequirement.java
index 2615d07..daab573 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/timers/RosTimersAnalysisRequirement.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/analysis/timers/RosTimersAnalysisRequirement.java
@@ -11,9 +11,8 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.analysis.timers;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Collection;
+import java.util.Objects;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.tracecompass.incubator.internal.ros.core.trace.layout.IRosEventLayout;
@@ -44,12 +43,12 @@
private static Collection<TmfAbstractAnalysisRequirement> getSubRequirements(IRosEventLayout layout) {
// Requirement on timer_added event
TmfAnalysisEventRequirement timerAddedReq = new TmfAnalysisEventRequirement(
- ImmutableSet.of(checkNotNull(layout.eventTimerAdded())),
+ ImmutableSet.of(Objects.requireNonNull(layout.eventTimerAdded())),
PriorityLevel.MANDATORY);
// Requirement on timer_scheduled event
TmfAnalysisEventRequirement timerScheduledReq = new TmfAnalysisEventRequirement(
- ImmutableSet.of(checkNotNull(layout.eventTimerScheduled())),
+ ImmutableSet.of(Objects.requireNonNull(layout.eventTimerScheduled())),
PriorityLevel.MANDATORY);
return ImmutableSet.of(timerAddedReq, timerScheduledReq);
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/trace/RosTrace.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/trace/RosTrace.java
index 8255e54..40b196d 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/trace/RosTrace.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/trace/RosTrace.java
@@ -11,9 +11,9 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.trace;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
import java.util.Collection;
+import java.util.Objects;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
@@ -101,7 +101,7 @@
private static @NonNull IRosEventLayout getLayout() {
// Only one layout for the moment
- return checkNotNull(IRosEventLayout.getDefault());
+ return Objects.requireNonNull(IRosEventLayout.getDefault());
}
@Override
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/trace/layout/IRosEventLayout.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/trace/layout/IRosEventLayout.java
index 9fdf199..29aed5d 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/trace/layout/IRosEventLayout.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.core/src/org/eclipse/tracecompass/incubator/internal/ros/core/trace/layout/IRosEventLayout.java
@@ -11,11 +11,10 @@
package org.eclipse.tracecompass.incubator.internal.ros.core.trace.layout;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Objects;
import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -58,11 +57,11 @@
method -> method.getName().startsWith("event")) //$NON-NLS-1$
.forEach(eventMethod -> {
try {
- eventNames.add(checkNotNull((String) eventMethod.invoke(this)));
+ eventNames.add(Objects.requireNonNull((String) eventMethod.invoke(this)));
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
}
});
- return ImmutableList.copyOf(checkNotNull(eventNames));
+ return ImmutableList.copyOf(Objects.requireNonNull(eventNames));
}
// ------------------------------------------------------------------------
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/fused/FusedVirtualMachineAnalysis.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/fused/FusedVirtualMachineAnalysis.java
index e329659..1401de5 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/fused/FusedVirtualMachineAnalysis.java
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/fused/FusedVirtualMachineAnalysis.java
@@ -11,9 +11,8 @@
package org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.fused;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Collections;
+import java.util.Objects;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNull;
@@ -82,8 +81,8 @@
// REQUIRED_EVENTS, ValuePriorityLevel.MANDATORY);
// eventReq.addValues(OPTIONAL_EVENTS, ValuePriorityLevel.OPTIONAL);
//
- // REQUIREMENTS = checkNotNull(ImmutableSet.of(domainReq, eventReq));
- REQUIREMENTS = checkNotNull(Collections.EMPTY_SET);
+ // REQUIREMENTS = Objects.requireNonNull(ImmutableSet.of(domainReq, eventReq));
+ REQUIREMENTS = Objects.requireNonNull(Collections.EMPTY_SET);
}
@Override
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/fused/handlers/FusedVirtualMachineStateProvider.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/fused/handlers/FusedVirtualMachineStateProvider.java
index 3399a42..937c5e3 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/fused/handlers/FusedVirtualMachineStateProvider.java
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/fused/handlers/FusedVirtualMachineStateProvider.java
@@ -14,10 +14,9 @@
package org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.fused.handlers;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread;
@@ -247,7 +246,7 @@
final String eventName = event.getName();
final long ts = event.getTimestamp().getValue();
- final ITmfStateSystemBuilder ss = checkNotNull(getStateSystemBuilder());
+ final ITmfStateSystemBuilder ss = Objects.requireNonNull(getStateSystemBuilder());
/*
* Do this block only all machines have their roles
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/fused/handlers/SchedSwitchHandler.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/fused/handlers/SchedSwitchHandler.java
index 02c9d95..1fa66f0 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/fused/handlers/SchedSwitchHandler.java
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/fused/handlers/SchedSwitchHandler.java
@@ -11,9 +11,8 @@
package org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.fused.handlers;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.List;
+import java.util.Objects;
import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout;
import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.fused.FusedAttributes;
@@ -65,8 +64,8 @@
ITmfEventField content = event.getContent();
Integer prevTid = ((Long) content.getField(getLayout().fieldPrevTid()).getValue()).intValue();
- Long prevState = checkNotNull((Long) content.getField(getLayout().fieldPrevState()).getValue());
- String nextProcessName = checkNotNull((String) content.getField(getLayout().fieldNextComm()).getValue());
+ Long prevState = Objects.requireNonNull((Long) content.getField(getLayout().fieldPrevState()).getValue());
+ String nextProcessName = Objects.requireNonNull((String) content.getField(getLayout().fieldNextComm()).getValue());
Integer nextTid = ((Long) content.getField(getLayout().fieldNextTid()).getValue()).intValue();
Integer nextPrio = ((Long) content.getField(getLayout().fieldNextPrio()).getValue()).intValue();
String machineHost = event.getTrace().getHostId();
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/analysis/VirtualMachineModelStateProvider.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/analysis/VirtualMachineModelStateProvider.java
index 63984f6..fbcca55 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/analysis/VirtualMachineModelStateProvider.java
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/analysis/VirtualMachineModelStateProvider.java
@@ -14,11 +14,10 @@
package org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.analysis;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.analysis.os.linux.core.trace.DefaultEventLayout;
@@ -160,7 +159,7 @@
}
}
- ITmfStateSystemBuilder ss = checkNotNull(getStateSystemBuilder());
+ ITmfStateSystemBuilder ss = Objects.requireNonNull(getStateSystemBuilder());
Collection<IVirtualMachineModelBuilderEventHandler> handlers = fEventNames.get(eventName);
if (handlers.isEmpty()) {
return;
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/qemukvm/QemuKvmVmModel.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/qemukvm/QemuKvmVmModel.java
index 889e097..a141993 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/qemukvm/QemuKvmVmModel.java
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/qemukvm/QemuKvmVmModel.java
@@ -27,7 +27,6 @@
import org.eclipse.tracecompass.analysis.os.linux.core.kernel.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.incubator.analysis.core.model.IHostModel;
import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.IVirtualMachineModel;
@@ -70,7 +69,7 @@
/* Maps a virtual machine name to a virtual machine */
private final Map<String, VirtualMachine> fKnownMachines = new HashMap<>();
/* Associate a VM and a VCPU to a PCPU */
- private final Table<VirtualMachine, VirtualCPU, Long> fVirtualToPhysicalCpu = NonNullUtils.checkNotNull(HashBasedTable.<VirtualMachine, VirtualCPU, Long> create());
+ private final Table<VirtualMachine, VirtualCPU, Long> fVirtualToPhysicalCpu = Objects.requireNonNull(HashBasedTable.<VirtualMachine, VirtualCPU, Long> create());
private final TmfExperiment fExperiment;
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadStateProvider.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadStateProvider.java
index e543d30..f533402 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadStateProvider.java
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadStateProvider.java
@@ -11,13 +11,12 @@
package org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.overhead;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import org.eclipse.jdt.annotation.Nullable;
@@ -215,7 +214,7 @@
}
}
- ITmfStateSystemBuilder ss = checkNotNull(getStateSystemBuilder());
+ ITmfStateSystemBuilder ss = Objects.requireNonNull(getStateSystemBuilder());
Collection<IVirtualMachineEventHandler> handlers = fEventNames.get(eventName);
if (handlers.isEmpty()) {
return;
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/virtual/resources/VirtualResourcesStateProvider.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/virtual/resources/VirtualResourcesStateProvider.java
index ba14814..6dc8ee9 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/virtual/resources/VirtualResourcesStateProvider.java
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/virtual/resources/VirtualResourcesStateProvider.java
@@ -14,11 +14,10 @@
package org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.virtual.resources;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.analysis.os.linux.core.trace.DefaultEventLayout;
@@ -154,7 +153,7 @@
}
}
- ITmfStateSystemBuilder ss = checkNotNull(getStateSystemBuilder());
+ ITmfStateSystemBuilder ss = Objects.requireNonNull(getStateSystemBuilder());
Collection<IVirtualMachineEventHandler> handlers = fEventNames.get(eventName);
if (handlers.isEmpty()) {
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.ui/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/ui/views/vresources/AggregateEventIterator.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.ui/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/ui/views/vresources/AggregateEventIterator.java
index bb09b1e..5877af0 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.ui/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/ui/views/vresources/AggregateEventIterator.java
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.ui/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/ui/views/vresources/AggregateEventIterator.java
@@ -11,13 +11,12 @@
package org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.ui.views.vresources;
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.Objects;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.model.ITimeEvent;
@@ -123,6 +122,6 @@
}
}
- return checkNotNull(next);
+ return Objects.requireNonNull(next);
}
}
\ No newline at end of file
