Skip to content

Commit fd09995

Browse files
committed
Remove more for loops
1 parent c2784c3 commit fd09995

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

src/main/java/org/jenkinsci/plugins/gogs/GogsPayload.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ private Map<String, String> getPayload() {
2525
@Override
2626
public void buildEnvVars(AbstractBuild<?, ?> abstractBuild, EnvVars envVars) {
2727
LOGGER.log(Level.FINEST, "Injecting GOGS_PAYLOAD: {0}", getPayload());
28-
for (Map.Entry<String, String> entry : payload.entrySet()) {
29-
envVars.put("GOGS_" + entry.getKey().toUpperCase(), entry.getValue());
30-
}
31-
28+
payload.forEach((key, value) -> envVars.put("GOGS_" + key.toUpperCase(), value));
3229
}
3330

3431
private static final Logger LOGGER = Logger.getLogger(GogsPayload.class.getName());

src/main/java/org/jenkinsci/plugins/gogs/GogsPayloadProcessor.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ associated documentation files (the "Software"), to deal in the Software without
2626
import hudson.model.BuildableItem;
2727
import hudson.model.Cause;
2828
import hudson.security.ACL;
29-
import hudson.triggers.Trigger;
3029
import jenkins.model.ParameterizedJobMixIn;
3130
import jenkins.triggers.SCMTriggerItem;
3231
import org.acegisecurity.context.SecurityContext;
@@ -61,12 +60,8 @@ public GogsResults triggerJobs(String jobName, String deliveryID) {
6160

6261
if (project instanceof ParameterizedJobMixIn.ParameterizedJob) {
6362
ParameterizedJobMixIn.ParameterizedJob pJob = (ParameterizedJobMixIn.ParameterizedJob) project;
64-
for (Trigger trigger : pJob.getTriggers().values()) {
65-
if (trigger instanceof GogsTrigger) {
66-
gTrigger = (GogsTrigger) trigger;
67-
break;
68-
}
69-
}
63+
gTrigger = (GogsTrigger) pJob.getTriggers().values().stream()
64+
.filter(trigger1 -> trigger1 instanceof GogsTrigger).findFirst().get();
7065
}
7166

7267
if (gTrigger != null) {

src/main/java/org/jenkinsci/plugins/gogs/GogsWebHook.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ associated documentation files (the "Software"), to deal in the Software without
3535
import org.kohsuke.stapler.StaplerRequest;
3636
import org.kohsuke.stapler.StaplerResponse;
3737

38+
import javax.annotation.Nonnull;
3839
import javax.crypto.Mac;
3940
import javax.crypto.spec.SecretKeySpec;
4041
import java.io.IOException;
@@ -79,7 +80,8 @@ public String getUrlName() {
7980
* @return a String with the encoded sha256 hmac
8081
* @throws Exception Something went wrong getting the sha256 hmac
8182
*/
82-
private static String encode(String data, String key) throws Exception {
83+
private static @Nonnull
84+
String encode(String data, String key) throws Exception {
8385
final Charset asciiCs = Charset.forName("UTF-8");
8486
final Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
8587
final SecretKeySpec secret_key = new javax.crypto.spec.SecretKeySpec(asciiCs.encode(key).array(), "HmacSHA256");

0 commit comments

Comments
 (0)