Merge pull request #16 from stalb/master

On branch limit analysis to new issues since last leak period

Author: javamachr

src/main/java/com/talanlabs/sonar/plugins/gitlab/GitLabApiV4Wrapper.java

@@ -283,7 +283,7 @@ public String getGitLabUrl(@Nullable String revision, String path, @Nullable Int
     @Override
     public void createOrUpdateReviewComment(String revision, String fullPath, Integer line, String body) {
         try {
-            if (config.isMergeRequestDiscussionEnabled()) {
+            if (config.isMergeRequestDiscussionEnabled() && config.mergeRequestIid() != -1) {
                 createReviewDiscussion(fullPath, line, body);
             } else {
                 gitLabAPIV4.getGitLabAPICommits().postCommitComments(gitLabProject.getId(), revision != null ? revision : getFirstCommitSHA(), body, fullPath, line, "new");

src/main/java/com/talanlabs/sonar/plugins/gitlab/SonarFacade.java

@@ -258,6 +258,9 @@ private Issues.SearchWsResponse searchIssues(String componentKey, int pullReques
         }
         else if (isNotBlankAndNotEmpty(branch)) {
             searchRequest.setBranch(branch);
+            if (! gitLabPluginConfiguration.allIssues()) {
+            	searchRequest.setSinceLeakPeriod("true");
+            }
         }
         return wsClient.issues().search(searchRequest);
     }

src/test/java/com/talanlabs/sonar/plugins/gitlab/GitLabApiV4WrapperTest.java

@@ -156,19 +156,35 @@ public void testReviewComment() throws IOException {
     }
 
     @Test
-    public void testCreateReviewDiscussionMissingIidFail() {
+    public void testCreateReviewDiscussionMissingIidFallbackCommentOnCommit() throws IOException {
         GitLabPluginConfiguration gitLabPluginConfiguration = mock(GitLabPluginConfiguration.class);
+        when(gitLabPluginConfiguration.commitSHA()).thenReturn(Collections.singletonList("1"));
+        when(gitLabPluginConfiguration.refName()).thenReturn("master");
         when(gitLabPluginConfiguration.mergeRequestIid()).thenReturn(-1);
         when(gitLabPluginConfiguration.isMergeRequestDiscussionEnabled()).thenReturn(true);
 
         GitLabApiV4Wrapper facade = new GitLabApiV4Wrapper(gitLabPluginConfiguration);
 
+        GitLabAPI gitLabAPI = mock(GitLabAPI.class);
+        facade.setGitLabAPI(gitLabAPI);
+
+        GitLabAPICommits gitLabAPICommits = mock(GitLabAPICommits.class);
+        when(gitLabAPICommits.postCommitComments("1", "1", "pending", "master", null, null)).thenReturn(null);
+
+        when(gitLabAPI.getGitLabAPICommits()).thenReturn(gitLabAPICommits);
+
         GitLabProject gitLabProject = mock(GitLabProject.class);
         when(gitLabProject.getId()).thenReturn(1);
         facade.setGitLabProject(gitLabProject);
 
-        assertThatIllegalArgumentException().isThrownBy(() ->
-                facade.createOrUpdateReviewComment(null, "src/main/Foo.java", 5, "nothing"));
+        facade.createOrUpdateReviewComment(null, "src/main/Foo.java", 5, "nothing");
+
+        verify(gitLabAPICommits).postCommitComments(1, "1", "nothing", "src/main/Foo.java", 5, "new");
+
+        
+        
+        //assertThatIllegalArgumentException().isThrownBy(() ->
+        //        facade.createOrUpdateReviewComment(null, "src/main/Foo.java", 5, "nothing"));
     }
 
     @Test