SONAR-13999 remove orgs from application WS

3 files changed, 7 insertions, 12 deletions

diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/organization/DefaultOrganizationProviderImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/organization/DefaultOrganizationProviderImpl.java
index 207913fe827..d6361ac38b2 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/organization/DefaultOrganizationProviderImpl.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/organization/DefaultOrganizationProviderImpl.java
@@ -23,9 +23,9 @@ import java.util.Optional;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.organization.OrganizationDto;
-import org.sonar.server.property.InternalProperties;
 
 import static com.google.common.base.Preconditions.checkState;
+import static org.sonar.db.organization.OrganizationDao.DEFAULT_ORGANIZATION;
 
 public class DefaultOrganizationProviderImpl implements DefaultOrganizationProvider {
   private final DbClient dbClient;
@@ -46,7 +46,7 @@ public class DefaultOrganizationProviderImpl implements DefaultOrganizationProvi
 
   public static DefaultOrganization getDefaultOrganization(DbClient dbClient) {
     try (DbSession dbSession = dbClient.openSession(false)) {
-      Optional<String> uuid = dbClient.internalPropertiesDao().selectByKey(dbSession, InternalProperties.DEFAULT_ORGANIZATION);
+      Optional<String> uuid = dbClient.internalPropertiesDao().selectByKey(dbSession, DEFAULT_ORGANIZATION);
       checkState(uuid.isPresent() && !uuid.get().isEmpty(), "No Default organization uuid configured");
       Optional<OrganizationDto> dto = dbClient.organizationDao().selectByUuid(dbSession, uuid.get());
       checkState(dto.isPresent(), "Default organization with uuid '%s' does not exist", uuid.get());
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/property/InternalProperties.java b/server/sonar-server-common/src/main/java/org/sonar/server/property/InternalProperties.java
index 05b45240d5d..4a7c0cd7ae8 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/property/InternalProperties.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/property/InternalProperties.java
@@ -26,11 +26,6 @@ import javax.annotation.Nullable;
  * Allows to read and write internal properties.
  */
 public interface InternalProperties {
-  /**
-   * The UUID of the default organization.
-   * Can't be null unless SQ is strongly corrupted.
-   */
-  String DEFAULT_ORGANIZATION = "organization.default";
 
   String ORGANIZATION_ENABLED = "organization.enabled";
 
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java
index a7034d31356..d879f705589 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java
@@ -31,8 +31,8 @@ import org.sonar.db.organization.OrganizationDto;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.sonar.db.organization.OrganizationDao.DEFAULT_ORGANIZATION;
 import static org.sonar.db.organization.OrganizationTesting.newOrganizationDto;
-import static org.sonar.server.property.InternalProperties.DEFAULT_ORGANIZATION;
 
 public class DefaultOrganizationProviderImplTest {
   private static final OrganizationDto ORGANIZATION_DTO_1 = newOrganizationDto()
@@ -41,17 +41,17 @@ public class DefaultOrganizationProviderImplTest {
     .setKey("the key 1");
   private static final long DATE_1 = 1_999_888L;
 
-  private System2 system2 = mock(System2.class);
+  private final System2 system2 = mock(System2.class);
 
   @Rule
   public DbTester dbTester = DbTester.create(system2).setDisableDefaultOrganization(true);
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 
-  private DbClient dbClient = dbTester.getDbClient();
-  private DbSession dbSession = dbTester.getSession();
+  private final DbClient dbClient = dbTester.getDbClient();
+  private final DbSession dbSession = dbTester.getSession();
 
-  private DefaultOrganizationProviderImpl underTest = new DefaultOrganizationProviderImpl(dbClient);
+  private final DefaultOrganizationProviderImpl underTest = new DefaultOrganizationProviderImpl(dbClient);
 
   @Test
   public void get_fails_with_ISE_if_default_organization_internal_property_does_not_exist() {