diff options
Diffstat (limited to 'server')
7 files changed, 10 insertions, 14 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationIndexer.java index 2003e088945..2121a661182 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationIndexer.java @@ -37,7 +37,7 @@ import java.util.Date; import java.util.Map; /** - * Manages the synchronization of index issues/issueAuthorization with authorization settings defined in database : + * Manages the synchronization of index issues/authorization with authorization settings defined in database : * <ul> * <li>index the projects with recent permission changes</li> * <li>delete project orphans from index</li> diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java index c78d2706ce2..e620fdab286 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java @@ -34,7 +34,7 @@ public class IssueIndexDefinition implements IndexDefinition { public static final String INDEX = "issues"; - public static final String TYPE_AUTHORIZATION = "issueAuthorization"; + public static final String TYPE_AUTHORIZATION = "authorization"; public static final String TYPE_ISSUE = "issue"; public static final String FIELD_AUTHORIZATION_PROJECT_UUID = "project"; @@ -87,7 +87,7 @@ public class IssueIndexDefinition implements IndexDefinition { // else keep defaults (one shard) } - // type "issueAuthorization" + // type "authorization" NewIndex.NewIndexType authorizationMapping = index.createType(TYPE_AUTHORIZATION); authorizationMapping.setAttribute("_id", ImmutableMap.of("path", FIELD_AUTHORIZATION_PROJECT_UUID)); authorizationMapping.createDateTimeField(FIELD_AUTHORIZATION_UPDATED_AT); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java index 04d112d99bc..493635b5531 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java @@ -100,7 +100,7 @@ public class IssueIndexer extends BaseIndexer { private UpdateRequest newUpsertRequest(IssueDoc issue) { String projectUuid = issue.projectUuid(); - // parent doc is issueAuthorization + // type of parent doc is "authorization" issue.setField("_parent", projectUuid); return new UpdateRequest(IssueIndexDefinition.INDEX, IssueIndexDefinition.TYPE_ISSUE, issue.key()) diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/IndexDefinition.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexDefinition.java index 5947bfb33eb..fc9b36ebe17 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/IndexDefinition.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/IndexDefinition.java @@ -39,7 +39,6 @@ public class IndexDefinition { public static final IndexDefinition RULE = new IndexDefinition("rules", "rule"); public static final IndexDefinition ACTIVE_RULE = new IndexDefinition("rules", "activeRule"); - public static final IndexDefinition ISSUES_AUTHORIZATION = new IndexDefinition("issues", "issueAuthorization"); public static final IndexDefinition ISSUES = new IndexDefinition("issues", "issue"); public static final IndexDefinition LOG = new IndexDefinition("logs", "sonarLog"); diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java index a3457b7e1d9..cbeb9db3bd1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java @@ -61,8 +61,6 @@ public class IndexSynchronizer { /* synchronize all activeRules until we have mng tables in INDEX */ DbSession session = db.openSession(true); try { - LOG.info("Starting DB to Index synchronization"); - long start = System.currentTimeMillis(); List<String> projectUuids = db.componentDao().findProjectUuids(session); synchronize(session, db.ruleDao(), index.get(RuleIndex.class)); issueAuthorizationIndexer.index(); @@ -75,7 +73,6 @@ public class IndexSynchronizer { sourceLineIndexer.index(); session.commit(); - LOG.info("Synchronization done in {}ms...", System.currentTimeMillis() - start); } finally { session.close(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java index a0ea5860886..bc7bbb49174 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java @@ -46,7 +46,7 @@ public class IssueAuthorizationIndexerTest { IssueAuthorizationIndexer indexer = createIndexer(); indexer.doIndex(0L); - assertThat(esTester.countDocuments("issues", "issueAuthorization")).isZero(); + assertThat(esTester.countDocuments("issues", "authorization")).isZero(); } @Test @@ -56,7 +56,7 @@ public class IssueAuthorizationIndexerTest { IssueAuthorizationIndexer indexer = createIndexer(); indexer.doIndex(0L); - List<SearchHit> docs = esTester.getDocuments("issues", "issueAuthorization"); + List<SearchHit> docs = esTester.getDocuments("issues", "authorization"); assertThat(docs).hasSize(1); SearchHit doc = docs.get(0); assertThat(doc.getSource().get("project")).isEqualTo("ABC"); @@ -73,7 +73,7 @@ public class IssueAuthorizationIndexerTest { public void do_not_fail_when_deleting_unindexed_project() throws Exception { IssueAuthorizationIndexer indexer = createIndexer(); indexer.deleteProject("UNKNOWN", true); - assertThat(esTester.countDocuments("issues", "issueAuthorization")).isZero(); + assertThat(esTester.countDocuments("issues", "authorization")).isZero(); } @Test @@ -85,13 +85,13 @@ public class IssueAuthorizationIndexerTest { indexer.index(Arrays.asList(authorization)); // has permissions - assertThat(esTester.countDocuments("issues", "issueAuthorization")).isEqualTo(1); + assertThat(esTester.countDocuments("issues", "authorization")).isEqualTo(1); // remove permissions -> dto has no users nor groups authorization = new IssueAuthorizationDao.Dto("ABC", System.currentTimeMillis()); indexer.index(Arrays.asList(authorization)); - assertThat(esTester.countDocuments("issues", "issueAuthorization")).isZero(); + assertThat(esTester.countDocuments("issues", "authorization")).isZero(); } private IssueAuthorizationIndexer createIndexer() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDefinitionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDefinitionTest.java index ca25778fca5..241479d5751 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDefinitionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDefinitionTest.java @@ -39,7 +39,7 @@ public class IssueIndexDefinitionTest { assertThat(context.getIndices()).hasSize(1); NewIndex issuesIndex = context.getIndices().get("issues"); assertThat(issuesIndex).isNotNull(); - assertThat(issuesIndex.getTypes().keySet()).containsOnly("issue", "issueAuthorization"); + assertThat(issuesIndex.getTypes().keySet()).containsOnly("issue", "authorization"); // no cluster by default assertThat(issuesIndex.getSettings().get("index.number_of_shards")).isEqualTo("1"); |