Cosmetics.

Apply code cleanups.

Change-Id: I9207cbe1808484eeac1072bd19ed3dcbc71b53f9

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java

@@ -363,7 +363,7 @@ public class SyncUtil {
 		final IBreakpointsTargetDMContext bpTargetDmc = DMContexts.getAncestorOfType(containerDmc,
 				IBreakpointsTargetDMContext.class);
 
-		Query<MIBreakInsertInfo> query = new Query<MIBreakInsertInfo>() {
+		Query<MIBreakInsertInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIBreakInsertInfo> rm) {
 				fGdbControl.queueCommand(
@@ -388,7 +388,7 @@ public class SyncUtil {
 		final IBreakpointsTargetDMContext bpTargetDmc = DMContexts.getAncestorOfType(containerDmc,
 				IBreakpointsTargetDMContext.class);
 
-		Query<MIBreakListInfo> query = new Query<MIBreakListInfo>() {
+		Query<MIBreakListInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIBreakListInfo> rm) {
 				fGdbControl.queueCommand(fCommandFactory.createMIBreakList(bpTargetDmc), rm);
@@ -480,7 +480,7 @@ public class SyncUtil {
 	 * @throws Throwable
 	 */
 	public static boolean canResume(final IExecutionDMContext execDmc) throws Throwable {
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				fRunControl.canResume(execDmc, new ImmediateDataRequestMonitor<Boolean>(rm) {
@@ -620,7 +620,7 @@ public class SyncUtil {
 	 * @throws Exception
 	 */
 	public static IFrameDMContext getStackFrame(final IExecutionDMContext execCtx, final int level) throws Exception {
-		Query<IFrameDMContext> query = new Query<IFrameDMContext>() {
+		Query<IFrameDMContext> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IFrameDMContext> rm) {
 				fStack.getFrames(execCtx, level, level, new ImmediateDataRequestMonitor<IFrameDMContext[]>(rm) {
@@ -685,7 +685,7 @@ public class SyncUtil {
 	 * @throws Throwable
 	 */
 	public static Integer getStackDepth(final IExecutionDMContext execCtx, final int maxDepth) throws Throwable {
-		Query<Integer> query = new Query<Integer>() {
+		Query<Integer> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Integer> rm) {
 				fStack.getStackDepth(execCtx, maxDepth, rm);
@@ -706,7 +706,7 @@ public class SyncUtil {
 	 * @throws Throwable
 	 */
 	public static IFrameDMData getFrameData(final IExecutionDMContext execCtx, final int level) throws Throwable {
-		Query<IFrameDMData> query = new Query<IFrameDMData>() {
+		Query<IFrameDMData> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IFrameDMData> rm) {
 				fStack.getFrames(execCtx, level, level, new ImmediateDataRequestMonitor<IFrameDMContext[]>(rm) {
@@ -751,7 +751,7 @@ public class SyncUtil {
 		final IProcessDMContext processContext = DMContexts.getAncestorOfType(SyncUtil.getContainerContext(),
 				IProcessDMContext.class);
 
-		Query<IThreadDMData> query = new Query<IThreadDMData>() {
+		Query<IThreadDMData> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IThreadDMData> rm) {
 				IThreadDMContext threadDmc = fProcessesService.createThreadContext(processContext,
@@ -793,7 +793,7 @@ public class SyncUtil {
 	 */
 	public static IExpressionDMContext[] getSubExpressions(final IExpressionDMContext dmc)
 			throws InterruptedException, ExecutionException {
-		Query<IExpressionDMContext[]> query = new Query<IExpressionDMContext[]>() {
+		Query<IExpressionDMContext[]> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IExpressionDMContext[]> rm) {
 				fExpressions.getSubExpressions(dmc, rm);
@@ -841,7 +841,7 @@ public class SyncUtil {
 	 * @throws Throwable
 	 */
 	public static String getExpressionValue(final IExpressionDMContext exprDmc, final String format) throws Throwable {
-		Query<String> query = new Query<String>() {
+		Query<String> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> rm) {
 				FormattedValueDMContext valueDmc = fExpressions.getFormattedValueContext(exprDmc, format);
@@ -1008,7 +1008,7 @@ public class SyncUtil {
 			throws InterruptedException, ExecutionException, TimeoutException {
 		assert !fProcessesService.getExecutor().isInExecutorThread();
 
-		Query<IContainerDMContext> query = new Query<IContainerDMContext>() {
+		Query<IContainerDMContext> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IContainerDMContext> rm) {
 				fProcessesService.getProcessesBeingDebugged(fGdbControl.getContext(),
@@ -1049,7 +1049,7 @@ public class SyncUtil {
 
 		final IContainerDMContext containerDmc = SyncUtil.getContainerContext();
 
-		Query<IMIExecutionDMContext[]> query = new Query<IMIExecutionDMContext[]>() {
+		Query<IMIExecutionDMContext[]> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IMIExecutionDMContext[]> rm) {
 				fProcessesService.getProcessesBeingDebugged(containerDmc,
@@ -1101,7 +1101,7 @@ public class SyncUtil {
 		final IContainerDMContext containerDmc = getContainerContext();
 
 		// Check if restart is allowed
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				fProcessesService.canRestart(containerDmc, new ImmediateDataRequestMonitor<Boolean>(rm) {
@@ -1139,7 +1139,7 @@ public class SyncUtil {
 		final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class);
 
 		// Perform the restart
-		Query<IContainerDMContext> query2 = new Query<IContainerDMContext>() {
+		Query<IContainerDMContext> query2 = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IContainerDMContext> rm) {
 				Map<String, Object> attributes = null;
@@ -1171,7 +1171,7 @@ public class SyncUtil {
 	 * @throws Throwable
 	 */
 	public static IVariableDMData[] getLocals(final IFrameDMContext frameDmc) throws Throwable {
-		Query<IVariableDMData[]> query = new Query<IVariableDMData[]>() {
+		Query<IVariableDMData[]> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IVariableDMData[]> rm) {
 				fStack.getLocals(frameDmc, new ImmediateDataRequestMonitor<IVariableDMContext[]>() {
@@ -1226,7 +1226,7 @@ public class SyncUtil {
 			// Note that we send an MI Command in this code and do not use the IRegister service;
 			// this is because we want to test the service later, comparing it to what we find
 			// by asking GDB directly.
-			Query<MIDataListRegisterNamesInfo> query = new Query<MIDataListRegisterNamesInfo>() {
+			Query<MIDataListRegisterNamesInfo> query = new Query<>() {
 				@Override
 				protected void execute(DataRequestMonitor<MIDataListRegisterNamesInfo> rm) {
 					IContainerDMContext containerDmc = DMContexts.getAncestorOfType(context, IContainerDMContext.class);
@@ -1269,7 +1269,7 @@ public class SyncUtil {
 	 */
 	public static MemoryByte[] readMemory(final IMemoryDMContext dmc, final IAddress address, final long offset,
 			final int wordSize, final int count) throws InterruptedException, ExecutionException {
-		Query<MemoryByte[]> query = new Query<MemoryByte[]>() {
+		Query<MemoryByte[]> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MemoryByte[]> rm) {
 				fMemory.getMemory(dmc, address, offset, wordSize, count, rm);
@@ -1295,7 +1295,7 @@ public class SyncUtil {
 	 */
 	public static void writeMemory(final IMemoryDMContext dmc, final IAddress address, final long offset,
 			final int wordSize, final int count, final byte[] buffer) throws InterruptedException, ExecutionException {
-		Query<Void> query = new Query<Void>() {
+		Query<Void> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Void> rm) {
 				fMemory.setMemory(dmc, address, offset, wordSize, count, buffer, rm);
@@ -1321,7 +1321,7 @@ public class SyncUtil {
 	 */
 	public static void fillMemory(final IMemoryDMContext dmc, final IAddress address, final long offset,
 			final int wordSize, final int count, final byte[] pattern) throws InterruptedException, ExecutionException {
-		Query<Void> query = new Query<Void>() {
+		Query<Void> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Void> rm) {
 				fMemory.fillMemory(dmc, address, offset, wordSize, count, pattern, rm);
@@ -1369,7 +1369,7 @@ public class SyncUtil {
 	 * {@link ISourceLookup#getSource(ISourceLookupDMContext, String, DataRequestMonitor)}
 	 */
 	public static Object getSource(final String debuggerPath) throws Exception {
-		Query<Object> query = new Query<Object>() {
+		Query<Object> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
 				final ISourceLookupDMContext ctx = DMContexts.getAncestorOfType(fGdbControl.getContext(),
@@ -1390,7 +1390,7 @@ public class SyncUtil {
 	 * {@link IDebugSourceFiles#getSources(IDMContext, DataRequestMonitor)}
 	 */
 	public static IDebugSourceFileInfo[] getSources(IDMContext ctx) throws Exception {
-		Query<IDebugSourceFileInfo[]> query = new Query<IDebugSourceFileInfo[]>() {
+		Query<IDebugSourceFileInfo[]> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IDebugSourceFileInfo[]> rm) {
 				fDebugSourceFiles.getSources(ctx, rm);

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandLineArgsTest.java

@@ -142,7 +142,7 @@ public class CommandLineArgsTest extends BaseParametrizedTestCase {
 
 		// Check that argc is correct
 		final IExpressionDMContext argcDmc = SyncUtil.createExpression(stoppedEvent.getDMContext(), "argc");
-		Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -160,7 +160,7 @@ public class CommandLineArgsTest extends BaseParametrizedTestCase {
 		for (int i = 0; i < expected.length; i++) {
 			final IExpressionDMContext argvDmc = SyncUtil.createExpression(stoppedEvent.getDMContext(),
 					"argv[" + (i + 1) + "]");
-			Query<FormattedValueDMData> query2 = new Query<FormattedValueDMData>() {
+			Query<FormattedValueDMData> query2 = new Query<>() {
 				@Override
 				protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 					fExpService.getFormattedExpressionValue(

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java

@@ -101,7 +101,7 @@ public class CommandTimeoutTest extends BaseParametrizedTestCase {
 				ICommandControlShutdownDMEvent.class);
 
 		// Send the command that will timeout
-		Query<MIInfo> query = new Query<MIInfo>() {
+		Query<MIInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
 				DsfServicesTracker tracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), session.getId());

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleBreakpointsTest.java

@@ -679,7 +679,7 @@ public class GDBConsoleBreakpointsTest extends BaseParametrizedTestCase {
 	}
 
 	private MIBreakpoint[] getTargetBreakpoints(int timeout, TimeUnit unit) throws Throwable {
-		Query<MIBreakListInfo> query = new Query<MIBreakListInfo>() {
+		Query<MIBreakListInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIBreakListInfo> rm) {
 				fCommandControl.queueCommand(fCommandControl.getCommandFactory().createMIBreakList(fBreakpointsDmc),
@@ -715,7 +715,7 @@ public class GDBConsoleBreakpointsTest extends BaseParametrizedTestCase {
 	}
 
 	private void queueConsoleCommand(final String command, int timeout, TimeUnit unit) throws Throwable {
-		Query<MIInfo> query = new Query<MIInfo>() {
+		Query<MIInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
 				fCommandControl.queueCommand(fCommandControl.getCommandFactory()

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleSynchronizingTest.java

@@ -141,7 +141,7 @@ public class GDBConsoleSynchronizingTest extends BaseParametrizedTestCase {
 		final IExpressionDMContext exprDmc = SyncUtil.createExpression(frameDmc, "i");
 
 		// Read the memory that will change first, or else there will be no event for it
-		Query<IExpressionDMAddress> query = new Query<IExpressionDMAddress>() {
+		Query<IExpressionDMAddress> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IExpressionDMAddress> rm) {
 				fExprService.getExpressionAddressData(exprDmc, rm);
@@ -186,7 +186,7 @@ public class GDBConsoleSynchronizingTest extends BaseParametrizedTestCase {
 		final IExpressionDMContext exprDmc = SyncUtil.createExpression(frameDmc, "i");
 
 		// Read the memory that will change first, or else there will be no event for it
-		Query<IExpressionDMAddress> query = new Query<IExpressionDMAddress>() {
+		Query<IExpressionDMAddress> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IExpressionDMAddress> rm) {
 				fExprService.getExpressionAddressData(exprDmc, rm);
@@ -254,7 +254,7 @@ public class GDBConsoleSynchronizingTest extends BaseParametrizedTestCase {
 		final IExpressionDMContext exprDmc = SyncUtil.createExpression(frameDmc, "i");
 
 		// Read the memory that will change first, or else there will be no event for it
-		Query<IExpressionDMAddress> query = new Query<IExpressionDMAddress>() {
+		Query<IExpressionDMAddress> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IExpressionDMAddress> rm) {
 				fExprService.getExpressionAddressData(exprDmc, rm);
@@ -303,7 +303,7 @@ public class GDBConsoleSynchronizingTest extends BaseParametrizedTestCase {
 		SyncUtil.runToLocation("testMemoryChanges");
 
 		// check starting state
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				reverseService.isReverseModeEnabled(fCommandControl.getContext(), rm);
@@ -323,7 +323,7 @@ public class GDBConsoleSynchronizingTest extends BaseParametrizedTestCase {
 		assertEquals(true, event.isReverseModeEnabled());
 
 		// Check the service
-		query = new Query<Boolean>() {
+		query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				reverseService.isReverseModeEnabled(fCommandControl.getContext(), rm);
@@ -349,7 +349,7 @@ public class GDBConsoleSynchronizingTest extends BaseParametrizedTestCase {
 		fEventsReceived.clear();
 
 		// check starting state
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				reverseService.enableReverseMode(fCommandControl.getContext(), true, new ImmediateRequestMonitor(rm) {
@@ -377,7 +377,7 @@ public class GDBConsoleSynchronizingTest extends BaseParametrizedTestCase {
 		assertEquals(false, event.isReverseModeEnabled());
 
 		// Check the service
-		query = new Query<Boolean>() {
+		query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				reverseService.isReverseModeEnabled(fCommandControl.getContext(), rm);
@@ -405,7 +405,7 @@ public class GDBConsoleSynchronizingTest extends BaseParametrizedTestCase {
 	}
 
 	private void queueConsoleCommand(final String command, int timeout, TimeUnit unit) throws Throwable {
-		Query<MIInfo> query = new Query<MIInfo>() {
+		Query<MIInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
 				fCommandControl.queueCommand(fCommandControl.getCommandFactory()

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java

@@ -115,7 +115,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase
 			"var", "var2" };
 
 	protected void checkChildrenCount(final IExpressionDMContext parentDmc, final int expectedCount) throws Throwable {
-		Query<Integer> query = new Query<Integer>() {
+		Query<Integer> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Integer> rm) {
 				fExpService.getSubExpressionCount(parentDmc, rm);
@@ -129,7 +129,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase
 	}
 
 	protected String getRegisterValue(final String regName, final IMIExecutionDMContext threadDmc) throws Exception {
-		Query<String> query = new Query<String>() {
+		Query<String> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> rm) {
 				fRegService.getRegisters(threadDmc, new ImmediateDataRequestMonitor<IRegisterDMContext[]>(rm) {
@@ -162,7 +162,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase
 	}
 
 	protected String getExpressionValue(final IExpressionDMContext exprDmc) throws Throwable {
-		Query<String> query = new Query<String>() {
+		Query<String> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> rm) {
 				final FormattedValueDMContext valueDmc = fExpService.getFormattedValueContext(exprDmc,
@@ -185,7 +185,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase
 	protected IExpressionDMContext[] checkChildren(final IExpressionDMContext parentDmc, final int startIndex,
 			final int length, String[] expectedValues) throws Throwable {
 
-		Query<IExpressionDMContext[]> query = new Query<IExpressionDMContext[]>() {
+		Query<IExpressionDMContext[]> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IExpressionDMContext[]> rm) {
 				fExpService.getSubExpressions(parentDmc, startIndex, length, rm);
@@ -1430,7 +1430,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase
 
 		final IExpressionDMContext exprDmc = SyncUtil.createExpression(frameDmc, exprString);
 
-		Query<IExpressionDMData> query = new Query<IExpressionDMData>() {
+		Query<IExpressionDMData> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IExpressionDMData> rm) {
 				fExpService.getExpressionData(exprDmc, rm);
@@ -1439,7 +1439,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase
 		fSession.getExecutor().execute(query);
 		IExpressionDMData data = query.get();
 
-		Query<IExpressionDMDataExtension> query2 = new Query<IExpressionDMDataExtension>() {
+		Query<IExpressionDMDataExtension> query2 = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IExpressionDMDataExtension> rm) {
 				fExpService.getExpressionDataExtension(exprDmc, rm);
@@ -1474,7 +1474,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase
 
 		final IExpressionDMContext exprDmc = SyncUtil.createExpression(frameDmc, exprString);
 
-		Query<IExpressionDMAddress> query = new Query<IExpressionDMAddress>() {
+		Query<IExpressionDMAddress> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IExpressionDMAddress> rm) {
 				fExpService.getExpressionAddressData(exprDmc, rm);
@@ -1509,7 +1509,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase
 
 		final IExpressionDMContext exprDmc = SyncUtil.createExpression(frameDmc, exprString);
 
-		Query<IExpressionDMContext[]> query = new Query<IExpressionDMContext[]>() {
+		Query<IExpressionDMContext[]> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IExpressionDMContext[]> rm) {
 				fExpService.getSubExpressions(exprDmc, rm);
@@ -1550,7 +1550,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase
 
 		final IExpressionDMContext exprDmc = SyncUtil.createExpression(frameDmc, exprString);
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				fExpService.canWriteExpression(exprDmc, rm);
@@ -1577,7 +1577,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase
 
 		final IExpressionDMContext exprDmc = SyncUtil.createExpression(frameDmc, exprString);
 
-		Query<String[]> query = new Query<String[]>() {
+		Query<String[]> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String[]> rm) {
 				fExpService.getAvailableFormats(exprDmc, rm);

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java

@@ -301,7 +301,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase {
 
 	protected IBreakpointDMContext insertBreakpoint(final IBreakpointsTargetDMContext context,
 			final Map<String, Object> attributes) throws Throwable {
-		Query<IBreakpointDMContext> query = new Query<IBreakpointDMContext>() {
+		Query<IBreakpointDMContext> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IBreakpointDMContext> rm) {
 				fBreakpointService.insertBreakpoint(context, attributes, rm);
@@ -318,7 +318,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase {
 	}
 
 	protected void removeBreakpoint(final IBreakpointDMContext breakpoint) throws Throwable {
-		Query<Object> query = new Query<Object>() {
+		Query<Object> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Object> rm) {
 				fBreakpointService.removeBreakpoint(breakpoint, rm);
@@ -335,7 +335,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase {
 
 	protected void updateBreakpoint(final IBreakpointDMContext breakpoint, final Map<String, Object> delta)
 			throws Throwable {
-		Query<Object> query = new Query<Object>() {
+		Query<Object> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
 				fBreakpointService.updateBreakpoint(breakpoint, delta, rm);
@@ -351,7 +351,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase {
 	}
 
 	protected IBreakpointDMData getBreakpoint(final IBreakpointDMContext breakpoint) throws Throwable {
-		Query<IBreakpointDMData> query = new Query<IBreakpointDMData>() {
+		Query<IBreakpointDMData> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IBreakpointDMData> rm) {
 				fBreakpointService.getBreakpointDMData(breakpoint, rm);
@@ -368,7 +368,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase {
 	}
 
 	protected IBreakpointDMContext[] getBreakpoints(final IBreakpointsTargetDMContext context) throws Throwable {
-		Query<IBreakpointDMContext[]> query = new Query<IBreakpointDMContext[]>() {
+		Query<IBreakpointDMContext[]> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IBreakpointDMContext[]> rm) {
 				fBreakpointService.getBreakpoints(context, rm);
@@ -707,7 +707,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase {
 		assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_5);
 
 		IContainerDMContext containerDmc = SyncUtil.getContainerContext();
-		Query<MIInfo> query = new Query<MIInfo>() {
+		Query<MIInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
 				fGdbControl.queueCommand(

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java

@@ -171,7 +171,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 
 		doLaunch();
 
-		Query<MIInfo> query = new Query<MIInfo>() {
+		Query<MIInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
 				fGdbControl.queueCommand(
@@ -241,7 +241,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 
 		// Check that argc is correct
 		final IExpressionDMContext argcDmc = SyncUtil.createExpression(stoppedEvent.getDMContext(), "argc");
-		Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -258,7 +258,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 
 		// Check that argv is also correct.  For simplicity we only check the last argument
 		final IExpressionDMContext argvDmc = SyncUtil.createExpression(stoppedEvent.getDMContext(), "argv[argc-1]");
-		Query<FormattedValueDMData> query2 = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query2 = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -298,7 +298,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 		// The program has stored the content of $HOME into a variable called 'home'.
 		// Let's verify this variable is 0x0 which means $HOME does not exist.
 		final IExpressionDMContext exprDmc = SyncUtil.createExpression(stoppedEvent.getDMContext(), "home");
-		Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -340,7 +340,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 		// The program has stored the content of $LAUNCHTEST into a variable called 'launchTest'.
 		// Let's verify this variable is set to "IS SET".
 		final IExpressionDMContext exprDmc = SyncUtil.createExpression(stoppedEvent.getDMContext(), "launchTest");
-		Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -356,7 +356,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 
 		// Check that the normal environment is there by checking that $HOME (which is stored in 'home" exists.
 		final IExpressionDMContext exprDmc2 = SyncUtil.createExpression(stoppedEvent.getDMContext(), "home");
-		Query<FormattedValueDMData> query2 = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query2 = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -401,7 +401,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 		// The program has stored the content of $LAUNCHTEST into a variable called 'launchTest'.
 		// Let's verify this variable is set to "IS SET".
 		final IExpressionDMContext exprDmc = SyncUtil.createExpression(stoppedEvent.getDMContext(), "launchTest");
-		Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -418,7 +418,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 		// The program has stored the content of $HOME into a variable called 'home'.
 		// Let's verify this variable is 0x0 which means it does not exist.
 		final IExpressionDMContext exprDmc2 = SyncUtil.createExpression(stoppedEvent.getDMContext(), "home");
-		Query<FormattedValueDMData> query2 = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query2 = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -458,7 +458,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 
 		// Check that argc is correct
 		final IExpressionDMContext argcDmc = SyncUtil.createExpression(stoppedEvent.getDMContext(), "argc");
-		Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -475,7 +475,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 
 		// Check that argv is also correct.  For simplicity we only check the last argument
 		final IExpressionDMContext argvDmc = SyncUtil.createExpression(stoppedEvent.getDMContext(), "argv[argc-1]");
-		Query<FormattedValueDMData> query2 = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query2 = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -648,7 +648,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 
 		final IBreakpointsTargetDMContext bpTargetDmc = DMContexts.getAncestorOfType(stoppedEvent.getDMContext(),
 				IBreakpointsTargetDMContext.class);
-		Query<MIBreakListInfo> query = new Query<MIBreakListInfo>() {
+		Query<MIBreakListInfo> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<MIBreakListInfo> rm) {
 				fGdbControl.queueCommand(fGdbControl.getCommandFactory().createCLITrace(bpTargetDmc, "invalid", ""),
@@ -716,7 +716,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 
 		final int REVERSE_NUM_STEPS = 2;
 		final IExecutionDMContext execDmc = stoppedEvent.getDMContext();
-		Query<MIInfo> query = new Query<MIInfo>() {
+		Query<MIInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
 				fGdbControl.queueCommand(
@@ -780,7 +780,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 		final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class);
 
 		final int REVERSE_NUM_STEPS = 3;
-		Query<MIInfo> query2 = new Query<MIInfo>() {
+		Query<MIInfo> query2 = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
 				fGdbControl.queueCommand(
@@ -853,7 +853,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
 		final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class);
 
 		final int REVERSE_NUM_STEPS = 3;
-		Query<MIInfo> query2 = new Query<MIInfo>() {
+		Query<MIInfo> query2 = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
 				fGdbControl.queueCommand(

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java

@@ -405,7 +405,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase {
 		final FormattedValueDMContext formattedValueDMC = SyncUtil.getFormattedValue(fExpressionService, expressionDMC,
 				IFormattedValues.DECIMAL_FORMAT);
 
-		Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				fExpressionService.getFormattedExpressionValue(formattedValueDMC, rm);
@@ -432,7 +432,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase {
 	 */
 	protected IBreakpointDMContext[] getBreakpoints(final IBreakpointsTargetDMContext context)
 			throws InterruptedException, ExecutionException, TimeoutException {
-		Query<IBreakpointDMContext[]> query = new Query<IBreakpointDMContext[]>() {
+		Query<IBreakpointDMContext[]> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IBreakpointDMContext[]> rm) {
 				fBreakpointService.getBreakpoints(context, rm);
@@ -458,7 +458,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase {
 	 */
 	protected IBreakpointDMData getBreakpoint(final IBreakpointDMContext breakpoint)
 			throws InterruptedException, ExecutionException, TimeoutException {
-		Query<IBreakpointDMData> query = new Query<IBreakpoints.IBreakpointDMData>() {
+		Query<IBreakpointDMData> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IBreakpointDMData> rm) {
 				fBreakpointService.getBreakpointDMData(breakpoint, rm);
@@ -516,7 +516,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase {
 	 */
 	protected IBreakpointDMContext insertBreakpoint(final IBreakpointsTargetDMContext context,
 			final Map<String, Object> attributes) throws InterruptedException, ExecutionException, TimeoutException {
-		Query<IBreakpointDMContext> query = new Query<IBreakpointDMContext>() {
+		Query<IBreakpointDMContext> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IBreakpointDMContext> rm) {
 				fBreakpointService.insertBreakpoint(context, attributes, rm);
@@ -566,7 +566,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase {
 	 */
 	private void removeBreakpoint(final IBreakpointDMContext breakpoint)
 			throws InterruptedException, ExecutionException, TimeoutException {
-		Query<Void> query = new Query<Void>() {
+		Query<Void> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Void> rm) {
 				fBreakpointService.removeBreakpoint(breakpoint, rm);
@@ -617,7 +617,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase {
 	 */
 	private void updateBreakpoint(final IBreakpointDMContext breakpoint, final Map<String, Object> delta)
 			throws InterruptedException, ExecutionException, TimeoutException {
-		Query<Void> query = new Query<Void>() {
+		Query<Void> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Void> rm) {
 				fBreakpointService.updateBreakpoint(breakpoint, delta, rm);
@@ -2509,7 +2509,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase {
 	}
 
 	private void queueConsoleCommand(final String command) throws Throwable {
-		Query<MIInfo> query = new Query<MIInfo>() {
+		Query<MIInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
 				fCommandControl.queueCommand(fCommandControl.getCommandFactory()

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java

@@ -344,8 +344,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase {
 				IFormattedValues.DECIMAL_FORMAT);
 
 		// Create the DataRequestMonitor which will store the operation result in the wait object
-		final DataRequestMonitor<FormattedValueDMData> drm = new DataRequestMonitor<FormattedValueDMData>(
+		final DataRequestMonitor<FormattedValueDMData> drm = new DataRequestMonitor<>(fSession.getExecutor(), null) {
-				fSession.getExecutor(), null) {
 			@Override
 			protected void handleCompleted() {
 				if (isSuccess()) {
@@ -388,7 +387,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase {
 		fWait.waitReset();
 
 		// Set the Request Monitor
-		final DataRequestMonitor<IBreakpointDMContext[]> drm = new DataRequestMonitor<IBreakpointDMContext[]>(
+		final DataRequestMonitor<IBreakpointDMContext[]> drm = new DataRequestMonitor<>(
 				fBreakpointService.getExecutor(), null) {
 			@Override
 			protected void handleCompleted() {
@@ -425,8 +424,8 @@ public class MICatchpointsTest extends BaseParametrizedTestCase {
 		fWait.waitReset();
 
 		// Set the Request Monitor
-		final DataRequestMonitor<IBreakpointDMData> drm = new DataRequestMonitor<IBreakpointDMData>(
+		final DataRequestMonitor<IBreakpointDMData> drm = new DataRequestMonitor<>(fBreakpointService.getExecutor(),
-				fBreakpointService.getExecutor(), null) {
+				null) {
 			@Override
 			protected void handleCompleted() {
 				fWait.waitFinished(getStatus());
@@ -464,8 +463,8 @@ public class MICatchpointsTest extends BaseParametrizedTestCase {
 		fWait.waitReset();
 
 		// Set the Request Monitor
-		final DataRequestMonitor<IBreakpointDMContext> drm = new DataRequestMonitor<IBreakpointDMContext>(
+		final DataRequestMonitor<IBreakpointDMContext> drm = new DataRequestMonitor<>(fBreakpointService.getExecutor(),
-				fBreakpointService.getExecutor(), null) {
+				null) {
 			@Override
 			protected void handleCompleted() {
 				fWait.waitFinished(getStatus());

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIDisassemblyTest.java

@@ -172,7 +172,7 @@ public class MIDisassemblyTest extends BaseParametrizedTestCase {
 	 */
 	private IInstruction[] getInstruction(final IDisassemblyDMContext dmc, final BigInteger startAddress,
 			final BigInteger endAddress) throws InterruptedException, ExecutionException {
-		Query<IInstruction[]> query = new Query<IInstruction[]>() {
+		Query<IInstruction[]> query = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<IInstruction[]> rm) {
@@ -204,7 +204,7 @@ public class MIDisassemblyTest extends BaseParametrizedTestCase {
 	 */
 	private IInstruction[] getInstruction(final IDisassemblyDMContext dmc, final String function, final int linenum,
 			final int count) throws InterruptedException, ExecutionException {
-		Query<IInstruction[]> query = new Query<IInstruction[]>() {
+		Query<IInstruction[]> query = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<IInstruction[]> rm) {
@@ -235,7 +235,7 @@ public class MIDisassemblyTest extends BaseParametrizedTestCase {
 	 */
 	private IMixedInstruction[] getMixedInstruction(final IDisassemblyDMContext dmc, final BigInteger startAddress,
 			final BigInteger endAddress) throws InterruptedException, ExecutionException {
-		Query<IMixedInstruction[]> query = new Query<IMixedInstruction[]>() {
+		Query<IMixedInstruction[]> query = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<IMixedInstruction[]> rm) {
@@ -266,7 +266,7 @@ public class MIDisassemblyTest extends BaseParametrizedTestCase {
 	 */
 	private IMixedInstruction[] getMixedInstruction(final IDisassemblyDMContext dmc, final String function,
 			final int linenum, final int count) throws InterruptedException, ExecutionException {
-		Query<IMixedInstruction[]> query = new Query<IMixedInstruction[]>() {
+		Query<IMixedInstruction[]> query = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<IMixedInstruction[]> rm) {

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java

@@ -372,7 +372,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 		// First we get the expected value of the array pointer.
 		final IExpressionDMContext exprDmc = SyncUtil.createExpression(frameDmc, "f");
 
-		Query<IExpressionDMData> query = new Query<IExpressionDMData>() {
+		Query<IExpressionDMData> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IExpressionDMData> rm) {
 				fExpService.getExpressionData(exprDmc, rm);
@@ -421,7 +421,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 		final IExpressionDMContext exprDmc = SyncUtil.createExpression(frameDmc, "this");
 		final IExpressionDMContext[] children = getChildren(exprDmc, new String[] { "Base", "Base" });
 
-		Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				FormattedValueDMContext dmc = fExpService.getFormattedValueContext(children[0],
@@ -436,7 +436,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 
 		// This second child is testing the fact that we could have the child named
 		// the same as its type and we still want to be able to get the details without error.
-		query = new Query<FormattedValueDMData>() {
+		query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				FormattedValueDMContext dmc = fExpService.getFormattedValueContext(children[1],
@@ -468,7 +468,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 		final IExpressionDMContext[] children = getChildren(children1[0], new String[] { "nested", "pNested" });
 		final IExpressionDMContext[] childOfPointer = getChildren(children[1], new String[] { "*pNested" });
 
-		Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
@@ -481,7 +481,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 		fExpService.getExecutor().submit(query);
 		query.get();
 
-		query = new Query<FormattedValueDMData>() {
+		query = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
@@ -494,7 +494,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 		fExpService.getExecutor().submit(query);
 		query.get();
 
-		query = new Query<FormattedValueDMData>() {
+		query = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
@@ -542,7 +542,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 		ServiceEventWaitor<IExpressionChangedDMEvent> eventWaitor = new ServiceEventWaitor<>(fSession,
 				IExpressionChangedDMEvent.class);
 		// Write the new value using its formatted value
-		Query<Void> writeQuery = new Query<Void>() {
+		Query<Void> writeQuery = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<Void> rm) {
@@ -557,7 +557,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 		assertThat(event.getDMContext(), is(exprDmc));
 
 		// Read the new value in decimal and check that it is what we expected
-		Query<FormattedValueDMData> readQuery = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> readQuery = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
@@ -3339,7 +3339,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 		// get child and its value
 		final IExpressionDMContext[] children = getChildren(exprDmc, new String[] { "*int_ptr" });
 
-		Query<String> query = new Query<String>() {
+		Query<String> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -3358,7 +3358,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 		assertEquals("65", value);
 
 		final IExpressionDMContext[] castChildren = getChildren(castExprDmc, new String[] { "*((char*)(int_ptr))" });
-		query = new Query<String>() {
+		query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -3407,7 +3407,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 		String[] expectedValues = new String[] { "1094861636", "1162233672" };
 		for (int i = 0; i < children.length; i++) {
 			final IExpressionDMContext child = children[i];
-			Query<String> query = new Query<String>() {
+			Query<String> query = new Query<>() {
 				@Override
 				protected void execute(final DataRequestMonitor<String> rm) {
 					fExpService.getFormattedExpressionValue(
@@ -3465,7 +3465,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 
 			getExpressionType(child, "char");
 
-			Query<String> query = new Query<String>() {
+			Query<String> query = new Query<>() {
 				@Override
 				protected void execute(final DataRequestMonitor<String> rm) {
 					fExpService.getFormattedExpressionValue(
@@ -3522,7 +3522,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 
 			getExpressionType(child, "char");
 
-			Query<String> query = new Query<String>() {
+			Query<String> query = new Query<>() {
 				@Override
 				protected void execute(final DataRequestMonitor<String> rm) {
 					fExpService.getFormattedExpressionValue(
@@ -3588,7 +3588,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 			final IExpressionDMContext child = castedChildren[i];
 			getExpressionType(child, "char");
 
-			Query<String> query = new Query<String>() {
+			Query<String> query = new Query<>() {
 				@Override
 				protected void execute(final DataRequestMonitor<String> rm) {
 					fExpService.getFormattedExpressionValue(
@@ -3660,7 +3660,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 			final IExpressionDMContext child = castedChildren[i];
 			getExpressionType(child, "int");
 
-			Query<String> query = new Query<String>() {
+			Query<String> query = new Query<>() {
 				@Override
 				protected void execute(final DataRequestMonitor<String> rm) {
 					fExpService.getFormattedExpressionValue(
@@ -3730,7 +3730,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 			final IExpressionDMContext child = castedChildren[i];
 			getExpressionType(child, "char");
 
-			Query<String> query = new Query<String>() {
+			Query<String> query = new Query<>() {
 				@Override
 				protected void execute(final DataRequestMonitor<String> rm) {
 					fExpService.getFormattedExpressionValue(
@@ -3780,7 +3780,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 
 		// Now check how the return value will be displayed to the user
 		final IExpressionDMContext returnExprDmc = SyncUtil.createExpression(frameDmc, "$2");
-		Query<IExpressionDMData> query = new Query<IExpressionDMData>() {
+		Query<IExpressionDMData> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IExpressionDMData> rm) {
 				fExpService.getExpressionData(returnExprDmc, rm);
@@ -3830,7 +3830,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 
 		// Now check how the return value will be displayed to the user
 		final IExpressionDMContext returnExprDmc = SyncUtil.createExpression(frameDmc, "$2");
-		Query<IExpressionDMData> query = new Query<IExpressionDMData>() {
+		Query<IExpressionDMData> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<IExpressionDMData> rm) {
 				fExpService.getExpressionData(returnExprDmc, rm);
@@ -3891,7 +3891,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 
 		// Fetch the child directly
 		final IExpressionDMContext childDmc = SyncUtil.createExpression(frameDmc, CHILD_EXPR);
-		Query<String> query = new Query<String>() {
+		Query<String> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -3911,7 +3911,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 
 		// Now fetch the child through its parent
 		final IExpressionDMContext parentDmc = SyncUtil.createExpression(frameDmc, PARENT_EXPR);
-		query = new Query<String>() {
+		query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> rm) {
 				fExpService.getSubExpressions(parentDmc, new ImmediateDataRequestMonitor<IExpressionDMContext[]>(rm) {
@@ -3976,7 +3976,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 
 		// First fetch the child through its parent
 		final IExpressionDMContext parentDmc = SyncUtil.createExpression(frameDmc, PARENT_EXPR);
-		Query<String> query = new Query<String>() {
+		Query<String> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> rm) {
 				fExpService.getSubExpressions(parentDmc, new ImmediateDataRequestMonitor<IExpressionDMContext[]>(rm) {
@@ -4024,7 +4024,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 
 		// Now access the child directly
 		final IExpressionDMContext childDmc = SyncUtil.createExpression(frameDmc, CHILD_EXPR);
-		query = new Query<String>() {
+		query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> rm) {
 				fExpService.getFormattedExpressionValue(
@@ -4044,7 +4044,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 	}
 
 	protected void assertChildrenCount(final IExpressionDMContext parentDmc, final int expectedCount) throws Throwable {
-		Query<Integer> query = new Query<Integer>() {
+		Query<Integer> query = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<Integer> rm) {
@@ -4061,7 +4061,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
 
 	protected String getExpressionType(final IExpressionDMContext exprDmc, final String expectedType) throws Throwable {
 
-		Query<String> query = new Query<String>() {
+		Query<String> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> rm) {
 				fExpService.getExpressionData(exprDmc, new ImmediateDataRequestMonitor<IExpressionDMData>(rm) {

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIModifiedServicesTest.java

@@ -179,7 +179,7 @@ public class MIModifiedServicesTest extends BaseParametrizedTestCase {
 
 		final DsfSession session = getGDBLaunch().getSession();
 
-		Query<Void> query = new Query<Void>() {
+		Query<Void> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Void> rm) {
 				DsfServicesTracker servicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(),
@@ -221,7 +221,7 @@ public class MIModifiedServicesTest extends BaseParametrizedTestCase {
 		final ServiceEventWaitor<IResumedDMEvent> resumedWaitor = new ServiceEventWaitor<>(getGDBLaunch().getSession(),
 				IResumedDMEvent.class);
 
-		Query<Void> query = new Query<Void>() {
+		Query<Void> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Void> rm) {
 				fRunCtrl.resume(fContainerDmc, rm);
@@ -239,7 +239,7 @@ public class MIModifiedServicesTest extends BaseParametrizedTestCase {
 			return;
 		}
 
-		Query<Boolean> querySuspend = new Query<Boolean>() {
+		Query<Boolean> querySuspend = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				rm.done(fRunCtrl.isSuspended(fContainerDmc));
@@ -265,7 +265,7 @@ public class MIModifiedServicesTest extends BaseParametrizedTestCase {
 		ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>(
 				getGDBLaunch().getSession(), ISuspendedDMEvent.class);
 
-		Query<MIInfo> requestSuspend = new Query<MIInfo>() {
+		Query<MIInfo> requestSuspend = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
 				fRunCtrl.suspend(fThreadExecDmc, rm);
@@ -279,7 +279,7 @@ public class MIModifiedServicesTest extends BaseParametrizedTestCase {
 		suspendedEventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
 
 		// Double check that the target is in the suspended state
-		Query<Boolean> querySuspend = new Query<Boolean>() {
+		Query<Boolean> querySuspend = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				rm.done(fRunCtrl.isSuspended(fContainerDmc));

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java

@@ -161,7 +161,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	 */
 	private IRegisterDMContext[] getAllRegisters(final IFrameDMContext frameDmc) throws Throwable {
 
-		Query<IRegisterDMContext[]> queryRegisters = new Query<IRegisterDMContext[]>() {
+		Query<IRegisterDMContext[]> queryRegisters = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IRegisterDMContext[]> rm) {
 				fRegService.getRegisters(new CompositeDMContext(new IDMContext[] { fCompositeDmc, frameDmc }), rm);
@@ -182,7 +182,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	 */
 	private IRegisterDMContext[] getRegisters(final IDMContext dmc) throws Throwable {
 
-		Query<IRegisterDMContext[]> queryRegistersDmc = new Query<IRegisterDMContext[]>() {
+		Query<IRegisterDMContext[]> queryRegistersDmc = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IRegisterDMContext[]> rm) {
 				fRegService.getRegisters(dmc, rm);
@@ -246,7 +246,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	private IRegisterDMData[] getRegistersData(final IRegisterDMContext[] regDMCs)
 			throws InterruptedException, ExecutionException {
 
-		Query<IRegisterDMData[]> query = new Query<IRegisterDMData[]>() {
+		Query<IRegisterDMData[]> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IRegisterDMData[]> rm) {
 				final IRegisterDMData[] datas = new IRegisterDMData[regDMCs.length];
@@ -283,7 +283,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 
 		final FormattedValueDMContext valueDmc = fRegService.getFormattedValueContext(registerDmc, format);
 
-		Query<FormattedValueDMData> queryFormattedData = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> queryFormattedData = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				fRegService.getFormattedExpressionValue(valueDmc, rm);
@@ -331,7 +331,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 		final IContainerDMContext containerDmc = DMContexts.getAncestorOfType(stoppedEvent.getDMContext(),
 				IContainerDMContext.class);
 
-		Query<IExecutionDMContext[]> queryExecutionContexts = new Query<IExecutionDMContext[]>() {
+		Query<IExecutionDMContext[]> queryExecutionContexts = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IExecutionDMContext[]> rm) {
 				fRunControl.getExecutionContexts(containerDmc, rm);
@@ -394,7 +394,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	private void writeRegister(final IRegisterDMContext registerDmc, final String regValue, final String formatId)
 			throws Throwable {
 
-		Query<Object> queryAction = new Query<Object>() {
+		Query<Object> queryAction = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
 				fRegService.writeRegister(registerDmc, regValue, formatId, rm);
@@ -905,7 +905,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	 */
 	private IRegisterGroupDMContext[] getRegisterGroups() throws Throwable {
 
-		Query<IRegisterGroupDMContext[]> queryGroupsCtx = new Query<IRegisterGroupDMContext[]>() {
+		Query<IRegisterGroupDMContext[]> queryGroupsCtx = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IRegisterGroupDMContext[]> rm) {
 				fRegService.getRegisterGroups(fCompositeDmc, rm);
@@ -936,7 +936,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	}
 
 	private boolean canAddRegisterGroup(final IDMContext context) throws Throwable {
-		Query<Boolean> queryAction = new Query<Boolean>() {
+		Query<Boolean> queryAction = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				fRegService.canAddRegisterGroup(context, rm);
@@ -948,7 +948,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	}
 
 	private boolean canEditRegisterGroup(final IRegisterGroupDMContext context) throws Throwable {
-		Query<Boolean> queryAction = new Query<Boolean>() {
+		Query<Boolean> queryAction = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				fRegService.canEditRegisterGroup(context, rm);
@@ -960,7 +960,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	}
 
 	private boolean canRemoveRegisterGroups(final IRegisterGroupDMContext[] groupsContext) throws Throwable {
-		Query<Boolean> queryAction = new Query<Boolean>() {
+		Query<Boolean> queryAction = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				fRegService.canRemoveRegisterGroups(groupsContext, rm);
@@ -978,7 +978,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 			return;
 		}
 
-		Query<Object> queryAction = new Query<Object>() {
+		Query<Object> queryAction = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
 				IContainerDMContext contDmc = DMContexts.getAncestorOfType(regIndexes[0], IContainerDMContext.class);
@@ -993,7 +993,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	private void editGroup(final IRegisterGroupDMContext group, final String newGroupName,
 			final IRegisterDMContext[] regIndexes) throws Throwable {
 
-		Query<Object> queryAction = new Query<Object>() {
+		Query<Object> queryAction = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
 				fRegService.editRegisterGroup(group, newGroupName, regIndexes, rm);
@@ -1006,7 +1006,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 
 	private void removeGroups(final IRegisterGroupDMContext[] groups) throws Throwable {
 
-		Query<Object> queryAction = new Query<Object>() {
+		Query<Object> queryAction = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
 				fRegService.removeRegisterGroups(groups, rm);
@@ -1018,7 +1018,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	}
 
 	private boolean canRestoreDefaultGroups() throws Throwable {
-		Query<Boolean> queryCanRestore = new Query<Boolean>() {
+		Query<Boolean> queryCanRestore = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
@@ -1035,7 +1035,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	}
 
 	private void restoreDefaultGroups() throws Throwable {
-		Query<Object> queryRestore = new Query<Object>() {
+		Query<Object> queryRestore = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
@@ -1053,7 +1053,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	private void resetRegService() throws Throwable {
 		assert (fRegService instanceof GDBRegisters);
 		final GDBRegisters regManager = (GDBRegisters) fRegService;
-		Query<Object> queryReset = new Query<Object>() {
+		Query<Object> queryReset = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
@@ -1070,7 +1070,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	private void saveRegGroups() throws Throwable {
 		assert (fRegService instanceof GDBRegisters);
 		final GDBRegisters regManager = (GDBRegisters) fRegService;
-		Query<Object> querySave = new Query<Object>() {
+		Query<Object> querySave = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
@@ -1086,7 +1086,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	}
 
 	private IRegisterDMData getRegisterData(final IRegisterDMContext registerDmc) throws Throwable {
-		Query<IRegisterDMData> registerDataQ = new Query<IRegisterDMData>() {
+		Query<IRegisterDMData> registerDataQ = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IRegisterDMData> rm) {
 				fRegService.getRegisterData(registerDmc, rm);
@@ -1101,7 +1101,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	}
 
 	private FormattedValueDMData getRegisterValue(final IRegisterDMContext registerDmc) throws Throwable {
-		Query<FormattedValueDMData> registerValueQ = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> registerValueQ = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<FormattedValueDMData> rm) {
 				FormattedValueDMContext valueDmc = new FormattedValueDMContext(fRegService, registerDmc,
@@ -1118,7 +1118,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	}
 
 	private IRegisterGroupDMData getRegisterGroupData(final IRegisterGroupDMContext groupDmc) throws Throwable {
-		Query<IRegisterGroupDMData> groupDataQ = new Query<IRegisterGroupDMData>() {
+		Query<IRegisterGroupDMData> groupDataQ = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IRegisterGroupDMData> rm) {
 				fRegService.getRegisterGroupData(groupDmc, rm);
@@ -1133,7 +1133,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase {
 	}
 
 	private IRegisterGroupDMData[] getRegisterGroupsData(final IDMContext dmc) throws Throwable {
-		Query<IRegisterGroupDMData[]> groupDataQ = new Query<IRegisterGroupDMData[]>() {
+		Query<IRegisterGroupDMData[]> groupDataQ = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<IRegisterGroupDMData[]> rm) {
 				getRegisterGroupsData(dmc, rm);

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlReverseTest.java

@@ -106,7 +106,7 @@ public class MIRunControlReverseTest extends BaseParametrizedTestCase {
 		assertTrue("Reverse debugging is not supported", fRunCtrl instanceof IReverseRunControl);
 		final IReverseRunControl reverseService = (IReverseRunControl) fRunCtrl;
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				reverseService.enableReverseMode(fGDBCtrl.getContext(), true, new ImmediateRequestMonitor(rm) {
@@ -150,7 +150,7 @@ public class MIRunControlReverseTest extends BaseParametrizedTestCase {
 
 		String newValue = "8989";
 		// Now modify a variable to trigger the query as we are modifying a recorded value
-		Query<Void> writeQuery = new Query<Void>() {
+		Query<Void> writeQuery = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Void> rm) {
 				fExpressions.writeExpression(expr, newValue, IFormattedValues.DECIMAL_FORMAT, rm);

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java

@@ -113,7 +113,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
 			}
 		} };
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				fRunCtrl.executeWithTargetAvailable(fContainerDmc, steps, rm);
@@ -161,7 +161,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
 
 		SyncUtil.resume();
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				fRunCtrl.executeWithTargetAvailable(fContainerDmc, steps, rm);
@@ -220,7 +220,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
 			}
 		} };
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				fRunCtrl.executeWithTargetAvailable(fContainerDmc, steps, rm);
@@ -289,7 +289,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
 			}
 		} };
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				fRunCtrl.executeWithTargetAvailable(fContainerDmc, steps, rm);
@@ -353,7 +353,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
 
 		SyncUtil.resume();
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				fRunCtrl.executeWithTargetAvailable(fContainerDmc, steps, rm);
@@ -426,7 +426,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
 
 		SyncUtil.resume();
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				fRunCtrl.executeWithTargetAvailable(fContainerDmc, steps, rm);
@@ -476,7 +476,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
 			} };
 		}
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				CountingRequestMonitor crm = new CountingRequestMonitor(fGDBCtrl.getExecutor(), null) {
@@ -543,7 +543,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
 
 		SyncUtil.resume();
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				CountingRequestMonitor crm = new CountingRequestMonitor(fGDBCtrl.getExecutor(), null) {
@@ -618,7 +618,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
 			}
 		} };
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				fRunCtrl.executeWithTargetAvailable(fContainerDmc, steps, rm);
@@ -686,7 +686,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
 
 		SyncUtil.resume();
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				fRunCtrl.executeWithTargetAvailable(fContainerDmc, steps, rm);
@@ -747,7 +747,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
 			}
 		} };
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				fRunCtrl.executeWithTargetAvailable(fContainerDmc, steps, rm);
@@ -813,7 +813,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
 
 		SyncUtil.resume();
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				fRunCtrl.executeWithTargetAvailable(fContainerDmc, steps, rm);

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java

@@ -195,8 +195,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase {
 		/*
 		 * Create a request monitor
 		 */
-		final DataRequestMonitor<IExecutionDMContext[]> rm = new DataRequestMonitor<IExecutionDMContext[]>(
+		final DataRequestMonitor<IExecutionDMContext[]> rm = new DataRequestMonitor<>(fRunCtrl.getExecutor(), null) {
-				fRunCtrl.getExecutor(), null) {
 			@Override
 			protected void handleCompleted() {
 				if (isSuccess()) {
@@ -250,7 +249,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase {
 		/*
 		 * Create a request monitor
 		 */
-		final DataRequestMonitor<IExecutionDMContext[]> rmExecutionCtxts = new DataRequestMonitor<IExecutionDMContext[]>(
+		final DataRequestMonitor<IExecutionDMContext[]> rmExecutionCtxts = new DataRequestMonitor<>(
 				fRunCtrl.getExecutor(), null) {
 			@Override
 			protected void handleCompleted() {
@@ -317,8 +316,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase {
 		/*
 		 * Create a request monitor
 		 */
-		final DataRequestMonitor<IExecutionDMData> rm = new DataRequestMonitor<IExecutionDMData>(fRunCtrl.getExecutor(),
+		final DataRequestMonitor<IExecutionDMData> rm = new DataRequestMonitor<>(fRunCtrl.getExecutor(), null) {
-				null) {
 			@Override
 			protected void handleCompleted() {
 				if (isSuccess()) {
@@ -366,8 +364,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase {
 		 */
 		final MIStoppedEvent stoppedEvent = SyncUtil.step(StepType.STEP_OVER);
 
-		final DataRequestMonitor<IExecutionDMData> rm = new DataRequestMonitor<IExecutionDMData>(fRunCtrl.getExecutor(),
+		final DataRequestMonitor<IExecutionDMData> rm = new DataRequestMonitor<>(fRunCtrl.getExecutor(), null) {
-				null) {
 			@Override
 			protected void handleCompleted() {
 				if (isSuccess()) {
@@ -411,8 +408,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase {
 		 */
 		final MIStoppedEvent stoppedEvent = SyncUtil.resumeUntilStopped();
 
-		final DataRequestMonitor<IExecutionDMData> rm = new DataRequestMonitor<IExecutionDMData>(fRunCtrl.getExecutor(),
+		final DataRequestMonitor<IExecutionDMData> rm = new DataRequestMonitor<>(fRunCtrl.getExecutor(), null) {
-				null) {
 			@Override
 			protected void handleCompleted() {
 				if (isSuccess()) {
@@ -452,8 +448,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase {
 		 */
 		SyncUtil.resumeUntilStopped();
 
-		final DataRequestMonitor<IExecutionDMData> rm = new DataRequestMonitor<IExecutionDMData>(fRunCtrl.getExecutor(),
+		final DataRequestMonitor<IExecutionDMData> rm = new DataRequestMonitor<>(fRunCtrl.getExecutor(), null) {
-				null) {
 			@Override
 			protected void handleCompleted() {
 				if (isSuccess()) {
@@ -484,8 +479,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase {
 	public void getExecutionContextsForInvalidContainerDMC() throws InterruptedException {
 		final AsyncCompletionWaitor wait = new AsyncCompletionWaitor();
 
-		final DataRequestMonitor<IExecutionDMContext[]> rm = new DataRequestMonitor<IExecutionDMContext[]>(
+		final DataRequestMonitor<IExecutionDMContext[]> rm = new DataRequestMonitor<>(fRunCtrl.getExecutor(), null) {
-				fRunCtrl.getExecutor(), null) {
 			@Override
 			protected void handleCompleted() {
 				if (isSuccess()) {
@@ -528,7 +522,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase {
 	public void resume() throws InterruptedException, ExecutionException, TimeoutException {
 		final AsyncCompletionWaitor wait = new AsyncCompletionWaitor();
 
-		final DataRequestMonitor<MIInfo> rm = new DataRequestMonitor<MIInfo>(fRunCtrl.getExecutor(), null) {
+		final DataRequestMonitor<MIInfo> rm = new DataRequestMonitor<>(fRunCtrl.getExecutor(), null) {
 			@Override
 			protected void handleCompleted() {
 				wait.waitFinished(getStatus());
@@ -569,7 +563,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase {
 	public void resumeContainerContext() throws InterruptedException, ExecutionException, TimeoutException {
 		final AsyncCompletionWaitor wait = new AsyncCompletionWaitor();
 
-		final DataRequestMonitor<MIInfo> rm = new DataRequestMonitor<MIInfo>(fRunCtrl.getExecutor(), null) {
+		final DataRequestMonitor<MIInfo> rm = new DataRequestMonitor<>(fRunCtrl.getExecutor(), null) {
 			@Override
 			protected void handleCompleted() {
 				wait.waitFinished(getStatus());

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java

@@ -212,7 +212,7 @@ public class OperationsWhileTargetIsRunningTest extends BaseParametrizedTestCase
 		ServiceEventWaitor<IExitedDMEvent> exitedEventWaitor = new ServiceEventWaitor<>(getGDBLaunch().getSession(),
 				IExitedDMEvent.class);
 
-		Query<Object> query = new Query<Object>() {
+		Query<Object> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Object> rm) {
 				IProcessDMContext processDmc = DMContexts.getAncestorOfType(fContainerDmc, IProcessDMContext.class);
@@ -289,7 +289,7 @@ public class OperationsWhileTargetIsRunningTest extends BaseParametrizedTestCase
 		ServiceEventWaitor<IExitedDMEvent> exitedEventWaitor = new ServiceEventWaitor<>(getGDBLaunch().getSession(),
 				IExitedDMEvent.class);
 
-		Query<Object> query = new Query<Object>() {
+		Query<Object> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Object> rm) {
 				fProcesses.detachDebuggerFromProcess(fContainerDmc, rm);

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/PostMortemCoreTest.java

@@ -470,7 +470,7 @@ public class PostMortemCoreTest extends BaseParametrizedTestCase {
 		final FormattedValueDMContext formattedValueDMC = SyncUtil.getFormattedValue(fExpService, expressionDMC,
 				IFormattedValues.HEX_FORMAT);
 
-		Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() {
+		Query<FormattedValueDMData> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<FormattedValueDMData> rm) {
 				fExpService.getFormattedExpressionValue(formattedValueDMC, rm);

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java

@@ -672,7 +672,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase {
 	 * Change directory to the binary (aka EXEC_PATH)
 	 */
 	protected void doCdToBinDir() throws Exception {
-		Query<MIInfo> query = new Query<MIInfo>() {
+		Query<MIInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
 				fCommandControl.queueCommand(fCommandFactory.createMIEnvironmentCD(fCommandControl.getContext(),

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/StepIntoSelectionTest.java

@@ -165,7 +165,7 @@ public class StepIntoSelectionTest extends BaseParametrizedTestCase {
 
 	private void checkGdbIsSuspended() throws Throwable {
 		final IContainerDMContext containerDmc = SyncUtil.getContainerContext();
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				rm.done(fRunCtrl.isSuspended(containerDmc));
@@ -185,7 +185,7 @@ public class StepIntoSelectionTest extends BaseParametrizedTestCase {
 			final int targetLine, final IFunctionDeclaration function, final boolean skipBreakPoints) throws Throwable {
 		ServiceEventWaitor<ISuspendedDMEvent> eventWaitor = new ServiceEventWaitor<>(fSession, ISuspendedDMEvent.class);
 
-		Query<Object> query = new Query<Object>() {
+		Query<Object> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
 				fRunCtrl.stepIntoSelection(exeContext, sourceName, targetLine, skipBreakPoints, function, rm);
@@ -205,7 +205,7 @@ public class StepIntoSelectionTest extends BaseParametrizedTestCase {
 			final int targetLine, final boolean skipBreakPoints) throws Throwable {
 		ServiceEventWaitor<ISuspendedDMEvent> eventWaitor = new ServiceEventWaitor<>(fSession, ISuspendedDMEvent.class);
 
-		Query<Object> query = new Query<Object>() {
+		Query<Object> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
 				fRunCtrl.runToLine(exeContext, sourceName, targetLine, skipBreakPoints, rm);

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java

@@ -110,7 +110,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 	}
 
 	private <V> V runAsyncCall(final AsyncRunnable<V> runnable, boolean expectExecutionException) throws Exception {
-		Query<V> query = new Query<V>() {
+		Query<V> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<V> rm) {
 				runnable.run(rm);
@@ -696,7 +696,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<>(fMultiRun.getSession(),
 				MIRunningEvent.class);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(threads, drm);
@@ -736,7 +736,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertFalse("expected no threads to be suspended, but found some", result);
 
 		// No error should be thrown, the call should ignore running threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(threads, drm);
@@ -777,7 +777,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>(fMultiRun.getSession(),
 				MIRunningEvent.class);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(threads[0], drm);
@@ -829,7 +829,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>(fMultiRun.getSession(),
 				MIRunningEvent.class);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(threads, drm);
@@ -877,7 +877,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 				MIRunningEvent.class);
 
 		// No error should be thrown, the call should ignore running threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(threads, drm);
@@ -928,7 +928,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 				MIRunningEvent.class);
 
 		// No error should be thrown, the call should ignore running threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(threads, drm);
@@ -960,7 +960,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected a single thread but got " + threads.length, threads.length == 1);
 
 		// No error should be thrown, the already suspended threads should be ignored
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(threads, drm);
@@ -1000,7 +1000,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fMultiRun.getSession(),
 				MIStoppedEvent.class);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(threads, drm);
@@ -1039,7 +1039,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
 		// No error should be thrown, the already suspended threads should be ignored
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(threads, drm);
@@ -1081,7 +1081,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
 		// No error should be thrown, the call should ignore the suspended threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(threads, drm);
@@ -1128,7 +1128,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
 		// No error should be thrown, the call should ignore running threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(threads[0], drm);
@@ -1183,7 +1183,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts();
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(threads, drm);
@@ -1217,7 +1217,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected a single thread but got " + threads.length, threads.length == 1);
 
 		for (final IRunControl.StepType type : IRunControl.StepType.values()) {
-			runAsyncCall(new AsyncRunnable<Object>() {
+			runAsyncCall(new AsyncRunnable<>() {
 				@Override
 				public void run(DataRequestMonitor<Object> drm) {
 					fMultiRun.step(threads, type, drm);
@@ -2824,7 +2824,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<>(fMultiRun.getSession(),
 				MIRunningEvent.class);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(processes, drm);
@@ -2863,7 +2863,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertFalse("expected no process to be suspended, but found some", result);
 
 		// No error should be thrown, the call should ignore running processes
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(processes, drm);
@@ -2903,7 +2903,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>(fMultiRun.getSession(),
 				MIRunningEvent.class);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(processes, drm);
@@ -2950,7 +2950,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 				MIRunningEvent.class);
 
 		// No error should be thrown, the call should ignore running threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(processes, drm);
@@ -3000,7 +3000,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 				MIRunningEvent.class);
 
 		// No error should be thrown, the call should ignore running threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(processes, drm);
@@ -3034,7 +3034,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected a single thread but got " + threads.length, threads.length == 1);
 
 		// No error should be thrown, the already suspended processes should be ignored
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(processes, drm);
@@ -3082,7 +3082,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fMultiRun.getSession(),
 				MIStoppedEvent.class);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(processes, drm);
@@ -3123,7 +3123,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
 		// No error should be thrown, the already suspended threads should be ignored
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(processes, drm);
@@ -3176,7 +3176,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
 		// No error should be thrown, the call should ignore the suspended threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(processes, drm);
@@ -3233,7 +3233,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts();
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(processes, drm);
@@ -3275,7 +3275,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final IExecutionDMContext[] processes = new IExecutionDMContext[] { SyncUtil.getContainerContext() };
 
 		for (final IRunControl.StepType type : IRunControl.StepType.values()) {
-			runAsyncCall(new AsyncRunnable<Object>() {
+			runAsyncCall(new AsyncRunnable<>() {
 				@Override
 				public void run(DataRequestMonitor<Object> drm) {
 					fMultiRun.step(processes, type, drm);
@@ -3302,7 +3302,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<>(fMultiRun.getSession(),
 				MIRunningEvent.class);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(execDmcs, drm);
@@ -3348,7 +3348,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 				MIRunningEvent.class);
 
 		// No error should be thrown, the call should ignore running processes
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(execDmcs, drm);
@@ -3391,7 +3391,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>(fMultiRun.getSession(),
 				MIRunningEvent.class);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(execDmcs, drm);
@@ -3442,7 +3442,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 				MIRunningEvent.class);
 
 		// No error should be thrown, the call should ignore running threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(execDmcs, drm);
@@ -3492,7 +3492,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 				MIRunningEvent.class);
 
 		// No error should be thrown, the call should ignore running threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(execDmcs, drm);
@@ -3544,7 +3544,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 				MIRunningEvent.class);
 
 		// No error should be thrown, the call should ignore running threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(execDmcs, drm);
@@ -3600,7 +3600,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected a single thread but got " + threads.length, threads.length == 1);
 
 		// No error should be thrown, the already suspended processes should be ignored
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(execDmcs, drm);
@@ -3650,7 +3650,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fMultiRun.getSession(),
 				MIStoppedEvent.class);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(execDmcs, drm);
@@ -3693,7 +3693,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
 		// No error should be thrown, the already suspended threads should be ignored
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(execDmcs, drm);
@@ -3748,7 +3748,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
 		// No error should be thrown, the call should ignore the suspended threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(execDmcs, drm);
@@ -3805,7 +3805,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
 		// No error should be thrown, the call should ignore the suspended threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(execDmcs, drm);
@@ -3864,7 +3864,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts();
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(execDmcs, drm);
@@ -3908,7 +3908,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 				SyncUtil.getExecutionContext(0) };
 
 		for (final IRunControl.StepType type : IRunControl.StepType.values()) {
-			runAsyncCall(new AsyncRunnable<Object>() {
+			runAsyncCall(new AsyncRunnable<>() {
 				@Override
 				public void run(DataRequestMonitor<Object> drm) {
 					fMultiRun.step(execDmcs, type, drm);
@@ -3947,7 +3947,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>(fMultiRun.getSession(),
 				MIRunningEvent.class);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(execDmcs, drm);
@@ -3998,7 +3998,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 				MIRunningEvent.class);
 
 		// No error should be thrown, the call should ignore running threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(execDmcs, drm);
@@ -4050,7 +4050,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 				MIRunningEvent.class);
 
 		// No error should be thrown, the call should ignore running threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.resume(execDmcs, drm);
@@ -4097,7 +4097,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
 		// No error should be thrown, the already suspended threads should be ignored
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(execDmcs, drm);
@@ -4152,7 +4152,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
 		// No error should be thrown, the call should ignore the suspended threads
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(execDmcs, drm);
@@ -4211,7 +4211,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
 		final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts();
 		assertTrue("Expected two threads but got " + threads.length, threads.length == 2);
 
-		runAsyncCall(new AsyncRunnable<Object>() {
+		runAsyncCall(new AsyncRunnable<>() {
 			@Override
 			public void run(DataRequestMonitor<Object> drm) {
 				fMultiRun.suspend(execDmcs, drm);

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/ThreadStackFrameSyncTest.java

@@ -372,7 +372,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase {
 	private String sendCLIThread(String tid) throws Exception {
 		IContainerDMContext containerDmc = SyncUtil.getContainerContext();
 
-		Query<CLIThreadInfo> query = new Query<CLIThreadInfo>() {
+		Query<CLIThreadInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<CLIThreadInfo> rm) {
 				fCommandControl.queueCommand(new CLICommand<CLIThreadInfo>(containerDmc, "thread " + tid) {
@@ -404,10 +404,10 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase {
 	private String sendCLIFrame(String level) throws Exception {
 		IContainerDMContext containerDmc = SyncUtil.getContainerContext();
 
-		Query<MIInfo> query = new Query<MIInfo>() {
+		Query<MIInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
-				fCommandControl.queueCommand(new CLICommand<MIInfo>(containerDmc, "frame " + level) {
+				fCommandControl.queueCommand(new CLICommand<>(containerDmc, "frame " + level) {
 					@Override
 					public CLIThreadInfo getResult(MIOutput output) {
 						return new CLIThreadInfo(output);
@@ -490,7 +490,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase {
 	}
 
 	private void queueConsoleCommand(final String command, int timeout, TimeUnit unit) throws Throwable {
-		Query<MIInfo> query = new Query<MIInfo>() {
+		Query<MIInfo> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
 				fCommandControl.queueCommand(fCommandControl.getCommandFactory()

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/mi/service/command/MIAsyncErrorProcessorTests.java

@@ -195,7 +195,7 @@ public class MIAsyncErrorProcessorTests extends BaseParametrizedTestCase {
 		if (!runControl.isSuspended(containerDmc))
 			return false;
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				runControl.getExecutionData(containerDmc, new ImmediateDataRequestMonitor<IExecutionDMData>(rm) {