From cc838211b1c811ff86156d481b9e7f7fba9c632c Mon Sep 17 00:00:00 2001 From: Jacek Date: Fri, 18 Dec 2020 16:35:04 +0100 Subject: [PATCH] SONAR-13999 drop Tester#disableOrganization() utility method --- .../java/org/sonar/server/ui/ws/GlobalAction.java | 13 +------------ .../org/sonar/server/ui/ws/GlobalActionTest.java | 15 +-------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/GlobalAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/GlobalAction.java index c61985fdf43..71e44f2ba30 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/GlobalAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/ws/GlobalAction.java @@ -41,7 +41,6 @@ import org.sonar.db.dialect.H2; import org.sonar.server.almsettings.MultipleAlmFeatureProvider; import org.sonar.server.branch.BranchFeatureProxy; import org.sonar.server.issue.index.IssueIndexSyncProgressChecker; -import org.sonar.server.organization.DefaultOrganizationProvider; import org.sonar.server.platform.WebServer; import org.sonar.server.ui.PageRepository; import org.sonar.server.ui.VersionFormatter; @@ -78,7 +77,6 @@ public class GlobalAction implements NavigationWsAction, Startable { private final Server server; private final WebServer webServer; private final DbClient dbClient; - private final DefaultOrganizationProvider defaultOrganizationProvider; private final BranchFeatureProxy branchFeature; private final UserSession userSession; private final PlatformEditionProvider editionProvider; @@ -87,8 +85,7 @@ public class GlobalAction implements NavigationWsAction, Startable { private final IssueIndexSyncProgressChecker issueIndexSyncChecker; public GlobalAction(PageRepository pageRepository, Configuration config, ResourceTypes resourceTypes, Server server, - WebServer webServer, DbClient dbClient, - DefaultOrganizationProvider defaultOrganizationProvider, BranchFeatureProxy branchFeature, UserSession userSession, PlatformEditionProvider editionProvider, + WebServer webServer, DbClient dbClient, BranchFeatureProxy branchFeature, UserSession userSession, PlatformEditionProvider editionProvider, MultipleAlmFeatureProvider multipleAlmFeatureProvider, WebAnalyticsLoader webAnalyticsLoader, IssueIndexSyncProgressChecker issueIndexSyncChecker) { this.pageRepository = pageRepository; this.config = config; @@ -96,7 +93,6 @@ public class GlobalAction implements NavigationWsAction, Startable { this.server = server; this.webServer = webServer; this.dbClient = dbClient; - this.defaultOrganizationProvider = defaultOrganizationProvider; this.branchFeature = branchFeature; this.userSession = userSession; this.editionProvider = editionProvider; @@ -143,7 +139,6 @@ public class GlobalAction implements NavigationWsAction, Startable { writeQualifiers(json); writeVersion(json); writeDatabaseProduction(json); - writeOrganizationSupport(json); writeBranchSupport(json); writeMultipleAlmEnabled(json); editionProvider.get().ifPresent(e -> json.prop("edition", e.name().toLowerCase(Locale.ENGLISH))); @@ -198,12 +193,6 @@ public class GlobalAction implements NavigationWsAction, Startable { json.prop("productionDatabase", !dbClient.getDatabase().getDialect().getId().equals(H2.ID)); } - // TODO:: drop - private void writeOrganizationSupport(JsonWriter json) { - json.prop("organizationsEnabled", false); - json.prop("defaultOrganization", defaultOrganizationProvider.get().getKey()); - } - private void writeBranchSupport(JsonWriter json) { json.prop("branchesEnabled", branchFeature.isEnabled()); } diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java index 8f932035ead..706bf2fc2c8 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java @@ -39,8 +39,6 @@ import org.sonar.db.dialect.H2; import org.sonar.db.dialect.PostgreSql; import org.sonar.server.almsettings.MultipleAlmFeatureProvider; import org.sonar.server.issue.index.IssueIndexSyncProgressChecker; -import org.sonar.server.organization.DefaultOrganizationProvider; -import org.sonar.server.organization.TestDefaultOrganizationProvider; import org.sonar.server.platform.WebServer; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ui.PageRepository; @@ -66,7 +64,6 @@ public class GlobalActionTest { private final WebServer webServer = mock(WebServer.class); private final DbClient dbClient = mock(DbClient.class, RETURNS_DEEP_STUBS); private final IssueIndexSyncProgressChecker indexSyncProgressChecker = mock(IssueIndexSyncProgressChecker.class); - private final DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.fromUuid("foo"); private final BranchFeatureRule branchFeature = new BranchFeatureRule(); private final PlatformEditionProvider editionProvider = mock(PlatformEditionProvider.class); private final MultipleAlmFeatureProvider multipleAlmFeatureProvider = mock(MultipleAlmFeatureProvider.class); @@ -234,16 +231,6 @@ public class GlobalActionTest { "}"); } - @Test - public void organization_support() { - init(); - - assertJson(call()).isSimilarTo("{" + - " \"organizationsEnabled\": false," + - " \"defaultOrganization\": \"key_foo\"" + - "}"); - } - @Test public void branch_support() { init(); @@ -386,7 +373,7 @@ public class GlobalActionTest { }}); pageRepository.start(); GlobalAction wsAction = new GlobalAction(pageRepository, settings.asConfig(), new ResourceTypes(resourceTypeTrees), server, - webServer, dbClient, defaultOrganizationProvider, branchFeature, userSession, editionProvider, multipleAlmFeatureProvider, webAnalyticsLoader, + webServer, dbClient, branchFeature, userSession, editionProvider, multipleAlmFeatureProvider, webAnalyticsLoader, indexSyncProgressChecker); ws = new WsActionTester(wsAction); wsAction.start(); -- 2.39.5