SONAR-5945 Improve export of components in report and fix upload

2 files changed, 5 insertions, 2 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
index bc866693f9b..950eb020e2d 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
@@ -26,6 +26,7 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.component.Component;
 import org.sonar.api.config.Settings;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
 import java.util.ArrayList;
@@ -323,6 +324,7 @@ public class Project extends Resource implements Component {
     return false;
   }
 
+  @CheckForNull
   @Override
   public Project getParent() {
     return parent;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java
index dd9e05b1155..a07c226a73b 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java
@@ -214,11 +214,12 @@ public abstract class Resource implements Serializable {
   public abstract String getQualifier();
 
   /**
-   * The parent is used to build the resources tree, for example for relations between classes, packages and projects.
+   * The parent is used to build the resources tree, for example for relations between files, directories and projects.
    * <p>
-   * Return null if the parent is the project.
+   * Return null if the parent is the current project (or module in case of multi-module).
    * </p>
    */
+  @CheckForNull
   public abstract Resource getParent();
 
   /**