SONAR-7441 no DB Component should have @ServerSide nor @ComputeEngineSide

diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java
index b4e0dd844e5d47e7bd209449e5d10c8eaf9692dc..515747a6a426b1d3f99bc282653c1bb2c8fb583b 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java
@@ -25,8 +25,6 @@ import java.util.Collection;
 import java.util.List;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
-import org.sonar.api.ce.ComputeEngineSide;
-import org.sonar.api.server.ServerSide;
 import org.sonar.core.issue.DefaultIssueComment;
 import org.sonar.core.issue.FieldDiffs;
 import org.sonar.db.Dao;
@@ -36,8 +34,6 @@ import org.sonar.db.MyBatis;
 
 import static java.util.Arrays.asList;
 
-@ServerSide
-@ComputeEngineSide
 public class IssueChangeDao implements Dao {
 
   private final MyBatis mybatis;

diff --git a/sonar-db/src/main/java/org/sonar/db/measure/custom/CustomMeasureDao.java b/sonar-db/src/main/java/org/sonar/db/measure/custom/CustomMeasureDao.java
index 0d883a62bd8782ace3522c0da109a090a3cd4076..f74109fc7ea08a78f1a68179dba3384b6598306c 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/measure/custom/CustomMeasureDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/measure/custom/CustomMeasureDao.java
@@ -24,15 +24,11 @@ import java.util.List;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import org.apache.ibatis.session.RowBounds;
-import org.sonar.api.ce.ComputeEngineSide;
-import org.sonar.api.server.ServerSide;
 import org.sonar.db.Dao;
 import org.sonar.db.DatabaseUtils;
 import org.sonar.db.DbSession;
 import org.sonar.db.RowNotFoundException;
 
-@ServerSide
-@ComputeEngineSide
 public class CustomMeasureDao implements Dao {
   public void insert(DbSession session, CustomMeasureDto customMeasureDto) {
     mapper(session).insert(customMeasureDto);

diff --git a/sonar-db/src/main/java/org/sonar/db/permission/PermissionRepository.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionRepository.java
index cd62f93ec3fc51d0118546678f27234dc6d102c2..29f9a9d5a7e86a47c8c293d6042e4e249e2b38c3 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/permission/PermissionRepository.java
+++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionRepository.java
@@ -27,8 +27,6 @@ import javax.annotation.Nullable;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.config.Settings;
 import org.sonar.api.security.DefaultGroups;
-import org.sonar.api.ce.ComputeEngineSide;
-import org.sonar.api.server.ServerSide;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.component.ComponentDto;
@@ -43,8 +41,6 @@ import org.sonar.db.user.UserRoleDto;
  * <p/>
  * WARNING, this class is called by Deveveloper Cockpit to apply default permission template on new developers
  */
-@ServerSide
-@ComputeEngineSide
 public class PermissionRepository {
 
   private final DbClient dbClient;

diff --git a/sonar-db/src/main/java/org/sonar/db/purge/period/DefaultPeriodCleaner.java b/sonar-db/src/main/java/org/sonar/db/purge/period/DefaultPeriodCleaner.java
index f761eafda521028c6e3ce4f5f3f8c5e8e983cf36..ac65ae2247a7b5b2d42f9e5ea2d7e1e26949ed40 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/purge/period/DefaultPeriodCleaner.java
+++ b/sonar-db/src/main/java/org/sonar/db/purge/period/DefaultPeriodCleaner.java
@@ -22,8 +22,6 @@ package org.sonar.db.purge.period;
 import com.google.common.annotations.VisibleForTesting;
 import java.util.List;
 import org.sonar.api.config.Settings;
-import org.sonar.api.ce.ComputeEngineSide;
-import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
@@ -33,8 +31,6 @@ import org.sonar.db.purge.PurgeProfiler;
 import org.sonar.db.purge.PurgeSnapshotQuery;
 import org.sonar.db.purge.PurgeableSnapshotDto;
 
-@ServerSide
-@ComputeEngineSide
 public class DefaultPeriodCleaner {
 
   private static final Logger LOG = Loggers.get(DefaultPeriodCleaner.class);

diff --git a/sonar-db/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java
index 1f11add1fee83bc62fbe07da6955488fcd2f2e0a..ca2ec555f1cfd90cca31bdabcc6e4bd21b3395df 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java
@@ -27,8 +27,6 @@ import java.util.List;
 import java.util.Map;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import org.sonar.api.ce.ComputeEngineSide;
-import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.System2;
 import org.sonar.db.Dao;
 import org.sonar.db.DbSession;
@@ -36,8 +34,6 @@ import org.sonar.db.MyBatis;
 import org.sonar.db.RowNotFoundException;
 import org.sonar.db.component.ComponentDto;
 
-@ServerSide
-@ComputeEngineSide
 public class QualityProfileDao implements Dao {
 
   private final MyBatis mybatis;

diff --git a/sonar-db/src/main/java/org/sonar/db/user/AuthorizationDao.java b/sonar-db/src/main/java/org/sonar/db/user/AuthorizationDao.java
index d24381d4e494db2ba52ea74d7b569a901f18bdc2..761d302dff564d39c8b38fb6e23268ad6102ec4e 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/user/AuthorizationDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/user/AuthorizationDao.java
@@ -27,8 +27,6 @@ import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
 import org.apache.ibatis.session.SqlSession;
-import org.sonar.api.ce.ComputeEngineSide;
-import org.sonar.api.server.ServerSide;
 import org.sonar.db.Dao;
 import org.sonar.db.DatabaseUtils;
 import org.sonar.db.DbSession;
@@ -36,8 +34,6 @@ import org.sonar.db.MyBatis;
 
 import static com.google.common.collect.Maps.newHashMap;
 
-@ServerSide
-@ComputeEngineSide
 public class AuthorizationDao implements Dao {
 
   private static final String USER_ID_PARAM = "userId";