SONAR-9088 set default visibility to “not-private” for new organisations

32 files changed, 62 insertions, 43 deletions

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/organization/OrganizationDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/organization/OrganizationDao.java
index 7626e23a991..0fc79499f1c 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/organization/OrganizationDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/organization/OrganizationDao.java
@@ -40,12 +40,12 @@ public class OrganizationDao implements Dao {
     this.system2 = system2;
   }
 
-  public void insert(DbSession dbSession, OrganizationDto organization) {
+  public void insert(DbSession dbSession, OrganizationDto organization, boolean newProjectPrivate) {
     checkDto(organization);
     long now = system2.now();
     organization.setCreatedAt(now);
     organization.setUpdatedAt(now);
-    getMapper(dbSession).insert(organization);
+    getMapper(dbSession).insert(organization, newProjectPrivate);
   }
 
   public int countByQuery(DbSession dbSession, OrganizationQuery organizationQuery) {
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/organization/OrganizationMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/organization/OrganizationMapper.java
index d1350aa9a7c..1a8d78a5744 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/organization/OrganizationMapper.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/organization/OrganizationMapper.java
@@ -25,7 +25,7 @@ import org.apache.ibatis.annotations.Param;
 import org.sonar.db.Pagination;
 
 public interface OrganizationMapper {
-  void insert(@Param("organization") OrganizationDto organization);
+  void insert(@Param("organization") OrganizationDto organization, @Param("newProjectPrivate") boolean newProjectPrivate);
 
   int countByQuery(@Param("query") OrganizationQuery organizationQuery);
 
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/organization/OrganizationMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/organization/OrganizationMapper.xml
index d3bc8b02e00..d8b676988d2 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/organization/OrganizationMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/organization/OrganizationMapper.xml
@@ -187,7 +187,7 @@
     org.uuid = #{uuid, jdbcType=VARCHAR}
   </select>
 
-  <insert id="insert" parameterType="Organization" useGeneratedKeys="false">
+  <insert id="insert" parameterType="map" useGeneratedKeys="false">
     insert into organizations
     (
       uuid,
@@ -197,6 +197,7 @@
       url,
       avatar_url,
       guarded,
+      new_project_private,
       user_id,
       created_at,
       updated_at
@@ -210,6 +211,7 @@
       #{organization.url, jdbcType=VARCHAR},
       #{organization.avatarUrl, jdbcType=VARCHAR},
       #{organization.guarded, jdbcType=BOOLEAN},
+      #{newProjectPrivate, jdbcType=BOOLEAN},
       #{organization.userId, jdbcType=INTEGER},
       #{organization.createdAt, jdbcType=BIGINT},
       #{organization.updatedAt, jdbcType=BIGINT}
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/DbTester.java b/server/sonar-db-dao/src/test/java/org/sonar/db/DbTester.java
index 16a07f06977..31ab11a427a 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/DbTester.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/DbTester.java
@@ -152,7 +152,7 @@ public class DbTester extends AbstractDbTester<TestDb> {
   private void insertDefaultOrganization() {
     defaultOrganization = OrganizationTesting.newOrganizationDto().setUuid(defaultOrganizationUuid);
     try (DbSession dbSession = db.getMyBatis().openSession(false)) {
-      client.organizationDao().insert(dbSession, defaultOrganization);
+      client.organizationDao().insert(dbSession, defaultOrganization, false);
       client.internalPropertiesDao().save(dbSession, "organization.default", defaultOrganization.getUuid());
       dbSession.commit();
     }
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/organization/OrganizationDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/organization/OrganizationDaoTest.java
index ed122c52226..7e37027d520 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/organization/OrganizationDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/organization/OrganizationDaoTest.java
@@ -101,7 +101,7 @@ public class OrganizationDaoTest {
   public void insert_fails_with_NPE_if_OrganizationDto_is_null() {
     expectDtoCanNotBeNull();
 
-    underTest.insert(dbSession, null);
+    underTest.insert(dbSession, null, false);
   }
 
   @Test
@@ -185,7 +185,7 @@ public class OrganizationDaoTest {
 
     expectedException.expect(PersistenceException.class);
 
-    underTest.insert(dbSession, dto);
+    underTest.insert(dbSession, dto, false);
   }
 
   @Test
@@ -955,7 +955,7 @@ public class OrganizationDaoTest {
   }
 
   private void insertOrganization(OrganizationDto dto) {
-    underTest.insert(dbSession, dto);
+    underTest.insert(dbSession, dto, false);
     dbSession.commit();
   }
 
@@ -969,6 +969,7 @@ public class OrganizationDaoTest {
           "      name," +
           "      default_perm_template_project," +
           "      default_perm_template_view," +
+          "      new_project_private," +
           "      guarded," +
           "      created_at," +
           "      updated_at" +
@@ -982,6 +983,7 @@ public class OrganizationDaoTest {
           "      ?," +
           "      ?," +
           "      ?," +
+          "      ?," +
           "      ?" +
           "    )")) {
       preparedStatement.setString(1, organizationUuid);
@@ -990,8 +992,9 @@ public class OrganizationDaoTest {
       preparedStatement.setString(4, project);
       preparedStatement.setString(5, view);
       preparedStatement.setBoolean(6, false);
-      preparedStatement.setLong(7, 1000L);
-      preparedStatement.setLong(8, 2000L);
+      preparedStatement.setBoolean(7, false);
+      preparedStatement.setLong(8, 1000L);
+      preparedStatement.setLong(9, 2000L);
       preparedStatement.execute();
     } catch (SQLException e) {
       throw new RuntimeException("dirty insert failed", e);
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/organization/OrganizationDbTester.java b/server/sonar-db-dao/src/test/java/org/sonar/db/organization/OrganizationDbTester.java
index 81082965ffd..7155e5ff388 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/organization/OrganizationDbTester.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/organization/OrganizationDbTester.java
@@ -61,7 +61,7 @@ public class OrganizationDbTester {
    */
   public OrganizationDto insert(OrganizationDto dto) {
     DbSession dbSession = dbTester.getSession();
-    dbTester.getDbClient().organizationDao().insert(dbSession, dto);
+    dbTester.getDbClient().organizationDao().insert(dbSession, dto, false);
     dbSession.commit();
     return dto;
   }
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupDaoTest.java
index 6e8136bad2d..325da9993d0 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupDaoTest.java
@@ -62,7 +62,7 @@ public class GroupDaoTest {
   @Before
   public void setUp() {
     when(system2.now()).thenReturn(NOW);
-    db.getDbClient().organizationDao().insert(dbSession, AN_ORGANIZATION);
+    db.getDbClient().organizationDao().insert(dbSession, AN_ORGANIZATION, false);
   }
 
   @Test
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/selectForIndexing.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/selectForIndexing.xml
index ed56c9a1779..3f85dda60d3 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/selectForIndexing.xml
+++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/selectForIndexing.xml
@@ -4,6 +4,7 @@
                  kee="org1_key"
                  name="org1_name"
                  guarded="[false]"
+                 new_project_private="[false]"
                  created_at="1000"
                  updated_at="1000"/>
 
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/shared.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/shared.xml
index f6d903ddc92..c435f025563 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/shared.xml
+++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoTest/shared.xml
@@ -4,6 +4,7 @@
                  kee="org1_key"
                  name="org1_name"
                  guarded="[false]"
+                 new_project_private="[false]"
                  created_at="1000"
                  updated_at="1000"/>
 
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoWithDuplicatedKeysTest/schema.sql b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoWithDuplicatedKeysTest/schema.sql
index 5216e4dc13f..cc547e89452 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoWithDuplicatedKeysTest/schema.sql
+++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ComponentDaoWithDuplicatedKeysTest/schema.sql
@@ -5,6 +5,7 @@ CREATE TABLE "ORGANIZATIONS" (
   "DESCRIPTION" VARCHAR(256),
   "URL" VARCHAR(256),
   "AVATAR_URL" VARCHAR(256),
+  "NEW_PROJECT_PRIVATE" BOOLEAN,
   "USER_ID" BIGINT,
   "GUARDED" BOOLEAN NOT NULL,
   "CREATED_AT" BIGINT NOT NULL,
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java b/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java
index 6626510ef04..cc835cbb44c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java
@@ -192,7 +192,7 @@ public class OrganizationCreationImpl implements OrganizationCreation {
       .setUrl(newOrganization.getUrl())
       .setAvatarUrl(newOrganization.getAvatar());
     extendCreation.accept(res);
-    dbClient.organizationDao().insert(dbSession, res);
+    dbClient.organizationDao().insert(dbSession, res, false);
     return res;
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java
index de6fc94df45..a02a5bfb58e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java
@@ -86,7 +86,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_project_settings_with_global_scan_permission() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     userSessionRule.logIn().addProjectPermission(SCAN_EXECUTION, project);
     dbClient.componentDao().insert(dbSession, project);
@@ -110,7 +110,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_project_settings_with_project_scan_permission() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     userSessionRule.logIn("john").addProjectPermission(SCAN_EXECUTION, project);
     dbClient.componentDao().insert(dbSession, project);
@@ -134,7 +134,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void not_returned_secured_settings_when_lgged_but_no_scan_permission() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     userSessionRule.logIn("john").addProjectPermission(UserRole.USER, project);
     dbClient.componentDao().insert(dbSession, project);
@@ -156,7 +156,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_project_with_module_settings() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     userSessionRule.logIn().addProjectPermission(SCAN_EXECUTION, project);
     dbClient.componentDao().insert(dbSession, project);
@@ -192,7 +192,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_project_with_module_settings_inherited_from_project() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     userSessionRule.logIn().addProjectPermission(SCAN_EXECUTION, project);
     dbClient.componentDao().insert(dbSession, project);
@@ -223,7 +223,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_project_with_module_with_sub_module() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     userSessionRule.logIn().addProjectPermission(SCAN_EXECUTION, project);
     dbClient.componentDao().insert(dbSession, project);
@@ -270,7 +270,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_project_with_two_modules() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     userSessionRule.logIn().addProjectPermission(SCAN_EXECUTION, project);
     dbClient.componentDao().insert(dbSession, project);
@@ -315,7 +315,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_provisioned_project_settings() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     // No snapshot attached on the project -> provisioned project
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     userSessionRule.logIn().addProjectPermission(SCAN_EXECUTION, project);
@@ -337,7 +337,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_sub_module_settings() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     dbClient.componentDao().insert(dbSession, project);
     addDefaultProfile();
@@ -371,7 +371,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_sub_module_settings_including_settings_from_parent_modules() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     dbClient.componentDao().insert(dbSession, project);
     addDefaultProfile();
@@ -407,7 +407,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_sub_module_settings_only_inherited_from_project() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     dbClient.componentDao().insert(dbSession, project);
     addDefaultProfile();
@@ -441,7 +441,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_sub_module_settings_inherited_from_project_and_module() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     dbClient.componentDao().insert(dbSession, project);
     addDefaultProfile();
@@ -478,7 +478,7 @@ public class ProjectDataLoaderMediumTest {
     userSessionRule.logIn();
 
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     dbClient.componentDao().insert(dbSession, project);
     dbSession.commit();
@@ -494,7 +494,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void fail_when_not_preview_and_only_browse_permission_without_scan_permission() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     dbClient.componentDao().insert(dbSession, project);
     dbSession.commit();
@@ -510,7 +510,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void fail_when_preview_and_only_scan_permission_without_browse_permission() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     dbClient.componentDao().insert(dbSession, project);
     dbSession.commit();
@@ -525,7 +525,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_file_data_from_single_project() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     userSessionRule.logIn().addProjectPermission(SCAN_EXECUTION, project);
     dbClient.componentDao().insert(dbSession, project);
@@ -545,7 +545,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_file_data_from_multi_modules() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     userSessionRule.logIn().addProjectPermission(SCAN_EXECUTION, project);
     dbClient.componentDao().insert(dbSession, project);
@@ -574,7 +574,7 @@ public class ProjectDataLoaderMediumTest {
   @Test
   public void return_file_data_from_module() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     ComponentDto project = ComponentTesting.newPrivateProjectDto(organizationDto);
     dbClient.componentDao().insert(dbSession, project);
     addDefaultProfile();
@@ -603,7 +603,7 @@ public class ProjectDataLoaderMediumTest {
 
   private void addDefaultProfile() {
     OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
-    dbClient.organizationDao().insert(dbSession, organizationDto);
+    dbClient.organizationDao().insert(dbSession, organizationDto, false);
     QualityProfileDto profileDto = newQProfileDto(organizationDto, QProfileName.createFor(ServerTester.Xoo.KEY, "SonarQube way"), "abcd").setRulesUpdatedAt(
       formatDateTime(new Date())).setDefault(true);
     dbClient.qualityProfileDao().insert(dbSession, profileDto);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java
index 34054c431fe..f3c1174e9ee 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java
@@ -147,7 +147,7 @@ public class IssueServiceMediumTest {
 
   private ComponentDto newPublicProject() {
     OrganizationDto organization = OrganizationTesting.newOrganizationDto();
-    tester.get(OrganizationDao.class).insert(session, organization);
+    tester.get(OrganizationDao.class).insert(session, organization, false);
     ComponentDto project = ComponentTesting.newPublicProjectDto(organization);
     tester.get(ComponentDao.class).insert(session, project);
     session.commit();
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java
index 21b1856e5b8..a856c355ad7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java
@@ -95,8 +95,8 @@ public class SearchActionComponentsMediumTest {
     this.defaultOrganization = organizationDao.selectByUuid(session, defaultOrganization.getUuid()).get();
     this.otherOrganization1 = OrganizationTesting.newOrganizationDto().setKey("my-org-1");
     this.otherOrganization2 = OrganizationTesting.newOrganizationDto().setKey("my-org-2");
-    organizationDao.insert(session, this.otherOrganization1);
-    organizationDao.insert(session, this.otherOrganization2);
+    organizationDao.insert(session, this.otherOrganization1, false);
+    organizationDao.insert(session, this.otherOrganization2, false);
     session.commit();
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java
index 282b2dcc1dd..2f4a430d5e1 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java
@@ -99,8 +99,8 @@ public class SearchActionMediumTest {
     this.defaultOrganization = organizationDao.selectByUuid(session, defaultOrganization.getUuid()).get();
     this.otherOrganization1 = OrganizationTesting.newOrganizationDto().setKey("my-org-1");
     this.otherOrganization2 = OrganizationTesting.newOrganizationDto().setKey("my-org-2");
-    organizationDao.insert(session, this.otherOrganization1);
-    organizationDao.insert(session, this.otherOrganization2);
+    organizationDao.insert(session, this.otherOrganization1, false);
+    organizationDao.insert(session, this.otherOrganization2, false);
     session.commit();
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java
index ff4c47e5668..09a22653625 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java
@@ -179,7 +179,7 @@ public class DefaultOrganizationProviderImplTest {
 
   private void insertOrganization(OrganizationDto dto, long createdAt) {
     when(system2.now()).thenReturn(createdAt);
-    dbClient.organizationDao().insert(dbSession, dto);
+    dbClient.organizationDao().insert(dbSession, dto, false);
     dbSession.commit();
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java
index 6276a91bdf5..7a354eac0bf 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java
@@ -653,7 +653,7 @@ public class CreateActionTest {
       .setName(key + "_name")
       .setCreatedAt((long) key.hashCode())
       .setUpdatedAt((long) key.hashCode());
-    dbClient.organizationDao().insert(dbTester.getSession(), dto);
+    dbClient.organizationDao().insert(dbTester.getSession(), dto, false);
     dbTester.commit();
     return dto;
   }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java
index 242156f515f..a638eeb8bce 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java
@@ -249,7 +249,7 @@ public class SearchActionTest {
 
   private void insertOrganization(OrganizationDto dto) {
     DbSession dbSession = dbTester.getSession();
-    dbTester.getDbClient().organizationDao().insert(dbSession, dto);
+    dbTester.getDbClient().organizationDao().insert(dbSession, dto, false);
     dbSession.commit();
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java
index 072fb6e81a2..537da55958f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java
@@ -109,7 +109,7 @@ public class QProfileBackuperMediumTest {
     ruleIndexer.indexRuleDefinition(xooRule2.getDefinition().getKey());
 
     this.organization = OrganizationTesting.newOrganizationDto();
-    db.organizationDao().insert(dbSession, organization);
+    db.organizationDao().insert(dbSession, organization, false);
   }
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java
index e36fc719158..64cea1e7730 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java
@@ -57,7 +57,7 @@ public class QProfileFactoryMediumTest {
     dbSession = db.openSession(false);
     factory = tester.get(QProfileFactory.class);
     organization = OrganizationTesting.newOrganizationDto();
-    db.organizationDao().insert(dbSession, organization);
+    db.organizationDao().insert(dbSession, organization, false);
   }
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java
index ea1568f886f..46c80685cfb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java
@@ -88,7 +88,7 @@ public class QProfilesWsMediumTest {
     ruleIndexer = tester.get(RuleIndexer.class);
     activeRuIndexer = tester.get(ActiveRuleIndexer.class);
     organization = OrganizationTesting.newOrganizationDto().setKey("org-123");
-    db.organizationDao().insert(session, organization);
+    db.organizationDao().insert(session, organization, false);
   }
 
   @After
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/no_previous_version.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/no_previous_version.xml
index 4c2fca27ce5..eb9da8278d4 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/no_previous_version.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/no_previous_version.xml
@@ -4,6 +4,7 @@
                  kee="org1_key"
                  name="org1_name"
                  guarded="[false]"
+                 new_project_private="[false]"
                  created_at="1000"
                  updated_at="2000"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_deleted.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_deleted.xml
index df0e28c48ae..d235e0a4365 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_deleted.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_deleted.xml
@@ -4,6 +4,7 @@
                  kee="org1_key"
                  name="org1_name"
                  guarded="[false]"
+                 new_project_private="[false]"
                  created_at="1000"
                  updated_at="2000"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_is_last_one.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_is_last_one.xml
index 9bda9495680..010f700391f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_is_last_one.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_is_last_one.xml
@@ -4,6 +4,7 @@
                  kee="org1_key"
                  name="org1_name"
                  guarded="[false]"
+                 new_project_private="[false]"
                  created_at="1000"
                  updated_at="2000"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/shared.xml
index 761666879ec..bbd500b4ade 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/shared.xml
@@ -4,6 +4,7 @@
                  kee="org1_key"
                  name="org1_name"
                  guarded="[false]"
+                 new_project_private="[false]"
                  created_at="1000"
                  updated_at="2000"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml
index 3be757d999c..c235e1fc744 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml
@@ -4,6 +4,7 @@
                  kee="org1_key"
                  name="org1_name"
                  guarded="[false]"
+                 new_project_private="[false]"
                  created_at="1000"
                  updated_at="2000"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml
index addb010461b..72c6e708229 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml
@@ -4,6 +4,7 @@
                  kee="org1_key"
                  name="org1_name"
                  guarded="[false]"
+                 new_project_private="[false]"
                  created_at="1000"
                  updated_at="2000"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml
index 3be757d999c..c235e1fc744 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml
@@ -4,6 +4,7 @@
                  kee="org1_key"
                  name="org1_name"
                  guarded="[false]"
+                 new_project_private="[false]"
                  created_at="1000"
                  updated_at="2000"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
index f3cb2add5d5..0b8edb614d0 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
@@ -4,6 +4,7 @@
                  kee="org1_key"
                  name="org1_name"
                  guarded="[false]"
+                 new_project_private="[false]"
                  created_at="1000"
                  updated_at="2000"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/no_source.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/no_source.xml
index c4e2888ef4f..27d6d23da30 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/no_source.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/no_source.xml
@@ -4,6 +4,7 @@
                  kee="org1_key"
                  name="org1_name"
                  guarded="[false]"
+                 new_project_private="[false]"
                  created_at="1000"
                  updated_at="2000"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml
index e6e6839c83b..95d3148acb3 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml
@@ -4,6 +4,7 @@
                  kee="org1_key"
                  name="org1_name"
                  guarded="[false]"
+                 new_project_private="[false]"
                  created_at="1000"
                  updated_at="2000"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/show_hashes_on_test_file.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/show_hashes_on_test_file.xml
index 2b46f5381e6..c189d2270fa 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/show_hashes_on_test_file.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/show_hashes_on_test_file.xml
@@ -4,6 +4,7 @@
                  kee="org1_key"
                  name="org1_name"
                  guarded="[false]"
+                 new_project_private="[false]"
                  created_at="1000"
                  updated_at="2000"/>