From 3cf7d3e72f09ec723fbd9ff9d04e42fd57d20ad7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Tue, 29 Mar 2016 11:23:39 +0200 Subject: [PATCH] SONAR-7441 no DB Component should have @ServerSide nor @ComputeEngineSide --- sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java | 4 ---- .../java/org/sonar/db/measure/custom/CustomMeasureDao.java | 4 ---- .../java/org/sonar/db/permission/PermissionRepository.java | 4 ---- .../java/org/sonar/db/purge/period/DefaultPeriodCleaner.java | 4 ---- .../java/org/sonar/db/qualityprofile/QualityProfileDao.java | 4 ---- .../src/main/java/org/sonar/db/user/AuthorizationDao.java | 4 ---- 6 files changed, 24 deletions(-) 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 b4e0dd844e5..515747a6a42 100644 --- 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 0d883a62bd8..f74109fc7ea 100644 --- 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 cd62f93ec3f..29f9a9d5a7e 100644 --- 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; *

* 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 f761eafda52..ac65ae2247a 100644 --- 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 1f11add1fee..ca2ec555f1c 100644 --- 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 d24381d4e49..761d302dff5 100644 --- 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"; -- 2.39.5