bartek/esa-tool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5: Add Severity to Issue model

Browse Source
This commit is contained in:
Bartłomiej Pluta
2019-04-02 14:19:19 +02:00
parent b660752d67
commit f6cbf89dbe
10 changed files with 21 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bartek/esa/core/archetype/AndroidManifestPlugin.java
View File

@@ -7,7 +7,7 @@ import java.io.File;
public abstract class AndroidManifestPlugin extends XmlPlugin {
private final GlobMatcher globMatcher;
protected AndroidManifestPlugin(GlobMatcher globMatcher) {
public AndroidManifestPlugin(GlobMatcher globMatcher) {
super(globMatcher);
this.globMatcher = globMatcher;
}

10
src/main/java/com/bartek/esa/core/archetype/BasePlugin.java
View File

@@ -1,6 +1,7 @@
package com.bartek.esa.core.archetype;
import com.bartek.esa.core.model.Issue;
import com.bartek.esa.core.model.enumeration.Severity;
import com.bartek.esa.core.model.object.Issue;
import java.io.File;
import java.util.ArrayList;
@@ -24,12 +25,13 @@ public abstract class BasePlugin implements Plugin {
protected abstract void run(File file);
protected void addIssue(Integer lineNumber, String line) {
addIssue("", lineNumber, line);
protected void addIssue(Severity severity, Integer lineNumber, String line) {
addIssue(severity, "", lineNumber, line);
}
protected void addIssue(String descriptionCode, Integer lineNumber, String line) {
protected void addIssue(Severity severity, String descriptionCode, Integer lineNumber, String line) {
Issue issue = Issue.builder()
.severity(severity)
.issuer(this.getClass())
.descriptionCode(descriptionCode)
.file(file)

44
src/main/java/com/bartek/esa/core/archetype/JavaMethodBodyStatementPlugin.java
View File

@@ -1,44 +0,0 @@
package com.bartek.esa.core.archetype;
import com.bartek.esa.file.matcher.GlobMatcher;
import com.github.javaparser.ast.CompilationUnit;
import com.github.javaparser.ast.body.BodyDeclaration;
import com.github.javaparser.ast.body.MethodDeclaration;
import com.github.javaparser.ast.body.TypeDeclaration;
import com.github.javaparser.ast.stmt.BlockStmt;
import com.github.javaparser.ast.stmt.Statement;
import java.util.Collection;
import java.util.Optional;
import java.util.stream.Stream;
public abstract class JavaMethodBodyStatementPlugin extends JavaPlugin {
public JavaMethodBodyStatementPlugin(GlobMatcher globMatcher) {
super(globMatcher);
}
@Override
public void run(CompilationUnit compilationUnit) {
Stream<Statement> statements = compilationUnit.getTypes().stream()
.map(TypeDeclaration::getMembers)
.flatMap(Collection::stream)
.filter(BodyDeclaration::isMethodDeclaration)
.map(b -> (MethodDeclaration) b)
.map(MethodDeclaration::getBody)
.flatMap(Optional::stream)
.map(BlockStmt::getStatements)
.flatMap(Collection::stream);
checkStatements(statements);
}
protected abstract void checkStatements(Stream<Statement> statements);
protected Integer getLineNumberOfStatement(Statement statement) {
return statement.getRange()
.map(range -> range.begin)
.map(begin -> begin.line)
.orElse(null);
}
}

2
src/main/java/com/bartek/esa/core/archetype/JavaPlugin.java
View File

@@ -11,7 +11,7 @@ import java.io.File;
public abstract class JavaPlugin extends BasePlugin {
private final GlobMatcher globMatcher;
protected JavaPlugin(GlobMatcher globMatcher) {
public JavaPlugin(GlobMatcher globMatcher) {
this.globMatcher = globMatcher;
}

2
src/main/java/com/bartek/esa/core/archetype/Plugin.java
View File

@@ -1,6 +1,6 @@
package com.bartek.esa.core.archetype;
import com.bartek.esa.core.model.Issue;
import com.bartek.esa.core.model.object.Issue;
import java.io.File;
import java.util.List;

2
src/main/java/com/bartek/esa/core/archetype/XmlPlugin.java
View File

@@ -14,7 +14,7 @@ import java.io.File;
public abstract class XmlPlugin extends BasePlugin {
private final GlobMatcher globMatcher;
protected XmlPlugin(GlobMatcher globMatcher) {
public XmlPlugin(GlobMatcher globMatcher) {
this.globMatcher = globMatcher;
}

2
src/main/java/com/bartek/esa/core/desc/provider/DescriptionProvider.java
View File

@@ -1,6 +1,6 @@
package com.bartek.esa.core.desc.provider;
import com.bartek.esa.core.model.Issue;
import com.bartek.esa.core.model.object.Issue;
import com.bartek.esa.error.EsaException;
import io.vavr.control.Try;

2
src/main/java/com/bartek/esa/core/executor/PluginExecutor.java
View File

@@ -1,7 +1,7 @@
package com.bartek.esa.core.executor;
import com.bartek.esa.core.archetype.Plugin;
import com.bartek.esa.core.model.Issue;
import com.bartek.esa.core.model.object.Issue;
import javax.inject.Inject;
import java.io.File;

6
src/main/java/com/bartek/esa/core/model/enumeration/Severity.java Normal file
View File

@@ -0,0 +1,6 @@
package com.bartek.esa.core.model.enumeration;
public enum Severity {
WARNING,
ERROR
}

4
src/main/java/com/bartek/esa/core/model/Issue.java → src/main/java/com/bartek/esa/core/model/object/Issue.java
View File

@@ -1,5 +1,6 @@
package com.bartek.esa.core.model;
package com.bartek.esa.core.model.object;
import com.bartek.esa.core.model.enumeration.Severity;
import lombok.Builder;
import lombok.Data;
@@ -9,6 +10,7 @@ import java.io.File;
@Builder
public class Issue {
private final Class<?> issuer;
private final Severity severity;
private final String descriptionCode;
private final File file;
private final Integer lineNumber;