Bump ssh.test BREE to 1.8.

Enable more warnings and clean them up.

Change-Id: I6401c6cdadbaa733035ec571189087c13ce9bd1e
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

9 files changed, 144 insertions, 34 deletions

diff --git a/bundles/archived/org.eclipse.equinox.console.ssh.tests/.classpath b/bundles/archived/org.eclipse.equinox.console.ssh.tests/.classpath
index 23f11b11a..e8eda02c4 100755
--- a/bundles/archived/org.eclipse.equinox.console.ssh.tests/.classpath
+++ b/bundles/archived/org.eclipse.equinox.console.ssh.tests/.classpath
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/archived/org.eclipse.equinox.console.ssh.tests/.settings/org.eclipse.jdt.core.prefs b/bundles/archived/org.eclipse.equinox.console.ssh.tests/.settings/org.eclipse.jdt.core.prefs
index c3a62744c..7f9ec003e 100755
--- a/bundles/archived/org.eclipse.equinox.console.ssh.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/archived/org.eclipse.equinox.console.ssh.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,113 @@
-#Tue Oct 18 16:14:30 EEST 2011
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/bundles/archived/org.eclipse.equinox.console.ssh.tests/META-INF/MANIFEST.MF b/bundles/archived/org.eclipse.equinox.console.ssh.tests/META-INF/MANIFEST.MF
index a676438ca..19e920331 100755
--- a/bundles/archived/org.eclipse.equinox.console.ssh.tests/META-INF/MANIFEST.MF
+++ b/bundles/archived/org.eclipse.equinox.console.ssh.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Ssh Tests
 Bundle-SymbolicName: org.eclipse.equinox.console.ssh.tests
 Bundle-Version: 1.1.0.qualifier
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: junit.framework;version="4.8.1",
  org.apache.sshd.client.future,
  org.apache.sshd.client,
diff --git a/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshCommandTests.java b/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshCommandTests.java
index 64a87e2dc..00fc5e7b6 100755
--- a/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshCommandTests.java
+++ b/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshCommandTests.java
@@ -71,6 +71,7 @@ public class SshCommandTests {
         initJaasConfigFile();
 	}
 	
+	@SuppressWarnings("unchecked")
 	@Test
 	public void testSshCommand() throws Exception {
 		CommandSession session = EasyMock.createMock(CommandSession.class);
@@ -93,7 +94,7 @@ public class SshCommandTests {
 		EasyMock.expect(context.registerService((String)EasyMock.anyObject(), EasyMock.anyObject(), (Dictionary<String, ?>)EasyMock.anyObject())).andReturn(null);
 		EasyMock.replay(context);
 
-		Map<String, String> environment = new HashMap<String, String>();
+		Map<String, String> environment = new HashMap<>();
 		environment.put(TERM_PROPERTY, XTERM);
 		Environment env = EasyMock.createMock(Environment.class);
 		EasyMock.expect(env.getEnv()).andReturn(environment);
diff --git a/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshCommandWithConfigAdminTests.java b/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshCommandWithConfigAdminTests.java
index 63be2c46e..473e758d1 100755
--- a/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshCommandWithConfigAdminTests.java
+++ b/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshCommandWithConfigAdminTests.java
@@ -74,6 +74,7 @@ public class SshCommandWithConfigAdminTests {
         initJaasConfigFile();
 	}
 	
+	@SuppressWarnings("unchecked")
 	@Test
 	public void testSshCommandWithConfigAdmin() throws Exception {
 		
@@ -90,7 +91,7 @@ public class SshCommandWithConfigAdminTests {
 		EasyMock.replay(processor);
 
 		final ServiceRegistration<?> registration = EasyMock.createMock(ServiceRegistration.class);
-        registration.setProperties((Dictionary)EasyMock.anyObject());
+        registration.setProperties((Dictionary<String, ?>)EasyMock.anyObject());
         EasyMock.expectLastCall();
         EasyMock.replay(registration);
 
@@ -103,11 +104,9 @@ public class SshCommandWithConfigAdminTests {
         				(String)EasyMock.anyObject(), 
         				(ManagedService)EasyMock.anyObject(), 
         				(Dictionary<String, ?>)EasyMock.anyObject())
-        	).andAnswer((IAnswer<ServiceRegistration<?>>) new IAnswer<ServiceRegistration<?>>() {
-        		public ServiceRegistration<?> answer() {
-        			configurator = (ManagedService) EasyMock.getCurrentArguments()[1];
-        			return registration;
-        		}
+        	).andAnswer((IAnswer<ServiceRegistration<?>>) () -> {
+				configurator = (ManagedService) EasyMock.getCurrentArguments()[1];
+				return registration;
 			});
         EasyMock.expect(
         		context.registerService(
@@ -116,14 +115,14 @@ public class SshCommandWithConfigAdminTests {
         				(Dictionary<String, ?>)EasyMock.anyObject())).andReturn(null);
 		EasyMock.replay(context);
 
-		Map<String, String> environment = new HashMap<String, String>();
+		Map<String, String> environment = new HashMap<>();
 		environment.put(TERM_PROPERTY, XTERM);
 		Environment env = EasyMock.createMock(Environment.class);
 		EasyMock.expect(env.getEnv()).andReturn(environment);
 		EasyMock.replay(env);
 
 		SshCommand command = new SshCommand(processor, context);
-		Dictionary props = new Hashtable();
+		Dictionary<String, Object> props = new Hashtable<>();
 		props.put("port", SSH_PORT);
 		props.put("host", HOST);
 		props.put("enabled", TRUE);
@@ -175,6 +174,7 @@ public class SshCommandWithConfigAdminTests {
 		testDisabled(true);
 	}
 	
+	@SuppressWarnings("unchecked")
 	private void testDisabled(boolean isDefault) throws Exception {
 		CommandSession session = EasyMock.createMock(CommandSession.class);
 		EasyMock.expect(session.put((String)EasyMock.anyObject(), EasyMock.anyObject())).andReturn(EasyMock.anyObject()).times(4);
@@ -188,7 +188,7 @@ public class SshCommandWithConfigAdminTests {
 		EasyMock.replay(processor);
 
 		final ServiceRegistration<?> registration = EasyMock.createMock(ServiceRegistration.class);
-        registration.setProperties((Dictionary)EasyMock.anyObject());
+        registration.setProperties((Dictionary<String, ?>)EasyMock.anyObject());
         EasyMock.expectLastCall();
         EasyMock.replay(registration);
 
@@ -200,11 +200,9 @@ public class SshCommandWithConfigAdminTests {
         				(String)EasyMock.anyObject(), 
         				(ManagedService)EasyMock.anyObject(), 
         				(Dictionary<String, ?>)EasyMock.anyObject())
-        	).andAnswer((IAnswer<ServiceRegistration<?>>) new IAnswer<ServiceRegistration<?>>() {
-        		public ServiceRegistration<?> answer() {
-        			configurator = (ManagedService) EasyMock.getCurrentArguments()[1];
-        			return registration;
-        		}
+        	).andAnswer((IAnswer<ServiceRegistration<?>>) () -> {
+				configurator = (ManagedService) EasyMock.getCurrentArguments()[1];
+				return registration;
 			});
         EasyMock.expect(
         		context.registerService(
@@ -213,14 +211,14 @@ public class SshCommandWithConfigAdminTests {
         				(Dictionary<String, ?>)EasyMock.anyObject())).andReturn(null);
 		EasyMock.replay(context);
 
-		Map<String, String> environment = new HashMap<String, String>();
+		Map<String, String> environment = new HashMap<>();
 		environment.put(TERM_PROPERTY, XTERM);
 		Environment env = EasyMock.createMock(Environment.class);
 		EasyMock.expect(env.getEnv()).andReturn(environment);
 		EasyMock.replay(env);
 
 		SshCommand command = new SshCommand(processor, context);
-		Dictionary props = new Hashtable();
+		Dictionary<String, Object> props = new Hashtable<>();
 		props.put("port", SSH_PORT);
 		props.put("host", HOST);
 		if (isDefault == false) {
@@ -239,9 +237,8 @@ public class SshCommandWithConfigAdminTests {
 			} catch (InterruptedException ie) {
 				// do nothing
 			}
-			ClientSession sshSession;
 			try {
-				sshSession = defaultConnectFuture.getSession();
+				defaultConnectFuture.getSession();
 				Assert.fail("It should not be possible to connect to " + HOST + ":" + SSH_PORT);
 			} catch (RuntimeSshException e) {
 				//this is expected
diff --git a/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshInputScannerTests.java b/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshInputScannerTests.java
index c4260ce88..c2d620501 100755
--- a/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshInputScannerTests.java
+++ b/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshInputScannerTests.java
@@ -56,7 +56,7 @@ public class SshInputScannerTests {
 
         try {
             scanner.scan((byte) 'a');
-            scanner.scan((byte) ESC);
+            scanner.scan(ESC);
             scanner.scan((byte) 'b');
         } catch (IOException e) {
             System.out.println("Error while scanning: " + e.getMessage());
diff --git a/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshShellTests.java b/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshShellTests.java
index 463f6cb31..0e0cec710 100755
--- a/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshShellTests.java
+++ b/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/SshShellTests.java
@@ -91,13 +91,13 @@ public class SshShellTests {
             EasyMock.expect(context.getProperty(DEFAULT_USER_STORAGE)).andReturn(TRUE);
             EasyMock.replay(context);
             
-            Map<String, String> environment = new HashMap<String, String>();
+            Map<String, String> environment = new HashMap<>();
             environment.put(TERM_PROPERTY, XTERM);
             Environment env = EasyMock.createMock(Environment.class);
             EasyMock.expect(env.getEnv()).andReturn(environment);
             EasyMock.replay(env);
             
-            List<CommandProcessor> processors = new ArrayList<CommandProcessor>();
+            List<CommandProcessor> processors = new ArrayList<>();
             processors.add(processor);
             shell = new SshShell(processors, context);
             shell.setInputStream(socketServer.getInputStream());
diff --git a/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/UserAdminCommandTests.java b/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/UserAdminCommandTests.java
index 522b8246f..3ed7b1673 100755
--- a/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/UserAdminCommandTests.java
+++ b/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/ssh/UserAdminCommandTests.java
@@ -105,12 +105,12 @@ public class UserAdminCommandTests {
 	}
 	
 	private boolean compareRoles(String expectedRoles, String actualRoles) {
-		Set<String> expectedRolesSet = new HashSet<String>();
+		Set<String> expectedRolesSet = new HashSet<>();
 		for(String role : expectedRoles.split(",")) {
 			expectedRolesSet.add(role);
 		}
 		
-		Set<String> actualRolesSet = new HashSet<String>();
+		Set<String> actualRolesSet = new HashSet<>();
 		for(String role : actualRoles.split(",")) {
 			actualRolesSet.add(role);
 		}
diff --git a/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/storage/SecureUserStoreTests.java b/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/storage/SecureUserStoreTests.java
index d224991a6..a407847aa 100755
--- a/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/storage/SecureUserStoreTests.java
+++ b/bundles/archived/org.eclipse.equinox.console.ssh.tests/src/org/eclipse/equinox/console/storage/SecureUserStoreTests.java
@@ -98,12 +98,12 @@ public class SecureUserStoreTests {
 	}
 	
 	private boolean compareRoles(String expectedRoles, String actualRoles) {
-		Set<String> expectedRolesSet = new HashSet<String>();
+		Set<String> expectedRolesSet = new HashSet<>();
 		for(String role : expectedRoles.split(",")) {
 			expectedRolesSet.add(role);
 		}
 		
-		Set<String> actualRolesSet = new HashSet<String>();
+		Set<String> actualRolesSet = new HashSet<>();
 		for(String role : actualRoles.split(",")) {
 			actualRolesSet.add(role);
 		}