From ad1c6547dddc9f53c4d0e6958a6e53c3fb90391a Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 26 Nov 2014 20:41:57 +0100 Subject: [PATCH] Change type of column PROJECTS.AUTHORIZATION_UPDATED_AT from TIMESTAMP to BIGINT --- .../db/migrations/v50/FeedFileSources.java | 1 + ...ojectsAuthorizationUpdatedAtMigration.java | 8 +- .../server/es/IssueAuthorizationDao.java | 5 +- .../server/es/IssueAuthorizationIndexer.java | 3 +- .../org/sonar/server/es/IssueIndexer.java | 3 +- .../server/component/db/ComponentDaoTest.java | 6 +- ...tsAuthorizationUpdatedAtMigrationTest.java | 3 +- .../server/es/IssueAuthorizationDaoTest.java | 3 +- .../db/ComponentDaoTest/delete-result.xml | 4 +- .../ComponentDaoTest/find_project_uuids.xml | 4 +- .../db/ComponentDaoTest/insert-result.xml | 2 +- .../insert_disabled_component-result.xml | 2 +- .../component/db/ComponentDaoTest/shared.xml | 4 +- .../v50/FeedFileSourcesTest/schema.sql | 2 +- .../after.xml | 4 +- .../schema.sql | 2 +- .../migrate_components.xml | 10 +-- .../migrate_components_without_uuid.xml | 6 +- .../migrate_developer.xml | 4 +- .../migrate_disable_components.xml | 10 +-- .../migrate_library.xml | 2 +- .../migrate_provisioned_project.xml | 2 +- .../migrate_view.xml | 6 +- ...ot_migrate_already_migrated_components.xml | 12 +-- .../schema.sql | 3 +- .../do_not_execute_if_already_migrated.xml | 2 +- .../execute.xml | 2 +- .../schema.sql | 5 +- .../no_authorization.xml | 2 +- .../es/IssueAuthorizationDaoTest/shared.xml | 4 +- .../IssueAuthorizationIndexerTest/index.xml | 2 +- ...d_authorization_updated_at_to_projects.rb} | 2 +- ...sert_projects_authorization_updated_at.rb} | 0 .../sonar/core/component/ComponentDto.java | 6 +- .../issue/db/IssueAuthorizationMapper.java | 33 ------- .../core/persistence/DatabaseVersion.java | 2 +- .../org/sonar/core/persistence/MyBatis.java | 3 +- .../org/sonar/core/resource/ResourceDao.java | 9 +- .../org/sonar/core/resource/ResourceDto.java | 6 +- .../sonar/core/resource/ResourceMapper.java | 3 +- .../issue/db/IssueAuthorizationMapper.xml | 88 ------------------- .../org/sonar/core/persistence/rows-h2.sql | 4 +- .../org/sonar/core/persistence/schema-h2.ddl | 2 +- .../sonar/core/resource/ResourceMapper.xml | 4 +- .../core/component/ComponentDtoTest.java | 5 +- .../core/permission/PermissionFacadeTest.java | 5 +- .../sonar/core/resource/ResourceDaoTest.java | 4 +- .../should_add_user_permission-result.xml | 2 +- .../should_add_user_permission.xml | 2 +- .../should_apply_permission_template.xml | 2 +- .../should_delete_group_permission-result.xml | 2 +- .../should_delete_group_permission.xml | 2 +- .../should_delete_user_permission-result.xml | 2 +- .../should_delete_user_permission.xml | 2 +- ..._insert_anyone_group_permission-result.xml | 2 +- .../should_insert_anyone_group_permission.xml | 2 +- .../should_insert_group_permission-result.xml | 2 +- .../should_insert_group_permission.xml | 2 +- .../core/resource/ResourceDaoTest/fixture.xml | 2 +- .../ResourceDaoTest/insert-result.xml | 4 +- .../update_authorization_date-result.xml | 2 +- 61 files changed, 103 insertions(+), 231 deletions(-) rename server/sonar-web/src/main/webapp/WEB-INF/db/migrate/{700_add_authorization_updated_at_to_projects.rb => 715_add_authorization_updated_at_to_projects.rb} (92%) rename server/sonar-web/src/main/webapp/WEB-INF/db/migrate/{701_insert_projects_authorization_updated_at.rb => 716_insert_projects_authorization_updated_at.rb} (100%) delete mode 100644 sonar-core/src/main/java/org/sonar/core/issue/db/IssueAuthorizationMapper.java delete mode 100644 sonar-core/src/main/resources/org/sonar/core/issue/db/IssueAuthorizationMapper.xml diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedFileSources.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedFileSources.java index 43fb7a00831..6835720da49 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedFileSources.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedFileSources.java @@ -179,6 +179,7 @@ public class FeedFileSources extends BaseDataChange { "(project_uuid, file_uuid, created_at, updated_at, data, line_hashes, data_hash)" + "VALUES " + "(?, ?, ?, ?, ?, ?, ?)"); + massUpdate.rowPluralName("files"); massUpdate.execute(new FileSourceBuilder(system)); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigration.java index 2d3d2a541a6..2a07d4d6e73 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigration.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigration.java @@ -28,10 +28,9 @@ import org.sonar.server.db.migrations.Select; import org.sonar.server.db.migrations.SqlStatement; import java.sql.SQLException; -import java.util.Date; /** - * Used in the Active Record Migration 701 + * Used in the Active Record Migration 716 * * @since 5.0 */ @@ -46,16 +45,17 @@ public class InsertProjectsAuthorizationUpdatedAtMigration extends BaseDataChang @Override public void execute(Context context) throws SQLException { - final Date now = new Date(system.now()); + final long now = system.now(); MassUpdate massUpdate = context.prepareMassUpdate(); massUpdate.select("SELECT p.id FROM projects p WHERE p.scope=? AND p.enabled=?").setString(1, "PRJ").setBoolean(2, true); massUpdate.update("UPDATE projects SET authorization_updated_at=? WHERE id=?"); + massUpdate.rowPluralName("projects"); massUpdate.execute(new MassUpdate.Handler() { @Override public boolean handle(Select.Row row, SqlStatement update) throws SQLException { Long id = row.getLong(1); - update.setDate(1, now); + update.setLong(1, now); update.setLong(2, id); return true; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/IssueAuthorizationDao.java b/server/sonar-server/src/main/java/org/sonar/server/es/IssueAuthorizationDao.java index bff214f0f37..c3d1873cf75 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/es/IssueAuthorizationDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/es/IssueAuthorizationDao.java @@ -179,9 +179,8 @@ class IssueAuthorizationDao { } PreparedStatement stmt = dbClient.newScrollingSelectStatement(connection, sql); if (afterDate > 0L) { - Timestamp ts = new Timestamp(afterDate); for (int i = 1; i <= 4; i++) { - stmt.setTimestamp(i, ts); + stmt.setLong(i, afterDate); } } return stmt; @@ -194,7 +193,7 @@ class IssueAuthorizationDao { Dto dto = dtosByProjectUuid.get(projectUuid); if (dto == null) { - long updatedAt = rs.getTimestamp(4).getTime(); + long updatedAt = rs.getLong(4); dto = new Dto(projectUuid, updatedAt); dtosByProjectUuid.put(projectUuid, dto); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/IssueAuthorizationIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/es/IssueAuthorizationIndexer.java index 331137a4a55..872f3ffe625 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/es/IssueAuthorizationIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/es/IssueAuthorizationIndexer.java @@ -30,6 +30,7 @@ import org.sonar.server.db.DbClient; import java.sql.Connection; import java.util.Collection; +import java.util.Date; import java.util.Map; /** @@ -103,7 +104,7 @@ public class IssueAuthorizationIndexer extends BaseIndexer { IssueIndexDefinition.FIELD_AUTHORIZATION_PROJECT_UUID, dto.getProjectUuid(), IssueIndexDefinition.FIELD_AUTHORIZATION_GROUPS, dto.getGroups(), IssueIndexDefinition.FIELD_AUTHORIZATION_USERS, dto.getUsers(), - IssueIndexDefinition.FIELD_AUTHORIZATION_UPDATED_AT, dto.getUpdatedAt()); + IssueIndexDefinition.FIELD_AUTHORIZATION_UPDATED_AT, new Date(dto.getUpdatedAt())); request = new UpdateRequest(IssueIndexDefinition.INDEX_ISSUES, IssueIndexDefinition.TYPE_ISSUE_AUTHORIZATION, dto.getProjectUuid()) .routing(dto.getProjectUuid()) .doc(doc) diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/IssueIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/es/IssueIndexer.java index 31700591cf1..218db7b2594 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/es/IssueIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/es/IssueIndexer.java @@ -77,9 +77,8 @@ public class IssueIndexer extends BaseIndexer { public void deleteProject(String uuid, boolean refresh) { QueryBuilder query = QueryBuilders.filteredQuery( QueryBuilders.matchAllQuery(), - FilterBuilders.boolFilter().must(FilterBuilders.termsFilter(IssueNormalizer.IssueField.PROJECT.field(), uuid)) + FilterBuilders.boolFilter().must(FilterBuilders.termsFilter(IssueIndexDefinition.FIELD_ISSUE_PROJECT_UUID, uuid)) ); - esClient.prepareDeleteByQuery(IssueIndexDefinition.INDEX_ISSUES).setQuery(query).get(); if (refresh) { esClient.prepareRefresh(IssueIndexDefinition.INDEX_ISSUES).get(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java index 283139c5f01..59606927380 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java @@ -137,7 +137,7 @@ public class ComponentDaoTest extends AbstractDaoTestCase { assertThat(result.scope()).isEqualTo("PRJ"); assertThat(result.language()).isNull(); assertThat(result.subProjectId()).isNull(); - assertThat(result.getAuthorizationUpdatedAt()).isEqualTo(DateUtils.parseDate("2014-06-18")); + assertThat(result.getAuthorizationUpdatedAt()).isEqualTo(123456789L); } @Test @@ -350,7 +350,7 @@ public class ComponentDaoTest extends AbstractDaoTestCase { .setPath("src/org/struts/RequestContext.java") .setSubProjectId(3L) .setEnabled(true) - .setAuthorizationUpdatedAt(DateUtils.parseDate("2014-06-18")); + .setAuthorizationUpdatedAt(123456789L); dao.insert(session, componentDto); session.commit(); @@ -379,7 +379,7 @@ public class ComponentDaoTest extends AbstractDaoTestCase { .setPath("src/org/struts/RequestContext.java") .setSubProjectId(3L) .setEnabled(false) - .setAuthorizationUpdatedAt(DateUtils.parseDate("2014-06-18")); + .setAuthorizationUpdatedAt(123456789L); dao.insert(session, componentDto); session.commit(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest.java index 15d30bf2a7c..89eb3f1957f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest.java @@ -23,7 +23,6 @@ package org.sonar.server.db.migrations.v50; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; import org.sonar.core.persistence.TestDatabase; import org.sonar.server.db.migrations.DatabaseMigration; @@ -43,7 +42,7 @@ public class InsertProjectsAuthorizationUpdatedAtMigrationTest { public void setUp() throws Exception { db.executeUpdateSql("truncate table projects"); migration = new InsertProjectsAuthorizationUpdatedAtMigration(db.database(), system); - when(system.now()).thenReturn(DateUtils.parseDate("2014-09-03").getTime()); + when(system.now()).thenReturn(123456789L); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/IssueAuthorizationDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/IssueAuthorizationDaoTest.java index 138368db7e1..4f2f7753bf7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/IssueAuthorizationDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/IssueAuthorizationDaoTest.java @@ -80,8 +80,7 @@ public class IssueAuthorizationDaoTest { public void select_after_date() throws Exception { dbTester.prepareDbUnit(getClass(), "shared.xml"); - Date date = DateUtils.parseDate("2014-01-01"); - Collection dtos = dao.selectAfterDate(client, connection, date.getTime()); + Collection dtos = dao.selectAfterDate(client, connection, 1500000000L); // only project DEF was updated in this period assertThat(dtos).hasSize(1); diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/delete-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/delete-result.xml index 9e79aa88fe6..165990c3e29 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/delete-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/delete-result.xml @@ -8,7 +8,7 @@ + enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" created_at="[null]" authorization_updated_at="123456789" /> + enabled="[false]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789" /> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/find_project_uuids.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/find_project_uuids.xml index c4665e06e75..924a9a769e1 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/find_project_uuids.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/find_project_uuids.xml @@ -4,7 +4,7 @@ + enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789" /> + enabled="[false]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789" /> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/insert_disabled_component-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/insert_disabled_component-result.xml index 477c9bdd09a..907cf4c54d7 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/insert_disabled_component-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/insert_disabled_component-result.xml @@ -4,7 +4,7 @@ uuid="GHIJ" project_uuid="ABCD" module_uuid="EFGH" module_uuid_path="ABCD.EFGH" qualifier="FIL" scope="FIL" language="java" path="src/org/struts/RequestContext.java" root_id="3" description="[null]" enabled="[false]" copy_resource_id="[null]" person_id="[null]" deprecated_kee="[null]" - authorization_updated_at="2014-06-18" created_at="2014-06-18" + authorization_updated_at="123456789" created_at="2014-06-18" /> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/shared.xml index e33a274dbac..d01c2eed69a 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/shared.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/shared.xml @@ -8,7 +8,7 @@ + enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789" /> + enabled="[false]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789" /> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/FeedFileSourcesTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/FeedFileSourcesTest/schema.sql index e52c7df7329..481ea89ba0a 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/FeedFileSourcesTest/schema.sql +++ b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/FeedFileSourcesTest/schema.sql @@ -78,7 +78,7 @@ CREATE TABLE "PROJECTS" ( "LONG_NAME" VARCHAR(256), "PERSON_ID" INTEGER, "CREATED_AT" TIMESTAMP, - "AUTHORIZATION_UPDATED_AT" TIMESTAMP + "AUTHORIZATION_UPDATED_AT" BIGINT ); CREATE TABLE "PROJECT_MEASURES" ( diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest/after.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest/after.xml index e751fcc4f82..2007c328093 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest/after.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest/after.xml @@ -2,11 +2,11 @@ + created_at="2014-09-01" authorization_updated_at="123456789"/> + created_at="2014-09-01" authorization_updated_at="123456789"/> + created_at="2014-06-18" /> + description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" created_at="2014-06-18" /> + description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" created_at="2014-06-18" /> + enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="src/org/struts" created_at="2014-06-18" /> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="src/org/struts/RequestContext.java" created_at="2014-06-18" /> + created_at="2014-06-18" /> + description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" created_at="2014-06-18" /> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="src/org/struts/RequestContext.java" created_at="2014-06-18" /> + created_at="2014-09-01" /> + created_at="2014-06-18" /> + created_at="2014-06-18" /> + description="[null]" enabled="[false]" language="[null]" copy_resource_id="[null]" person_id="[null]" created_at="2014-06-18" /> + description="[null]" enabled="[false]" language="[null]" copy_resource_id="[null]" person_id="[null]" created_at="2014-06-18" /> + enabled="[false]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="src/org/struts" created_at="2014-06-18" /> + enabled="[false]" language="java" copy_resource_id="[null]" person_id="[null]" path="src/org/struts/RequestContext.java" created_at="2014-06-18" /> + created_at="2014-06-18" /> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest/migrate_provisioned_project.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest/migrate_provisioned_project.xml index a38323d7a19..9e688d16451 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest/migrate_provisioned_project.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest/migrate_provisioned_project.xml @@ -5,6 +5,6 @@ uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]" description="the description" long_name="Apache Struts" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" - created_at="2014-06-18" authorization_updated_at="2014-06-18" /> + created_at="2014-06-18" /> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest/migrate_view.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest/migrate_view.xml index c6973bc6a19..5a1a222a2ba 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest/migrate_view.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest/migrate_view.xml @@ -4,7 +4,7 @@ + created_at="2014-09-01" /> + created_at="2014-09-01" /> + created_at="2014-06-18" /> + created_at="2014-06-18" /> + description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" created_at="2014-06-18" /> + description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" created_at="2014-06-18" /> + enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="src/org/struts" created_at="2014-06-18" /> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="src/org/struts/RequestContext.java" created_at="2014-06-18" /> + enabled="[false]" language="java" copy_resource_id="[null]" person_id="[null]" path="src/org/struts/RequestContext.java" created_at="2014-06-18" /> + created_at="2014-06-18" /> + created_at="2014-06-18" /> + authorization_updated_at="123456789"/> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/es/IssueAuthorizationDaoTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/es/IssueAuthorizationDaoTest/shared.xml index 58069e0e9d5..a58b31317d0 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/es/IssueAuthorizationDaoTest/shared.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/es/IssueAuthorizationDaoTest/shared.xml @@ -4,13 +4,13 @@ root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" - authorization_updated_at="2012-01-01"/> + authorization_updated_at="1000000000"/> + authorization_updated_at="2000000000"/> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/es/IssueAuthorizationIndexerTest/index.xml b/server/sonar-server/src/test/resources/org/sonar/server/es/IssueAuthorizationIndexerTest/index.xml index 4a42489f30b..0ac5fc38f5f 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/es/IssueAuthorizationIndexerTest/index.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/es/IssueAuthorizationIndexerTest/index.xml @@ -4,7 +4,7 @@ root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" - authorization_updated_at="2012-01-01"/> + authorization_updated_at="123456789"/> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/700_add_authorization_updated_at_to_projects.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/715_add_authorization_updated_at_to_projects.rb similarity index 92% rename from server/sonar-web/src/main/webapp/WEB-INF/db/migrate/700_add_authorization_updated_at_to_projects.rb rename to server/sonar-web/src/main/webapp/WEB-INF/db/migrate/715_add_authorization_updated_at_to_projects.rb index 3a243c84cff..fe2415a07b7 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/700_add_authorization_updated_at_to_projects.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/715_add_authorization_updated_at_to_projects.rb @@ -25,7 +25,7 @@ class AddAuthorizationUpdatedAtToProjects < ActiveRecord::Migration def self.up - add_column 'projects', :authorization_updated_at, :datetime, :null => true + add_column 'projects', :authorization_updated_at, :big_integer, :null => true end end diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/701_insert_projects_authorization_updated_at.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/716_insert_projects_authorization_updated_at.rb similarity index 100% rename from server/sonar-web/src/main/webapp/WEB-INF/db/migrate/701_insert_projects_authorization_updated_at.rb rename to server/sonar-web/src/main/webapp/WEB-INF/db/migrate/716_insert_projects_authorization_updated_at.rb diff --git a/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java b/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java index 719cd46ba12..9d1389309a6 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java +++ b/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java @@ -46,7 +46,7 @@ public class ComponentDto extends Dto implements Component { private String language; private Long subProjectId; private boolean enabled = true; - private Date authorizationUpdatedAt; + private Long authorizationUpdatedAt; public Long getId() { return id; @@ -202,11 +202,11 @@ public class ComponentDto extends Dto implements Component { * Only available on projects */ @CheckForNull - public Date getAuthorizationUpdatedAt() { + public Long getAuthorizationUpdatedAt() { return authorizationUpdatedAt; } - public ComponentDto setAuthorizationUpdatedAt(@Nullable Date authorizationUpdatedAt) { + public ComponentDto setAuthorizationUpdatedAt(@Nullable Long authorizationUpdatedAt) { this.authorizationUpdatedAt = authorizationUpdatedAt; return this; } diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueAuthorizationMapper.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueAuthorizationMapper.java deleted file mode 100644 index d34ed67442d..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueAuthorizationMapper.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package org.sonar.core.issue.db; - -import org.apache.ibatis.annotations.Param; - -import javax.annotation.Nullable; - -import java.util.Date; - -public interface IssueAuthorizationMapper { - - IssueAuthorizationDto selectAfterDate(@Nullable @Param("date") Date date, @Param("permission") String permission, @Param("anyone") String anyoneGroup); - -} diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java index 79633975972..73f373f6a3d 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java @@ -33,7 +33,7 @@ import java.util.List; */ public class DatabaseVersion implements BatchComponent, ServerComponent { - public static final int LAST_VERSION = 714; + public static final int LAST_VERSION = 716; /** * List of all the tables. * This list is hardcoded because we didn't succeed in using java.sql.DatabaseMetaData#getTables() in the same way diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java index cc81d7d2ccc..51da304c157 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java @@ -66,7 +66,6 @@ import org.sonar.core.issue.db.ActionPlanMapper; import org.sonar.core.issue.db.ActionPlanStatsDto; import org.sonar.core.issue.db.ActionPlanStatsMapper; import org.sonar.core.issue.db.IssueAuthorizationDto; -import org.sonar.core.issue.db.IssueAuthorizationMapper; import org.sonar.core.issue.db.IssueChangeDto; import org.sonar.core.issue.db.IssueChangeMapper; import org.sonar.core.issue.db.IssueDto; @@ -230,7 +229,7 @@ public class MyBatis implements BatchComponent, ServerComponent { loadMapper(conf, "org.sonar.core.permission.PermissionMapper"); Class[] mappers = {ActivityMapper.class, ActiveDashboardMapper.class, AuthorMapper.class, DashboardMapper.class, DependencyMapper.class, DuplicationMapper.class, GraphDtoMapper.class, - IssueMapper.class, IssueAuthorizationMapper.class, IssueChangeMapper.class, IssueFilterMapper.class, IssueFilterFavouriteMapper.class, + IssueMapper.class, IssueChangeMapper.class, IssueFilterMapper.class, IssueFilterFavouriteMapper.class, LoadedTemplateMapper.class, MeasureFilterMapper.class, Migration44Mapper.class, PermissionTemplateMapper.class, PropertiesMapper.class, PurgeMapper.class, ResourceKeyUpdaterMapper.class, ResourceIndexerMapper.class, ResourceSnapshotMapper.class, RoleMapper.class, RuleMapper.class, SchemaMigrationMapper.class, SemaphoreMapper.class, UserMapper.class, GroupMapper.class, WidgetMapper.class, WidgetPropertyMapper.class, diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java index 538ff9cbb7f..b26f6ff465e 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java +++ b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java @@ -35,7 +35,10 @@ import org.sonar.core.persistence.MyBatis; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.List; import static com.google.common.collect.Lists.newArrayList; @@ -157,7 +160,7 @@ public class ResourceDao implements DaoComponent { resource.setProjectUuid(uuid); } resource.setCreatedAt(now); - resource.setAuthorizationUpdatedAt(now); + resource.setAuthorizationUpdatedAt(now.getTime()); mapper.insert(resource); } else { mapper.update(resource); @@ -174,7 +177,7 @@ public class ResourceDao implements DaoComponent { * Should not be called from batch side (used to reindex permission in E/S) */ public void updateAuthorizationDate(Long projectId, SqlSession session) { - session.getMapper(ResourceMapper.class).updateAuthorizationDate(projectId, new Date(system2.now())); + session.getMapper(ResourceMapper.class).updateAuthorizationDate(projectId, system2.now()); } @CheckForNull diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java index 3e8f8ada5e9..3fef645f9ee 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java +++ b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java @@ -42,7 +42,7 @@ public class ResourceDto { private Long copyResourceId; private Long personId; private Date createdAt; - private Date authorizationUpdatedAt; + private Long authorizationUpdatedAt; public Long getId() { return id; @@ -215,11 +215,11 @@ public class ResourceDto { return this; } - public Date getAuthorizationUpdatedAt() { + public Long getAuthorizationUpdatedAt() { return authorizationUpdatedAt; } - public ResourceDto setAuthorizationUpdatedAt(Date authorizationUpdatedAt) { + public ResourceDto setAuthorizationUpdatedAt(Long authorizationUpdatedAt) { this.authorizationUpdatedAt = authorizationUpdatedAt; return this; } diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceMapper.java b/sonar-core/src/main/java/org/sonar/core/resource/ResourceMapper.java index e599e77f5ff..961e6bf3e9b 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceMapper.java +++ b/sonar-core/src/main/java/org/sonar/core/resource/ResourceMapper.java @@ -24,7 +24,6 @@ import org.apache.ibatis.session.ResultHandler; import org.sonar.core.component.SnapshotDto; import java.util.Collection; -import java.util.Date; import java.util.List; public interface ResourceMapper { @@ -77,6 +76,6 @@ public interface ResourceMapper { void update(ResourceDto resource); - void updateAuthorizationDate(@Param("projectId") Long projectId, @Param("authorizationDate") Date authorizationDate); + void updateAuthorizationDate(@Param("projectId") Long projectId, @Param("authorizationDate") Long authorizationDate); } diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueAuthorizationMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueAuthorizationMapper.xml deleted file mode 100644 index 5b2def86db3..00000000000 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueAuthorizationMapper.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql index 1150833188c..4a0311f3d17 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql @@ -259,8 +259,6 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('601'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('603'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('604'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('605'); -INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('700'); -INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('701'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('702'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('703'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('704'); @@ -274,6 +272,8 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('711'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('712'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('713'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('714'); +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('715'); +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('716'); INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '2011-09-26 22:27:48.0', '2011-09-26 22:27:48.0', null, null); ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2; diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl index fec355edc63..722be701b68 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl @@ -271,7 +271,7 @@ CREATE TABLE "PROJECTS" ( "LONG_NAME" VARCHAR(256), "PERSON_ID" INTEGER, "CREATED_AT" TIMESTAMP, - "AUTHORIZATION_UPDATED_AT" TIMESTAMP + "AUTHORIZATION_UPDATED_AT" BIGINT ); CREATE TABLE "MANUAL_MEASURES" ( diff --git a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml index 337750718da..025d5f4deb1 100644 --- a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml @@ -226,9 +226,7 @@ update projects set authorization_updated_at=#{authorizationDate} - - AND id=#{projectId} - + where id=#{projectId} diff --git a/sonar-core/src/test/java/org/sonar/core/component/ComponentDtoTest.java b/sonar-core/src/test/java/org/sonar/core/component/ComponentDtoTest.java index de13c227c61..2816c20843b 100644 --- a/sonar-core/src/test/java/org/sonar/core/component/ComponentDtoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/component/ComponentDtoTest.java @@ -21,7 +21,6 @@ package org.sonar.core.component; import org.junit.Test; -import org.sonar.api.utils.DateUtils; import static org.fest.assertions.Assertions.assertThat; @@ -40,7 +39,7 @@ public class ComponentDtoTest { .setLanguage("java") .setPath("src/org/struts/RequestContext.java") .setSubProjectId(3L) - .setAuthorizationUpdatedAt(DateUtils.parseDate("2014-09-11")); + .setAuthorizationUpdatedAt(123456789L); assertThat(componentDto.getId()).isEqualTo(1L); assertThat(componentDto.key()).isEqualTo("org.struts:struts-core:src/org/struts/RequestContext.java"); @@ -52,7 +51,7 @@ public class ComponentDtoTest { assertThat(componentDto.path()).isEqualTo("src/org/struts/RequestContext.java"); assertThat(componentDto.language()).isEqualTo("java"); assertThat(componentDto.subProjectId()).isEqualTo(3L); - assertThat(componentDto.getAuthorizationUpdatedAt()).isEqualTo(DateUtils.parseDate("2014-09-11")); + assertThat(componentDto.getAuthorizationUpdatedAt()).isEqualTo(123456789L); } @Test diff --git a/sonar-core/src/test/java/org/sonar/core/permission/PermissionFacadeTest.java b/sonar-core/src/test/java/org/sonar/core/permission/PermissionFacadeTest.java index 26405bc7607..2f6a064e360 100644 --- a/sonar-core/src/test/java/org/sonar/core/permission/PermissionFacadeTest.java +++ b/sonar-core/src/test/java/org/sonar/core/permission/PermissionFacadeTest.java @@ -26,7 +26,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.config.Settings; -import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; import org.sonar.core.persistence.AbstractDaoTestCase; @@ -53,7 +52,7 @@ public class PermissionFacadeTest extends AbstractDaoTestCase { @Before public void setUp() { system2 = mock(System2.class); - when(system2.now()).thenReturn(DateUtils.parseDate("2014-09-03").getTime()); + when(system2.now()).thenReturn(123456789L); session = getMyBatis().openSession(false); RoleDao roleDao = new RoleDao(); @@ -86,7 +85,7 @@ public class PermissionFacadeTest extends AbstractDaoTestCase { assertThat(permissionFacade.selectUserPermissions(session, "marius", 123L)).containsOnly("admin"); - assertThat(resourceDao.getResource(123L, session).getAuthorizationUpdatedAt()).isEqualTo(DateUtils.parseDate("2014-09-03")); + assertThat(resourceDao.getResource(123L, session).getAuthorizationUpdatedAt()).isEqualTo(123456789L); } @Test diff --git a/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java b/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java index 0a3e21e3dd3..b5fdb0c48ac 100644 --- a/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java @@ -265,7 +265,7 @@ public class ResourceDaoTest extends AbstractDaoTestCase { assertThat(file1.getId()).isNotNull(); assertThat(file2.getId()).isNotNull(); - checkTables("insert", "projects"); + checkTables("insert", new String[] {"authorization_updated_at"}, "projects"); // SONAR-3636 : created_at must be fed when inserting a new entry in the 'projects' table ResourceDto fileLoadedFromDB = dao.getResource(file1.getId()); @@ -436,7 +436,7 @@ public class ResourceDaoTest extends AbstractDaoTestCase { public void update_authorization_date() { setupData("update_authorization_date"); - when(system2.now()).thenReturn(DateUtils.parseDate("2014-09-03").getTime()); + when(system2.now()).thenReturn(987654321L); dao.updateAuthorizationDate(1L, session); session.commit(); diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_add_user_permission-result.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_add_user_permission-result.xml index e3bec368812..dbd5e8b636c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_add_user_permission-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_add_user_permission-result.xml @@ -7,6 +7,6 @@ + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_add_user_permission.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_add_user_permission.xml index 48f61b2505a..d40ea59c0ba 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_add_user_permission.xml +++ b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_add_user_permission.xml @@ -6,6 +6,6 @@ + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_apply_permission_template.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_apply_permission_template.xml index 8c761b5daaa..7d07da03f61 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_apply_permission_template.xml +++ b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_apply_permission_template.xml @@ -2,7 +2,7 @@ + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_group_permission-result.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_group_permission-result.xml index fc6722d58dd..d280edba4a5 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_group_permission-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_group_permission-result.xml @@ -6,6 +6,6 @@ + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_group_permission.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_group_permission.xml index 70eb158107d..aa0328516a4 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_group_permission.xml +++ b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_group_permission.xml @@ -7,6 +7,6 @@ + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_user_permission-result.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_user_permission-result.xml index 72df0ea9490..d40ea59c0ba 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_user_permission-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_user_permission-result.xml @@ -6,6 +6,6 @@ + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_user_permission.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_user_permission.xml index 2e96b709620..fd37d39cbab 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_user_permission.xml +++ b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_user_permission.xml @@ -7,6 +7,6 @@ + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_anyone_group_permission-result.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_anyone_group_permission-result.xml index badbf13378a..9b43d347c46 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_anyone_group_permission-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_anyone_group_permission-result.xml @@ -7,7 +7,7 @@ + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_anyone_group_permission.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_anyone_group_permission.xml index 4c9370a070b..8fb097772df 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_anyone_group_permission.xml +++ b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_anyone_group_permission.xml @@ -6,7 +6,7 @@ + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_group_permission-result.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_group_permission-result.xml index 59fefdb7445..aa0328516a4 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_group_permission-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_group_permission-result.xml @@ -7,6 +7,6 @@ + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_group_permission.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_group_permission.xml index a67a1967f9a..d280edba4a5 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_group_permission.xml +++ b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_group_permission.xml @@ -6,6 +6,6 @@ + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture.xml index 1819dc696de..b878d636fbe 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture.xml +++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture.xml @@ -9,7 +9,7 @@ uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]" description="the description" long_name="Apache Struts" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" - created_at="2008-12-02" authorization_updated_at="2014-09-03"/> + created_at="2008-12-02" authorization_updated_at="123456789"/> + authorization_updated_at="123456789"/> + authorization_updated_at="123456789"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update_authorization_date-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update_authorization_date-result.xml index 06dec472118..084fab84366 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update_authorization_date-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update_authorization_date-result.xml @@ -4,6 +4,6 @@ scope="PRJ" qualifier="TRK" kee="old key" name="old name" description="old name" long_name="old long name" enabled="[false]" language="old" copy_resource_id="2" person_id="3" created_at="[null]" path="/old/foo/bar" deprecated_kee="old deprecated key" - authorization_updated_at="2014-09-03"/> + authorization_updated_at="987654321"/> -- 2.39.5