SONAR-8474 set organization uuid of components to uuid of task

for the time being, the organization uuid of a task is either the one of the component the task is associated to, or the default organization

server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java

@@ -37,25 +37,29 @@
 import org.sonar.db.ce.CeActivityDto;
 import org.sonar.db.ce.CeQueueDto;
 import org.sonar.db.component.ComponentDto;
+import org.sonar.server.organization.DefaultOrganizationProvider;
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Predicates.notNull;
 import static com.google.common.collect.FluentIterable.from;
 import static java.util.Collections.singleton;
+import static java.util.Objects.requireNonNull;
 import static org.sonar.db.component.ComponentDtoFunctions.toUuid;
 
 @ComputeEngineSide
 public class CeQueueImpl implements CeQueue {
 
   private final DbClient dbClient;
   private final UuidFactory uuidFactory;
+  private final DefaultOrganizationProvider defaultOrganizationProvider;
 
   // state
   private AtomicBoolean submitPaused = new AtomicBoolean(false);
 
-  public CeQueueImpl(DbClient dbClient, UuidFactory uuidFactory) {
+  public CeQueueImpl(DbClient dbClient, UuidFactory uuidFactory, DefaultOrganizationProvider defaultOrganizationProvider) {
     this.dbClient = dbClient;
     this.uuidFactory = uuidFactory;
+    this.defaultOrganizationProvider = defaultOrganizationProvider;
   }
 
   @Override
@@ -102,13 +106,13 @@ public List<CeTask> massSubmit(Collection<CeTaskSubmit> submissions) {
 
   protected CeTask loadTask(DbSession dbSession, CeQueueDto dto) {
     if (dto.getComponentUuid() == null) {
-      return new CeQueueDtoToCeTask().apply(dto);
+      return new CeQueueDtoToCeTask(defaultOrganizationProvider.get().getUuid()).apply(dto);
     }
     Optional<ComponentDto> componentDto = dbClient.componentDao().selectByUuid(dbSession, dto.getComponentUuid());
     if (componentDto.isPresent()) {
-      return new CeQueueDtoToCeTask(ImmutableMap.of(dto.getComponentUuid(), componentDto.get())).apply(dto);
+      return new CeQueueDtoToCeTask(defaultOrganizationProvider.get().getUuid(), ImmutableMap.of(dto.getComponentUuid(), componentDto.get())).apply(dto);
     }
-    return new CeQueueDtoToCeTask().apply(dto);
+    return new CeQueueDtoToCeTask(defaultOrganizationProvider.get().getUuid()).apply(dto);
   }
 
   private List<CeTask> loadTasks(DbSession dbSession, List<CeQueueDto> dtos) {
@@ -121,7 +125,7 @@ private List<CeTask> loadTasks(DbSession dbSession, List<CeQueueDto> dtos) {
         .uniqueIndex(toUuid());
 
     return from(dtos)
-      .transform(new CeQueueDtoToCeTask(componentDtoByUuid))
+      .transform(new CeQueueDtoToCeTask(defaultOrganizationProvider.get().getUuid(), componentDtoByUuid))
       .toList();
   }
 
@@ -191,13 +195,15 @@ public boolean isSubmitPaused() {
   }
 
   private static class CeQueueDtoToCeTask implements Function<CeQueueDto, CeTask> {
+    private final String defaultOrganizationUuid;
     private final Map<String, ComponentDto> componentDtoByUuid;
 
-    public CeQueueDtoToCeTask() {
-      this.componentDtoByUuid = Collections.emptyMap();
+    public CeQueueDtoToCeTask(String defaultOrganizationUuid) {
+      this(defaultOrganizationUuid, Collections.emptyMap());
     }
 
-    public CeQueueDtoToCeTask(Map<String, ComponentDto> componentDtoByUuid) {
+    public CeQueueDtoToCeTask(String defaultOrganizationUuid, Map<String, ComponentDto> componentDtoByUuid) {
+      this.defaultOrganizationUuid = requireNonNull(defaultOrganizationUuid, "defaultOrganizationUuid can't be null");
       this.componentDtoByUuid = componentDtoByUuid;
     }
 
@@ -213,10 +219,15 @@ public CeTask apply(@Nonnull CeQueueDto dto) {
         builder.setComponentUuid(componentUuid);
         ComponentDto component = componentDtoByUuid.get(componentUuid);
         if (component != null) {
+          builder.setOrganizationUuid(component.getOrganizationUuid());
           builder.setComponentKey(component.getKey());
           builder.setComponentName(component.name());
         }
       }
+      // fixme this should be set from the CeQueueDto
+      if (!builder.hasOrganizationUuid()) {
+        builder.setOrganizationUuid(defaultOrganizationUuid);
+      }
       return builder.build();
     }
   }

server/sonar-server/src/main/java/org/sonar/ce/queue/CeTask.java

@@ -30,6 +30,7 @@
 @Immutable
 public class CeTask {
 
+  private final String organizationUuid;
   private final String type;
   private final String uuid;
   private final String componentUuid;
@@ -38,14 +39,19 @@ public class CeTask {
   private final String submitterLogin;
 
   private CeTask(Builder builder) {
-    this.uuid = requireNonNull(emptyToNull(builder.uuid));
-    this.type = requireNonNull(emptyToNull(builder.type));
+    this.organizationUuid = requireNonNull(emptyToNull(builder.organizationUuid), "organizationUuid can't be null nor empty");
+    this.uuid = requireNonNull(emptyToNull(builder.uuid), "uuid can't be null nor empty");
+    this.type = requireNonNull(emptyToNull(builder.type), "type can't be null nor empty");
     this.componentUuid = emptyToNull(builder.componentUuid);
     this.componentKey = emptyToNull(builder.componentKey);
     this.componentName = emptyToNull(builder.componentName);
     this.submitterLogin = emptyToNull(builder.submitterLogin);
   }
 
+  public String getOrganizationUuid() {
+    return organizationUuid;
+  }
+
   public String getUuid() {
     return uuid;
   }
@@ -77,9 +83,12 @@ public String getSubmitterLogin() {
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
-      .add("componentUuid", componentUuid)
-      .add("uuid", uuid)
+      .add("organizationUuid", organizationUuid)
       .add("type", type)
+      .add("uuid", uuid)
+      .add("componentUuid", componentUuid)
+      .add("componentKey", componentKey)
+      .add("componentName", componentName)
       .add("submitterLogin", submitterLogin)
       .toString();
   }
@@ -102,13 +111,24 @@ public int hashCode() {
   }
 
   public static final class Builder {
+    private String organizationUuid;
     private String uuid;
     private String type;
     private String componentUuid;
     private String componentKey;
     private String componentName;
     private String submitterLogin;
 
+    public Builder setOrganizationUuid(String organizationUuid) {
+      this.organizationUuid = organizationUuid;
+      return this;
+    }
+
+    // FIXME remove this method when organization support is added to the Compute Engine queue
+    public boolean hasOrganizationUuid() {
+      return organizationUuid != null;
+    }
+
     public Builder setUuid(String uuid) {
       this.uuid = uuid;
       return this;

server/sonar-server/src/main/java/org/sonar/server/computation/queue/InternalCeQueueImpl.java

@@ -39,6 +39,7 @@
 import org.sonar.db.DbSession;
 import org.sonar.db.ce.CeActivityDto;
 import org.sonar.db.ce.CeQueueDto;
+import org.sonar.server.organization.DefaultOrganizationProvider;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
@@ -53,8 +54,9 @@ public class InternalCeQueueImpl extends CeQueueImpl implements InternalCeQueue
   // state
   private AtomicBoolean peekPaused = new AtomicBoolean(false);
 
-  public InternalCeQueueImpl(System2 system2, DbClient dbClient, UuidFactory uuidFactory, CEQueueStatus queueStatus) {
-    super(dbClient, uuidFactory);
+  public InternalCeQueueImpl(System2 system2, DbClient dbClient, UuidFactory uuidFactory, CEQueueStatus queueStatus,
+    DefaultOrganizationProvider defaultOrganizationProvider) {
+    super(dbClient, uuidFactory, defaultOrganizationProvider);
     this.system2 = system2;
     this.dbClient = dbClient;
     this.queueStatus = queueStatus;
@@ -127,7 +129,7 @@ private static void updateError(CeActivityDto activityDto, @Nullable Throwable e
   @CheckForNull
   private static String getStackTraceForPersistence(Throwable error) {
     try (ByteArrayOutputStream out = new ByteArrayOutputStream();
-         LineReturnEnforcedPrintStream printStream = new LineReturnEnforcedPrintStream(out)) {
+      LineReturnEnforcedPrintStream printStream = new LineReturnEnforcedPrintStream(out)) {
       error.printStackTrace(printStream);
       printStream.flush();
       return out.toString();

server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolder.java

@@ -25,6 +25,12 @@
 
 public interface AnalysisMetadataHolder {
 
+  /**
+   * Returns the UUID of the organization the analysis belongs to.
+   * @throws IllegalStateException if organization uuid has not been set
+   */
+  String getOrganizationUuid();
+
   /**
    * Returns the UUID generated for this analysis.
    * @throws IllegalStateException if uuid has not been set

server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java

@@ -27,34 +27,38 @@
 import org.sonar.server.qualityprofile.QualityProfile;
 
 import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
 
 public class AnalysisMetadataHolderImpl implements MutableAnalysisMetadataHolder {
 
+  private final InitializedProperty<String> organizationUuid = new InitializedProperty<>();
   private final InitializedProperty<String> uuid = new InitializedProperty<>();
-
   private final InitializedProperty<Long> analysisDate = new InitializedProperty<>();
-
   private final InitializedProperty<Analysis> baseProjectSnapshot = new InitializedProperty<>();
-
   private final InitializedProperty<Boolean> crossProjectDuplicationEnabled = new InitializedProperty<>();
-
   private final InitializedProperty<String> branch = new InitializedProperty<>();
-
   private final InitializedProperty<Integer> rootComponentRef = new InitializedProperty<>();
-
   private final InitializedProperty<Map<String, QualityProfile>> qProfilesPerLanguage = new InitializedProperty<>();
 
   @Override
-  public MutableAnalysisMetadataHolder setUuid(String s) {
-    checkState(!uuid.isInitialized(), "Analysis uuid has already been set");
-    this.uuid.setProperty(s);
+  public MutableAnalysisMetadataHolder setOrganizationUuid(String organizationUuid) {
+    checkState(!this.organizationUuid.isInitialized(), "Organization uuid has already been set");
+    requireNonNull(organizationUuid, "Organization uuid can't be null");
+    this.organizationUuid.setProperty(organizationUuid);
     return this;
   }
 
   @Override
-  public MutableAnalysisMetadataHolder setAnalysisDate(long date) {
-    checkState(!analysisDate.isInitialized(), "Analysis date has already been set");
-    this.analysisDate.setProperty(date);
+  public String getOrganizationUuid() {
+    checkState(organizationUuid.isInitialized(), "Organization uuid has not been set");
+    return organizationUuid.getProperty();
+  }
+
+  @Override
+  public MutableAnalysisMetadataHolder setUuid(String s) {
+    checkState(!uuid.isInitialized(), "Analysis uuid has already been set");
+    requireNonNull(s, "Analysis uuid can't be null");
+    this.uuid.setProperty(s);
     return this;
   }
 
@@ -64,6 +68,13 @@ public String getUuid() {
     return this.uuid.getProperty();
   }
 
+  @Override
+  public MutableAnalysisMetadataHolder setAnalysisDate(long date) {
+    checkState(!analysisDate.isInitialized(), "Analysis date has already been set");
+    this.analysisDate.setProperty(date);
+    return this;
+  }
+
   @Override
   public long getAnalysisDate() {
     checkState(analysisDate.isInitialized(), "Analysis date has not been set");

server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java

@@ -25,6 +25,11 @@
 
 public interface MutableAnalysisMetadataHolder extends AnalysisMetadataHolder {
 
+  /**
+   * @throws IllegalStateException if the organization uuid has already been set
+   */
+  MutableAnalysisMetadataHolder setOrganizationUuid(String organizationUuid);
+
   /**
    * @throws IllegalStateException if the analysis uuid has already been set
    */

server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java

@@ -69,6 +69,7 @@ public void execute() {
     mutableAnalysisMetadataHolder.setBranch(isNotEmpty(reportMetadata.getBranch()) ? reportMetadata.getBranch() : null);
     mutableAnalysisMetadataHolder.setCrossProjectDuplicationEnabled(reportMetadata.getCrossProjectDuplicationActivated());
     mutableAnalysisMetadataHolder.setQProfilesByLanguage(transformValues(reportMetadata.getQprofilesPerLanguage(), TO_COMPUTE_QPROFILE));
+    mutableAnalysisMetadataHolder.setOrganizationUuid(ceTask.getOrganizationUuid());
   }
 
   private void checkProjectKeyConsistency(ScannerReport.Metadata reportMetadata) {

server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java

@@ -37,6 +37,7 @@
 import org.sonar.db.DbSession;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.component.ComponentUpdateDto;
+import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder;
 import org.sonar.server.computation.task.projectanalysis.component.Component;
 import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit;
 import org.sonar.server.computation.task.projectanalysis.component.DbIdsRepositoryImpl;
@@ -47,7 +48,6 @@
 import org.sonar.server.computation.task.projectanalysis.component.PathAwareVisitorAdapter;
 import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder;
 import org.sonar.server.computation.task.step.ComputationStep;
-import org.sonar.server.organization.DefaultOrganizationProvider;
 
 import static com.google.common.collect.FluentIterable.from;
 import static org.sonar.db.component.ComponentDto.UUID_PATH_OF_ROOT;
@@ -65,18 +65,17 @@ public class PersistComponentsStep implements ComputationStep {
   private final MutableDbIdsRepository dbIdsRepository;
   private final System2 system2;
   private final MutableDisabledComponentsHolder disabledComponentsHolder;
-  private final DefaultOrganizationProvider defaultOrganizationProvider;
+  private final AnalysisMetadataHolder analysisMetadataHolder;
 
   public PersistComponentsStep(DbClient dbClient, TreeRootHolder treeRootHolder,
     MutableDbIdsRepository dbIdsRepository, System2 system2,
-    MutableDisabledComponentsHolder disabledComponentsHolder,
-    DefaultOrganizationProvider defaultOrganizationProvider) {
+    MutableDisabledComponentsHolder disabledComponentsHolder, AnalysisMetadataHolder analysisMetadataHolder) {
     this.dbClient = dbClient;
     this.treeRootHolder = treeRootHolder;
     this.dbIdsRepository = dbIdsRepository;
     this.system2 = system2;
     this.disabledComponentsHolder = disabledComponentsHolder;
-    this.defaultOrganizationProvider = defaultOrganizationProvider;
+    this.analysisMetadataHolder = analysisMetadataHolder;
   }
 
   @Override
@@ -349,7 +348,7 @@ private ComponentDto createBase(Component component) {
     String componentUuid = component.getUuid();
 
     ComponentDto componentDto = new ComponentDto();
-    componentDto.setOrganizationUuid(defaultOrganizationProvider.get().getUuid());
+    componentDto.setOrganizationUuid(analysisMetadataHolder.getOrganizationUuid());
     componentDto.setUuid(componentUuid);
     componentDto.setKey(componentKey);
     componentDto.setDeprecatedKey(componentKey);

server/sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java

@@ -36,24 +36,28 @@
 import org.sonar.db.ce.CeTaskTypes;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.component.ComponentTesting;
+import org.sonar.server.organization.DefaultOrganizationProvider;
+import org.sonar.server.organization.TestDefaultOrganizationProvider;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.startsWith;
 
 public class CeQueueImplTest {
 
+  private System2 system2 = new TestSystem2().setNow(1_450_000_000_000L);
+
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
-
-  System2 system2 = new TestSystem2().setNow(1_450_000_000_000L);
-
   @Rule
   public DbTester dbTester = DbTester.create(system2);
-  DbSession session = dbTester.getSession();
 
-  UuidFactory uuidFactory = UuidFactoryImpl.INSTANCE;
-  CeQueue underTest = new CeQueueImpl(dbTester.getDbClient(), uuidFactory);
+  private DbSession session = dbTester.getSession();
+
+  private UuidFactory uuidFactory = UuidFactoryImpl.INSTANCE;
+  private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(dbTester);
+
+  private CeQueue underTest = new CeQueueImpl(dbTester.getDbClient(), uuidFactory, defaultOrganizationProvider);
 
   @Test
   public void submit_returns_task_populated_from_CeTaskSubmit_and_creates_CeQueue_row() {
@@ -176,6 +180,11 @@ public void pause_and_resume_submits() throws Exception {
   }
 
   private void verifyCeTask(CeTaskSubmit taskSubmit, CeTask task, @Nullable ComponentDto componentDto) {
+    if (componentDto == null) {
+      assertThat(task.getOrganizationUuid()).isEqualTo(defaultOrganizationProvider.get().getUuid());
+    } else {
+      assertThat(task.getOrganizationUuid()).isEqualTo(componentDto.getOrganizationUuid());
+    }
     assertThat(task.getUuid()).isEqualTo(taskSubmit.getUuid());
     assertThat(task.getComponentUuid()).isEqualTo(task.getComponentUuid());
     assertThat(task.getType()).isEqualTo(taskSubmit.getType());