Merge pull request #7 from mhuin/JENKINS_42764

Fix JENKINS-42764
jenkinsci · Mar 15, 2017 · 6529c24 · 6529c24
2 parents a10e656 + b6b5954
commit 6529c24
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/main/java/jenkins/plugins/mqttnotification/MqttNotifier.java b/src/main/java/jenkins/plugins/mqttnotification/MqttNotifier.java
@@ -86,18 +86,12 @@ public int getValue() {
 
     @DataBoundConstructor
     public MqttNotifier(String brokerUrl, String topic, String message, String qos, boolean retainMessage, String credentialsId) {
-        this(brokerUrl, topic, message, qos, retainMessage, lookupSystemCredentials(credentialsId));
-    }
-
-    public MqttNotifier(String brokerUrl, String topic, String message, String qos, boolean retainMessage,
-                        StandardUsernamePasswordCredentials credentials) {
         this.brokerUrl = brokerUrl;
         this.topic = topic;
         this.message = message;
         this.qos = qos;
         this.retainMessage = retainMessage;
-        this.credentials = credentials;
-        this.credentialsId = credentials == null ? null : credentials.getId();
+        this.credentialsId = credentialsId;
     }
 
     public String getCredentialsId() {
@@ -153,9 +147,10 @@ public boolean perform(final AbstractBuild build, final Launcher launcher, final
             final MqttDefaultFilePersistence dataStore = new MqttDefaultFilePersistence(tmpDir);
             final MqttClient mqtt = new MqttClient(getBrokerUrl(), CLIENT_ID, dataStore);
             MqttConnectOptions mqttConnectOptions = new MqttConnectOptions();
-            if (this.credentials != null) {
-                mqttConnectOptions.setUserName(this.credentials.getUsername());
-                mqttConnectOptions.setPassword(this.credentials.getPassword().getPlainText().toCharArray());
+            StandardUsernamePasswordCredentials credentials = MqttNotifier.lookupSystemCredentials(this.credentialsId);
+            if (credentials != null) {
+                mqttConnectOptions.setUserName(credentials.getUsername());
+                mqttConnectOptions.setPassword(credentials.getPassword().getPlainText().toCharArray());
             }
             mqtt.connect(mqttConnectOptions);
             mqtt.publish(
@@ -308,4 +303,4 @@ private String replaceEnvironmentVariables(final String rawString, final Abstrac
     private String replaceBuildVariables(final String rawString, final AbstractBuild build) {
         return new StrSubstitutor(build.getBuildVariables()).replace(rawString);
     }
-}
+}
diff --git a/src/test/java/jenkins/plugins/mqttnotification/MqttNotifierTest.java b/src/test/java/jenkins/plugins/mqttnotification/MqttNotifierTest.java
@@ -30,7 +30,7 @@ private MqttNotifier createSubject() {
             "message1",
             "1",
             false,
-            (StandardUsernamePasswordCredentials) null
+            null
         );
     }
 
@@ -66,4 +66,4 @@ public void setEnvironmentVariables() throws IOException {
         j.jenkins.getGlobalNodeProperties().add(prop);
     }
 
-}
+}