SONAR-13450 Deprecate 'id' parameter in `api/user_groups/update`

3 files changed, 13 insertions, 94 deletions

diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java
index 15c2bb9a161..830da6ef24a 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java
@@ -20,7 +20,6 @@
 package org.sonar.server.platform.platformlevel;
 
 import org.sonar.server.authentication.SafeModeUserSession;
-import org.sonar.server.organization.NoopDefaultOrganizationCache;
 import org.sonar.server.platform.ServerImpl;
 import org.sonar.server.platform.db.migration.AutoDbMigration;
 import org.sonar.server.platform.db.migration.DatabaseMigrationImpl;
@@ -58,9 +57,7 @@ public class PlatformLevelSafeMode extends PlatformLevel {
       // WS engine
       SafeModeUserSession.class,
       WebServiceEngine.class,
-      WebServiceFilter.class,
-
-      NoopDefaultOrganizationCache.class);
+      WebServiceFilter.class);
     addIfStartupLeader(
       DatabaseMigrationImpl.class,
       MigrationEngineModule.class,
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/web/UserSessionFilter.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/web/UserSessionFilter.java
index 12a95caf60a..aa87a67963a 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/web/UserSessionFilter.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/web/UserSessionFilter.java
@@ -30,11 +30,10 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.sonar.db.DBSessions;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
+import org.sonar.db.DBSessions;
 import org.sonar.server.authentication.UserSessionInitializer;
-import org.sonar.server.organization.DefaultOrganizationCache;
 import org.sonar.server.platform.Platform;
 import org.sonar.server.platform.PlatformImpl;
 import org.sonar.server.setting.ThreadLocalSettings;
@@ -47,8 +46,7 @@ public class UserSessionFilter implements Filter {
     this.platform = PlatformImpl.getInstance();
   }
 
-  @VisibleForTesting
-  UserSessionFilter(Platform platform) {
+  @VisibleForTesting UserSessionFilter(Platform platform) {
     this.platform = platform;
   }
 
@@ -59,22 +57,16 @@ public class UserSessionFilter implements Filter {
 
     DBSessions dbSessions = platform.getContainer().getComponentByType(DBSessions.class);
     ThreadLocalSettings settings = platform.getContainer().getComponentByType(ThreadLocalSettings.class);
-    DefaultOrganizationCache defaultOrganizationCache = platform.getContainer().getComponentByType(DefaultOrganizationCache.class);
     UserSessionInitializer userSessionInitializer = platform.getContainer().getComponentByType(UserSessionInitializer.class);
 
     LOG.trace("{} serves {}", Thread.currentThread(), request.getRequestURI());
     dbSessions.enableCaching();
     try {
-      defaultOrganizationCache.load();
+      settings.load();
       try {
-        settings.load();
-        try {
-          doFilter(request, response, chain, userSessionInitializer);
-        } finally {
-          settings.unload();
-        }
+        doFilter(request, response, chain, userSessionInitializer);
       } finally {
-        defaultOrganizationCache.unload();
+        settings.unload();
       }
     } finally {
       dbSessions.disableCaching();
diff --git a/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/UserSessionFilterTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/UserSessionFilterTest.java
index dbdcc256e3a..aca65747ca3 100644
--- a/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/UserSessionFilterTest.java
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/UserSessionFilterTest.java
@@ -31,7 +31,6 @@ import org.mockito.InOrder;
 import org.sonar.core.platform.ComponentContainer;
 import org.sonar.db.DBSessions;
 import org.sonar.server.authentication.UserSessionInitializer;
-import org.sonar.server.organization.DefaultOrganizationCache;
 import org.sonar.server.platform.Platform;
 import org.sonar.server.setting.ThreadLocalSettings;
 
@@ -42,7 +41,7 @@ import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 public class UserSessionFilterTest {
@@ -55,12 +54,11 @@ public class UserSessionFilterTest {
   private FilterChain chain = mock(FilterChain.class);
   private DBSessions dbSessions = mock(DBSessions.class);
   private ThreadLocalSettings settings = mock(ThreadLocalSettings.class);
-  private DefaultOrganizationCache defaultOrganizationCache = mock(DefaultOrganizationCache.class);
   private UserSessionFilter underTest = new UserSessionFilter(platform);
 
   @Before
   public void setUp() {
-    container.add(dbSessions, settings, defaultOrganizationCache);
+    container.add(dbSessions, settings);
     when(platform.getContainer()).thenReturn(container);
   }
 
@@ -89,7 +87,7 @@ public class UserSessionFilterTest {
     underTest.doFilter(request, response, chain);
 
     verify(chain).doFilter(request, response);
-    verifyZeroInteractions(userSessionInitializer);
+    verifyNoInteractions(userSessionInitializer);
   }
 
   @Test
@@ -139,22 +137,6 @@ public class UserSessionFilterTest {
   }
 
   @Test
-  public void doFilter_unloads_Settings_even_if_DefaultOrganizationCache_unload_fails() throws Exception {
-    RuntimeException thrown = new RuntimeException("Faking DefaultOrganizationCache.unload failing");
-    doThrow(thrown)
-        .when(defaultOrganizationCache)
-        .unload();
-
-    try {
-      underTest.doFilter(request, response, chain);
-      fail("A RuntimeException should have been thrown");
-    } catch (RuntimeException e) {
-      assertThat(e).isSameAs(thrown);
-      verify(settings).unload();
-    }
-  }
-
-  @Test
   public void doFilter_unloads_Settings_even_if_UserSessionInitializer_removeUserSession_fails() throws Exception {
     RuntimeException thrown = mockUserSessionInitializerRemoveUserSessionFailing();
 
@@ -168,58 +150,6 @@ public class UserSessionFilterTest {
   }
 
   @Test
-  public void doFilter_loads_and_unloads_DefaultOrganizationCache() throws Exception {
-    underTest.doFilter(request, response, chain);
-
-    InOrder inOrder = inOrder(defaultOrganizationCache);
-    inOrder.verify(defaultOrganizationCache).load();
-    inOrder.verify(defaultOrganizationCache).unload();
-    inOrder.verifyNoMoreInteractions();
-  }
-
-  @Test
-  public void doFilter_unloads_DefaultOrganizationCache_even_if_chain_throws_exception() throws Exception {
-    RuntimeException thrown = mockChainDoFilterError();
-
-    try {
-      underTest.doFilter(request, response, chain);
-      fail("A RuntimeException should have been thrown");
-    } catch (RuntimeException e) {
-      assertThat(e).isSameAs(thrown);
-      verify(defaultOrganizationCache).unload();
-    }
-  }
-
-  @Test
-  public void doFilter_unloads_DefaultOrganizationCache_even_if_Settings_unload_fails() throws Exception {
-    RuntimeException thrown = new RuntimeException("Faking Settings.unload failing");
-    doThrow(thrown)
-        .when(settings)
-        .unload();
-
-    try {
-      underTest.doFilter(request, response, chain);
-      fail("A RuntimeException should have been thrown");
-    } catch (RuntimeException e) {
-      assertThat(e).isSameAs(thrown);
-      verify(defaultOrganizationCache).unload();
-    }
-  }
-
-  @Test
-  public void doFilter_unloads_DefaultOrganizationCache_even_if_UserSessionInitializer_removeUserSession_fails() throws Exception {
-    RuntimeException thrown = mockUserSessionInitializerRemoveUserSessionFailing();
-
-    try {
-      underTest.doFilter(request, response, chain);
-      fail("A RuntimeException should have been thrown");
-    } catch (RuntimeException e) {
-      assertThat(e).isSameAs(thrown);
-      verify(defaultOrganizationCache).unload();
-    }
-  }
-
-  @Test
   public void just_for_fun_and_coverage() {
     UserSessionFilter filter = new UserSessionFilter();
     filter.init(mock(FilterConfig.class));
@@ -236,16 +166,16 @@ public class UserSessionFilterTest {
     container.add(userSessionInitializer);
     RuntimeException thrown = new RuntimeException("Faking UserSessionInitializer.removeUserSession failing");
     doThrow(thrown)
-        .when(userSessionInitializer)
-        .removeUserSession();
+      .when(userSessionInitializer)
+      .removeUserSession();
     return thrown;
   }
 
   private RuntimeException mockChainDoFilterError() throws IOException, ServletException {
     RuntimeException thrown = new RuntimeException("Faking chain.doFilter failing");
     doThrow(thrown)
-        .when(chain)
-        .doFilter(request, response);
+      .when(chain)
+      .doFilter(request, response);
     return thrown;
   }
 }