Merge pull request #68 from nireeshT/master

Sonar projectId null check
hygieia · Oct 1, 2020 · f802dfe · f802dfe
2 parents 6cdb3f1 + 8069593
commit f802dfe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <description>CodeQuality Collector Microservices currently collects data from Sonar</description>
   <url>https://hygieia.github.io/Hygieia/getting_started.html</url>
   <packaging>jar</packaging>
-  <version>3.2.1-SNAPSHOT</version>
+  <version>3.2.2-SNAPSHOT</version>
 
   <parent>
     <groupId>org.springframework.boot</groupId>

diff --git a/src/main/java/com/capitalone/dashboard/collector/SonarCollectorTask.java b/src/main/java/com/capitalone/dashboard/collector/SonarCollectorTask.java
@@ -370,7 +370,10 @@ private void addNewProjects(List<SonarProject> projects, List<SonarProject> exis
                 int[] indexes = IntStream.range(0,existingProjects.size()).filter(i-> existingProjects.get(i).equals(project)).toArray();
                 for (int index :indexes) {
                     SonarProject s = existingProjects.get(index);
-                    if (!s.getProjectId().equals(project.getProjectId()) || !StringUtils.equals(s.getNiceName(),project.getNiceName())) {
+                    if(Objects.isNull(s.getProjectId())){
+                        LOG.info("ProjectId is null for sonar project="+s.getProjectName());
+                    }
+                    if ((Objects.nonNull(s.getProjectId()) && !s.getProjectId().equals(project.getProjectId())) || !StringUtils.equals(s.getNiceName(),project.getNiceName())) {
                         LOG.info(String.format("UpdatedProject projectName=%s projectId=%s enabled=%s",
                                 project.getProjectName(), s.getProjectId(), Boolean.toString(s.isEnabled())));
                         if (s.getErrors().size() > 0) {