Skip to content
This repository was archived by the owner on Jun 12, 2022. It is now read-only.

Commit a1d78f8

Browse files
committed
Remove markdown, refactor
1 parent 6c97734 commit a1d78f8

11 files changed

+191
-348
lines changed

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
<groupId>commons-lang</groupId>
4949
<artifactId>commons-lang</artifactId>
5050
<version>2.6</version>
51-
<scope>provided</scope>
5251
</dependency>
5352

5453
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
@@ -97,7 +96,7 @@
9796
</configuration>
9897
</plugin>
9998
<plugin>
100-
<!-- UTF-8 bundles are not supported by Java, so they must be converted during build -->
99+
<!-- UTF-8 bundles are not supported by Java, so they must be converted durbuildReportuild -->
101100
<groupId>org.codehaus.mojo</groupId>
102101
<artifactId>native2ascii-maven-plugin</artifactId>
103102
<version>1.0-beta-1</version>

src/main/java/io/nthienan/phdiff/NotificationPostJob.java renamed to src/main/java/io/nthienan/phdiff/PhabricatorDifferentialBot.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.nthienan.phdiff;
22

3-
import io.nthienan.phdiff.comment.GlobalCommenter;
4-
import io.nthienan.phdiff.comment.CommentBuilder;
53
import io.nthienan.phdiff.issue.IssueComparator;
4+
import io.nthienan.phdiff.report.GlobalReportBuilder;
65
import org.sonar.api.batch.postjob.PostJob;
76
import org.sonar.api.batch.postjob.PostJobContext;
87
import org.sonar.api.batch.postjob.PostJobDescriptor;
98
import org.sonar.api.batch.postjob.issue.PostJobIssue;
9+
import org.sonar.api.config.Settings;
1010
import org.sonar.api.utils.log.Logger;
1111
import org.sonar.api.utils.log.Loggers;
1212

@@ -18,16 +18,18 @@
1818
*
1919
* @author nthienan
2020
*/
21-
public class NotificationPostJob implements PostJob {
21+
public class PhabricatorDifferentialBot implements PostJob {
2222

23-
private static final Logger LOG = Loggers.get(NotificationPostJob.class);
23+
private static final Logger LOG = Loggers.get(PhabricatorDifferentialBot.class);
2424

2525
private static final Comparator<PostJobIssue> ISSUE_COMPARATOR = new IssueComparator();
2626

27-
private final CommentBuilder reportBuilder;
27+
private final GlobalReportBuilder reportBuilder;
28+
private Settings settings;
2829

29-
public NotificationPostJob(CommentBuilder reportBuilder) {
30+
public PhabricatorDifferentialBot(GlobalReportBuilder reportBuilder, Settings settings) {
3031
this.reportBuilder = reportBuilder;
32+
this.settings = settings;
3133
}
3234

3335
@Override
@@ -39,17 +41,13 @@ public void describe(PostJobDescriptor descriptor) {
3941

4042
@Override
4143
public void execute(PostJobContext context) {
42-
GlobalCommenter commenter = new GlobalCommenter(this.reportBuilder);
4344
// issues are not accessible when the mode "issues" is not enabled
4445
if (context.analysisMode().isIssues()) {
4546
StreamSupport.stream(context.issues().spliterator(), false)
4647
.filter(PostJobIssue::isNew)
4748
.sorted(ISSUE_COMPARATOR)
48-
.forEach(commenter::process);
49-
}
50-
if(commenter.hasNewIssue()) {
51-
String markdown = commenter.formatForMarkdown();
52-
LOG.error(String.format("Markdown: %s", markdown));
49+
.forEach(reportBuilder::add);
5350
}
51+
LOG.error(reportBuilder.buildReport());
5452
}
5553
}

src/main/java/io/nthienan/phdiff/PhabricatorDifferentialPlugin.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.nthienan.phdiff;
22

3-
import io.nthienan.phdiff.comment.MarkDownCommentBuilder;
4-
import io.nthienan.phdiff.comment.MarkDownUtils;
3+
import io.nthienan.phdiff.report.RemarkGlobalReportBuilder;
4+
import io.nthienan.phdiff.report.RemarkupUtils;
55
import org.sonar.api.Plugin;
66
import org.sonar.api.Properties;
77
import org.sonar.api.Property;
@@ -50,10 +50,10 @@ public class PhabricatorDifferentialPlugin implements Plugin {
5050
@Override
5151
public void define(Context context) {
5252
context.addExtensions(
53-
NotificationPostJob.class,
53+
PhabricatorDifferentialBot.class,
5454
Configuration.class,
55-
MarkDownCommentBuilder.class,
56-
MarkDownUtils.class
55+
RemarkGlobalReportBuilder.class,
56+
RemarkupUtils.class
5757
);
5858
}
5959
}

src/main/java/io/nthienan/phdiff/comment/CommentBuilder.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/main/java/io/nthienan/phdiff/comment/GlobalCommenter.java

Lines changed: 0 additions & 124 deletions
This file was deleted.

src/main/java/io/nthienan/phdiff/comment/MarkDownCommentBuilder.java

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)