Remove useless constructors with System2.INSTANCE

4 files changed, 6 insertions, 23 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java b/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java
index 0049e3468e4..5800f7d698c 100644
--- a/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java
+++ b/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.activity.db;
 
-import com.google.common.annotations.VisibleForTesting;
 import org.sonar.api.utils.System2;
 import org.sonar.core.activity.db.ActivityDto;
 import org.sonar.core.activity.db.ActivityMapper;
@@ -37,11 +36,6 @@ import java.util.List;
  */
 public class ActivityDao extends BaseDao<ActivityMapper, ActivityDto, String> {
 
-  public ActivityDao() {
-    this(System2.INSTANCE);
-  }
-
-  @VisibleForTesting
   public ActivityDao(System2 system) {
     super(IndexDefinition.LOG, ActivityMapper.class, system);
   }
@@ -59,7 +53,7 @@ public class ActivityDao extends BaseDao<ActivityMapper, ActivityDto, String> {
 
   @Override
   protected ActivityDto doUpdate(DbSession session, ActivityDto item) {
-   throw new IllegalStateException("Cannot update Log!");
+    throw new IllegalStateException("Cannot update Log!");
   }
 
   @Override
@@ -73,7 +67,7 @@ public class ActivityDao extends BaseDao<ActivityMapper, ActivityDto, String> {
 
   @Override
   public void synchronizeAfter(DbSession session, Date time) {
-    for(ActivityDto activity:this.findAll(session)){
+    for (ActivityDto activity : this.findAll(session)) {
       session.enqueue(new DtoIndexAction<ActivityDto>(this.getIndexType(), IndexAction.Method.UPSERT, activity));
     }
     session.commit();
diff --git a/sonar-server/src/main/java/org/sonar/server/component/persistence/ComponentDao.java b/sonar-server/src/main/java/org/sonar/server/component/persistence/ComponentDao.java
index d6618173c35..940bd4d344e 100644
--- a/sonar-server/src/main/java/org/sonar/server/component/persistence/ComponentDao.java
+++ b/sonar-server/src/main/java/org/sonar/server/component/persistence/ComponentDao.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.component.persistence;
 
-import com.google.common.annotations.VisibleForTesting;
 import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.ServerComponent;
 import org.sonar.api.utils.System2;
@@ -36,11 +35,6 @@ import java.util.Date;
  */
 public class ComponentDao extends BaseDao<ComponentMapper, ComponentDto, String> implements ServerComponent, DaoComponent {
 
-  public ComponentDao() {
-    this(System2.INSTANCE);
-  }
-
-  @VisibleForTesting
   public ComponentDao(System2 system) {
     super(ComponentMapper.class, system);
   }
diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueChangelogMigration.java b/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueChangelogMigration.java
index ad2b816aec1..ef8ae771dfa 100644
--- a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueChangelogMigration.java
+++ b/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueChangelogMigration.java
@@ -46,12 +46,12 @@ public class IssueChangelogMigration implements DatabaseMigration {
   private final System2 system2;
   private final Database db;
 
-  public IssueChangelogMigration(Database database, PropertiesDao propertiesDao) {
-    this(database, new WorkDurationConvertor(propertiesDao), System2.INSTANCE);
+  public IssueChangelogMigration(Database database, System2 system2, PropertiesDao propertiesDao) {
+    this(database, system2, new WorkDurationConvertor(propertiesDao));
   }
 
   @VisibleForTesting
-  IssueChangelogMigration(Database database, WorkDurationConvertor convertor, System2 system2) {
+  IssueChangelogMigration(Database database, System2 system2, WorkDurationConvertor convertor) {
     this.db = database;
     this.workDurationConvertor = convertor;
     this.system2 = system2;
diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigration.java b/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigration.java
index cfd9cc707b2..a06d94615fd 100644
--- a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigration.java
+++ b/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigration.java
@@ -43,12 +43,7 @@ public class NotResolvedIssuesOnRemovedComponentsMigration implements DatabaseMi
   private final System2 system2;
   private final Database db;
 
-  public NotResolvedIssuesOnRemovedComponentsMigration(Database database) {
-    this(database, System2.INSTANCE);
-  }
-
-  @VisibleForTesting
-  NotResolvedIssuesOnRemovedComponentsMigration(Database database, System2 system2) {
+  public NotResolvedIssuesOnRemovedComponentsMigration(Database database, System2 system2) {
     this.db = database;
     this.system2 = system2;
   }