aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukasz Jarocki <lukasz.jarocki@sonarsource.com>2023-05-22 14:07:29 +0200
committersonartech <sonartech@sonarsource.com>2023-06-01 20:02:59 +0000
commitf6308252cbca9343c8071c2f268c633654d92650 (patch)
treedbec3bc240158fb98e915c82f5a0527f297a98a6
parent2b19b12cdc0623c07ebae3121b50965c257b5b36 (diff)
downloadsonarqube-f6308252cbca9343c8071c2f268c633654d92650.tar.gz
sonarqube-f6308252cbca9343c8071c2f268c633654d92650.zip
SONAR-18856 javadoc and unit test cosmetics
-rw-r--r--server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ProjectAlmSettingDto.java5
-rw-r--r--server/sonar-db-dao/src/main/java/org/sonar/db/portfolio/PortfolioDto.java4
-rw-r--r--server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectDto.java5
-rw-r--r--server/sonar-db-dao/src/test/java/org/sonar/db/entity/EntityDtoTest.java26
4 files changed, 26 insertions, 14 deletions
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ProjectAlmSettingDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ProjectAlmSettingDto.java
index d95255ff18b..f74ac9617ac 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ProjectAlmSettingDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ProjectAlmSettingDto.java
@@ -21,7 +21,6 @@ package org.sonar.db.alm.setting;
import javax.annotation.CheckForNull;
import javax.annotation.Nullable;
-import org.sonar.db.component.ComponentDto;
public class ProjectAlmSettingDto {
@@ -31,8 +30,8 @@ public class ProjectAlmSettingDto {
private String uuid;
/**
- * Non-null UUID of project. Max size is 50.
- * @see ComponentDto#uuid()
+ * Non-null UUID of project. Max size is 40.
+ * @see org.sonar.db.entity.EntityDto#getUuid()
*/
private String projectUuid;
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/portfolio/PortfolioDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/portfolio/PortfolioDto.java
index fe6c28f84ed..d5f63653f26 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/portfolio/PortfolioDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/portfolio/PortfolioDto.java
@@ -40,10 +40,6 @@ public class PortfolioDto extends EntityDto {
private long createdAt;
private long updatedAt;
- public PortfolioDto() {
- // nothing to do here
- }
-
public String getRootUuid() {
return rootUuid;
}
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectDto.java
index 738be9d67d9..6e48cccde0c 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectDto.java
@@ -20,7 +20,6 @@
package org.sonar.db.project;
import java.util.List;
-import java.util.Objects;
import java.util.stream.Collectors;
import javax.annotation.CheckForNull;
import javax.annotation.Nullable;
@@ -36,10 +35,6 @@ public class ProjectDto extends EntityDto {
private long createdAt;
private long updatedAt;
- public ProjectDto() {
- // nothing to do here
- }
-
public long getCreatedAt() {
return createdAt;
}
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/entity/EntityDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/entity/EntityDtoTest.java
index 6275d53d33d..654d2174dce 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/entity/EntityDtoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/entity/EntityDtoTest.java
@@ -25,17 +25,28 @@ import org.sonar.db.portfolio.PortfolioDto;
import static org.assertj.core.api.Assertions.assertThat;
public class EntityDtoTest {
+
+ @Test
+ public void equals_whenEmptyObjects_shouldReturnTrue() {
+ PortfolioDto p1 = new PortfolioDto();
+ PortfolioDto p2 = new PortfolioDto();
+
+ boolean equals = p1.equals(p2);
+
+ assertThat(equals).isTrue();
+ }
+
@Test
public void equals_whenSameUuid_shouldReturnTrue() {
PortfolioDto e1 = new PortfolioDto().setUuid("uuid1");
- PortfolioDto e2 = new PortfolioDto().setUuid("uuid1");;
+ PortfolioDto e2 = new PortfolioDto().setUuid("uuid1");
assertThat(e1).isEqualTo(e2);
}
@Test
public void equals_whenDifferentUuid_shouldReturnFalse() {
PortfolioDto e1 = new PortfolioDto().setUuid("uuid1");
- PortfolioDto e2 = new PortfolioDto().setUuid("uuid2");;
+ PortfolioDto e2 = new PortfolioDto().setUuid("uuid2");
assertThat(e1).isNotEqualTo(e2);
}
@@ -51,4 +62,15 @@ public class EntityDtoTest {
assertThat(e1).isNotEqualTo(new Object());
}
+ @Test
+ public void hashCode_whenEmptyObjects_shouldBeTheSame() {
+ PortfolioDto p1 = new PortfolioDto();
+ PortfolioDto p2 = new PortfolioDto();
+
+ int hash1 = p1.hashCode();
+ int hash2 = p2.hashCode();
+
+ assertThat(hash1).isEqualTo(hash2);
+ }
+
} \ No newline at end of file