make webhook async

Author: Vladimir Kotal

plugins/pom.xml

@@ -67,6 +67,12 @@ Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
             <artifactId>jersey-hk2</artifactId>
             <version>${jersey.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+            <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+            <version>${jersey.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

plugins/src/opengrok/auth/plugin/ldap/LdapFacade.java

@@ -45,7 +45,6 @@
 import opengrok.auth.plugin.entity.User;
 import opengrok.auth.plugin.util.WebHook;
 import opengrok.auth.plugin.util.WebHooks;
-import opengrok.auth.plugin.util.RestfulClient;
 
 public class LdapFacade extends AbstractLdapProvider {
 
@@ -332,7 +331,7 @@ private <T> T lookup(String dn, String filter, String[] attributes, AttributeMap
             reported = false;
             WebHook hook;
             if ((hook = webHooks.getFail()) != null) {
-                RestfulClient.postIt(hook.getURI(), hook.getContent());
+                hook.post();
             }
             throw new LdapException("Tried all LDAP servers in a pool but no server works");
         }
@@ -353,7 +352,7 @@ private <T> T lookup(String dn, String filter, String[] attributes, AttributeMap
                     errorTimestamp = 0;
                     WebHook hook;
                     if ((hook = webHooks.getRecover()) != null) {
-                        RestfulClient.postIt(hook.getURI(), hook.getContent());
+                        hook.post();
                     }
                 }
                 return processResult(sr, mapper);

plugins/src/opengrok/auth/plugin/util/RestfulClient.java

@@ -23,6 +23,7 @@
 
 package opengrok.auth.plugin.util;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
@@ -45,8 +46,9 @@ private RestfulClient() {
      * Perform HTTP PUT request
      * @param URI URI
      * @param input JSON string contents
+     * @return HTTP status or -1
      */
-    public static void postIt(String URI, String input) {
+    public static int postIt(String URI, String input) {
         try {
             Client client = ClientBuilder.newClient();
 
@@ -57,11 +59,14 @@ public static void postIt(String URI, String input) {
                     .post(Entity.entity(input, MediaType.APPLICATION_JSON));
 
             int status = response.getStatus();
-            if (status != 201) {  // TODO use definition
+            if (status != HttpServletResponse.SC_CREATED) {
                 LOGGER.log(Level.WARNING, "REST request failed: HTTP error code : {0}", status);
             }
+
+            return status;
         } catch (Exception e) {
             LOGGER.log(Level.WARNING, "REST request failed: {0}", e);
+            return -1;
         }
     }
 }

plugins/src/opengrok/auth/plugin/util/WebHook.java

@@ -24,16 +24,40 @@
 package opengrok.auth.plugin.util;
 
 import java.io.Serializable;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 public class WebHook implements Serializable {
     private static final long serialVersionUID = -1;
 
     private String URI;
     private String content;
 
+    public WebHook() {
+    }
+
+    WebHook(String URI, String content) {
+        this.URI = URI;
+        this.content = content;
+    }
+
     public void setURI(String URI) { this.URI = URI; }
     public String getURI() { return URI; }
 
     public void setContent(String content) { this.content = content; }
     public String getContent() { return content; }
+
+    public Future<String> post() {
+        CompletableFuture<String> completableFuture
+                = new CompletableFuture<>();
+
+        Executors.newCachedThreadPool().submit(() -> {
+            int status = RestfulClient.postIt(getURI(), getContent());
+            completableFuture.complete(String.valueOf(status));
+            return null;
+        });
+
+        return completableFuture;
+    }
 }

plugins/test/opengrok/auth/plugin/util/WebHookTest.java

@@ -0,0 +1,38 @@
+package opengrok.auth.plugin.util;
+
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.JerseyTest;
+import org.junit.Test;
+
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Application;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import static org.junit.Assert.assertEquals;
+
+public class WebHookTest extends JerseyTest {
+    private static final String PREFIX = "service";
+    private static int requests;
+
+    @Path(PREFIX)
+    public static class Service {
+        @POST
+        public String handlePost() { requests++; return "posted"; }
+    }
+
+    @Override
+    protected Application configure() {
+        return new ResourceConfig(Service.class);
+    }
+
+    @Test
+    public void testPost() throws ExecutionException, InterruptedException {
+        assertEquals(0, requests);
+        WebHook hook = new WebHook(getBaseUri() + PREFIX, "{}");
+        Future<String> future = hook.post();
+        future.get();
+        assertEquals(1, requests);
+    }
+}