Use new PropertyDefinition API in CpdPlugin

1 files changed, 4 insertions, 2 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ServerClient.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ServerClient.java
index c8e47e469dd..07582732ed9 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ServerClient.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ServerClient.java
@@ -119,10 +119,12 @@ public class ServerClient implements BatchComponent {
   }
 
   private String getLogin() {
-    return settings.property(CoreProperties.LOGIN) != null ? settings.property(CoreProperties.LOGIN) : DEFAULT_LOGIN;
+    String login = settings.property(CoreProperties.LOGIN);
+    return login != null ? login : DEFAULT_LOGIN;
   }
 
   private String getPassword() {
-    return settings.property(CoreProperties.PASSWORD) != null ? settings.property(CoreProperties.PASSWORD) : DEFAULT_PASSWORD;
+    String password = settings.property(CoreProperties.PASSWORD);
+    return password != null ? password : DEFAULT_PASSWORD;
   }
 }