add GogsProjectProperty.filterBranch(), used in GogsWebHook to filter pushed branch.

Author: chenz85

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

@@ -62,6 +62,13 @@ public boolean getHasBranchFilter() {
         return gogsBranchFilter != null && gogsBranchFilter.length() > 0;
     }
 
+    public boolean filterBranch(String ref) {
+        if (gogsBranchFilter != null && gogsBranchFilter.length() > 0 && !gogsBranchFilter.equals("*")) {
+            return ref == null || ref.length() == 0 || ref.endsWith(gogsBranchFilter);
+        }
+        return true;
+    }
+
     private static final Logger LOGGER = Logger.getLogger(GogsWebHook.class.getName());
 
     @Extension

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

@@ -168,9 +168,11 @@ public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException
             }
 
             String jSecret = null;
-            String branchFilter = null;
             boolean foundJob = false;
 
+            // filter branch, if ref not match branch filter, skip trigger job.
+            boolean isRefMatched = true;
+
             String ref = (String) jsonObject.getString("ref");
             payloadProcessor.setPayload("ref", ref);
             payloadProcessor.setPayload("before", jsonObject.getString("before"));
@@ -186,7 +188,7 @@ public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException
                     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 */
-                        branchFilter = property.getGogsBranchFilter(); /* branch filter provided by jenkins */
+                        isRefMatched = property.filterBranch(ref);
                     }
                 } else {
                     String[] components = ref.split("/");
@@ -206,7 +208,7 @@ public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException
                         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 */
-                            branchFilter = property.getGogsBranchFilter(); /* branch filter provided by jenkins */
+                            isRefMatched = property.filterBranch(ref);
                         }
                     }
                 }
@@ -228,18 +230,12 @@ public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException
                 }
             }
 
-            // filter branch, not ref not match branch filter, skip trigger.
-            boolean isRefMatched = true;
-            if (branchFilter != null && !branchFilter.equals("*") && branchFilter.length() > 0) {
-                isRefMatched = ref == null || ref.length() == 0 || ref.endsWith(branchFilter);
-            }
-
             if (!foundJob) {
                 String msg = String.format("Job '%s' is not defined in Jenkins", jobName);
                 result.setStatus(404, msg);
                 LOGGER.warning(msg);
             } else if (!isRefMatched) {
-                String msg = String.format("received ref ('%s') is not matched with branch filter in job '%s' ('%s')", ref, jobName, branchFilter);
+                String msg = String.format("received ref ('%s') is not matched with branch filter in job '%s'", ref, jobName);
                 result.setStatus(200, msg);
                 LOGGER.info(msg);
             } else if (isNullOrEmpty(jSecret) && isNullOrEmpty(gSecret)) {