diff --git a/pom.xml b/pom.xml
index 82f17013..d6d3c22c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,11 @@
bridge-method-injector
1.23
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
diff --git a/src/main/java/com/lpvs/LicensePreValidationSystem.java b/src/main/java/com/lpvs/LicensePreValidationSystem.java
index 38f014d7..190b9135 100644
--- a/src/main/java/com/lpvs/LicensePreValidationSystem.java
+++ b/src/main/java/com/lpvs/LicensePreValidationSystem.java
@@ -24,7 +24,7 @@
@EnableAsync
public class LicensePreValidationSystem {
- private int corePoolSize;
+ private final int corePoolSize;
public LicensePreValidationSystem(@Value("${lpvs.cores:8}") int corePoolSize) {
this.corePoolSize = corePoolSize;
diff --git a/src/main/java/com/lpvs/controller/GitHubWebhooksController.java b/src/main/java/com/lpvs/controller/GitHubWebhooksController.java
index d9c719c6..2f0e5aef 100644
--- a/src/main/java/com/lpvs/controller/GitHubWebhooksController.java
+++ b/src/main/java/com/lpvs/controller/GitHubWebhooksController.java
@@ -36,6 +36,7 @@
@RestController
public class GitHubWebhooksController {
+
private String GITHUB_SECRET;
@Autowired
@@ -56,7 +57,7 @@ public void setProps() {
private GitHubService gitHubService;
- private static Logger LOG = LoggerFactory.getLogger(GitHubWebhooksController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GitHubWebhooksController.class);
private static final String SIGNATURE = "X-Hub-Signature-256";
private static final String SUCCESS = "Success";
diff --git a/src/main/java/com/lpvs/entity/ResponseWrapper.java b/src/main/java/com/lpvs/entity/ResponseWrapper.java
index cd832214..5d3c2a32 100644
--- a/src/main/java/com/lpvs/entity/ResponseWrapper.java
+++ b/src/main/java/com/lpvs/entity/ResponseWrapper.java
@@ -8,7 +8,6 @@
package com.lpvs.entity;
public class ResponseWrapper {
-
private String message;
public ResponseWrapper(String message) {
diff --git a/src/main/java/com/lpvs/entity/enums/PullRequestAction.java b/src/main/java/com/lpvs/entity/enums/PullRequestAction.java
index d153f522..cae57f1d 100644
--- a/src/main/java/com/lpvs/entity/enums/PullRequestAction.java
+++ b/src/main/java/com/lpvs/entity/enums/PullRequestAction.java
@@ -27,8 +27,6 @@ public String getPullRequestAction() {
return type;
}
- private static Logger LOG = LoggerFactory.getLogger(PullRequestAction.class);
-
public static PullRequestAction convertFrom(String action) {
if (action.equals(OPEN.getPullRequestAction())) {
return OPEN;
diff --git a/src/main/java/com/lpvs/service/DetectService.java b/src/main/java/com/lpvs/service/DetectService.java
index 3b209fac..818de4d0 100644
--- a/src/main/java/com/lpvs/service/DetectService.java
+++ b/src/main/java/com/lpvs/service/DetectService.java
@@ -33,7 +33,7 @@ public DetectService(@Value("${scanner:scanoss}") String scannerType,
this.scanossDetectService = scanossDetectService;
}
- private static Logger LOG = LoggerFactory.getLogger(DetectService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DetectService.class);
@PostConstruct
private void init() {
diff --git a/src/main/java/com/lpvs/service/GitHubService.java b/src/main/java/com/lpvs/service/GitHubService.java
index 69f5e438..e9ae0d94 100644
--- a/src/main/java/com/lpvs/service/GitHubService.java
+++ b/src/main/java/com/lpvs/service/GitHubService.java
@@ -71,7 +71,7 @@ private void checks() throws Exception {
}
}
- private static Logger LOG = LoggerFactory.getLogger(GitHubService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GitHubService.class);
private static GitHub gitHub;
diff --git a/src/main/java/com/lpvs/service/LicenseService.java b/src/main/java/com/lpvs/service/LicenseService.java
index d9064d20..5406e12c 100644
--- a/src/main/java/com/lpvs/service/LicenseService.java
+++ b/src/main/java/com/lpvs/service/LicenseService.java
@@ -40,7 +40,7 @@ public class LicenseService {
public String licenseFilePath;
public String licenseConflictsSource;
- private static Logger LOG = LoggerFactory.getLogger(LicenseService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LicenseService.class);
private List licenses;
@@ -184,8 +184,11 @@ public List> findConflicts(WebhookConfig webhookConfig,
for (int i = 0; i < detectedLicensesUnique.size(); i++) {
for (int j = i + 1; j < detectedLicensesUnique.size(); j++) {
for (Conflict licenseConflict : licenseConflicts) {
- Conflict possibleConflict = new Conflict<>(detectedLicensesUnique.toArray()[i].toString(),
- detectedLicensesUnique.toArray()[j].toString());
+ Conflict possibleConflict =
+ new Conflict<>(
+ (String) detectedLicensesUnique.toArray()[i],
+ (String) detectedLicensesUnique.toArray()[j]
+ );
if (licenseConflict.equals(possibleConflict)) {
foundConflicts.add(possibleConflict);
}
@@ -197,8 +200,8 @@ public List> findConflicts(WebhookConfig webhookConfig,
}
public static class Conflict {
- License1 l1;
- License2 l2;
+ public License1 l1;
+ public License2 l2;
Conflict(License1 l1, License2 l2) {
this.l1 = l1;
this.l2 = l2;
diff --git a/src/main/java/com/lpvs/service/QueueProcessorService.java b/src/main/java/com/lpvs/service/QueueProcessorService.java
index e8da4c38..fe28fc47 100644
--- a/src/main/java/com/lpvs/service/QueueProcessorService.java
+++ b/src/main/java/com/lpvs/service/QueueProcessorService.java
@@ -23,7 +23,7 @@ public class QueueProcessorService {
private QueueService queueService;
- private static Logger LOG = LoggerFactory.getLogger(QueueProcessorService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QueueProcessorService.class);
@Autowired
QueueProcessorService(QueueService queueService) {
diff --git a/src/main/java/com/lpvs/service/QueueService.java b/src/main/java/com/lpvs/service/QueueService.java
index ab4bfc4d..541163fe 100644
--- a/src/main/java/com/lpvs/service/QueueService.java
+++ b/src/main/java/com/lpvs/service/QueueService.java
@@ -36,7 +36,7 @@ public QueueService(GitHubService gitHubService,
this.licenseService = licenseService;
}
- private static Logger LOG = LoggerFactory.getLogger(QueueService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QueueService.class);
private static final BlockingDeque QUEUE = new LinkedBlockingDeque<>();
diff --git a/src/main/java/com/lpvs/service/scanner/scanoss/ScanossDetectService.java b/src/main/java/com/lpvs/service/scanner/scanoss/ScanossDetectService.java
index 26ccc1eb..e9922170 100644
--- a/src/main/java/com/lpvs/service/scanner/scanoss/ScanossDetectService.java
+++ b/src/main/java/com/lpvs/service/scanner/scanoss/ScanossDetectService.java
@@ -19,7 +19,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.*;
-import java.lang.reflect.Type;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.*;
@@ -33,7 +32,7 @@ public class ScanossDetectService {
@Autowired
private GitHubService gitHubService;
- private static Logger LOG = LoggerFactory.getLogger(ScanossDetectService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ScanossDetectService.class);
public void runScan(WebhookConfig webhookConfig, String path) throws Exception {
LOG.info("Starting Scanoss scanning");
@@ -81,12 +80,12 @@ public List checkLicenses(WebhookConfig webhookConfig) {
Gson gson = new Gson();
Reader reader = Files.newBufferedReader(Paths.get("RESULTS/" + webhookConfig.getRepositoryName() + "_" + webhookConfig.getHeadCommitSHA() + ".json"));
// convert JSON file to map
- Type mapType = new TypeToken