From: Julien HENRY <julien.henry@sonarsource.com>
Date: Mon, 9 Jun 2014 13:16:10 +0000 (+0200)
Subject: Remove deprecated stuff
X-Git-Tag: 4.4-RC1~554
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8ea2af68747cd8cea440d928ae1c09302fb63208;p=sonarqube.git

Remove deprecated stuff
---

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/Batch.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/Batch.java
index 08b3796cfb2..b8c143656f3 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/Batch.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/Batch.java
@@ -21,7 +21,6 @@ package org.sonar.batch.bootstrapper;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.batch.bootstrap.BootstrapContainer;
 import org.sonar.batch.bootstrap.BootstrapProperties;
 
@@ -39,11 +38,6 @@ public final class Batch {
   private LoggingConfiguration logging;
   private List<Object> components;
   private Map<String, String> bootstrapProperties = Maps.newHashMap();
-  /**
-   * @deprecated since 3.7
-   */
-  @Deprecated
-  private ProjectReactor projectReactor;
 
   private Batch(Builder builder) {
     components = Lists.newArrayList();
@@ -53,13 +47,7 @@ public final class Batch {
     }
     if (builder.bootstrapProperties != null) {
       bootstrapProperties.putAll(builder.bootstrapProperties);
-    } else {
-      if (builder.projectReactor != null) {
-        // For backward compatibility, previously all properties were set in root project
-        bootstrapProperties.putAll(Maps.fromProperties(builder.projectReactor.getRoot().getProperties()));
-      }
     }
-    projectReactor = builder.projectReactor;
     if (builder.isEnableLoggingConfiguration()) {
       logging = LoggingConfiguration.create(builder.environment).setProperties(bootstrapProperties);
     }
@@ -84,9 +72,6 @@ public final class Batch {
   private void startBatch() {
     List<Object> all = Lists.newArrayList(components);
     all.add(new BootstrapProperties(bootstrapProperties));
-    if (projectReactor != null) {
-      all.add(projectReactor);
-    }
 
     BootstrapContainer bootstrapContainer = BootstrapContainer.create(all);
     bootstrapContainer.execute();
@@ -98,11 +83,6 @@ public final class Batch {
 
   public static final class Builder {
     private Map<String, String> bootstrapProperties;
-    /**
-     * @deprecated since 3.7
-     */
-    @Deprecated
-    private ProjectReactor projectReactor;
     private EnvironmentInformation environment;
     private List<Object> components = Lists.newArrayList();
     private boolean enableLoggingConfiguration = true;
@@ -110,15 +90,6 @@ public final class Batch {
     private Builder() {
     }
 
-    /**
-     * @deprecated since 3.7
-     */
-    @Deprecated
-    public Builder setProjectReactor(ProjectReactor projectReactor) {
-      this.projectReactor = projectReactor;
-      return this;
-    }
-
     public Builder setEnvironment(EnvironmentInformation env) {
       this.environment = env;
       return this;
@@ -129,15 +100,6 @@ public final class Batch {
       return this;
     }
 
-    /**
-     * @deprecated since 3.7 use {@link #setBootstrapProperties(Map)}
-     */
-    @Deprecated
-    public Builder setGlobalProperties(Map<String, String> globalProperties) {
-      this.bootstrapProperties = globalProperties;
-      return this;
-    }
-
     public Builder setBootstrapProperties(Map<String, String> bootstrapProperties) {
       this.bootstrapProperties = bootstrapProperties;
       return this;
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/BatchTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/BatchTest.java
index 71a6b70f395..401353c5b83 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/BatchTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/BatchTest.java
@@ -20,7 +20,6 @@
 package org.sonar.batch.bootstrapper;
 
 import org.junit.Test;
-import org.sonar.api.batch.bootstrap.ProjectReactor;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -36,7 +35,6 @@ public class BatchTest {
   private Batch newBatch() {
     return Batch.builder()
       .setEnvironment(new EnvironmentInformation("Gradle", "1.0"))
-      .setProjectReactor(new ProjectReactor(org.sonar.api.batch.bootstrap.ProjectDefinition.create()))
       .addComponent("fake")
       .build();
   }
@@ -44,7 +42,6 @@ public class BatchTest {
   @Test(expected = IllegalStateException.class)
   public void shouldFailIfNullComponents() {
     Batch.builder()
-      .setProjectReactor(new ProjectReactor(org.sonar.api.batch.bootstrap.ProjectDefinition.create()))
       .setEnvironment(new EnvironmentInformation("Gradle", "1.0"))
       .setComponents(null)
       .build();
@@ -54,7 +51,6 @@ public class BatchTest {
   public void shouldDisableLoggingConfiguration() {
     Batch batch = Batch.builder()
       .setEnvironment(new EnvironmentInformation("Gradle", "1.0"))
-      .setProjectReactor(new ProjectReactor(org.sonar.api.batch.bootstrap.ProjectDefinition.create()))
       .addComponent("fake")
       .setEnableLoggingConfiguration(false)
       .build();