Remove useless boxing of UserDto.getId().intValue()

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/DeprecatedUserFinder.java b/server/sonar-server/src/main/java/org/sonar/server/user/DeprecatedUserFinder.java
index 6d0026bbfea28564cbd9f31446c4c9cff41f73e6..7a191e7d3d89bf37e90ca32c71ca12a7f99483e3 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/DeprecatedUserFinder.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/DeprecatedUserFinder.java
@@ -49,7 +49,7 @@ public class DeprecatedUserFinder implements UserFinder {
   private static User copy(@Nullable UserDto dto) {
     if (dto != null) {
       User user = new User().setEmail(dto.getEmail()).setLogin(dto.getLogin()).setName(dto.getName());
-      user.setId(dto.getId().intValue());
+      user.setId(dto.getId());
       return user;
     }
     return null;

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java
index e25aaf8f11e00d620de79b5c44b9c1fbe138c112..648cf0ff6b0fddfb6c11f4f0d09e6bfa8ca80b31 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java
@@ -91,7 +91,7 @@ public class ServerUserSession extends AbstractUserSession {
   @Override
   @CheckForNull
   public Integer getUserId() {
-    return userDto == null ? null : userDto.getId().intValue();
+    return userDto == null ? null : userDto.getId();
   }
 
   @Override

diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java
index 4b7974dccd177d906ab4155ba21df55a6df54ae3..98002b098d5dc0e7c22149248e1b204cfd402ce3 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java
@@ -282,7 +282,7 @@ public class PermissionIndexerTest {
   }
 
   private UserSessionRule log_in(UserDto u) {
-    userSession.logIn(u.getLogin()).setUserId(u.getId().intValue());
+    userSession.logIn(u.getLogin()).setUserId(u.getId());
     return userSession;
   }
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QgateProjectFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QgateProjectFinderTest.java
index c781c2662d4886e3f276239648d4a823891c34e8..122ac05ec34444eb30165dee4f77d55a5746303c 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QgateProjectFinderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QgateProjectFinderTest.java
@@ -150,7 +150,7 @@ public class QgateProjectFinderTest {
     // User can only see project 1
     dbTester.users().insertProjectPermissionOnUser(user, UserRole.USER, project1);
 
-    userSession.logIn(user.getLogin()).setUserId(user.getId().intValue());
+    userSession.logIn(user.getLogin()).setUserId(user.getId());
     Association result = underTest.find(
       builder()
         .gateId(Long.toString(qGate.getId()))

diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java
index 5ed506cc01404c6c013fed0c2b2c929551f6cc14..82b72a2b2c7e6febe05ed3c266e0785eb42537f1 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java
@@ -69,7 +69,7 @@ public class ProjectsActionTest {
   public void setUp() {
     organizationDto = db.organizations().insert();
     user = db.users().insertUser(UserTesting.newUserDto().setLogin("obiwan"));
-    userSessionRule.logIn("obiwan").setUserId(user.getId().intValue());
+    userSessionRule.logIn("obiwan").setUserId(user.getId());
 
     createProfiles();
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java
index a1aa790a07224a908bb3bc84d664c8853de29914..35c54e084eee5218b4460348b9ce135eba5897be 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java
@@ -339,7 +339,7 @@ public class ResetActionTest {
   private void assertUserPropertyExists(String key, UserDto user) {
     assertThat(dbClient.propertiesDao().selectByQuery(PropertyQuery.builder()
       .setKey(key)
-      .setUserId(user.getId().intValue())
+      .setUserId(user.getId())
       .build(),
       dbSession)).isNotEmpty();
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java
index 6ef0080f6987b79e03cde23ed9cf7dc63260c405..7629c59167c2f51b047d43e2f877c7bd5a677717 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java
@@ -216,7 +216,7 @@ public class SettingsUpdaterTest {
   private void assertUserPropertyExists(String key, UserDto user) {
     assertThat(dbClient.propertiesDao().selectByQuery(PropertyQuery.builder()
         .setKey(key)
-        .setUserId(user.getId().intValue())
+        .setUserId(user.getId())
         .build(),
       dbSession)).isNotEmpty();
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSession.java b/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSession.java
index 4e95c822fa6f63e9ba4bf8791560d30054838cae..1558d4a400af3e221de3614188ad879d1e6a8d96 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSession.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSession.java
@@ -48,7 +48,7 @@ public class MockUserSession extends AbstractMockUserSession<MockUserSession> {
     super(MockUserSession.class);
     checkArgument(!userDto.getLogin().isEmpty());
     this.login = userDto.getLogin();
-    setUserId(userDto.getId().intValue());
+    setUserId(userDto.getId());
     setName(userDto.getName());
   }
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/TestUserSessionFactory.java b/server/sonar-server/src/test/java/org/sonar/server/user/TestUserSessionFactory.java
index 8b83cbcf309b16bd3923c1d462f6ac1ac6a1f140..fe05f3dd5de4fe8a0e8740fc8e3f77ca027c573e 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/user/TestUserSessionFactory.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/TestUserSessionFactory.java
@@ -72,7 +72,7 @@ public class TestUserSessionFactory implements UserSessionFactory {
 
     @Override
     public Integer getUserId() {
-      return user != null ? user.getId().intValue() : null;
+      return user != null ? user.getId() : null;
     }
 
     @Override

diff --git a/sonar-db/src/test/java/org/sonar/db/organization/OrganizationDaoTest.java b/sonar-db/src/test/java/org/sonar/db/organization/OrganizationDaoTest.java
index 49195fba4c252b58ebe6203ef75ce36af2916efd..1c1fe9287cfc07e05b687016bd0c8e04b875526f 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/organization/OrganizationDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/organization/OrganizationDaoTest.java
@@ -724,11 +724,11 @@ public class OrganizationDaoTest {
     OrganizationDto organization3 = dbTester.organizations().insert();
     dbTester.users().insertPermissionOnUser(organization3, otherUser, PERMISSION_2);
 
-    assertThat(underTest.selectByPermission(dbSession, user.getId().intValue(), PERMISSION_2))
+    assertThat(underTest.selectByPermission(dbSession, user.getId(), PERMISSION_2))
       .extracting(OrganizationDto::getUuid)
       .containsOnly(organization1.getUuid(), organization2.getUuid());
 
-    assertThat(underTest.selectByPermission(dbSession, otherUser.getId().intValue(), PERMISSION_2))
+    assertThat(underTest.selectByPermission(dbSession, otherUser.getId(), PERMISSION_2))
       .extracting(OrganizationDto::getUuid)
       .containsOnly(organization3.getUuid());
 
@@ -753,11 +753,11 @@ public class OrganizationDaoTest {
     dbTester.users().insertPermissionOnGroup(group2, PERMISSION_1);
     dbTester.users().insertMember(group2, otherUser);
 
-    assertThat(underTest.selectByPermission(dbSession, user.getId().intValue(), PERMISSION_1))
+    assertThat(underTest.selectByPermission(dbSession, user.getId(), PERMISSION_1))
       .extracting(OrganizationDto::getUuid)
       .containsOnly(organization1.getUuid(), organization2.getUuid());
 
-    assertThat(underTest.selectByPermission(dbSession, otherUser.getId().intValue(), PERMISSION_1))
+    assertThat(underTest.selectByPermission(dbSession, otherUser.getId(), PERMISSION_1))
       .extracting(OrganizationDto::getUuid)
       .containsOnly(organization3.getUuid());
 
@@ -778,7 +778,7 @@ public class OrganizationDaoTest {
     dbTester.users().insertMember(group2, user);
     dbTester.users().insertPermissionOnUser(organization, user, permission);
 
-    assertThat(underTest.selectByPermission(dbSession, user.getId().intValue(), permission))
+    assertThat(underTest.selectByPermission(dbSession, user.getId(), permission))
       .extracting(OrganizationDto::getUuid)
       .containsOnlyOnce(organization.getUuid());
   }
@@ -794,16 +794,16 @@ public class OrganizationDaoTest {
     dbTester.users().insertPermissionOnUser(organization, otherUser, PERMISSION_2);
     dbTester.users().insertPermissionOnUser(otherOrganization, otherUser, PERMISSION_1);
 
-    assertThat(underTest.selectByPermission(dbSession, user.getId().intValue(), PERMISSION_1))
+    assertThat(underTest.selectByPermission(dbSession, user.getId(), PERMISSION_1))
       .extracting(OrganizationDto::getUuid)
       .containsOnlyOnce(organization.getUuid());
-    assertThat(underTest.selectByPermission(dbSession, user.getId().intValue(), PERMISSION_2))
+    assertThat(underTest.selectByPermission(dbSession, user.getId(), PERMISSION_2))
       .extracting(OrganizationDto::getUuid)
       .containsOnlyOnce(otherOrganization.getUuid());
-    assertThat(underTest.selectByPermission(dbSession, otherUser.getId().intValue(), PERMISSION_1))
+    assertThat(underTest.selectByPermission(dbSession, otherUser.getId(), PERMISSION_1))
       .extracting(OrganizationDto::getUuid)
       .containsOnlyOnce(otherOrganization.getUuid());
-    assertThat(underTest.selectByPermission(dbSession, otherUser.getId().intValue(), PERMISSION_2))
+    assertThat(underTest.selectByPermission(dbSession, otherUser.getId(), PERMISSION_2))
       .extracting(OrganizationDto::getUuid)
       .containsOnlyOnce(organization.getUuid());
   }
@@ -827,16 +827,16 @@ public class OrganizationDaoTest {
     dbTester.users().insertMember(group2, otherUser);
     dbTester.users().insertMember(otherGroup1, otherUser);
 
-    assertThat(underTest.selectByPermission(dbSession, user.getId().intValue(), PERMISSION_1))
+    assertThat(underTest.selectByPermission(dbSession, user.getId(), PERMISSION_1))
       .extracting(OrganizationDto::getUuid)
       .containsOnlyOnce(organization.getUuid());
-    assertThat(underTest.selectByPermission(dbSession, user.getId().intValue(), PERMISSION_2))
+    assertThat(underTest.selectByPermission(dbSession, user.getId(), PERMISSION_2))
       .extracting(OrganizationDto::getUuid)
       .containsOnlyOnce(otherOrganization.getUuid());
-    assertThat(underTest.selectByPermission(dbSession, otherUser.getId().intValue(), PERMISSION_1))
+    assertThat(underTest.selectByPermission(dbSession, otherUser.getId(), PERMISSION_1))
       .extracting(OrganizationDto::getUuid)
       .containsOnlyOnce(otherOrganization.getUuid());
-    assertThat(underTest.selectByPermission(dbSession, otherUser.getId().intValue(), PERMISSION_2))
+    assertThat(underTest.selectByPermission(dbSession, otherUser.getId(), PERMISSION_2))
       .extracting(OrganizationDto::getUuid)
       .containsOnlyOnce(organization.getUuid());
   }