aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-db-dao
diff options
context:
space:
mode:
authorDuarte Meneses <duarte.meneses@sonarsource.com>2021-11-17 14:03:41 -0600
committersonartech <sonartech@sonarsource.com>2021-11-18 20:03:33 +0000
commiteda9dff59cc60209b15b69ef4aa4c18885c0c744 (patch)
tree6b18970b9d56d562adbad875e0cd530490e89c10 /server/sonar-db-dao
parentcc17da15ebea7d7585325f94368b7401505fa74f (diff)
downloadsonarqube-eda9dff59cc60209b15b69ef4aa4c18885c0c744.tar.gz
sonarqube-eda9dff59cc60209b15b69ef4aa4c18885c0c744.zip
SONAR-15398 update class and method names
Diffstat (limited to 'server/sonar-db-dao')
-rw-r--r--server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java2
-rw-r--r--server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentUpdateDto.java2
-rw-r--r--server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java8
-rw-r--r--server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDtoTest.java2
4 files changed, 7 insertions, 7 deletions
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java
index 0f491d7f96a..616f456c64e 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java
@@ -352,7 +352,7 @@ public class ComponentDto {
}
@CheckForNull
- public String getCopyResourceUuid() {
+ public String getCopyComponentUuid() {
return copyComponentUuid;
}
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentUpdateDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentUpdateDto.java
index cec683c65b4..ca262064df2 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentUpdateDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentUpdateDto.java
@@ -189,7 +189,7 @@ public class ComponentUpdateDto {
.setUuid(from.uuid())
.setBChanged(false)
.setBKey(from.getDbKey())
- .setBCopyComponentUuid(from.getCopyResourceUuid())
+ .setBCopyComponentUuid(from.getCopyComponentUuid())
.setBDescription(from.description())
.setBEnabled(from.isEnabled())
.setBUuidPath(from.getUuidPath())
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java
index d5aad6f2f47..ccb93d46484 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java
@@ -149,7 +149,7 @@ public class ComponentDaoTest {
assertThat(result.qualifier()).isEqualTo("TRK");
assertThat(result.scope()).isEqualTo("PRJ");
assertThat(result.language()).isNull();
- assertThat(result.getCopyResourceUuid()).isNull();
+ assertThat(result.getCopyComponentUuid()).isNull();
assertThat(result.isPrivate()).isTrue();
assertThat(underTest.selectByUuid(dbSession, "UNKNOWN")).isEmpty();
@@ -178,7 +178,7 @@ public class ComponentDaoTest {
assertThat(result.qualifier()).isEqualTo("TRK");
assertThat(result.scope()).isEqualTo("FIL");
assertThat(result.language()).isNull();
- assertThat(result.getCopyResourceUuid()).isEqualTo(project.uuid());
+ assertThat(result.getCopyComponentUuid()).isEqualTo(project.uuid());
assertThat(result.isPrivate()).isFalse();
}
@@ -1272,7 +1272,7 @@ public class ComponentDaoTest {
Map<String, Object> row1 = selectBColumnsForUuid("U1");
assertThat(row1.get("bChanged")).isIn(true, /* for Oracle */1L, 1);
assertThat(row1.get("bKey")).isEqualTo(dto1.getDbKey());
- assertThat(row1.get("bCopyComponentUuid")).isEqualTo(dto1.getCopyResourceUuid());
+ assertThat(row1.get("bCopyComponentUuid")).isEqualTo(dto1.getCopyComponentUuid());
assertThat(row1.get("bDescription")).isEqualTo(dto1.description());
assertThat(row1.get("bEnabled")).isIn(false, /* for Oracle */0L, 0);
assertThat(row1.get("bUuidPath")).isEqualTo(dto1.getUuidPath());
@@ -1287,7 +1287,7 @@ public class ComponentDaoTest {
Map<String, Object> row2 = selectBColumnsForUuid("U2");
assertThat(row2.get("bChanged")).isIn(true, /* for Oracle */1L, 1);
assertThat(row2.get("bKey")).isEqualTo(dto2.getDbKey());
- assertThat(row2.get("bCopyComponentUuid")).isEqualTo(dto2.getCopyResourceUuid());
+ assertThat(row2.get("bCopyComponentUuid")).isEqualTo(dto2.getCopyComponentUuid());
assertThat(row2.get("bDescription")).isEqualTo(dto2.description());
assertThat(row2.get("bEnabled")).isIn(false, /* for Oracle */0L, 0);
assertThat(row2.get("bUuidPath")).isEqualTo(dto2.getUuidPath());
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDtoTest.java
index bcb2da60309..64974077864 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDtoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDtoTest.java
@@ -51,7 +51,7 @@ public class ComponentDtoTest {
assertThat(componentDto.language()).isEqualTo("java");
assertThat(componentDto.description()).isEqualTo("desc");
assertThat(componentDto.getRootUuid()).isEqualTo("uuid_3");
- assertThat(componentDto.getCopyResourceUuid()).isEqualTo("uuid_5");
+ assertThat(componentDto.getCopyComponentUuid()).isEqualTo("uuid_5");
assertThat(componentDto.isPrivate()).isFalse();
}