From f87c039aa5921285ffef64aa9045a423260477f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 27 Apr 2017 09:19:39 +0200 Subject: [PATCH] SONAR-9136 rename to DefaultOrganizationUuidProvider --- .../platform/db/migration/version/v63/DbVersion63.java | 2 +- ...nUuid.java => DefaultOrganizationUuidProvider.java} | 2 +- ...l.java => DefaultOrganizationUuidProviderImpl.java} | 2 +- .../version/v63/MakeDefaultOrganizationGuarded.java | 4 ++-- ...ulateDefaultPermTemplateColumnsOfOrganizations.java | 4 ++-- .../v63/PopulateOrganizationUuidToProjects.java | 4 ++-- .../version/v64/PopulateOrganizationMembersTable.java | 6 +++--- .../migration/version/v64/PopulateRulesMetadata.java | 6 +++--- .../migration/version/v64/RestoreSonarUsersGroups.java | 6 +++--- .../SetQualityProfileOrganizationUuidToDefault.java | 6 +++--- ...pportPrivateProjectInDefaultPermissionTemplate.java | 10 +++++----- .../v64/UpgradeQualityTemplateLoadedTemplates.java | 6 +++--- .../db/migration/version/v63/DbVersion63Test.java | 2 +- ...va => DefaultOrganizationUuidProviderImplTest.java} | 9 ++++----- .../v63/MakeDefaultOrganizationGuardedTest.java | 2 +- ...eDefaultPermTemplateColumnsOfOrganizationsTest.java | 3 +-- .../v63/PopulateOrganizationUuidToProjectsTest.java | 3 +-- ...d.java => TestDefaultOrganizationUuidProvider.java} | 6 +++--- .../v64/PopulateOrganizationMembersTableTest.java | 4 ++-- .../version/v64/PopulateRulesMetadataTest.java | 4 ++-- .../version/v64/RestoreSonarUsersGroupsTest.java | 4 ++-- ...SetQualityProfileOrganizationUuidToDefaultTest.java | 6 +++--- ...tPrivateProjectInDefaultPermissionTemplateTest.java | 4 ++-- .../v64/UpgradeQualityTemplateLoadedTemplatesTest.java | 4 ++-- .../internal_properties.sql | 0 25 files changed, 53 insertions(+), 56 deletions(-) rename server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/{DefaultOrganizationUuid.java => DefaultOrganizationUuidProvider.java} (97%) rename server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/{DefaultOrganizationUuidImpl.java => DefaultOrganizationUuidProviderImpl.java} (95%) rename server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/{DefaultOrganizationUuidImplTest.java => DefaultOrganizationUuidProviderImplTest.java} (86%) rename server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/{TestDefaultOrganizationUuid.java => TestDefaultOrganizationUuidProvider.java} (83%) rename server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v63/{DefaultOrganizationUuidImplTest => DefaultOrganizationUuidProviderImplTest}/internal_properties.sql (100%) diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DbVersion63.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DbVersion63.java index 0e4d36500cc..4968227be69 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DbVersion63.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DbVersion63.java @@ -26,7 +26,7 @@ import org.sonar.server.platform.db.migration.version.DbVersion; public class DbVersion63 implements DbVersion { @Override public Stream getSupportComponents() { - return Stream.of(DefaultOrganizationUuidImpl.class); + return Stream.of(DefaultOrganizationUuidProviderImpl.class); } @Override diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuid.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidProvider.java similarity index 97% rename from server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuid.java rename to server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidProvider.java index 2836b659219..991f1d610e9 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuid.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidProvider.java @@ -22,7 +22,7 @@ package org.sonar.server.platform.db.migration.version.v63; import java.sql.SQLException; import org.sonar.server.platform.db.migration.step.DataChange; -public interface DefaultOrganizationUuid { +public interface DefaultOrganizationUuidProvider { /** * Retrieves the uuid of the default organization from table INTERNAL_PROPERTIES. * diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidImpl.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidProviderImpl.java similarity index 95% rename from server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidImpl.java rename to server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidProviderImpl.java index 218b32c9dbb..ae8f4b1c922 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidImpl.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidProviderImpl.java @@ -29,7 +29,7 @@ import static com.google.common.base.Preconditions.checkState; * Component which can be injected in steps which provides access to the UUID of the default organization, it reads * directly from the BD. */ -public class DefaultOrganizationUuidImpl implements DefaultOrganizationUuid { +public class DefaultOrganizationUuidProviderImpl implements DefaultOrganizationUuidProvider { private static final String INTERNAL_PROPERTY_DEFAULT_ORGANIZATION = "organization.default"; diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/MakeDefaultOrganizationGuarded.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/MakeDefaultOrganizationGuarded.java index 08f8e121e4d..c5972e7234e 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/MakeDefaultOrganizationGuarded.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/MakeDefaultOrganizationGuarded.java @@ -24,9 +24,9 @@ import org.sonar.db.Database; import org.sonar.server.platform.db.migration.step.DataChange; public class MakeDefaultOrganizationGuarded extends DataChange { - private final DefaultOrganizationUuid defaultOrganizationUuid; + private final DefaultOrganizationUuidProvider defaultOrganizationUuid; - public MakeDefaultOrganizationGuarded(Database db, DefaultOrganizationUuid defaultOrganizationUuid) { + public MakeDefaultOrganizationGuarded(Database db, DefaultOrganizationUuidProvider defaultOrganizationUuid) { super(db); this.defaultOrganizationUuid = defaultOrganizationUuid; } diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/PopulateDefaultPermTemplateColumnsOfOrganizations.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/PopulateDefaultPermTemplateColumnsOfOrganizations.java index f91572b6f36..f39e51601ff 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/PopulateDefaultPermTemplateColumnsOfOrganizations.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/PopulateDefaultPermTemplateColumnsOfOrganizations.java @@ -48,9 +48,9 @@ public class PopulateDefaultPermTemplateColumnsOfOrganizations extends DataChang private static final String DEFAULT_VIEW_TEMPLATE_PROPERTY = "sonar.permission.template.VW.default"; private static final String DEFAULT_DEV_TEMPLATE_PROPERTY = "sonar.permission.template.DEV.default"; - private final DefaultOrganizationUuid defaultOrganizationUuid; + private final DefaultOrganizationUuidProvider defaultOrganizationUuid; - public PopulateDefaultPermTemplateColumnsOfOrganizations(Database db, DefaultOrganizationUuid defaultOrganizationUuid) { + public PopulateDefaultPermTemplateColumnsOfOrganizations(Database db, DefaultOrganizationUuidProvider defaultOrganizationUuid) { super(db); this.defaultOrganizationUuid = defaultOrganizationUuid; } diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/PopulateOrganizationUuidToProjects.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/PopulateOrganizationUuidToProjects.java index aeb102e8683..947b65c9dec 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/PopulateOrganizationUuidToProjects.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v63/PopulateOrganizationUuidToProjects.java @@ -25,9 +25,9 @@ import org.sonar.server.platform.db.migration.step.DataChange; import org.sonar.server.platform.db.migration.step.MassUpdate; public class PopulateOrganizationUuidToProjects extends DataChange { - private final DefaultOrganizationUuid defaultOrganizationUuid; + private final DefaultOrganizationUuidProvider defaultOrganizationUuid; - public PopulateOrganizationUuidToProjects(Database db, DefaultOrganizationUuid defaultOrganizationUuid) { + public PopulateOrganizationUuidToProjects(Database db, DefaultOrganizationUuidProvider defaultOrganizationUuid) { super(db); this.defaultOrganizationUuid = defaultOrganizationUuid; } diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/PopulateOrganizationMembersTable.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/PopulateOrganizationMembersTable.java index 46df4f3d8a7..ef88a7b540d 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/PopulateOrganizationMembersTable.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/PopulateOrganizationMembersTable.java @@ -24,15 +24,15 @@ import java.sql.SQLException; import org.sonar.db.Database; import org.sonar.server.platform.db.migration.step.DataChange; import org.sonar.server.platform.db.migration.step.MassUpdate; -import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuid; +import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidProvider; public class PopulateOrganizationMembersTable extends DataChange { private static final String INSERT_ORGANIZATION_MEMBERS_SQL = "INSERT INTO organization_members (user_id, organization_uuid) VALUES (?, ?)"; - private final DefaultOrganizationUuid defaultOrganizationUuid; + private final DefaultOrganizationUuidProvider defaultOrganizationUuid; - public PopulateOrganizationMembersTable(Database db, DefaultOrganizationUuid defaultOrganizationUuid) { + public PopulateOrganizationMembersTable(Database db, DefaultOrganizationUuidProvider defaultOrganizationUuid) { super(db); this.defaultOrganizationUuid = defaultOrganizationUuid; } diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/PopulateRulesMetadata.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/PopulateRulesMetadata.java index e5b979cecf9..2e8813a2371 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/PopulateRulesMetadata.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/PopulateRulesMetadata.java @@ -27,15 +27,15 @@ import org.sonar.server.platform.db.migration.step.DataChange; import org.sonar.server.platform.db.migration.step.MassUpdate; import org.sonar.server.platform.db.migration.step.Select; import org.sonar.server.platform.db.migration.step.SqlStatement; -import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuid; +import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidProvider; import static java.util.Optional.ofNullable; public class PopulateRulesMetadata extends DataChange { - private final DefaultOrganizationUuid defaultOrganizationUuid; + private final DefaultOrganizationUuidProvider defaultOrganizationUuid; private final System2 system2; - public PopulateRulesMetadata(Database db, DefaultOrganizationUuid defaultOrganizationUuid, System2 system2) { + public PopulateRulesMetadata(Database db, DefaultOrganizationUuidProvider defaultOrganizationUuid, System2 system2) { super(db); this.defaultOrganizationUuid = defaultOrganizationUuid; this.system2 = system2; diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/RestoreSonarUsersGroups.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/RestoreSonarUsersGroups.java index 9ac20c19274..81bd665b6c5 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/RestoreSonarUsersGroups.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/RestoreSonarUsersGroups.java @@ -29,7 +29,7 @@ import org.sonar.db.Database; import org.sonar.server.platform.db.migration.step.DataChange; import org.sonar.server.platform.db.migration.step.MassUpdate; import org.sonar.server.platform.db.migration.step.Select; -import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuid; +import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidProvider; import static com.google.common.base.Preconditions.checkState; import static java.lang.String.format; @@ -49,9 +49,9 @@ public class RestoreSonarUsersGroups extends DataChange { private static final String DEFAULT_GROUP_SETTING = "sonar.defaultGroup"; private final System2 system2; - private final DefaultOrganizationUuid defaultOrganizationUuid; + private final DefaultOrganizationUuidProvider defaultOrganizationUuid; - public RestoreSonarUsersGroups(Database db, System2 system2, DefaultOrganizationUuid defaultOrganizationUuid) { + public RestoreSonarUsersGroups(Database db, System2 system2, DefaultOrganizationUuidProvider defaultOrganizationUuid) { super(db); this.system2 = system2; this.defaultOrganizationUuid = defaultOrganizationUuid; diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/SetQualityProfileOrganizationUuidToDefault.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/SetQualityProfileOrganizationUuidToDefault.java index 2ab126ccb0d..7ad93199876 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/SetQualityProfileOrganizationUuidToDefault.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/SetQualityProfileOrganizationUuidToDefault.java @@ -22,13 +22,13 @@ package org.sonar.server.platform.db.migration.version.v64; import java.sql.SQLException; import org.sonar.db.Database; import org.sonar.server.platform.db.migration.step.DataChange; -import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuid; +import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidProvider; public class SetQualityProfileOrganizationUuidToDefault extends DataChange { - private final DefaultOrganizationUuid defaultOrganizationUuid; + private final DefaultOrganizationUuidProvider defaultOrganizationUuid; - public SetQualityProfileOrganizationUuidToDefault(Database db, DefaultOrganizationUuid defaultOrganizationUuid) { + public SetQualityProfileOrganizationUuidToDefault(Database db, DefaultOrganizationUuidProvider defaultOrganizationUuid) { super(db); this.defaultOrganizationUuid = defaultOrganizationUuid; } diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplate.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplate.java index 6ddf5b4ec4d..dc230e686e3 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplate.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplate.java @@ -28,7 +28,7 @@ import javax.annotation.Nullable; import org.sonar.db.Database; import org.sonar.server.platform.db.migration.step.DataChange; import org.sonar.server.platform.db.migration.step.Select; -import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuid; +import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidProvider; import static com.google.common.base.Preconditions.checkState; @@ -36,16 +36,16 @@ public class SupportPrivateProjectInDefaultPermissionTemplate extends DataChange private static final String PERMISSION_USER = "user"; private static final String PERMISSION_CODEVIEWER = "codeviewer"; - private DefaultOrganizationUuid defaultOrganizationUuid; + private DefaultOrganizationUuidProvider defaultOrganizationUuidProvider; - public SupportPrivateProjectInDefaultPermissionTemplate(Database db, DefaultOrganizationUuid defaultOrganizationUuid) { + public SupportPrivateProjectInDefaultPermissionTemplate(Database db, DefaultOrganizationUuidProvider defaultOrganizationUuidProvider) { super(db); - this.defaultOrganizationUuid = defaultOrganizationUuid; + this.defaultOrganizationUuidProvider = defaultOrganizationUuidProvider; } @Override protected void execute(Context context) throws SQLException { - String defaultOrganizationUuid = this.defaultOrganizationUuid.get(context); + String defaultOrganizationUuid = this.defaultOrganizationUuidProvider.get(context); ResolvedOrganizationProperties organizationProperties = readOrganizationProperties(context, defaultOrganizationUuid); diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/UpgradeQualityTemplateLoadedTemplates.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/UpgradeQualityTemplateLoadedTemplates.java index 712b97ba935..2de28b68f80 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/UpgradeQualityTemplateLoadedTemplates.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/UpgradeQualityTemplateLoadedTemplates.java @@ -25,7 +25,7 @@ import org.apache.commons.codec.digest.DigestUtils; import org.sonar.db.Database; import org.sonar.server.platform.db.migration.step.DataChange; import org.sonar.server.platform.db.migration.step.MassUpdate; -import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuid; +import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidProvider; import static java.lang.String.format; import static java.nio.charset.StandardCharsets.UTF_8; @@ -34,9 +34,9 @@ import static org.apache.commons.codec.binary.Hex.encodeHexString; public class UpgradeQualityTemplateLoadedTemplates extends DataChange { private static final String QUALITY_PROFILE_TYPE = "QUALITY_PROFILE"; - private final DefaultOrganizationUuid defaultOrganizationUuid; + private final DefaultOrganizationUuidProvider defaultOrganizationUuid; - public UpgradeQualityTemplateLoadedTemplates(Database db, DefaultOrganizationUuid defaultOrganizationUuid) { + public UpgradeQualityTemplateLoadedTemplates(Database db, DefaultOrganizationUuidProvider defaultOrganizationUuid) { super(db); this.defaultOrganizationUuid = defaultOrganizationUuid; } diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/DbVersion63Test.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/DbVersion63Test.java index dca9beeebdb..2cf4e2d1455 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/DbVersion63Test.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/DbVersion63Test.java @@ -31,7 +31,7 @@ public class DbVersion63Test { @Test public void verify_support_components() { assertThat(underTest.getSupportComponents()) - .containsOnly(DefaultOrganizationUuidImpl.class); + .containsOnly(DefaultOrganizationUuidProviderImpl.class); } @Test diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidImplTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidProviderImplTest.java similarity index 86% rename from server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidImplTest.java rename to server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidProviderImplTest.java index 6c4b101fd12..0339404601e 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidImplTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidProviderImplTest.java @@ -23,21 +23,20 @@ import java.sql.Connection; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.api.utils.System2; import org.sonar.db.CoreDbTester; import org.sonar.server.platform.db.migration.step.DataChange; import static org.assertj.core.api.Assertions.assertThat; -public class DefaultOrganizationUuidImplTest { +public class DefaultOrganizationUuidProviderImplTest { private static final String AN_ORG_UUID = "org1"; @Rule - public CoreDbTester dbTester = CoreDbTester.createForSchema(DefaultOrganizationUuidImplTest.class, "internal_properties.sql"); + public CoreDbTester dbTester = CoreDbTester.createForSchema(DefaultOrganizationUuidProviderImplTest.class, "internal_properties.sql"); @Rule public ExpectedException expectedException = ExpectedException.none(); - private DefaultOrganizationUuid underTest = new DefaultOrganizationUuidImpl(); + private DefaultOrganizationUuidProvider underTest = new DefaultOrganizationUuidProviderImpl(); @Test public void get_fails_with_ISE_if_default_organization_internal_property_is_not_set() throws Exception { @@ -54,7 +53,7 @@ public class DefaultOrganizationUuidImplTest { assertThat(callGet(underTest)).isEqualTo(AN_ORG_UUID); } - private String callGet(DefaultOrganizationUuid defaultOrganizationUuid) throws Exception { + private String callGet(DefaultOrganizationUuidProvider defaultOrganizationUuid) throws Exception { try (Connection connection = dbTester.openConnection()) { DataChange.Context context = new DataChange.Context(dbTester.database(), connection, connection); return defaultOrganizationUuid.get(context); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/MakeDefaultOrganizationGuardedTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/MakeDefaultOrganizationGuardedTest.java index 1bb0a0e7261..3b6a78c5b0b 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/MakeDefaultOrganizationGuardedTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/MakeDefaultOrganizationGuardedTest.java @@ -40,7 +40,7 @@ public class MakeDefaultOrganizationGuardedTest { @Rule public ExpectedException expectedException = ExpectedException.none(); - private MakeDefaultOrganizationGuarded underTest = new MakeDefaultOrganizationGuarded(db.database(), new DefaultOrganizationUuidImpl()); + private MakeDefaultOrganizationGuarded underTest = new MakeDefaultOrganizationGuarded(db.database(), new DefaultOrganizationUuidProviderImpl()); @Test public void fails_with_ISE_when_no_default_organization_is_set() throws SQLException { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/PopulateDefaultPermTemplateColumnsOfOrganizationsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/PopulateDefaultPermTemplateColumnsOfOrganizationsTest.java index 8abdae37504..9b37b2ebf36 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/PopulateDefaultPermTemplateColumnsOfOrganizationsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/PopulateDefaultPermTemplateColumnsOfOrganizationsTest.java @@ -25,7 +25,6 @@ import javax.annotation.Nullable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.api.utils.System2; import org.sonar.db.CoreDbTester; import static org.assertj.core.api.Assertions.assertThat; @@ -43,7 +42,7 @@ public class PopulateDefaultPermTemplateColumnsOfOrganizationsTest { public ExpectedException expectedException = ExpectedException.none(); private PopulateDefaultPermTemplateColumnsOfOrganizations underTest = new PopulateDefaultPermTemplateColumnsOfOrganizations(dbTester.database(), - new DefaultOrganizationUuidImpl()); + new DefaultOrganizationUuidProviderImpl()); @Test public void fails_with_ISE_when_no_default_organization_is_set() throws SQLException { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/PopulateOrganizationUuidToProjectsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/PopulateOrganizationUuidToProjectsTest.java index 605f418db93..a018c995056 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/PopulateOrganizationUuidToProjectsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/PopulateOrganizationUuidToProjectsTest.java @@ -22,7 +22,6 @@ package org.sonar.server.platform.db.migration.version.v63; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; -import org.sonar.api.utils.System2; import org.sonar.db.CoreDbTester; import static java.lang.String.valueOf; @@ -35,7 +34,7 @@ public class PopulateOrganizationUuidToProjectsTest { @Rule public CoreDbTester dbTester = CoreDbTester.createForSchema(PopulateOrganizationUuidToProjectsTest.class, "projects_with_nullable_organization.sql"); - private PopulateOrganizationUuidToProjects underTest = new PopulateOrganizationUuidToProjects(dbTester.database(), new TestDefaultOrganizationUuid(ORGANIZATION_UUID)); + private PopulateOrganizationUuidToProjects underTest = new PopulateOrganizationUuidToProjects(dbTester.database(), new TestDefaultOrganizationUuidProvider(ORGANIZATION_UUID)); @Test public void execute_has_no_effect_when_table_is_empty() throws SQLException { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/TestDefaultOrganizationUuid.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/TestDefaultOrganizationUuidProvider.java similarity index 83% rename from server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/TestDefaultOrganizationUuid.java rename to server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/TestDefaultOrganizationUuidProvider.java index 668d7d4560d..9c9c064c6f2 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/TestDefaultOrganizationUuid.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/TestDefaultOrganizationUuidProvider.java @@ -25,12 +25,12 @@ import org.sonar.server.platform.db.migration.step.DataChange; import static java.util.Objects.requireNonNull; /** - * Implementation of {@link DefaultOrganizationUuid} which never fails and returns the specified organization uuid. + * Implementation of {@link DefaultOrganizationUuidProvider} which never fails and returns the specified organization uuid. */ -public class TestDefaultOrganizationUuid implements DefaultOrganizationUuid { +public class TestDefaultOrganizationUuidProvider implements DefaultOrganizationUuidProvider { private final String organizationUuid; - public TestDefaultOrganizationUuid(String organizationUuid) { + public TestDefaultOrganizationUuidProvider(String organizationUuid) { this.organizationUuid = requireNonNull(organizationUuid, "organizationUuid can't be null"); } diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/PopulateOrganizationMembersTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/PopulateOrganizationMembersTableTest.java index 4b8df9f7af9..7b1c5f1271e 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/PopulateOrganizationMembersTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/PopulateOrganizationMembersTableTest.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.core.util.stream.MoreCollectors; import org.sonar.db.CoreDbTester; -import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidImpl; +import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidProviderImpl; import static java.lang.String.format; import static org.apache.commons.lang.math.RandomUtils.nextLong; @@ -62,7 +62,7 @@ public class PopulateOrganizationMembersTableTest { @Rule public CoreDbTester db = CoreDbTester.createForSchema(PopulateOrganizationMembersTableTest.class, "initial.sql"); - private PopulateOrganizationMembersTable underTest = new PopulateOrganizationMembersTable(db.database(), new DefaultOrganizationUuidImpl()); + private PopulateOrganizationMembersTable underTest = new PopulateOrganizationMembersTable(db.database(), new DefaultOrganizationUuidProviderImpl()); @Test public void fails_with_ISE_when_no_default_organization_is_set() throws SQLException { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/PopulateRulesMetadataTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/PopulateRulesMetadataTest.java index 414c1e5b2e7..88f0b3e1445 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/PopulateRulesMetadataTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/PopulateRulesMetadataTest.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.utils.System2; import org.sonar.db.CoreDbTester; -import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidImpl; +import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidProviderImpl; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -44,7 +44,7 @@ public class PopulateRulesMetadataTest { public ExpectedException expectedException = ExpectedException.none(); private System2 system2 = mock(System2.class); - private PopulateRulesMetadata underTest = new PopulateRulesMetadata(db.database(), new DefaultOrganizationUuidImpl(), system2); + private PopulateRulesMetadata underTest = new PopulateRulesMetadata(db.database(), new DefaultOrganizationUuidProviderImpl(), system2); @Test public void fails_with_ISE_when_no_default_organization_is_set() throws SQLException { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/RestoreSonarUsersGroupsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/RestoreSonarUsersGroupsTest.java index 1c8e76a0663..5884f867e23 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/RestoreSonarUsersGroupsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/RestoreSonarUsersGroupsTest.java @@ -34,7 +34,7 @@ import org.junit.rules.ExpectedException; import org.sonar.api.utils.System2; import org.sonar.api.utils.log.LogTester; import org.sonar.db.CoreDbTester; -import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidImpl; +import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidProviderImpl; import static java.lang.String.format; import static org.apache.commons.lang.math.RandomUtils.nextLong; @@ -64,7 +64,7 @@ public class RestoreSonarUsersGroupsTest { private System2 system2 = mock(System2.class); - private RestoreSonarUsersGroups underTest = new RestoreSonarUsersGroups(db.database(), system2, new DefaultOrganizationUuidImpl()); + private RestoreSonarUsersGroups underTest = new RestoreSonarUsersGroups(db.database(), system2, new DefaultOrganizationUuidProviderImpl()); @Before public void setUp() throws Exception { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SetQualityProfileOrganizationUuidToDefaultTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SetQualityProfileOrganizationUuidToDefaultTest.java index 51080d02f48..965ed02304f 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SetQualityProfileOrganizationUuidToDefaultTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SetQualityProfileOrganizationUuidToDefaultTest.java @@ -24,8 +24,8 @@ import org.assertj.core.api.Assertions; import org.junit.Rule; import org.junit.Test; import org.sonar.db.CoreDbTester; -import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuid; -import org.sonar.server.platform.db.migration.version.v63.TestDefaultOrganizationUuid; +import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidProvider; +import org.sonar.server.platform.db.migration.version.v63.TestDefaultOrganizationUuidProvider; public class SetQualityProfileOrganizationUuidToDefaultTest { @@ -35,7 +35,7 @@ public class SetQualityProfileOrganizationUuidToDefaultTest { @Rule public CoreDbTester db = CoreDbTester.createForSchema(SetQualityProfileOrganizationUuidToDefaultTest.class, "initial.sql"); - private DefaultOrganizationUuid defaultOrganization = new TestDefaultOrganizationUuid(DEFAULT_ORG); + private DefaultOrganizationUuidProvider defaultOrganization = new TestDefaultOrganizationUuidProvider(DEFAULT_ORG); public SetQualityProfileOrganizationUuidToDefault underTest = new SetQualityProfileOrganizationUuidToDefault(db.database(), defaultOrganization); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplateTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplateTest.java index 1dc8ae5d97c..ed06f61eb91 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplateTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplateTest.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.core.util.stream.MoreCollectors; import org.sonar.db.CoreDbTester; -import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidImpl; +import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidProviderImpl; import static java.lang.String.valueOf; import static org.apache.commons.lang.math.RandomUtils.nextLong; @@ -46,7 +46,7 @@ public class SupportPrivateProjectInDefaultPermissionTemplateTest { @Rule public ExpectedException expectedException = ExpectedException.none(); - private SupportPrivateProjectInDefaultPermissionTemplate underTest = new SupportPrivateProjectInDefaultPermissionTemplate(db.database(), new DefaultOrganizationUuidImpl()); + private SupportPrivateProjectInDefaultPermissionTemplate underTest = new SupportPrivateProjectInDefaultPermissionTemplate(db.database(), new DefaultOrganizationUuidProviderImpl()); @Test public void fails_with_ISE_when_no_default_organization_is_set() throws SQLException { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/UpgradeQualityTemplateLoadedTemplatesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/UpgradeQualityTemplateLoadedTemplatesTest.java index 345747f57e2..54014d589b2 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/UpgradeQualityTemplateLoadedTemplatesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/UpgradeQualityTemplateLoadedTemplatesTest.java @@ -24,7 +24,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.db.CoreDbTester; -import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidImpl; +import org.sonar.server.platform.db.migration.version.v63.DefaultOrganizationUuidProviderImpl; import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.commons.codec.digest.DigestUtils.md5Hex; @@ -42,7 +42,7 @@ public class UpgradeQualityTemplateLoadedTemplatesTest { @Rule public ExpectedException expectedException = ExpectedException.none(); - private UpgradeQualityTemplateLoadedTemplates underTest = new UpgradeQualityTemplateLoadedTemplates(db.database(), new DefaultOrganizationUuidImpl()); + private UpgradeQualityTemplateLoadedTemplates underTest = new UpgradeQualityTemplateLoadedTemplates(db.database(), new DefaultOrganizationUuidProviderImpl()); @Test public void fails_with_ISE_when_no_default_organization_is_set() throws SQLException { diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidImplTest/internal_properties.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidProviderImplTest/internal_properties.sql similarity index 100% rename from server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidImplTest/internal_properties.sql rename to server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v63/DefaultOrganizationUuidProviderImplTest/internal_properties.sql -- 2.39.5