Fix new violations

5 files changed, 9 insertions, 11 deletions

diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ManualMeasure.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ManualMeasure.java
index a755dfbf438..f2337bcdb7c 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ManualMeasure.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ManualMeasure.java
@@ -34,7 +34,7 @@ public class ManualMeasure extends Model {
   private Date createdAt;
   private Date updatedAt;
   private String userLogin;
-  private String userName;
+  private String username;
 
   public ManualMeasure() {
   }
@@ -102,12 +102,12 @@ public class ManualMeasure extends Model {
     return this;
   }
 
-  public String getUserName() {
-    return userName;
+  public String getUsername() {
+    return username;
   }
 
-  public ManualMeasure setUserName(String userName) {
-    this.userName = userName;
+  public ManualMeasure setUsername(String username) {
+    this.username = username;
     return this;
   }
 
diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ManualMeasureCreateQuery.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ManualMeasureCreateQuery.java
index b4c55497a96..dfa4edd735f 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ManualMeasureCreateQuery.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ManualMeasureCreateQuery.java
@@ -22,7 +22,7 @@ package org.sonar.wsclient.services;
 /**
  * @since 2.10
  */
-public class ManualMeasureCreateQuery extends CreateQuery<ManualMeasure> {
+public final class ManualMeasureCreateQuery extends CreateQuery<ManualMeasure> {
 
   private String resourceKey;
   private String metricKey;
diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ManualMeasureDeleteQuery.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ManualMeasureDeleteQuery.java
index 1384eb9b6ce..74b3e591136 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ManualMeasureDeleteQuery.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ManualMeasureDeleteQuery.java
@@ -22,7 +22,7 @@ package org.sonar.wsclient.services;
 /**
  * @since 2.10
  */
-public class ManualMeasureDeleteQuery extends DeleteQuery<ManualMeasure> {
+public final class ManualMeasureDeleteQuery extends DeleteQuery<ManualMeasure> {
 
   private String resourceKey;
   private String metricKey;
diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/ManualMeasureUnmarshaller.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/ManualMeasureUnmarshaller.java
index f3b1a2d7bf8..c873491d5eb 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/ManualMeasureUnmarshaller.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/ManualMeasureUnmarshaller.java
@@ -37,7 +37,7 @@ public class ManualMeasureUnmarshaller extends AbstractUnmarshaller<ManualMeasur
         .setCreatedAt(utils.getDateTime(json, "created_at"))
         .setUpdatedAt(utils.getDateTime(json, "updated_at"))
         .setUserLogin(utils.getString(json, "login"))
-        .setUserName(utils.getString(json, "username"))
+        .setUsername(utils.getString(json, "username"))
         .setValue(utils.getDouble(json, "val"))
         .setTextValue(utils.getString(json, "text"))
         ;
diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ManualMeasureUnmarshallerTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ManualMeasureUnmarshallerTest.java
index cc6667bc4f9..dcd7b6c4150 100644
--- a/sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ManualMeasureUnmarshallerTest.java
+++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ManualMeasureUnmarshallerTest.java
@@ -21,9 +21,7 @@ package org.sonar.wsclient.unmarshallers;
 
 import org.junit.Test;
 import org.sonar.wsclient.services.ManualMeasure;
-import org.sonar.wsclient.services.Metric;
 
-import java.util.Collection;
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -45,7 +43,7 @@ public class ManualMeasureUnmarshallerTest extends UnmarshallerTestCase {
     assertThat(measure.getResourceKey(), is("org.apache.struts:struts-parent"));
     assertThat(measure.getValue(), is(302.5));
     assertThat(measure.getUserLogin(), is("admin"));
-    assertThat(measure.getUserName(), is("Administrator"));
+    assertThat(measure.getUsername(), is("Administrator"));
     assertThat(measure.getCreatedAt().getDate(), is(27));
     assertThat(measure.getUpdatedAt().getDate(), is(3));
   }