Skip to content

Commit ab834d0

Browse files
ggallenggallen
committed
Fix save/restore of job steps when configuring.
Signed-off-by: Greg Allen <[email protected]>
1 parent f35a472 commit ab834d0

File tree

7 files changed

+39
-37
lines changed

7 files changed

+39
-37
lines changed

‎plugin/src/main/java/com/redhat/jenkins/plugins/ci/messaging/ActiveMqMessagingWorker.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,8 @@ public SendResult sendMessage(Run<?, ?> build, TaskListener listener, ProviderDa
440440

441441
message.setText(PluginUtils.getSubstitutedValue(pd.getMessageContent(), envVars2));
442442

443-
publisher.send(message, publisher.getDeliveryMode(), publisher.getPriority(), pd.getTimeToLiveMillis());
443+
publisher.send(message, publisher.getDeliveryMode(), publisher.getPriority(),
444+
(long) pd.getTimeToLiveMinutes() * 60 * 1000);
444445

445446
mesgId = message.getJMSMessageID();
446447
mesgContent = message.getText();
@@ -453,7 +454,7 @@ public SendResult sendMessage(Run<?, ?> build, TaskListener listener, ProviderDa
453454
}
454455

455456
} catch (IOException | JMSException | InterruptedException e) {
456-
if (pd.isFailOnError()) {
457+
if (pd.getFailOnError()) {
457458
log.severe("Unhandled exception in perform: ");
458459
log.severe(ExceptionUtils.getStackTrace(e));
459460
listener.fatalError("Unhandled exception in perform: ");

‎plugin/src/main/java/com/redhat/jenkins/plugins/ci/messaging/KafkaMessagingWorker.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public SendResult sendMessage(Run<?, ?> build, TaskListener listener, ProviderDa
247247
.println(String.format("message id: %s body: %s", producerRecord.key(), producerRecord.value()));
248248

249249
} catch (ExecutionException | IOException | InterruptedException e) {
250-
if (pd.isFailOnError()) {
250+
if (pd.getFailOnError()) {
251251
log.severe("Unhandled exception in perform: ");
252252
log.severe(ExceptionUtils.getStackTrace(e));
253253
listener.fatalError("Unhandled exception in perform: ");

‎plugin/src/main/java/com/redhat/jenkins/plugins/ci/messaging/RabbitMQMessagingWorker.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ public SendResult sendMessage(Run<?, ?> build, TaskListener listener, ProviderDa
284284

285285
// Fedora messaging wire format support
286286
Map<String, Object> headers = new HashMap<>();
287-
if (pd.isFedoraMessaging()) {
287+
if (pd.getFedoraMessaging()) {
288288
headers.put("fedora_messaging_severity", pd.getSeverity());
289289
headers.put("fedora_messaging_schema", pd.getSchema());
290290
headers.put("sent_at", ZonedDateTime.now().toString());
@@ -314,7 +314,7 @@ public SendResult sendMessage(Run<?, ?> build, TaskListener listener, ProviderDa
314314
new AMQP.BasicProperties.Builder().headers(headers).messageId(msgId).build(),
315315
body.getBytes(StandardCharsets.UTF_8));
316316
} catch (IOException e) {
317-
if (pd.isFailOnError()) {
317+
if (pd.getFailOnError()) {
318318
log.severe("Unhandled exception in perform: Failed to send message!");
319319
return new SendResult(false, msgId, body);
320320
}
@@ -327,7 +327,7 @@ public SendResult sendMessage(Run<?, ?> build, TaskListener listener, ProviderDa
327327
listener.getLogger().println("JSON message body:\n" + body);
328328

329329
} catch (Exception e) {
330-
if (pd.isFailOnError()) {
330+
if (pd.getFailOnError()) {
331331
log.severe("Unhandled exception in perform: ");
332332
log.severe(ExceptionUtils.getStackTrace(e));
333333
listener.fatalError("Unhandled exception in perform: ");

‎plugin/src/main/java/com/redhat/jenkins/plugins/ci/provider/data/ActiveMQPublisherProviderData.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class ActiveMQPublisherProviderData extends ActiveMQProviderData {
4646
private String messageProperties;
4747
private String messageContent;
4848
private Boolean failOnError = false;
49-
private Integer timeToLiveMillis = 0;
49+
private Integer timeToLiveMinutes = 0;
5050

5151
@DataBoundConstructor
5252
public ActiveMQPublisherProviderData() {
@@ -61,12 +61,12 @@ public ActiveMQPublisherProviderData(String name, MessagingProviderOverrides ove
6161
}
6262

6363
public ActiveMQPublisherProviderData(String name, MessagingProviderOverrides overrides, String messageProperties,
64-
String messageContent, Boolean failOnError, Integer timeToLiveMillis) {
64+
String messageContent, Boolean failOnError, Integer timeToLiveMinutes) {
6565
this(name, overrides);
6666
setMessageProperties(messageProperties);
6767
setMessageContent(messageContent);
6868
setFailOnError(failOnError);
69-
setTimeToLiveMillis(timeToLiveMillis);
69+
setTimeToLiveMinutes(timeToLiveMinutes);
7070
}
7171

7272
public String getMessageProperties() {
@@ -87,7 +87,7 @@ public void setMessageContent(String messageContent) {
8787
this.messageContent = Util.fixEmpty(messageContent);
8888
}
8989

90-
public Boolean isFailOnError() {
90+
public Boolean getFailOnError() {
9191
return failOnError;
9292
}
9393

@@ -96,13 +96,13 @@ public void setFailOnError(boolean failOnError) {
9696
this.failOnError = failOnError;
9797
}
9898

99-
public Integer getTimeToLiveMillis() {
100-
return timeToLiveMillis;
99+
public Integer getTimeToLiveMinutes() {
100+
return timeToLiveMinutes;
101101
}
102102

103103
@DataBoundSetter
104-
public void setTimeToLiveMillis(Integer timeToLiveMillis) {
105-
this.timeToLiveMillis = timeToLiveMillis;
104+
public void setTimeToLiveMinutes(Integer timeToLiveMinutes) {
105+
this.timeToLiveMinutes = timeToLiveMinutes;
106106
}
107107

108108
@Override
@@ -121,12 +121,12 @@ public boolean equals(Object that) {
121121
&& Objects.equals(this.messageProperties, thatp.messageProperties)
122122
&& Objects.equals(this.messageContent, thatp.messageContent)
123123
&& Objects.equals(this.failOnError, thatp.failOnError)
124-
&& Objects.equals(this.timeToLiveMillis, thatp.timeToLiveMillis);
124+
&& Objects.equals(this.timeToLiveMinutes, thatp.timeToLiveMinutes);
125125
}
126126

127127
@Override
128128
public int hashCode() {
129-
return Objects.hash(super.hashCode(), messageProperties, messageContent, failOnError, timeToLiveMillis);
129+
return Objects.hash(super.hashCode(), messageProperties, messageContent, failOnError, timeToLiveMinutes);
130130
}
131131

132132
@Extension
@@ -145,8 +145,7 @@ public ActiveMQPublisherProviderData newInstance(StaplerRequest2 sr, JSONObject
145145
mpo = new MessagingProviderOverrides(jo.getJSONObject("overrides").getString("topic"));
146146
}
147147
return new ActiveMQPublisherProviderData(jo.getString("name"), mpo, jo.getString("messageProperties"),
148-
jo.getString("messageContent"), jo.getBoolean("failOnError"),
149-
jo.getInt("timeToLiveMinutes") * 60 * 1000);
148+
jo.getString("messageContent"), jo.getBoolean("failOnError"), jo.getInt("timeToLiveMinutes"));
150149
}
151150

152151
public String getConfigPage() {

‎plugin/src/main/java/com/redhat/jenkins/plugins/ci/provider/data/KafkaPublisherProviderData.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void setMessageContent(String messageContent) {
7373
this.messageContent = Util.fixEmpty(messageContent);
7474
}
7575

76-
public Boolean isFailOnError() {
76+
public Boolean getFailOnError() {
7777
return failOnError;
7878
}
7979

‎plugin/src/main/java/com/redhat/jenkins/plugins/ci/provider/data/RabbitMQPublisherProviderData.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import hudson.Extension;
3838
import hudson.Util;
3939
import hudson.model.Descriptor;
40+
import hudson.util.ListBoxModel;
4041
import jenkins.model.Jenkins;
4142
import net.sf.json.JSONObject;
4243

@@ -91,7 +92,7 @@ public void setMessageContent(String messageContent) {
9192
this.messageContent = Util.fixEmpty(messageContent);
9293
}
9394

94-
public Boolean isFailOnError() {
95+
public Boolean getFailOnError() {
9596
return failOnError;
9697
}
9798

@@ -100,7 +101,7 @@ public void setFailOnError(boolean failOnError) {
100101
this.failOnError = failOnError;
101102
}
102103

103-
public Boolean isFedoraMessaging() {
104+
public Boolean getFedoraMessaging() {
104105
return fedoraMessaging;
105106
}
106107

@@ -160,6 +161,15 @@ public static class RabbitMQPublisherProviderDataDescriptor extends RabbitMQProv
160161
return "RabbitMQ Publisher Provider Data";
161162
}
162163

164+
public ListBoxModel doFillSeverityItems() {
165+
ListBoxModel items = new ListBoxModel();
166+
items.add("Debug", "10");
167+
items.add("Info", "20");
168+
items.add("Warning", "30");
169+
items.add("Critical", "40");
170+
return items;
171+
}
172+
163173
@Override
164174
public RabbitMQPublisherProviderData newInstance(StaplerRequest2 sr, JSONObject jo) {
165175
MessagingProviderOverrides mpo = null;
@@ -169,10 +179,10 @@ public RabbitMQPublisherProviderData newInstance(StaplerRequest2 sr, JSONObject
169179
if (!jo.getJSONObject("overrides").isNullObject()) {
170180
mpo = new MessagingProviderOverrides(jo.getJSONObject("overrides").getString("topic"));
171181
}
172-
if (!jo.getJSONObject("fedoraMessagingFields").isNullObject()) {
182+
if (!jo.getJSONObject("fedoraMessaging").isNullObject()) {
173183
fedoraMessaging = true;
174-
severity = jo.getJSONObject("fedoraMessagingFields").getInt("severity");
175-
schema = jo.getJSONObject("fedoraMessagingFields").getString("schema");
184+
severity = jo.getJSONObject("fedoraMessaging").getInt("severity");
185+
schema = jo.getJSONObject("fedoraMessaging").getString("schema");
176186
}
177187
return new RabbitMQPublisherProviderData(jo.getString("name"), mpo, jo.getString("messageContent"),
178188
jo.getBoolean("failOnError"), fedoraMessaging, severity, schema);

‎plugin/src/main/resources/com/redhat/jenkins/plugins/ci/provider/data/RabbitMQPublisherProviderData/RabbitMQPublisherProviderDataDescriptor/rabbitmq-publisher.jelly‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,13 @@
3030
<j:set var="checked" value="${pdata.hasOverrides();}"/>
3131
<j:set var="value" value="${pdata.getPublisherTopic();}"/>
3232
<j:set var="name" value="${pdata.getName();}"/>
33-
<j:set var="fedoraMessaging" value="${pdata.isFedoraMessaging();}"/>
34-
<j:set var="severity" value="${pdata.getSeverity();}"/>
35-
<j:set var="schema" value="${pdata.getSchema();}"/>
33+
<j:set var="fedoraMessaging" value="false"/>
3634
</j:when>
3735
<j:otherwise>
3836
<j:set var="checked" value="${instance.getOverrides() != null}"/>
3937
<j:set var="value" value="${instance.getOverrides().getTopic();}"/>
4038
<j:set var="name" value="${instance.getName();}"/>
41-
<j:set var="fedoraMessaging" value="false"/>
42-
<j:set var="severity" value="20"/>
39+
<j:set var="fedoraMessaging" value="${pdata.getFedoraMessaging();}"/>
4340
</j:otherwise>
4441
</j:choose>
4542
<rh:blockWrapper>
@@ -58,17 +55,12 @@
5855
</f:entry>
5956
<f:nested>
6057
<rh:blockWrapper>
61-
<f:optionalBlock field="fedoraMessagingFields" title="Fedora messaging header fields" checked="${fedoraMessaging}">
58+
<f:optionalBlock field="fedoraMessaging" title="Fedora messaging header fields" checked="${fedoraMessaging}">
6259
<f:entry title="${%Severity}" field="severity">
63-
<select name="severity" value="${severity}">
64-
<option value="10">Debug</option>
65-
<option value="20">Info</option>
66-
<option value="30">Warning</option>
67-
<option value="40">Critical</option>
68-
</select>
60+
<f:select />
6961
</f:entry>
7062
<f:entry title="${%Schema}" field="schema">
71-
<f:textbox value="${schema}"/>
63+
<f:textbox name="schema"/>
7264
</f:entry>
7365
</f:optionalBlock>
7466
</rh:blockWrapper>

0 commit comments

Comments
 (0)