aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-ce/src
diff options
context:
space:
mode:
authorBelen Pruvost <belen.pruvost@sonarsource.com>2021-08-17 23:38:09 +0200
committersonartech <sonartech@sonarsource.com>2021-08-19 20:08:15 +0000
commit7a6e871b1a37a53e76d483e0b65b811c6ac6beb9 (patch)
treec01fabd75ca6a9b476ebf6fb1c1e61b2326a9e4d /server/sonar-ce/src
parent0cbc47585976e86e63753f74e285ef95b7e59657 (diff)
downloadsonarqube-7a6e871b1a37a53e76d483e0b65b811c6ac6beb9.tar.gz
sonarqube-7a6e871b1a37a53e76d483e0b65b811c6ac6beb9.zip
SONAR-15142 - Add componentKey to all logs
Diffstat (limited to 'server/sonar-ce/src')
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/db/ReadOnlyPropertiesDao.java7
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java2
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/db/ReadOnlyPropertiesDaoTest.java6
3 files changed, 8 insertions, 7 deletions
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/db/ReadOnlyPropertiesDao.java b/server/sonar-ce/src/main/java/org/sonar/ce/db/ReadOnlyPropertiesDao.java
index f7eca8e91b9..ea1c3b3475c 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/db/ReadOnlyPropertiesDao.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/db/ReadOnlyPropertiesDao.java
@@ -44,7 +44,7 @@ public class ReadOnlyPropertiesDao extends PropertiesDao {
@Override
public void saveProperty(DbSession session, PropertyDto property, @Nullable String userLogin,
- @Nullable String projectName, @Nullable String qualifier) {
+ @Nullable String projectKey, @Nullable String projectName, @Nullable String qualifier) {
// do nothing
}
@@ -54,12 +54,13 @@ public class ReadOnlyPropertiesDao extends PropertiesDao {
}
@Override
- public void deleteProjectProperty(String key, String projectUuid, String projectName, String qualifier) {
+ public void deleteProjectProperty(String key, String projectUuid, String projectKey, String projectName, String qualifier) {
// do nothing
}
@Override
- public void deleteProjectProperty(DbSession session, String key, String projectUuid, String projectName, String qualifier) {
+ public void deleteProjectProperty(DbSession session, String key, String projectUuid, String projectKey,
+ String projectName, String qualifier) {
// do nothing
}
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
index 50fe9c75f8f..d566a60c46a 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
@@ -144,7 +144,7 @@ public class ComputeEngineContainerImplTest {
private void insertProperty(String key, String value) {
PropertyDto dto = new PropertyDto().setKey(key).setValue(value);
- db.getDbClient().propertiesDao().saveProperty(db.getSession(), dto, null, null, null);
+ db.getDbClient().propertiesDao().saveProperty(db.getSession(), dto, null, null, null, null);
db.commit();
}
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/db/ReadOnlyPropertiesDaoTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/db/ReadOnlyPropertiesDaoTest.java
index 83894a129bc..0aa81667d56 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/db/ReadOnlyPropertiesDaoTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/db/ReadOnlyPropertiesDaoTest.java
@@ -40,7 +40,7 @@ public class ReadOnlyPropertiesDaoTest {
@Test
public void insertProperty() {
- underTest.saveProperty(dbSession, propertyDto, null, null, null);
+ underTest.saveProperty(dbSession, propertyDto, null, null, null, null);
assertNoInteraction();
}
@@ -54,7 +54,7 @@ public class ReadOnlyPropertiesDaoTest {
@Test
public void deleteProjectProperty() {
- underTest.deleteProjectProperty(null, null, null, null);
+ underTest.deleteProjectProperty(null, null, null, null, null, null);
assertNoInteraction();
@@ -62,7 +62,7 @@ public class ReadOnlyPropertiesDaoTest {
@Test
public void deleteProjectProperty1() {
- underTest.deleteProjectProperty(dbSession, null, null, null, null);
+ underTest.deleteProjectProperty(dbSession, null, null, null, null, null);
assertNoInteraction();