From 10e2a7a4152933a0c8a533d78255f737ed69c6da Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Thu, 29 Nov 2018 18:40:25 +0100
Subject: SONAR-11465 API cleanup

---
 .../java/org/sonar/scanner/scan/branch/BranchConfigurationLoader.java | 4 +---
 .../java/org/sonar/scanner/scan/branch/BranchParamsValidator.java     | 4 +---
 .../java/org/sonar/scanner/scan/branch/ProjectBranchesLoader.java     | 4 +---
 .../java/org/sonar/scanner/scan/branch/ProjectPullRequestsLoader.java | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch')

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/BranchConfigurationLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/BranchConfigurationLoader.java
index 7949d5f07b4..149afa02eda 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/BranchConfigurationLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/BranchConfigurationLoader.java
@@ -21,11 +21,9 @@ package org.sonar.scanner.scan.branch;
 
 import java.util.Map;
 import java.util.function.Supplier;
-import org.sonar.api.batch.InstantiationStrategy;
-import org.sonar.api.batch.ScannerSide;
+import org.sonar.api.scanner.ScannerSide;
 
 @ScannerSide
-@InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 public interface BranchConfigurationLoader {
   BranchConfiguration load(Map<String, String> localSettings, Supplier<Map<String, String>> remoteSettingsSupplier, ProjectBranches branches, ProjectPullRequests pullRequests);
 }
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/BranchParamsValidator.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/BranchParamsValidator.java
index 587e6aedb8d..fc5b955bf36 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/BranchParamsValidator.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/BranchParamsValidator.java
@@ -21,11 +21,9 @@ package org.sonar.scanner.scan.branch;
 
 import java.util.List;
 import javax.annotation.Nullable;
-import org.sonar.api.batch.InstantiationStrategy;
-import org.sonar.api.batch.ScannerSide;
+import org.sonar.api.scanner.ScannerSide;
 
 @ScannerSide
-@InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 public interface BranchParamsValidator {
   void validate(List<String> validationMessages, @Nullable String deprecatedBranchName);
 }
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/ProjectBranchesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/ProjectBranchesLoader.java
index a7e6a2bc1bd..b06df550dd4 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/ProjectBranchesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/ProjectBranchesLoader.java
@@ -19,11 +19,9 @@
  */
 package org.sonar.scanner.scan.branch;
 
-import org.sonar.api.batch.InstantiationStrategy;
-import org.sonar.api.batch.ScannerSide;
+import org.sonar.api.scanner.ScannerSide;
 
 @ScannerSide
-@InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 public interface ProjectBranchesLoader {
 
   /**
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/ProjectPullRequestsLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/ProjectPullRequestsLoader.java
index c5af1c53375..26a12191844 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/ProjectPullRequestsLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/ProjectPullRequestsLoader.java
@@ -19,11 +19,9 @@
  */
 package org.sonar.scanner.scan.branch;
 
-import org.sonar.api.batch.InstantiationStrategy;
-import org.sonar.api.batch.ScannerSide;
+import org.sonar.api.scanner.ScannerSide;
 
 @ScannerSide
-@InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 public interface ProjectPullRequestsLoader {
 
   /**
-- 
cgit v1.2.3