tmf: Switch tmf.core.tests to Java 7 + fix warnings

Change-Id: I1c048d7c15015e6eff0c3382cb6e15e9cc8de31a
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/19928
Tested-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
IP-Clean: Matthew Khouzam <matthew.khouzam@ericsson.com>

20 files changed, 88 insertions, 87 deletions

diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/.classpath b/lttng/org.eclipse.linuxtools.tmf.core.tests/.classpath
index 70be98bada..9bacd0f47a 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/.classpath
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="stubs"/>
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/.settings/org.eclipse.jdt.core.prefs b/lttng/org.eclipse.linuxtools.tmf.core.tests/.settings/org.eclipse.jdt.core.prefs
index ccd0247adc..ea5fccc222 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -24,7 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=
 org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=error
@@ -75,7 +75,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
@@ -110,7 +110,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
index 7f991b2661..a0992054eb 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.tmf.core.tests;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java
index 04a5317cf9..343fb88410 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java
@@ -103,7 +103,7 @@ public class TmfEventProviderTest {
     @Test
     public void testGetPlainEvents() {
         final int NB_EVENTS = 1000;
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
         // Get the TmfSyntheticEventStub provider
         ITmfEventProvider[] eventProviders = TmfProviderManager.getProviders(ITmfEvent.class,
@@ -146,8 +146,8 @@ public class TmfEventProviderTest {
         final int NUMBER_EVENTS_BEFORE_CANCEL_REQ1 = 10;
         final int NUMBER_EVENTS_BEFORE_CANCEL_REQ2 = 800;
 
-        final Vector<ITmfEvent> requestedEventsReq1 = new Vector<ITmfEvent>();
-        final Vector<ITmfEvent> requestedEventsReq2 = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEventsReq1 = new Vector<>();
+        final Vector<ITmfEvent> requestedEventsReq2 = new Vector<>();
 
         // Get the TmfSyntheticEventStub provider
         ITmfEventProvider[] eventProviders = TmfProviderManager.getProviders(ITmfEvent.class,
@@ -252,7 +252,7 @@ public class TmfEventProviderTest {
     private static void getSyntheticData(final TmfTimeRange range,
             final int nbEvents) throws InterruptedException {
 
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
         // Get the event provider
         ITmfEventProvider[] eventProviders = TmfProviderManager
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfContextTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfContextTest.java
index ee2a807e06..cf69f3c54b 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfContextTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfContextTest.java
@@ -90,9 +90,9 @@ public class CtfTmfContextTest {
     public void testTooManyContexts() throws InterruptedException {
         final int lwcCount = 101;
         double increment = (end - begin) / lwcCount;
-        final ArrayList<Long> vals = new ArrayList<Long>();
-        final ArrayList<Thread> threads = new ArrayList<Thread>();
-        final ArrayList<CtfTmfContext> tooManyContexts = new ArrayList<CtfTmfContext>();
+        final ArrayList<Long> vals = new ArrayList<>();
+        final ArrayList<Thread> threads = new ArrayList<>();
+        final ArrayList<CtfTmfContext> tooManyContexts = new ArrayList<>();
 
         for (double i = begin; i < end; i += increment) {
             SeekerThread thread = new SeekerThread() {
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java
index ebffe99c61..4d876ce9d5 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java
@@ -40,7 +40,7 @@ public class Benchmark {
 
         // Work variables
         Long nbEvent = 0L;
-        final Vector<Double> benchs = new Vector<Double>();
+        final Vector<Double> benchs = new Vector<>();
         CtfTmfTrace trace = null;
         long start, stop;
         for (int loops = 0; loops < NUM_LOOPS; loops++) {
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/RequestBenchmark.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/RequestBenchmark.java
index ecd8d38fd7..5701ac372d 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/RequestBenchmark.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/RequestBenchmark.java
@@ -42,7 +42,7 @@ public class RequestBenchmark extends TmfEventRequest {
     // Work variables
     private static int nbEvent = 0;
     private static TmfExperiment fExperiment = null;
-    private static Vector<Double> benchs = new Vector<Double>();
+    private static Vector<Double> benchs = new Vector<>();
 
     /**
      * Run the benchmark
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java
index e09d68ea2e..721ae0ef46 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java
@@ -416,7 +416,7 @@ public class TmfCoalescedEventRequestTest {
         TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
         final long REQUEST_OFFSET = 1000;
 
-        requestedEvents1 = new Vector<ITmfEvent>();
+        requestedEvents1 = new Vector<>();
         request1 = new TmfEventRequest(ITmfEvent.class, range, signal.fIndex,
                 NB_EVENTS, ExecutionType.FOREGROUND) {
             @Override
@@ -431,7 +431,7 @@ public class TmfCoalescedEventRequestTest {
             }
         };
 
-        requestedEvents2 = new Vector<ITmfEvent>();
+        requestedEvents2 = new Vector<>();
         request2 = new TmfEventRequest(ITmfEvent.class, range,
                 signal.fIndex + REQUEST_OFFSET, NB_EVENTS, ExecutionType.FOREGROUND) {
             @Override
@@ -443,7 +443,7 @@ public class TmfCoalescedEventRequestTest {
             }
         };
 
-        requestedEvents3 = new Vector<ITmfEvent>();
+        requestedEvents3 = new Vector<>();
         request3 = new TmfEventRequest(ITmfEvent.class, range,
                 signal.fIndex + 2 * REQUEST_OFFSET, NB_EVENTS, ExecutionType.FOREGROUND) {
             @Override
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfSchedulerTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfSchedulerTest.java
index b9d9821c96..b13b93e641 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfSchedulerTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfSchedulerTest.java
@@ -69,7 +69,7 @@ public class TmfSchedulerTest {
     private long fEndTime;
     private TmfTimeRange fForegroundTimeRange;
 
-    private final List<String> fOrderList = new ArrayList<String>();
+    private final List<String> fOrderList = new ArrayList<>();
     private int fForegroundId = 0;
     private int fBackgroundId = 0;
 
@@ -339,7 +339,7 @@ public class TmfSchedulerTest {
     @Ignore
     @Test
     public void executionOrder() {
-        List<String> expectedOrder = new LinkedList<String>();
+        List<String> expectedOrder = new LinkedList<>();
         expectedOrder.add("FOREGROUND1");
         expectedOrder.add("FOREGROUND2");
         expectedOrder.add("FOREGROUND3");
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/signal/TmfSignalThrottlerTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/signal/TmfSignalThrottlerTest.java
index 7f4f74dea4..b83b228254 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/signal/TmfSignalThrottlerTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/signal/TmfSignalThrottlerTest.java
@@ -86,7 +86,7 @@ public class TmfSignalThrottlerTest {
      */
     @Test
     public void testMultipleChannels() {
-        List<MySignal> signals = new ArrayList<MySignal>();
+        List<MySignal> signals = new ArrayList<>();
         signals.add(new MySignal(sender, 0));
         signals.add(new MySignal(sender, 0));
         signals.add(new MySignal(sender, 0));
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/statesystem/backends/InMemoryBackendTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/statesystem/backends/InMemoryBackendTest.java
index 7a8f5e3497..05926b0343 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/statesystem/backends/InMemoryBackendTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/statesystem/backends/InMemoryBackendTest.java
@@ -94,7 +94,7 @@ public class InMemoryBackendTest {
      */
     @Test
     public void testDoQuery() {
-        List<ITmfStateInterval> interval = new ArrayList<ITmfStateInterval>(NUMBER_OF_ATTRIBUTES);
+        List<ITmfStateInterval> interval = new ArrayList<>(NUMBER_OF_ATTRIBUTES);
         for (int i = 0; i < NUMBER_OF_ATTRIBUTES; i++) {
             interval.add(null);
         }
@@ -140,7 +140,7 @@ public class InMemoryBackendTest {
             testInterval(interval[8], 908, 998, 9);
             testInterval(interval[9], 909, 999, 9);
 
-            List<ITmfStateInterval> intervalQuery = new ArrayList<ITmfStateInterval>(NUMBER_OF_ATTRIBUTES);
+            List<ITmfStateInterval> intervalQuery = new ArrayList<>(NUMBER_OF_ATTRIBUTES);
             for (int i = 0; i < NUMBER_OF_ATTRIBUTES; i++) {
                 intervalQuery.add(null);
             }
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/synchronization/TsTransformTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/synchronization/TsTransformTest.java
index 4e91a4ae97..f5a2d89d87 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/synchronization/TsTransformTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/synchronization/TsTransformTest.java
@@ -82,7 +82,7 @@ public class TsTransformTest {
      */
     @Test
     public void testEquality() {
-        Map<ITmfTimestampTransform, String> map = new HashMap<ITmfTimestampTransform, String>();
+        Map<ITmfTimestampTransform, String> map = new HashMap<>();
         ITmfTimestampTransform ttl = new TmfTimestampTransformLinear(BigDecimal.valueOf(2.0), BigDecimal.valueOf(3));
         ITmfTimestampTransform ttl2 = new TmfTimestampTransformLinear(BigDecimal.valueOf(2.0), BigDecimal.valueOf(3));
         ITmfTimestampTransform ttl3 = new TmfTimestampTransformLinear(BigDecimal.valueOf(3), BigDecimal.valueOf(3));
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java
index da2b68f9fe..99d096a080 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java
@@ -826,7 +826,7 @@ public class TmfExperimentTest {
     @Test
     public void testProcessRequestForNbEvents() throws InterruptedException {
         final int nbEvents  = 1000;
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
         final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class,
@@ -854,7 +854,7 @@ public class TmfExperimentTest {
     @Test
     public void testProcessRequestForAllEvents() throws InterruptedException {
         final int nbEvents  = ITmfEventRequest.ALL_DATA;
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
         final long nbExpectedEvents = NB_EVENTS;
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
@@ -888,7 +888,7 @@ public class TmfExperimentTest {
     public void testCancel() throws InterruptedException {
         final int nbEvents = NB_EVENTS;
         final int limit = BLOCK_SIZE;
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
         final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class,
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java
index 52d6a5ac4e..164fffa8ad 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java
@@ -675,7 +675,7 @@ public class TmfMultiTraceExperimentTest {
     @Test
     public void testProcessRequestForNbEvents() throws InterruptedException {
         final int nbEvents  = 1000;
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
         final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class,
@@ -703,7 +703,7 @@ public class TmfMultiTraceExperimentTest {
     @Test
     public void testProcessRequestForAllEvents() throws InterruptedException {
         final int nbEvents  = ITmfEventRequest.ALL_DATA;
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
         final long nbExpectedEvents = NB_EVENTS;
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
@@ -737,7 +737,7 @@ public class TmfMultiTraceExperimentTest {
     public void testCancel() throws InterruptedException {
         final int nbEvents  = NB_EVENTS;
         final int limit = BLOCK_SIZE;
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
         final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class,
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java
index 30e8577ef6..1a5e0a8de9 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java
@@ -1148,7 +1148,7 @@ public class TmfTraceTest {
 
     @Test
     public void testProcessEventRequestForAllEvents() throws InterruptedException {
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
         final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class,
@@ -1177,7 +1177,7 @@ public class TmfTraceTest {
     @Test
     public void testProcessEventRequestForNbEvents() throws InterruptedException {
         final int nbEvents  = 1000;
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
         final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class,
@@ -1207,7 +1207,7 @@ public class TmfTraceTest {
     public void testProcessEventRequestForSomeEvents() throws InterruptedException {
         final long startTime = 100;
         final int nbEvents  = 1000;
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
         final TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(startTime, SCALE), TmfTimestamp.BIG_CRUNCH);
         final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class,
@@ -1238,7 +1238,7 @@ public class TmfTraceTest {
         final int startIndex = 99;
         final long startTime = 100;
         final int nbEvents  = 1000;
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
         final TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(startTime, SCALE), TmfTimestamp.BIG_CRUNCH);
         final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class,
@@ -1268,7 +1268,7 @@ public class TmfTraceTest {
     public void testProcessDataRequestForSomeEvents() throws InterruptedException {
         final int startIndex = 100;
         final int nbEvents  = 1000;
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
         final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class,
                 TmfTimeRange.ETERNITY,
@@ -1303,7 +1303,7 @@ public class TmfTraceTest {
     @Test
     public void testCancel() throws InterruptedException {
         final int limit = 500;
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
+        final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
         final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class,
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/AbstractCheckpointCollectionTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/AbstractCheckpointCollectionTest.java
index 8601c76ad7..3fcb715be4 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/AbstractCheckpointCollectionTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/AbstractCheckpointCollectionTest.java
@@ -216,9 +216,9 @@ public abstract class AbstractCheckpointCollectionTest {
     public void testVersionChange() throws IOException {
         fCheckpointCollection.setIndexComplete();
         fCheckpointCollection.dispose();
-        RandomAccessFile f = new RandomAccessFile(fFile, "rw");
-        f.writeInt(-1);
-        f.close();
+        try (RandomAccessFile f = new RandomAccessFile(fFile, "rw");) {
+            f.writeInt(-1);
+        }
 
         fCheckpointCollection = createCollection();
         assertTrue(fCheckpointCollection.isCreatedFromScratch());
@@ -253,7 +253,7 @@ public abstract class AbstractCheckpointCollectionTest {
         }
 
         boolean random = true;
-        ArrayList<Integer> list = new ArrayList<Integer>();
+        ArrayList<Integer> list = new ArrayList<>();
         for (int i = 0; i < CHECKPOINTS_INSERT_NUM; i++) {
             if (random) {
                 Random rand = new Random();
@@ -302,7 +302,7 @@ public abstract class AbstractCheckpointCollectionTest {
         }
 
         boolean random = true;
-        ArrayList<Integer> list = new ArrayList<Integer>();
+        ArrayList<Integer> list = new ArrayList<>();
         for (int i = 0; i < CHECKPOINTS_INSERT_NUM; i++) {
             if (random) {
                 Random rand = new Random();
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/AllBench.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/AllBench.java
index cf82cbb469..d05abe293e 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/AllBench.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/AllBench.java
@@ -60,33 +60,33 @@ public class AllBench {
 
     private static void generateDataFile(ArrayList<Integer> list, int checkpointsNums) throws IOException {
         File randomDataFile = new File("data" + checkpointsNums);
-        RandomAccessFile f = new RandomAccessFile(randomDataFile, "rw");
-        if (randomDataFile.exists()) {
-            for (int i = 0; i < checkpointsNums; i++) {
-                Random rand = new Random();
-                int nextInt = rand.nextInt(checkpointsNums);
-                list.add(nextInt);
-                f.writeInt(nextInt);
-            }
-        } else {
-            for (int i = 0; i < checkpointsNums; i++) {
-                list.add(f.readInt());
+        try (RandomAccessFile f = new RandomAccessFile(randomDataFile, "rw");) {
+            if (randomDataFile.exists()) {
+                for (int i = 0; i < checkpointsNums; i++) {
+                    Random rand = new Random();
+                    int nextInt = rand.nextInt(checkpointsNums);
+                    list.add(nextInt);
+                    f.writeInt(nextInt);
+                }
+            } else {
+                for (int i = 0; i < checkpointsNums; i++) {
+                    list.add(f.readInt());
+                }
             }
         }
-        f.close();
     }
 
     @SuppressWarnings("javadoc")
     public static void main(String[] args) throws IOException {
         int checkpointsNums [] = new int [] { 5000, 50000, 500000, 1000000 };
-        nums = new ArrayList<ArrayList<Integer>>(checkpointsNums.length);
+        nums = new ArrayList<>(checkpointsNums.length);
 
         System.out.println("DEGREE: " + BTREE_DEGREE);
 
         AllBench b = new AllBench();
         b.setUp();
         for (int i = 0; i < checkpointsNums.length; i++) {
-            ArrayList<Integer> list = new ArrayList<Integer>();
+            ArrayList<Integer> list = new ArrayList<>();
             generateDataFile(list, checkpointsNums[i]);
             nums.add(list);
 
@@ -113,7 +113,7 @@ public class AllBench {
 
         writeCheckpoints(checkpointsNum);
 
-        ArrayList<Integer> list = new ArrayList<Integer>();
+        ArrayList<Integer> list = new ArrayList<>();
         for (int i = 0; i < checkpointsNum; i++) {
             list.add(i);
         }
@@ -131,7 +131,7 @@ public class AllBench {
 
         writeCheckpointsArray(checkpointsNum);
 
-        ArrayList<Integer> list = new ArrayList<Integer>();
+        ArrayList<Integer> list = new ArrayList<>();
         for (int i = 0; i < checkpointsNum; i++) {
             list.add(i);
         }
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/PairTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/PairTest.java
index 40138c933a..9230525f63 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/PairTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/PairTest.java
@@ -31,8 +31,8 @@ public class PairTest {
     // Field(s)
     // ------------------------------------------------------------------------
 
-    Pair<String, Long> fPair1 = new Pair<String, Long>("String 1", 1L);
-    Pair<String, Long> fPair2 = new Pair<String, Long>("String 2", 2L);
+    Pair<String, Long> fPair1 = new Pair<>("String 1", 1L);
+    Pair<String, Long> fPair2 = new Pair<>("String 2", 2L);
 
     // ------------------------------------------------------------------------
     // to String
@@ -50,7 +50,7 @@ public class PairTest {
 
     @Test
     public void testAccessors() {
-        Pair<String, Long> myPair = new Pair<String, Long>("String 1", 1L);
+        Pair<String, Long> myPair = new Pair<>("String 1", 1L);
         assertEquals("String 1", myPair.getFirst());
         assertEquals(Long.valueOf(1L), myPair.getSecond());
 
@@ -76,8 +76,8 @@ public class PairTest {
 
     @Test
     public void testEqualsSymmetry() {
-        Pair<String, Long> info1 = new Pair<String, Long>(fPair1.getFirst(), fPair1.getSecond().longValue());
-        Pair<String, Long> info2 = new Pair<String, Long>(fPair2.getFirst(), fPair2.getSecond().longValue());
+        Pair<String, Long> info1 = new Pair<>(fPair1.getFirst(), fPair1.getSecond().longValue());
+        Pair<String, Long> info2 = new Pair<>(fPair2.getFirst(), fPair2.getSecond().longValue());
 
         assertTrue("equals", info1.equals(fPair1));
         assertTrue("equals", fPair1.equals(info1));
@@ -88,9 +88,9 @@ public class PairTest {
 
     @Test
     public void testEqualsTransivity() {
-        Pair<String, Long> info1 = new Pair<String, Long>(fPair1.getFirst(), fPair1.getSecond().longValue());
-        Pair<String, Long> info2 = new Pair<String, Long>(fPair1.getFirst(), fPair1.getSecond().longValue());
-        Pair<String, Long> info3 = new Pair<String, Long>(fPair1.getFirst(), fPair1.getSecond().longValue());
+        Pair<String, Long> info1 = new Pair<>(fPair1.getFirst(), fPair1.getSecond().longValue());
+        Pair<String, Long> info2 = new Pair<>(fPair1.getFirst(), fPair1.getSecond().longValue());
+        Pair<String, Long> info3 = new Pair<>(fPair1.getFirst(), fPair1.getSecond().longValue());
 
         assertTrue("equals", info1.equals(info2));
         assertTrue("equals", info2.equals(info3));
@@ -105,7 +105,7 @@ public class PairTest {
 
     @Test
     public void testEqualsDifferentObj() {
-        Pair<Long, String> info = new Pair<Long, String>(1L, "String1");
+        Pair<Long, String> info = new Pair<>(1L, "String1");
         assertTrue("equals", !fPair1.equals(info));
     }
 
@@ -115,8 +115,8 @@ public class PairTest {
 
     @Test
     public void testHashCode() {
-        Pair<String, Long> info1 = new Pair<String, Long>(fPair1.getFirst(), fPair1.getSecond().longValue());
-        Pair<String, Long> info2 = new Pair<String, Long>(fPair2.getFirst(), fPair2.getSecond().longValue());
+        Pair<String, Long> info1 = new Pair<>(fPair1.getFirst(), fPair1.getSecond().longValue());
+        Pair<String, Long> info2 = new Pair<>(fPair2.getFirst(), fPair2.getSecond().longValue());
 
         assertTrue("hashCode", fPair1.hashCode() == info1.hashCode());
         assertTrue("hashCode", fPair2.hashCode() == info2.hashCode());
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java
index b9c47baafe..2400dc5940 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java
@@ -86,27 +86,28 @@ public class CreateTestFiles {
      * @throws FileNotFoundException
      * @throws IOException
      */
-    private static void createTestFile(final String file, final int size, final boolean monotonic, final boolean odd) throws FileNotFoundException, IOException {
-        DataOutputStream out;
+    private static void createTestFile(final String file, final int size,
+            final boolean monotonic, final boolean odd)
+            throws IOException {
         System.out.println("Creating " + file);
-        out = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file)));
+        try (DataOutputStream out = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file)));) {
 
-        final Random generator = new Random(19580427 + size);
-        long ts = (monotonic && odd) ? -1 : 0;
-        for (int i = 0; i < size; i++) {
-            ts += monotonic ? 2 : generator.nextInt(10);
-            final int sourceIndex = i % NB_SOURCES;
-            final int typeIndex   = i % NB_TYPES;
-            out.writeLong(ts);                      // Timestamp
-            out.writeUTF("Source-" + sourceIndex);  // Source
-            out.writeUTF("Type-"   + typeIndex);    // Type
-            out.writeInt(i + 1);                    // Reference (event #)
-            for (int j = 0; j < typeIndex; j++) {
-                out.writeUTF("Field-" + sourceIndex + "-" + j);
+            final Random generator = new Random(19580427 + size);
+            long ts = (monotonic && odd) ? -1 : 0;
+            for (int i = 0; i < size; i++) {
+                ts += monotonic ? 2 : generator.nextInt(10);
+                final int sourceIndex = i % NB_SOURCES;
+                final int typeIndex = i % NB_TYPES;
+                out.writeLong(ts); // Timestamp
+                out.writeUTF("Source-" + sourceIndex); // Source
+                out.writeUTF("Type-" + typeIndex); // Type
+                out.writeInt(i + 1); // Reference (event #)
+                for (int j = 0; j < typeIndex; j++) {
+                    out.writeUTF("Field-" + sourceIndex + "-" + j);
+                }
             }
+            out.flush();
         }
-        out.flush();
-        out.close();
     }
 
 }
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java
index 0d97326fea..75f89e9ab5 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java
@@ -51,7 +51,7 @@ public class TmfEventParserStub implements ITmfEventParser {
         fEventStream = eventStream;
         fTypes = new TmfEventType[NB_TYPES];
         for (int i = 0; i < NB_TYPES; i++) {
-            final Vector<String> fields = new Vector<String>();
+            final Vector<String> fields = new Vector<>();
             for (int j = 1; j <= i; j++) {
                 final String field = "Fmt-" + i + "-Fld-" + j;
                 fields.add(field);