@@ -28,7 +28,6 @@ import org.junit.jupiter.api.Test; | |||
import org.junit.jupiter.api.extension.RegisterExtension; | |||
import org.sonar.api.measures.Metric; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.core.util.Uuids; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.component.BranchDto; | |||
@@ -53,7 +52,6 @@ class QualityGateDaoIT { | |||
@Test | |||
void insert() { | |||
QualityGateDto newQgate = new QualityGateDto() | |||
.setUuid(Uuids.createFast()) | |||
.setName("My Quality Gate") | |||
.setBuiltIn(false) | |||
.setUpdatedAt(new Date()); | |||
@@ -71,7 +69,7 @@ class QualityGateDaoIT { | |||
@Test | |||
void insert_built_in() { | |||
underTest.insert(db.getSession(), new QualityGateDto().setName("test").setBuiltIn(true).setUuid(Uuids.createFast())); | |||
underTest.insert(db.getSession(), new QualityGateDto().setName("test").setBuiltIn(true)); | |||
QualityGateDto reloaded = underTest.selectByName(db.getSession(), "test"); | |||
@@ -21,7 +21,6 @@ package org.sonar.server.qualitygate; | |||
import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.sonar.core.util.UuidFactoryFast; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
@@ -39,7 +38,7 @@ public class QualityGateUpdaterIT { | |||
private final DbClient dbClient = db.getDbClient(); | |||
private final DbSession dbSession = db.getSession(); | |||
private final QualityGateUpdater underTest = new QualityGateUpdater(dbClient, UuidFactoryFast.getInstance()); | |||
private final QualityGateUpdater underTest = new QualityGateUpdater(dbClient); | |||
@Test | |||
public void create_quality_gate() { |
@@ -27,7 +27,6 @@ import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.core.util.UuidFactoryFast; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
@@ -63,7 +62,7 @@ public class CopyActionIT { | |||
private final DbClient dbClient = db.getDbClient(); | |||
private final DbSession dbSession = db.getSession(); | |||
private final QualityGateUpdater qualityGateUpdater = new QualityGateUpdater(dbClient, UuidFactoryFast.getInstance()); | |||
private final QualityGateUpdater qualityGateUpdater = new QualityGateUpdater(dbClient); | |||
private final QualityGatesWsSupport wsSupport = new QualityGatesWsSupport(dbClient, userSession, TestComponentFinder.from(db)); | |||
private final CopyAction underTest = new CopyAction(dbClient, userSession, qualityGateUpdater, wsSupport); |
@@ -29,10 +29,8 @@ import org.junit.Before; | |||
import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; | |||
import org.sonar.api.measures.CoreMetrics; | |||
import org.sonar.api.measures.Metric; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.core.util.UuidFactoryFast; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
@@ -65,8 +63,7 @@ public class CreateActionIT { | |||
private final DbClient dbClient = db.getDbClient(); | |||
private final DbSession dbSession = db.getSession(); | |||
private final CreateAction underTest = new CreateAction(dbClient, userSession, new QualityGateUpdater(dbClient, | |||
UuidFactoryFast.getInstance()), | |||
private final CreateAction underTest = new CreateAction(dbClient, userSession, new QualityGateUpdater(dbClient), | |||
new QualityGateConditionsUpdater(dbClient)); | |||
private final WsActionTester ws = new WsActionTester(underTest); | |||
@@ -19,7 +19,6 @@ | |||
*/ | |||
package org.sonar.server.qualitygate; | |||
import org.sonar.core.util.UuidFactory; | |||
import org.sonar.core.util.Uuids; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
@@ -32,19 +31,16 @@ import static org.sonar.server.util.Validation.IS_ALREADY_USED_MESSAGE; | |||
public class QualityGateUpdater { | |||
private final DbClient dbClient; | |||
private final UuidFactory uuidFactory; | |||
public QualityGateUpdater(DbClient dbClient, UuidFactory uuidFactory) { | |||
public QualityGateUpdater(DbClient dbClient) { | |||
this.dbClient = dbClient; | |||
this.uuidFactory = uuidFactory; | |||
} | |||
public QualityGateDto create(DbSession dbSession, String name) { | |||
validateQualityGate(dbSession, name); | |||
QualityGateDto newQualityGate = new QualityGateDto() | |||
.setName(name) | |||
.setBuiltIn(false) | |||
.setUuid(uuidFactory.create()); | |||
.setBuiltIn(false); | |||
dbClient.qualityGateDao().insert(dbSession, newQualityGate); | |||
return newQualityGate; | |||
} |