From dcb0457a1a79f9baa412849bd1524c14032f5c0f Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 26 Feb 2015 12:07:30 +0100 Subject: [PATCH] Rename a migration because the name is too long on windows --- .../org/sonar/server/db/migrations/DatabaseMigrations.java | 2 +- ...ComplianceMigration.java => AddNewCharacteristics.java} | 7 +++---- ...ceMigrationTest.java => AddNewCharacteristicsTest.java} | 6 +++--- .../do_nothing_when_already_migrated.xml | 0 .../empty.xml | 0 ...fail_if_compliance_already_exists_as_characteristic.xml | 0 ...ompliance_already_exists_under_wrong_characteristic.xml | 0 .../fail_if_usability_exists_as_sub_characteristic.xml | 0 ...usability_at_the_top_if_security_does_exists-result.xml | 0 ...insert_usability_at_the_top_if_security_does_exists.xml | 0 .../migrate-result.xml | 0 .../migrate.xml | 0 ..._if_some_deprecated_requirements_still_exists_in_db.xml | 0 .../schema.sql | 0 .../update_usability_if_already_exists-result.xml | 0 .../update_usability_if_already_exists.xml | 0 ...eristic_usability_and_sub_characteristics_compliance.rb | 2 +- 17 files changed, 8 insertions(+), 9 deletions(-) rename server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigration.java => AddNewCharacteristics.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest.java => AddNewCharacteristicsTest.java} (93%) rename server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest => AddNewCharacteristicsTest}/do_nothing_when_already_migrated.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest => AddNewCharacteristicsTest}/empty.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest => AddNewCharacteristicsTest}/fail_if_compliance_already_exists_as_characteristic.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest => AddNewCharacteristicsTest}/fail_if_compliance_already_exists_under_wrong_characteristic.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest => AddNewCharacteristicsTest}/fail_if_usability_exists_as_sub_characteristic.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest => AddNewCharacteristicsTest}/insert_usability_at_the_top_if_security_does_exists-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest => AddNewCharacteristicsTest}/insert_usability_at_the_top_if_security_does_exists.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest => AddNewCharacteristicsTest}/migrate-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest => AddNewCharacteristicsTest}/migrate.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest => AddNewCharacteristicsTest}/not_fail_if_some_deprecated_requirements_still_exists_in_db.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest => AddNewCharacteristicsTest}/schema.sql (100%) rename server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest => AddNewCharacteristicsTest}/update_usability_if_already_exists-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/{AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest => AddNewCharacteristicsTest}/update_usability_if_already_exists.xml (100%) diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java index f454013b2a1..6afedd0a1f6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java @@ -92,7 +92,7 @@ public interface DatabaseMigrations { FeedProjectMeasuresLongDates.class, FeedManualMeasuresLongDates.class, FeedEventsLongDates.class, - AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigration.class, + AddNewCharacteristics.class, RemovePermissionsOnModulesMigration.class ); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddNewCharacteristics.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddNewCharacteristics.java index 7c5714413cb..9b66e70a07e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigration.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddNewCharacteristics.java @@ -31,7 +31,6 @@ import org.sonar.server.db.migrations.Select; import javax.annotation.CheckForNull; import javax.annotation.Nullable; - import java.sql.SQLException; import java.util.Date; import java.util.List; @@ -47,9 +46,9 @@ import java.util.List; * Before 4.3 the characteristics table contains requirements, then when selecting characteristics we should not forget to exclude them (with a filter on rule_id IS NULL) * */ -public class AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigration extends BaseDataChange { +public class AddNewCharacteristics extends BaseDataChange { - private static final Logger LOGGER = LoggerFactory.getLogger(AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigration.class); + private static final Logger LOGGER = LoggerFactory.getLogger(AddNewCharacteristics.class); private static final String COMPLIANCE_NAME = "Compliance"; private static final String COMPLIANCE_KEY_SUFFIX = "_COMPLIANCE"; @@ -62,7 +61,7 @@ public class AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigration private final System2 system; - public AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigration(Database db, System2 system) { + public AddNewCharacteristics(Database db, System2 system) { super(db); this.system = system; } diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest.java index 012cf06fa4e..4bc2d86983c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest.java @@ -33,10 +33,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest { +public class AddNewCharacteristicsTest { @ClassRule - public static DbTester db = new DbTester().schema(AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest.class, "schema.sql"); + public static DbTester db = new DbTester().schema(AddNewCharacteristicsTest.class, "schema.sql"); DatabaseMigration migration; @@ -48,7 +48,7 @@ public class AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationT when(system.now()).thenReturn(DateUtils.parseDate("2015-02-15").getTime()); - migration = new AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigration(db.database(), system); + migration = new AddNewCharacteristics(db.database(), system); } @Test diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/do_nothing_when_already_migrated.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/do_nothing_when_already_migrated.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/do_nothing_when_already_migrated.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/do_nothing_when_already_migrated.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/empty.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/empty.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/fail_if_compliance_already_exists_as_characteristic.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/fail_if_compliance_already_exists_as_characteristic.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/fail_if_compliance_already_exists_as_characteristic.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/fail_if_compliance_already_exists_as_characteristic.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/fail_if_compliance_already_exists_under_wrong_characteristic.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/fail_if_compliance_already_exists_under_wrong_characteristic.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/fail_if_compliance_already_exists_under_wrong_characteristic.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/fail_if_compliance_already_exists_under_wrong_characteristic.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/fail_if_usability_exists_as_sub_characteristic.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/fail_if_usability_exists_as_sub_characteristic.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/fail_if_usability_exists_as_sub_characteristic.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/fail_if_usability_exists_as_sub_characteristic.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/insert_usability_at_the_top_if_security_does_exists-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/insert_usability_at_the_top_if_security_does_exists-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/insert_usability_at_the_top_if_security_does_exists-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/insert_usability_at_the_top_if_security_does_exists-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/insert_usability_at_the_top_if_security_does_exists.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/insert_usability_at_the_top_if_security_does_exists.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/insert_usability_at_the_top_if_security_does_exists.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/insert_usability_at_the_top_if_security_does_exists.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/migrate-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/migrate-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/migrate-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/migrate-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/migrate.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/migrate.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/migrate.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/migrate.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/not_fail_if_some_deprecated_requirements_still_exists_in_db.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/not_fail_if_some_deprecated_requirements_still_exists_in_db.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/not_fail_if_some_deprecated_requirements_still_exists_in_db.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/not_fail_if_some_deprecated_requirements_still_exists_in_db.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/schema.sql similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/schema.sql diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/update_usability_if_already_exists-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/update_usability_if_already_exists-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/update_usability_if_already_exists-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/update_usability_if_already_exists-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/update_usability_if_already_exists.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/update_usability_if_already_exists.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigrationTest/update_usability_if_already_exists.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest/update_usability_if_already_exists.xml diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/794_add_characteristic_usability_and_sub_characteristics_compliance.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/794_add_characteristic_usability_and_sub_characteristics_compliance.rb index 4c65c3c3864..3637819ad25 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/794_add_characteristic_usability_and_sub_characteristics_compliance.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/794_add_characteristic_usability_and_sub_characteristics_compliance.rb @@ -25,7 +25,7 @@ class AddCharacteristicUsabilityAndSubCharacteristicsCompliance < ActiveRecord::Migration def self.up - execute_java_migration 'org.sonar.server.db.migrations.v51.AddCharacteristicUsabilityAndSubCharacteristicsComplianceMigration' + execute_java_migration 'org.sonar.server.db.migrations.v51.AddNewCharacteristics' end end -- 2.39.5