SONAR-10182 Rename homepage parameter from 'value' to 'parameter'

diff --git a/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl b/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl
index faf1bc7731d62af2905a1361c0e4a8f2ea75c609..05d3d7872bb410c2c87a168d5dc5ad0253ec7298 100644 (file)
--- a/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl
+++ b/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl
@@ -461,7 +461,7 @@ CREATE TABLE "USERS" (
   "CREATED_AT" BIGINT,
   "UPDATED_AT" BIGINT,
   "HOMEPAGE_TYPE" VARCHAR(40),
-  "HOMEPAGE_VALUE" VARCHAR(40)
+  "HOMEPAGE_PARAMETER" VARCHAR(40)
 );
 CREATE UNIQUE INDEX "USERS_LOGIN" ON "USERS" ("LOGIN");
 CREATE INDEX "USERS_UPDATED_AT" ON "USERS" ("UPDATED_AT");

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDto.java
index 50e3207c72783b9085533b030c81a442f13263fe..f151f9ef1df61fbff74906a58bd85fe050965f73 100644 (file)
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDto.java
@@ -49,7 +49,7 @@ public class UserDto {
   private Long createdAt;
   private Long updatedAt;
   private String homepageType;
-  private String homepageValue;
+  private String homepageParameter;
   private boolean local = true;
   private boolean root = false;
   private boolean onboarded = false;
@@ -215,12 +215,12 @@ public class UserDto {
   }
 
   @CheckForNull
-  public String getHomepageValue() {
-    return homepageValue;
+  public String getHomepageParameter() {
+    return homepageParameter;
   }
 
-  public UserDto setHomepageValue(@Nullable String homepageValue) {
-    this.homepageValue = homepageValue;
+  public UserDto setHomepageParameter(@Nullable String homepageParameter) {
+    this.homepageParameter = homepageParameter;
     return this;
   }
 

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java
index f9fddb00f991d3ff5963be072b6f2b2094776ab1..1259fac00ea022601694bdb26365f7f10d15133b 100644 (file)
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java
@@ -69,5 +69,5 @@ public interface UserMapper {
 
   void deactivateUser(@Param("login") String login, @Param("now") long now);
 
-  void clearHomepage(@Param("homepageType") String type, @Param("homepageValue") String value, @Param("now") long now);
+  void clearHomepage(@Param("homepageType") String type, @Param("homepageParameter") String value, @Param("now") long now);
 }

diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
index db7e23a5b5776e9777fa4619261e95e87c9d9204..da99028da2c905d2605314c2780e41208851c128 100644 (file)
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
@@ -20,7 +20,7 @@
     u.created_at as "createdAt",
     u.updated_at as "updatedAt",
     u.homepage_type as "homepageType",
-    u.homepage_value as "homepageValue"
+    u.homepage_parameter as "homepageParameter"
   </sql>
 
   <select id="selectByLogin" parameterType="String" resultType="User">
@@ -140,11 +140,11 @@
   <update id="clearHomepage" parameterType="map">
     update users set
       homepage_type = null,
-      homepage_value = null,
+      homepage_parameter = null,
       updated_at = #{now, jdbcType=BIGINT}
     where
       homepage_type = #{homepageType, jdbcType=VARCHAR}
-      and homepage_value = #{homepageValue, jdbcType=VARCHAR}
+      and homepage_parameter = #{homepageParameter, jdbcType=VARCHAR}
   </update>
 
   <update id="setRoot">
@@ -173,7 +173,7 @@
       created_at,
       updated_at,
       homepage_type,
-      homepage_value
+      homepage_parameter
     ) values (
       #{user.login,jdbcType=VARCHAR},
       #{user.name,jdbcType=VARCHAR},
@@ -190,7 +190,7 @@
       #{now,jdbcType=BIGINT},
       #{now,jdbcType=BIGINT},
       #{user.homepageType,jdbcType=VARCHAR},
-      #{user.homepageValue,jdbcType=VARCHAR}
+      #{user.homepageParameter,jdbcType=VARCHAR}
     )
   </insert>
 
@@ -208,7 +208,7 @@
       crypted_password = #{user.cryptedPassword, jdbcType=BIGINT},
       updated_at = #{now, jdbcType=BIGINT},
       homepage_type = #{user.homepageType, jdbcType=VARCHAR},
-      homepage_value = #{user.homepageValue, jdbcType=VARCHAR}
+      homepage_parameter = #{user.homepageParameter, jdbcType=VARCHAR}
     where
       login = #{user.login, jdbcType=VARCHAR}
   </update>

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDaoTest.java
index 5ff6de3095d65dfc8589883cfcd0110df9c71881..1dc42157294709d67eac4013b59aaeb683d38360 100644 (file)
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDaoTest.java
@@ -325,7 +325,7 @@ public class UserDaoTest {
       .setCreatedAt(date)
       .setUpdatedAt(date)
       .setHomepageType("project")
-      .setHomepageValue("OB1");
+      .setHomepageParameter("OB1");
     underTest.insert(db.getSession(), userDto);
     db.getSession().commit();
 
@@ -345,7 +345,7 @@ public class UserDaoTest {
     assertThat(user.isLocal()).isTrue();
     assertThat(user.isRoot()).isFalse();
     assertThat(user.getHomepageType()).isEqualTo("project");
-    assertThat(user.getHomepageValue()).isEqualTo("OB1");
+    assertThat(user.getHomepageParameter()).isEqualTo("OB1");
   }
 
   @Test
@@ -372,7 +372,7 @@ public class UserDaoTest {
       .setExternalIdentityProvider("github")
       .setLocal(false)
       .setHomepageType("project")
-      .setHomepageValue("OB1");
+      .setHomepageParameter("OB1");
     underTest.update(db.getSession(), userUpdate);
 
     UserDto reloaded = underTest.selectByLogin(db.getSession(), user.getLogin());
@@ -391,7 +391,7 @@ public class UserDaoTest {
     assertThat(reloaded.isLocal()).isFalse();
     assertThat(reloaded.isRoot()).isFalse();
     assertThat(reloaded.getHomepageType()).isEqualTo("project");
-    assertThat(reloaded.getHomepageValue()).isEqualTo("OB1");
+    assertThat(reloaded.getHomepageParameter()).isEqualTo("OB1");
   }
 
   @Test
@@ -414,17 +414,17 @@ public class UserDaoTest {
     assertThat(userReloaded.isRoot()).isFalse();
     assertThat(userReloaded.getUpdatedAt()).isEqualTo(NOW);
     assertThat(userReloaded.getHomepageType()).isNull();
-    assertThat(userReloaded.getHomepageValue()).isNull();
+    assertThat(userReloaded.getHomepageParameter()).isNull();
     assertThat(underTest.selectUserById(session, otherUser.getId())).isNotNull();
   }
 
   @Test
   public void clean_users_homepage_when_deleting_organization() {
 
-    UserDto userUnderTest = newUserDto().setHomepageType("ORGANIZATION").setHomepageValue("dummy-organization-UUID");
+    UserDto userUnderTest = newUserDto().setHomepageType("ORGANIZATION").setHomepageParameter("dummy-organization-UUID");
     underTest.insert(session, userUnderTest);
 
-    UserDto untouchedUser = newUserDto().setHomepageType("ORGANIZATION").setHomepageValue("not-so-dummy-organization-UUID");
+    UserDto untouchedUser = newUserDto().setHomepageType("ORGANIZATION").setHomepageParameter("not-so-dummy-organization-UUID");
     underTest.insert(session, untouchedUser);
 
     session.commit();
@@ -434,21 +434,21 @@ public class UserDaoTest {
     UserDto userWithAHomepageReloaded = underTest.selectUserById(session, userUnderTest.getId());
     assertThat(userWithAHomepageReloaded.getUpdatedAt()).isEqualTo(NOW);
     assertThat(userWithAHomepageReloaded.getHomepageType()).isNull();
-    assertThat(userWithAHomepageReloaded.getHomepageValue()).isNull();
+    assertThat(userWithAHomepageReloaded.getHomepageParameter()).isNull();
 
     UserDto untouchedUserReloaded = underTest.selectUserById(session, untouchedUser.getId());
     assertThat(untouchedUserReloaded.getUpdatedAt()).isEqualTo(untouchedUser.getUpdatedAt());
     assertThat(untouchedUserReloaded.getHomepageType()).isEqualTo(untouchedUser.getHomepageType());
-    assertThat(untouchedUserReloaded.getHomepageValue()).isEqualTo(untouchedUser.getHomepageValue());
+    assertThat(untouchedUserReloaded.getHomepageParameter()).isEqualTo(untouchedUser.getHomepageParameter());
   }
 
   @Test
   public void clean_users_homepage_when_deleting_project() {
 
-    UserDto userUnderTest = newUserDto().setHomepageType("PROJECT").setHomepageValue("dummy-project-UUID");
+    UserDto userUnderTest = newUserDto().setHomepageType("PROJECT").setHomepageParameter("dummy-project-UUID");
     underTest.insert(session, userUnderTest);
 
-    UserDto untouchedUser = newUserDto().setHomepageType("PROJECT").setHomepageValue("not-so-dummy-project-UUID");
+    UserDto untouchedUser = newUserDto().setHomepageType("PROJECT").setHomepageParameter("not-so-dummy-project-UUID");
     underTest.insert(session, untouchedUser);
 
     session.commit();
@@ -458,12 +458,12 @@ public class UserDaoTest {
     UserDto userWithAHomepageReloaded = underTest.selectUserById(session, userUnderTest.getId());
     assertThat(userWithAHomepageReloaded.getUpdatedAt()).isEqualTo(NOW);
     assertThat(userWithAHomepageReloaded.getHomepageType()).isNull();
-    assertThat(userWithAHomepageReloaded.getHomepageValue()).isNull();
+    assertThat(userWithAHomepageReloaded.getHomepageParameter()).isNull();
 
     UserDto untouchedUserReloaded = underTest.selectUserById(session, untouchedUser.getId());
     assertThat(untouchedUserReloaded.getUpdatedAt()).isEqualTo(untouchedUser.getUpdatedAt());
     assertThat(untouchedUserReloaded.getHomepageType()).isEqualTo(untouchedUser.getHomepageType());
-    assertThat(untouchedUserReloaded.getHomepageValue()).isEqualTo(untouchedUser.getHomepageValue());
+    assertThat(untouchedUserReloaded.getHomepageParameter()).isEqualTo(untouchedUser.getHomepageParameter());
   }
 
   @Test
@@ -482,7 +482,7 @@ public class UserDaoTest {
       .setSalt("79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365")
       .setCryptedPassword("650d2261c98361e2f67f90ce5c65a95e7d8ea2fg")
       .setHomepageType("project")
-      .setHomepageValue("OB1"));
+      .setHomepageParameter("OB1"));
     UserDto user2 = db.users().insertUser();
     underTest.setRoot(session, user2.getLogin(), true);
 
@@ -499,7 +499,7 @@ public class UserDaoTest {
     assertThat(dto.getCreatedAt()).isEqualTo(user1.getCreatedAt());
     assertThat(dto.getUpdatedAt()).isEqualTo(user1.getUpdatedAt());
     assertThat(dto.getHomepageType()).isEqualTo("project");
-    assertThat(dto.getHomepageValue()).isEqualTo("OB1");
+    assertThat(dto.getHomepageParameter()).isEqualTo("OB1");
 
     dto = underTest.selectOrFailByLogin(session, user2.getLogin());
     assertThat(dto.isRoot()).isTrue();

diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v70/AddHomepageToUsers.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v70/AddHomepageToUsers.java
index b1c2d83da86aa18f098cc59b7e057f1ad25daf85..f3c1a71f86255f950423863a5d960a9696b98a2c 100644 (file)
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v70/AddHomepageToUsers.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v70/AddHomepageToUsers.java
@@ -42,7 +42,7 @@ public class AddHomepageToUsers extends DdlChange {
         .setLimit(40)
         .build())
       .addColumn(newVarcharColumnDefBuilder()
-        .setColumnName("homepage_value")
+        .setColumnName("homepage_parameter")
         .setIsNullable(true)
         .setLimit(40)
         .build())

diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v70/DbVersion70.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v70/DbVersion70.java
index 9a244e1d4c63588cd35f36326fbb0cb6aef88093..127d3f0e6c6c1ff59f0f58216c05a60fcc124117 100644 (file)
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v70/DbVersion70.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v70/DbVersion70.java
@@ -50,7 +50,7 @@ public class DbVersion70 implements DbVersion {
       .add(1920, "Read 'sonar.qualitygate' setting and set the value to default organization", ReadGlobalSonarQualityGateSettingToDefaultOrg.class)
       .add(1921, "Delete 'sonar.qualitygate' setting at global level", DeleteGlobalSonarQualityGateSetting.class)
       .add(1922, "Make ORGANIZATIONS.DEFAULT_QUALITY_GATE_UUID not nullable", SetDefaultQualityGateUuidAsNotNullableInOrganizations.class)
-      .add(1923, "Add users.homepage_type and users.homepage_value", AddHomepageToUsers.class)
+      .add(1923, "Add users.homepage_type and users.homepage_parameter", AddHomepageToUsers.class)
     ;
   }
 }

diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v70/AddHomepageToUsersTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v70/AddHomepageToUsersTest.java
index 5114bbd547e349383c8b8b9c9ed9a8668e9f4cf8..db1e215fb8055a11d933566ac26dd84191ffd33b 100644 (file)
--- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v70/AddHomepageToUsersTest.java
+++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v70/AddHomepageToUsersTest.java
@@ -46,7 +46,7 @@ public class AddHomepageToUsersTest {
     underTest.execute();
 
     dbTester.assertColumnDefinition("users", "homepage_type", VARCHAR, 40, true);
-    dbTester.assertColumnDefinition("users", "homepage_value", VARCHAR, 40, true);
+    dbTester.assertColumnDefinition("users", "homepage_parameter", VARCHAR, 40, true);
   }
 
   @Test

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java
index 71a6447d1420165843bada433af17a0f9424f39f..1adafa3811f7b0716b9924471ee95c4ad886468c 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java
@@ -125,31 +125,30 @@ public class CurrentAction implements UsersWsAction {
     if (user.getHomepageType() == null) {
       return defaultHomepageOf();
     }
-    String homepageValue = getHomepageValue(dbSession, user.getHomepageType(), user.getHomepageValue());
+    String homepageParameter = getHomepageParameter(dbSession, user.getHomepageType(), user.getHomepageParameter());
     CurrentWsResponse.Homepage.Builder homepage = CurrentWsResponse.Homepage.newBuilder()
       .setType(CurrentWsResponse.HomepageType.valueOf(user.getHomepageType()));
-    setNullable(homepageValue, homepage::setValue);
+    setNullable(homepageParameter, homepage::setParameter);
     return homepage.build();
   }
 
   @CheckForNull
-  private String getHomepageValue(DbSession dbSession, String homepageType, String homepageValue) {
+  private String getHomepageParameter(DbSession dbSession, String homepageType, String homepageParameter) {
     if (PROJECT.toString().equals(homepageType)) {
-      return dbClient.componentDao().selectByUuid(dbSession, homepageValue)
+      return dbClient.componentDao().selectByUuid(dbSession, homepageParameter)
         .transform(ComponentDto::getKey)
         .or(() -> {
-          throw new IllegalStateException(format("Unknown component '%s' for homepageValue", homepageValue));
+          throw new IllegalStateException(format("Unknown component '%s' for homepageParameter", homepageParameter));
         });
     }
     if (ORGANIZATION.toString().equals(homepageType)) {
-      return dbClient.organizationDao().selectByUuid(dbSession, homepageValue)
+      return dbClient.organizationDao().selectByUuid(dbSession, homepageParameter)
         .map(OrganizationDto::getKey)
-        .orElseThrow(() -> new IllegalStateException(format("Unknown organization '%s' for homepageValue", homepageValue)));
+        .orElseThrow(() -> new IllegalStateException(format("Unknown organization '%s' for homepageParameter", homepageParameter)));
     }
     return null;
   }
 
-  // Default WIP implementation to be done in SONAR-10185
   private static CurrentWsResponse.Homepage defaultHomepageOf() {
     return CurrentWsResponse.Homepage.newBuilder()
       .setType(MY_PROJECTS)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SetHomepageAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/SetHomepageAction.java
index 5427550e81993a45245e47bbc31071251a12e2ed..dd8f7d5e0c99c418065a8acc15dc1f44032b9c97 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SetHomepageAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/SetHomepageAction.java
@@ -44,7 +44,7 @@ import static org.sonarqube.ws.Users.CurrentWsResponse.HomepageType.PROJECT;
 public class SetHomepageAction implements UsersWsAction {
 
   static final String PARAM_TYPE = "type";
-  static final String PARAM_VALUE = "value";
+  static final String PARAM_PARAMETER = "parameter";
   static final String ACTION = "set_homepage";
 
   private final UserSession userSession;
@@ -71,7 +71,7 @@ public class SetHomepageAction implements UsersWsAction {
       .setRequired(true)
       .setPossibleValues(HomepageTypes.keys());
 
-    action.createParam(PARAM_VALUE)
+    action.createParam(PARAM_PARAMETER)
       .setDescription("Additional information to identify the page (project or organization key)")
       .setExampleValue(KEY_PROJECT_EXAMPLE_001);
 
@@ -82,9 +82,9 @@ public class SetHomepageAction implements UsersWsAction {
     userSession.checkLoggedIn();
 
     String type = request.mandatoryParam(PARAM_TYPE);
-    String value = request.param(PARAM_VALUE);
+    String parameter = request.param(PARAM_PARAMETER);
 
-    checkRequest(type, value);
+    checkRequest(type, parameter);
 
     String login = userSession.getLogin();
 
@@ -94,7 +94,7 @@ public class SetHomepageAction implements UsersWsAction {
       checkState(user != null, "User login '%s' cannot be found", login);
 
       user.setHomepageType(type);
-      user.setHomepageValue(findHomepageValue(dbSession, type, value));
+      user.setHomepageParameter(findHomepageParameter(dbSession, type, parameter));
 
       dbClient.userDao().update(dbSession, user);
       dbSession.commit();
@@ -104,27 +104,27 @@ public class SetHomepageAction implements UsersWsAction {
   }
 
   @CheckForNull
-  private String findHomepageValue(DbSession dbSession, String type, String value) {
+  private String findHomepageParameter(DbSession dbSession, String type, String parameter) {
 
     if (PROJECT.toString().equals(type)) {
-      return componentFinder.getByKey(dbSession, value).uuid();
+      return componentFinder.getByKey(dbSession, parameter).uuid();
     }
 
     if (ORGANIZATION.toString().equals(type)) {
-      return checkFoundWithOptional(dbClient.organizationDao().selectByKey(dbSession, value), "No organizationDto with key '%s'", value).getUuid();
+      return checkFoundWithOptional(dbClient.organizationDao().selectByKey(dbSession, parameter), "No organizationDto with key '%s'", parameter).getUuid();
     }
 
     return null;
   }
 
-  private static void checkRequest(String type, @Nullable String value) {
+  private static void checkRequest(String type, @Nullable String parameter) {
 
     if (PROJECT.toString().equals(type) || ORGANIZATION.toString().equals(type)) {
-      checkArgument(isNotBlank(value), "Type %s requires a value", type);
+      checkArgument(isNotBlank(parameter), "Type %s requires a parameter", type);
     }
 
     if (MY_PROJECTS.toString().equals(type) || MY_ISSUES.toString().equals(type)) {
-      checkArgument(isBlank(value), "Parameter value must not be provided when type is %s", type);
+      checkArgument(isBlank(parameter), "Parameter parameter must not be provided when type is %s", type);
     }
 
   }

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/current-example.json b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/current-example.json
index 64942a33c81f52aa0d2d022a371b1cc7e9e05588..66629ea66f685c92e5fe8155f6f8a61e57d123a7 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/current-example.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/current-example.json
@@ -15,6 +15,6 @@
   },
   "homepage": {
     "type": "PROJECT",
-    "value": "death-star-key"
+    "parameter": "death-star-key"
   }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java
index bdb27b8e588293c3cca120ff51049ba379f09752..5ba1a10460bc4bac9d954a20e3b39cd5f70db32a 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java
@@ -117,7 +117,7 @@ public class DeleteActionTest {
   @Test
   public void organization_deletion_also_ensure_that_homepage_on_this_organization_if_it_exists_is_cleared() throws Exception {
     OrganizationDto organization = db.organizations().insert();
-    UserDto user = dbClient.userDao().insert(session, newUserDto().setHomepageType("ORGANIZATION").setHomepageValue(organization.getUuid()));
+    UserDto user = dbClient.userDao().insert(session, newUserDto().setHomepageType("ORGANIZATION").setHomepageParameter(organization.getUuid()));
     session.commit();
 
     userSession.logIn().addPermission(ADMINISTER, organization);
@@ -128,7 +128,7 @@ public class DeleteActionTest {
 
     UserDto userReloaded = dbClient.userDao().selectUserById(session, user.getId());
     assertThat(userReloaded.getHomepageType()).isNull();
-    assertThat(userReloaded.getHomepageValue()).isNull();
+    assertThat(userReloaded.getHomepageParameter()).isNull();
   }
 
   @Test
@@ -136,7 +136,7 @@ public class DeleteActionTest {
     OrganizationDto organization = db.organizations().insert();
     ComponentDto project = db.components().insertPrivateProject(organization);
     UserDto user = dbClient.userDao().insert(session,
-      newUserDto().setHomepageType("PROJECT").setHomepageValue(project.uuid()));
+      newUserDto().setHomepageType("PROJECT").setHomepageParameter(project.uuid()));
     session.commit();
 
     userSession.logIn().addPermission(ADMINISTER, organization);
@@ -147,7 +147,7 @@ public class DeleteActionTest {
 
     UserDto userReloaded = dbClient.userDao().selectUserById(session, user.getId());
     assertThat(userReloaded.getHomepageType()).isNull();
-    assertThat(userReloaded.getHomepageValue()).isNull();
+    assertThat(userReloaded.getHomepageParameter()).isNull();
   }
 
   @Test

diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java
index 8af24654ac92883367b4dcbd4b1508569b8a382d..5b448d3417f3d23f8ea837f229c9d57a2c58a87d 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java
@@ -139,7 +139,7 @@ public class DeleteActionTest {
 
     ComponentDto project = componentDbTester.insertPrivateProject();
     UserDto insert = dbClient.userDao().insert(dbSession,
-      newUserDto().setHomepageType("PROJECT").setHomepageValue(project.uuid()));
+      newUserDto().setHomepageType("PROJECT").setHomepageParameter(project.uuid()));
     dbSession.commit();
 
     userSessionRule.logIn().addProjectPermission(ADMIN, project);
@@ -154,7 +154,7 @@ public class DeleteActionTest {
 
     UserDto userReloaded = dbClient.userDao().selectUserById(dbSession, insert.getId());
     assertThat(userReloaded.getHomepageType()).isNull();
-    assertThat(userReloaded.getHomepageValue()).isNull();
+    assertThat(userReloaded.getHomepageParameter()).isNull();
   }
 
   @Test

diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java
index f075450f0b8a6451ebc851732af1a68264d09679..bc667c3304f747005b0ddd64fe5a934398fc974c 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java
@@ -26,7 +26,6 @@ import org.sonar.api.server.ws.WebService;
 import org.sonar.api.utils.System2;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbTester;
-import org.sonar.db.component.ComponentDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.issue.ws.AvatarResolverImpl;
 import org.sonar.server.organization.DefaultOrganizationProvider;
@@ -196,7 +195,7 @@ public class CurrentActionTest {
       .setScmAccounts(newArrayList("obiwan:github", "obiwan:bitbucket"))
       .setOnboarded(true)
       .setHomepageType("PROJECT")
-      .setHomepageValue("UUID-of-the-death-star"));
+      .setHomepageParameter("UUID-of-the-death-star"));
     db.users().insertMember(db.users().insertGroup(newGroupDto().setName("Jedi")), obiwan);
     db.users().insertMember(db.users().insertGroup(newGroupDto().setName("Rebel")), obiwan);
 
@@ -226,22 +225,22 @@ public class CurrentActionTest {
 
   @Test
   public void fail_with_ISE_when_user_homepage_project_does_not_exist_in_db() {
-    UserDto user = db.users().insertUser(u -> u.setHomepageType("PROJECT").setHomepageValue("not-existing-project-uuid"));
+    UserDto user = db.users().insertUser(u -> u.setHomepageType("PROJECT").setHomepageParameter("not-existing-project-uuid"));
     userSessionRule.logIn(user.getLogin());
 
     expectedException.expect(IllegalStateException.class);
-    expectedException.expectMessage("Unknown component 'not-existing-project-uuid' for homepageValue");
+    expectedException.expectMessage("Unknown component 'not-existing-project-uuid' for homepageParameter");
 
     call();
   }
 
   @Test
   public void fail_with_ISE_when_user_homepage_organization_does_not_exist_in_db() {
-    UserDto user = db.users().insertUser(u -> u.setHomepageType("ORGANIZATION").setHomepageValue("not-existing-organization-uuid"));
+    UserDto user = db.users().insertUser(u -> u.setHomepageType("ORGANIZATION").setHomepageParameter("not-existing-organization-uuid"));
     userSessionRule.logIn(user.getLogin());
 
     expectedException.expect(IllegalStateException.class);
-    expectedException.expectMessage("Unknown organization 'not-existing-organization-uuid' for homepageValue");
+    expectedException.expectMessage("Unknown organization 'not-existing-organization-uuid' for homepageParameter");
 
     call();
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java
index cae8af9edcd6af1febcd84fa503b540d90644a99..3bc6338b455e80b8fe4879e28a89f5344c1804ab 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java
@@ -38,8 +38,8 @@ import org.sonar.server.ws.WsActionTester;
 import static org.apache.http.HttpStatus.SC_NO_CONTENT;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto;
+import static org.sonar.server.user.ws.SetHomepageAction.PARAM_PARAMETER;
 import static org.sonar.server.user.ws.SetHomepageAction.PARAM_TYPE;
-import static org.sonar.server.user.ws.SetHomepageAction.PARAM_VALUE;
 import static org.sonarqube.ws.Users.CurrentWsResponse.HomepageType.MY_ISSUES;
 import static org.sonarqube.ws.Users.CurrentWsResponse.HomepageType.MY_PROJECTS;
 import static org.sonarqube.ws.Users.CurrentWsResponse.HomepageType.ORGANIZATION;
@@ -82,7 +82,7 @@ public class SetHomepageActionTest {
     assertThat(typeParam.deprecatedSince()).isNull();
     assertThat(typeParam.deprecatedKey()).isNull();
 
-    WebService.Param keyParam = action.param("value");
+    WebService.Param keyParam = action.param("parameter");
     assertThat(keyParam.isRequired()).isFalse();
     assertThat(keyParam.description()).isEqualTo("Additional information to identify the page (project or organization key)");
     assertThat(keyParam.exampleValue()).isEqualTo("my_project");
@@ -103,13 +103,13 @@ public class SetHomepageActionTest {
     ws.newRequest()
       .setMethod("POST")
       .setParam(PARAM_TYPE, PROJECT.toString())
-      .setParam(PARAM_VALUE, project.getKey())
+      .setParam(PARAM_PARAMETER, project.getKey())
       .execute();
 
     UserDto actual = db.getDbClient().userDao().selectByLogin(db.getSession(), user.getLogin());
     assertThat(actual).isNotNull();
     assertThat(actual.getHomepageType()).isEqualTo(PROJECT.toString());
-    assertThat(actual.getHomepageValue()).isEqualTo(project.uuid());
+    assertThat(actual.getHomepageParameter()).isEqualTo(project.uuid());
   }
 
   @Test
@@ -122,13 +122,13 @@ public class SetHomepageActionTest {
     ws.newRequest()
       .setMethod("POST")
       .setParam(PARAM_TYPE, ORGANIZATION.toString())
-      .setParam(PARAM_VALUE, organization.getKey())
+      .setParam(PARAM_PARAMETER, organization.getKey())
       .execute();
 
     UserDto actual = db.getDbClient().userDao().selectByLogin(db.getSession(), user.getLogin());
     assertThat(actual).isNotNull();
     assertThat(actual.getHomepageType()).isEqualTo(ORGANIZATION.toString());
-    assertThat(actual.getHomepageValue()).isEqualTo(organization.getUuid());
+    assertThat(actual.getHomepageParameter()).isEqualTo(organization.getUuid());
   }
 
   @Test
@@ -144,7 +144,7 @@ public class SetHomepageActionTest {
     UserDto actual = db.getDbClient().userDao().selectByLogin(db.getSession(), user.getLogin());
     assertThat(actual).isNotNull();
     assertThat(actual.getHomepageType()).isEqualTo(MY_ISSUES.toString());
-    assertThat(actual.getHomepageValue()).isNullOrEmpty();
+    assertThat(actual.getHomepageParameter()).isNullOrEmpty();
   }
 
   @Test
@@ -160,7 +160,7 @@ public class SetHomepageActionTest {
     UserDto actual = db.getDbClient().userDao().selectByLogin(db.getSession(), user.getLogin());
     assertThat(actual).isNotNull();
     assertThat(actual.getHomepageType()).isEqualTo(MY_PROJECTS.toString());
-    assertThat(actual.getHomepageValue()).isNullOrEmpty();
+    assertThat(actual.getHomepageParameter()).isNullOrEmpty();
   }
 
   @Test
@@ -181,7 +181,7 @@ public class SetHomepageActionTest {
   public void fail_when_missing_project_id_when_requesting_project_type() {
 
     expectedException.expect(IllegalArgumentException.class);
-    expectedException.expectMessage("Type PROJECT requires a value");
+    expectedException.expectMessage("Type PROJECT requires a parameter");
 
     UserDto user = db.users().insertUser();
     userSession.logIn(user);
@@ -189,7 +189,7 @@ public class SetHomepageActionTest {
     ws.newRequest()
       .setMethod("POST")
       .setParam(PARAM_TYPE, PROJECT.toString())
-      .setParam(PARAM_VALUE, "")
+      .setParam(PARAM_PARAMETER, "")
       .execute();
 
   }
@@ -198,7 +198,7 @@ public class SetHomepageActionTest {
   public void fail_when_missing_organization_id_when_requesting_organization_type() {
 
     expectedException.expect(IllegalArgumentException.class);
-    expectedException.expectMessage("Type ORGANIZATION requires a value");
+    expectedException.expectMessage("Type ORGANIZATION requires a parameter");
 
     UserDto user = db.users().insertUser();
     userSession.logIn(user);
@@ -206,7 +206,7 @@ public class SetHomepageActionTest {
     ws.newRequest()
       .setMethod("POST")
       .setParam(PARAM_TYPE, ORGANIZATION.toString())
-      .setParam(PARAM_VALUE, "")
+      .setParam(PARAM_PARAMETER, "")
       .execute();
 
   }

diff --git a/sonar-ws/src/main/protobuf/ws-users.proto b/sonar-ws/src/main/protobuf/ws-users.proto
index ca3df0d064194370482fcca5aa29b1d209dd2375..d5bf59304d25695fd6ae8d350840d9899bf804d7 100644 (file)
--- a/sonar-ws/src/main/protobuf/ws-users.proto
+++ b/sonar-ws/src/main/protobuf/ws-users.proto
@@ -122,6 +122,6 @@ message CurrentWsResponse {
 
   message Homepage {
     optional HomepageType type = 1;
-    optional string value = 2;
+    optional string parameter = 2;
   }
 }