Remove duplicated code

Author: sanderv32

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

@@ -45,6 +45,8 @@ associated documentation files (the "Software"), to deal in the Software without
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -167,45 +169,35 @@ public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException
                 body = body.substring(8);
             }
 
-            String jSecret = null;
-            boolean foundJob = false;
+            AtomicReference<String> jSecret = new AtomicReference<>(null);
+            AtomicBoolean foundJob = new AtomicBoolean(false);
             payloadProcessor.setPayload("ref", jsonObject.getString("ref"));
             payloadProcessor.setPayload("before", jsonObject.getString("before"));
 
             SecurityContext saveCtx = ACL.impersonate(ACL.SYSTEM);
 
             try {
-                Job job = GogsUtils.find(jobName, Job.class);
-
-                if (job != null) {
-                    foundJob = true;
-                    /* secret is stored in the properties of Job */
-                    final GogsProjectProperty property = (GogsProjectProperty) job.getProperty(GogsProjectProperty.class);
-                    if (property != null) { /* only if Gogs secret is defined on the job */
-                        jSecret = property.getGogsSecret(); /* Secret provided by Jenkins */
-                    }
+                String ref = (String) jsonObject.get("ref");
+                String[] components = ref.split("/");
+                if (components.length > 3) {
+                    /* refs contains branch/tag with a slash */
+                    List<String> test = Arrays.asList(ref.split("/"));
+                    ref = String.join("%2F", test.subList(2, test.size()));
                 } else {
-                    String ref = (String) jsonObject.get("ref");
-                    String[] components = ref.split("/");
-                    if (components.length > 3) {
-                        /* refs contains branch/tag with a slash */
-                        List<String> test = Arrays.asList(ref.split("/"));
-                        ref = String.join("%2F", test.subList(2, test.size()));
-                    } else {
-                        ref = components[components.length - 1];
-                    }
-
-                    job = GogsUtils.find(jobName + "/" + ref, Job.class);
+                    ref = components[components.length - 1];
+                }
 
+                Arrays.asList(jobName, jobName + "/" + ref).forEach(j -> {
+                    Job job = GogsUtils.find(j, Job.class);
                     if (job != null) {
-                        foundJob = true;
+                        foundJob.set(true);
                         /* secret is stored in the properties of Job */
                         final GogsProjectProperty property = (GogsProjectProperty) job.getProperty(GogsProjectProperty.class);
                         if (property != null) { /* only if Gogs secret is defined on the job */
-                            jSecret = property.getGogsSecret(); /* Secret provided by Jenkins */
+                            jSecret.set(property.getGogsSecret()); /* Secret provided by Jenkins */
                         }
                     }
-                }
+                });
             } finally {
                 SecurityContextHolder.setContext(saveCtx);
             }
@@ -215,23 +207,23 @@ public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException
                 gSecret = jsonObject.optString("secret", null);  /* Secret provided by Gogs < 0.10.x   */
             } else {
                 try {
-                    if (gogsSignature.equals(encode(body, jSecret))) {
-                        gSecret = jSecret;
+                    if (gogsSignature.equals(encode(body, jSecret.get()))) {
+                        gSecret = jSecret.get();
                         // now hex is right, continue to old logic
                     }
                 } catch (Exception e) {
                     LOGGER.warning(e.getMessage());
                 }
             }
 
-            if (!foundJob) {
+            if (!foundJob.get()) {
                 String msg = String.format("Job '%s' is not defined in Jenkins", jobName);
                 result.setStatus(404, msg);
                 LOGGER.warning(msg);
-            } else if (isNullOrEmpty(jSecret) && isNullOrEmpty(gSecret)) {
+            } else if (isNullOrEmpty(jSecret.get()) && isNullOrEmpty(gSecret)) {
                 /* No password is set in Jenkins and Gogs, run without secrets */
                 result = payloadProcessor.triggerJobs(jobName, gogsDelivery);
-            } else if (!isNullOrEmpty(jSecret) && jSecret.equals(gSecret)) {
+            } else if (!isNullOrEmpty(jSecret.get()) && jSecret.equals(gSecret)) {
                 /* Password is set in Jenkins and Gogs, and is correct */
                 result = payloadProcessor.triggerJobs(jobName, gogsDelivery);
             } else {

src/test/java/org/jenkinsci/plugins/gogs/GogsWebHookTest.java

@@ -235,8 +235,6 @@ public void whenUriDoesNotContainUrlNameMustReturnError() throws Exception {
     //
     // Helper methods
     //
-
-
     private void performDoIndexTest(StaplerRequest staplerRequest, StaplerResponse staplerResponse, File file) throws IOException {
         PrintWriter printWriter = new PrintWriter(file.getAbsoluteFile(), "UTF-8");
         when(staplerResponse.getWriter()).thenReturn(printWriter);