Remove more for loops

jenkinsci · Apr 7, 2018 · fd09995 · fd09995
1 parent c2784c3
commit fd09995
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/gogs/GogsPayload.java b/src/main/java/org/jenkinsci/plugins/gogs/GogsPayload.java
@@ -25,10 +25,7 @@ private Map<String, String> getPayload() {
     @Override
     public void buildEnvVars(AbstractBuild<?, ?> abstractBuild, EnvVars envVars) {
         LOGGER.log(Level.FINEST, "Injecting GOGS_PAYLOAD: {0}", getPayload());
-        for (Map.Entry<String, String> entry : payload.entrySet()) {
-            envVars.put("GOGS_" + entry.getKey().toUpperCase(), entry.getValue());
-        }
-
+        payload.forEach((key, value) -> envVars.put("GOGS_" + key.toUpperCase(), value));
     }
 
     private static final Logger LOGGER = Logger.getLogger(GogsPayload.class.getName());

diff --git a/src/main/java/org/jenkinsci/plugins/gogs/GogsPayloadProcessor.java b/src/main/java/org/jenkinsci/plugins/gogs/GogsPayloadProcessor.java
@@ -26,7 +26,6 @@ associated documentation files (the "Software"), to deal in the Software without
 import hudson.model.BuildableItem;
 import hudson.model.Cause;
 import hudson.security.ACL;
-import hudson.triggers.Trigger;
 import jenkins.model.ParameterizedJobMixIn;
 import jenkins.triggers.SCMTriggerItem;
 import org.acegisecurity.context.SecurityContext;
@@ -61,12 +60,8 @@ public GogsResults triggerJobs(String jobName, String deliveryID) {
 
                 if (project instanceof ParameterizedJobMixIn.ParameterizedJob) {
                     ParameterizedJobMixIn.ParameterizedJob pJob = (ParameterizedJobMixIn.ParameterizedJob) project;
-                    for (Trigger trigger : pJob.getTriggers().values()) {
-                        if (trigger instanceof GogsTrigger) {
-                            gTrigger = (GogsTrigger) trigger;
-                            break;
-                        }
-                    }
+                    gTrigger = (GogsTrigger) pJob.getTriggers().values().stream()
+                            .filter(trigger1 -> trigger1 instanceof GogsTrigger).findFirst().get();
                 }
 
                 if (gTrigger != null) {

diff --git a/src/main/java/org/jenkinsci/plugins/gogs/GogsWebHook.java b/src/main/java/org/jenkinsci/plugins/gogs/GogsWebHook.java
@@ -35,6 +35,7 @@ associated documentation files (the "Software"), to deal in the Software without
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
+import javax.annotation.Nonnull;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 import java.io.IOException;
@@ -79,7 +80,8 @@ public String getUrlName() {
      * @return a String with the encoded sha256 hmac
      * @throws Exception Something went wrong getting the sha256 hmac
      */
-    private static String encode(String data, String key) throws Exception {
+    private static @Nonnull
+    String encode(String data, String key) throws Exception {
         final Charset asciiCs = Charset.forName("UTF-8");
         final Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
         final SecretKeySpec secret_key = new javax.crypto.spec.SecretKeySpec(asciiCs.encode(key).array(), "HmacSHA256");