Remove warnings

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/security/ExternalUsersProvider.java b/sonar-plugin-api/src/main/java/org/sonar/api/security/ExternalUsersProvider.java
index 25a9bbea7a0bfdf2901ec92159f9bf104809cc26..1a3f6886299d2becf8aba424834805bbde7731cc 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/security/ExternalUsersProvider.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/security/ExternalUsersProvider.java
@@ -33,6 +33,7 @@ public abstract class ExternalUsersProvider {
   /**
    * This method is overridden by old versions of plugins such as LDAP 1.1. It should be overridden anymore.
    *
+   * @param username the username
    * @return details for specified user, or null if such user doesn't exist
    * @throws RuntimeException in case of unexpected error such as connection failure
    * @deprecated replaced by {@link #doGetUserDetails(org.sonar.api.security.ExternalUsersProvider.Context)} since v. 3.1

diff --git a/sonar-server/src/test/java/org/sonar/server/startup/ServerMetadataPersisterTest.java b/sonar-server/src/test/java/org/sonar/server/startup/ServerMetadataPersisterTest.java
index 67dd9290b6c4f0ac604217ab243f6d25f36e2f58..beef9e2db4d48225bd91838dbef5231fe371cee8 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/startup/ServerMetadataPersisterTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/startup/ServerMetadataPersisterTest.java
@@ -19,10 +19,10 @@
  */
 package org.sonar.server.startup;
 
+import com.google.common.collect.ImmutableMap;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.ArgumentMatcher;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.platform.Server;
 import org.sonar.server.platform.PersistentSettings;
@@ -30,10 +30,8 @@ import org.sonar.server.platform.PersistentSettings;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Map;
 import java.util.TimeZone;
 
-import static org.mockito.Matchers.argThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -66,16 +64,10 @@ public class ServerMetadataPersisterTest {
     ServerMetadataPersister persister = new ServerMetadataPersister(server, persistentSettings);
     persister.start();
 
-    verify(persistentSettings).saveProperties(argThat(new ArgumentMatcher<Map<String, String>>() {
-      @Override
-      public boolean matches(Object o) {
-        Map<String, String> map = (Map<String, String>) o;
-        return map.get(CoreProperties.SERVER_ID).equals("123")
-          && map.get(CoreProperties.SERVER_VERSION).equals("3.2")
-          && map.get(CoreProperties.SERVER_STARTTIME).equals("2010-05-18T17:59:00+0000")
-          && map.size() == 3;
-      }
-    }));
+    verify(persistentSettings).saveProperties(ImmutableMap.of(
+        CoreProperties.SERVER_ID, "123",
+        CoreProperties.SERVER_VERSION, "3.2",
+        CoreProperties.SERVER_STARTTIME, "2010-05-18T17:59:00+0000"));
   }
 
 }