Define WebhookRequest which wraps StaplerRequest

ikikko · Jan 24, 2015 · 109748d · 109748d
1 parent 3db418b
commit 109748d
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 73 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/typetalk/TypetalkWebhookAction.java b/src/main/java/org/jenkinsci/plugins/typetalk/TypetalkWebhookAction.java
@@ -4,7 +4,7 @@
 import hudson.model.RootAction;
 import org.jenkinsci.plugins.typetalk.webhookaction.WebhookExecutor;
 import org.jenkinsci.plugins.typetalk.webhookaction.WebhookExecutorFactory;
-import org.jenkinsci.plugins.typetalk.webhookaction.WebhookParser;
+import org.jenkinsci.plugins.typetalk.webhookaction.WebhookRequest;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
@@ -44,9 +44,7 @@ public HttpResponse doNotify() {
         return new HttpResponse() {
             public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node)
                     throws IOException, ServletException {
-                String message = new WebhookParser(req).parse();
-                WebhookExecutor executor = WebhookExecutorFactory.create(req, rsp, message);
-
+                WebhookExecutor executor = WebhookExecutorFactory.create(new WebhookRequest(req), rsp);
                 executor.execute();
             }
         };

diff --git a/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/WebhookExecutor.java b/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/WebhookExecutor.java
@@ -1,6 +1,5 @@
 package org.jenkinsci.plugins.typetalk.webhookaction;
 
-import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
 import javax.servlet.http.HttpServletResponse;
@@ -12,11 +11,11 @@ public abstract class WebhookExecutor {
 
     protected Logger logger = Logger.getLogger(getClass().getName());
 
-    protected StaplerRequest req;
+    protected WebhookRequest req;
     protected StaplerResponse rsp;
     protected String command;
 
-    protected WebhookExecutor(StaplerRequest req, StaplerResponse rsp, String command) {
+    protected WebhookExecutor(WebhookRequest req, StaplerResponse rsp, String command) {
         this.req = req;
         this.rsp = rsp;
         this.command = command;

diff --git a/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/WebhookExecutorFactory.java b/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/WebhookExecutorFactory.java
@@ -4,15 +4,14 @@
 import org.jenkinsci.plugins.typetalk.webhookaction.executorimpl.HelpExecutor;
 import org.jenkinsci.plugins.typetalk.webhookaction.executorimpl.ListExecutor;
 import org.jenkinsci.plugins.typetalk.webhookaction.executorimpl.UndefinedExecutor;
-import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
 import java.util.Arrays;
 import java.util.LinkedList;
 
 public class WebhookExecutorFactory {
-    public static WebhookExecutor create(StaplerRequest req, StaplerResponse rsp, String message) {
-        LinkedList<String> messageList = new LinkedList<>(Arrays.asList(message.split("\\s+")));
+    public static WebhookExecutor create(WebhookRequest req, StaplerResponse rsp) {
+        LinkedList<String> messageList = new LinkedList<>(Arrays.asList(req.getPostMessage().split("\\s+")));
         String botUser = messageList.poll(); // not used
         String command = messageList.poll();
 

diff --git a/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/WebhookParser.java b/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/WebhookParser.java
diff --git a/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/WebhookRequest.java b/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/WebhookRequest.java
@@ -0,0 +1,51 @@
+package org.jenkinsci.plugins.typetalk.webhookaction;
+
+import net.sf.json.JSONObject;
+import org.kohsuke.stapler.StaplerRequest;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+
+public class WebhookRequest {
+
+    private StaplerRequest req;
+    private JSONObject json;
+
+    WebhookRequest() {
+        // for test
+    }
+
+    public WebhookRequest(StaplerRequest req) {
+        this.req = req;
+        parseBodyToJson();
+    }
+
+    private void parseBodyToJson() {
+        try {
+            StringBuilder sb = new StringBuilder();
+            BufferedReader reader = req.getReader();
+
+            String line;
+            while ((line = reader.readLine()) != null) {
+                sb.append(line).append('\n');
+            }
+
+            json = JSONObject.fromObject(sb.toString());
+        } catch (IOException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    public String getRemoteAddr() {
+        return req.getRemoteAddr();
+    }
+
+    public int getPostId() {
+        return json.getJSONObject("post").getInt("id");
+    }
+
+    public String getPostMessage() {
+        return json.getJSONObject("post").getString("message");
+    }
+
+}
diff --git a/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/executorimpl/BuildExecutor.java b/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/executorimpl/BuildExecutor.java
@@ -3,6 +3,7 @@
 import hudson.model.*;
 import jenkins.model.Jenkins;
 import org.jenkinsci.plugins.typetalk.webhookaction.WebhookExecutor;
+import org.jenkinsci.plugins.typetalk.webhookaction.WebhookRequest;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
@@ -20,7 +21,7 @@ public class BuildExecutor extends WebhookExecutor {
 
     private Map<String, String> parameterMap = new HashMap<>();
 
-    public BuildExecutor(StaplerRequest req, StaplerResponse rsp, String job, List<String> parameters) {
+    public BuildExecutor(WebhookRequest req, StaplerResponse rsp, String job, List<String> parameters) {
         super(req, rsp, "build");
         this.job = job;
         this.parameters = parameters;

diff --git a/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/executorimpl/HelpExecutor.java b/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/executorimpl/HelpExecutor.java
@@ -1,12 +1,12 @@
 package org.jenkinsci.plugins.typetalk.webhookaction.executorimpl;
 
-import org.kohsuke.stapler.StaplerRequest;
+import org.jenkinsci.plugins.typetalk.webhookaction.WebhookRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
 // TODO add help executor
 public class HelpExecutor extends UndefinedExecutor {
 
-    public HelpExecutor(StaplerRequest req, StaplerResponse rsp, String command) {
+    public HelpExecutor(WebhookRequest req, StaplerResponse rsp, String command) {
         super(req, rsp, command);
     }
 

diff --git a/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/executorimpl/ListExecutor.java b/src/main/java/org/jenkinsci/plugins/typetalk/webhookaction/executorimpl/ListExecutor.java
@@ -1,12 +1,12 @@
 package org.jenkinsci.plugins.typetalk.webhookaction.executorimpl;
 
-import org.kohsuke.stapler.StaplerRequest;
+import org.jenkinsci.plugins.typetalk.webhookaction.WebhookRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
 // TODO add list executor ( with regexp filter )
 public class ListExecutor extends UndefinedExecutor {
 
-    public ListExecutor(StaplerRequest req, StaplerResponse rsp, String command) {
+    public ListExecutor(WebhookRequest req, StaplerResponse rsp, String command) {
         super(req, rsp, command);
     }
 

diff --git a/...ain/java/org/jenkinsci/plugins/typetalk/webhookaction/executorimpl/UndefinedExecutor.java b/...ain/java/org/jenkinsci/plugins/typetalk/webhookaction/executorimpl/UndefinedExecutor.java
@@ -1,14 +1,12 @@
 package org.jenkinsci.plugins.typetalk.webhookaction.executorimpl;
 
 import org.jenkinsci.plugins.typetalk.webhookaction.WebhookExecutor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.jenkinsci.plugins.typetalk.webhookaction.WebhookRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
-import java.util.logging.Logger;
-
 public class UndefinedExecutor extends WebhookExecutor {
 
-    public UndefinedExecutor(StaplerRequest req, StaplerResponse rsp, String command) {
+    public UndefinedExecutor(WebhookRequest req, StaplerResponse rsp, String command) {
         super(req, rsp, command);
     }
 

diff --git a/...est/groovy/org/jenkinsci/plugins/typetalk/webhookaction/WebhookExecutorFactorySpec.groovy b/...est/groovy/org/jenkinsci/plugins/typetalk/webhookaction/WebhookExecutorFactorySpec.groovy
@@ -4,20 +4,22 @@ import org.jenkinsci.plugins.typetalk.webhookaction.executorimpl.BuildExecutor
 import org.jenkinsci.plugins.typetalk.webhookaction.executorimpl.HelpExecutor
 import org.jenkinsci.plugins.typetalk.webhookaction.executorimpl.ListExecutor
 import org.jenkinsci.plugins.typetalk.webhookaction.executorimpl.UndefinedExecutor
-import org.kohsuke.stapler.StaplerRequest
 import org.kohsuke.stapler.StaplerResponse
 import spock.lang.Specification
 import spock.lang.Unroll
 
 class WebhookExecutorFactorySpec extends Specification {
 
-    def req = Mock(StaplerRequest)
+    def req = Mock(WebhookRequest)
     def res = Mock(StaplerResponse)
 
     @Unroll
     def "create BuildExecutor : #message"() {
+        setup:
+        req.postMessage >> message
+
         when:
-        def executor = WebhookExecutorFactory.create(req, res, message)
+        def executor = WebhookExecutorFactory.create(req, res)
 
         then:
         executor.class == BuildExecutor
@@ -33,24 +35,33 @@ class WebhookExecutorFactorySpec extends Specification {
     }
 
     def "create ListExecutor"() {
+        setup:
+        req.postMessage >> "@jenkins+ list"
+
         when:
-        def executor = WebhookExecutorFactory.create(req, res, "@jenkins+ list")
+        def executor = WebhookExecutorFactory.create(req, res)
 
         then:
         executor.class == ListExecutor
     }
 
     def "create HelpExecutor"() {
+        setup:
+        req.postMessage >> "@jenkins+ help"
+
         when:
-        def executor = WebhookExecutorFactory.create(req, res, "@jenkins+ help")
+        def executor = WebhookExecutorFactory.create(req, res)
 
         then:
         executor.class == HelpExecutor
     }
 
     def "create UndefinedExecutor"() {
+        setup:
+        req.postMessage >> "@jenkins+ dummy"
+
         when:
-        def executor = WebhookExecutorFactory.create(req, res, "@jenkins+ dummy")
+        def executor = WebhookExecutorFactory.create(req, res)
 
         then:
         executor.class == UndefinedExecutor

diff --git a/...lk/webhookaction/WebhookParserSpec.groovy → ...k/webhookaction/WebhookRequestSpec.groovy b/...lk/webhookaction/WebhookParserSpec.groovy → ...k/webhookaction/WebhookRequestSpec.groovy
@@ -1,13 +1,10 @@
 package org.jenkinsci.plugins.typetalk.webhookaction
 
+import net.sf.json.JSONObject
 import spock.lang.Specification
 
-class WebhookParserSpec extends Specification {
-
-    def parseJson() {
-        setup:
-        def parser = new WebhookParser()
-        def json = """
+class WebhookRequestSpec extends Specification {
+    def json = """
 {
   "topic": {
     "id": 9526,
@@ -42,8 +39,14 @@ class WebhookParserSpec extends Specification {
 }
 """
 
+    def parseJson() {
+        setup:
+        def request = new WebhookRequest()
+        request.json = JSONObject.fromObject(json)
+
         expect:
-        parser.parseJson(json) == "@ikikkobot+ build hello-typetalk-plugin"
+        request.getPostMessage() == "@ikikkobot+ build hello-typetalk-plugin"
+        request.getPostId() == 754399
     }
 
 }
diff --git a/...groovy/org/jenkinsci/plugins/typetalk/webhookaction/executorimpl/BuildExecutorSpec.groovy b/...groovy/org/jenkinsci/plugins/typetalk/webhookaction/executorimpl/BuildExecutorSpec.groovy
@@ -10,10 +10,10 @@ import org.acegisecurity.Authentication
 import org.acegisecurity.context.SecurityContextHolder
 import org.acegisecurity.providers.TestingAuthenticationToken
 import org.jenkinsci.plugins.typetalk.webhookaction.WebhookExecutor
+import org.jenkinsci.plugins.typetalk.webhookaction.WebhookRequest
 import org.junit.Rule
 import org.jvnet.hudson.test.JenkinsRule
 import org.jvnet.hudson.test.TestBuilder
-import org.kohsuke.stapler.StaplerRequest
 import org.kohsuke.stapler.StaplerResponse
 import spock.lang.Specification
 import spock.lang.Unroll
@@ -24,7 +24,7 @@ class BuildExecutorSpec extends Specification {
 
     @Rule JenkinsRule j = new JenkinsRule()
 
-    def req = Mock(StaplerRequest)
+    def req = Mock(WebhookRequest)
     def res = Mock(StaplerResponse)
 
     AbstractProject project