Merge pull request #39 from polyapi/develop

Develop

Author: gastonortiz

README.md

@@ -1,7 +1,7 @@
 # Java Client Library (beta)
 
-* Latest released version 0.12.0
-* Latest snapshot version 0.12.1-SNAPSHOT
+* Latest released version 0.13.0
+* Latest snapshot version 0.13.1-SNAPSHOT
 
 ## Introduction
 Welcome my friends! This is the Poly API Java client GitHub page. If you are here, then it means you're familiar with what we do at Poly. If you aren't, you can always check [here](https://github.com/polyapi/poly-alpha).

commons/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.polyapi</groupId>
         <artifactId>parent-pom</artifactId>
-        <version>0.12.1-SNAPSHOT</version>
+        <version>0.13.0-SNAPSHOT</version>
         <relativePath>../parent-pom</relativePath>
     </parent>
 

commons/src/main/java/io/polyapi/commons/api/websocket/WebSocketClient.java

@@ -20,6 +20,18 @@ public interface WebSocketClient extends AutoCloseable {
      */
     <T> Handle registerTrigger(String event, String handleId, Type eventType, PolyEventConsumer<T> trigger);
 
+
+    /**
+     * Registers an event on the server so that it triggers a consumer every time an event is dispatched and blocks the current thread.
+     *
+     * @param event     The event to listen to.
+     * @param handleId  The ID of the emitter of the event in the server.
+     * @param eventType The type of object to be handled by the consumer. This parameter is so that a proper casting can be done.
+     * @param trigger   The {@link Consumer} that will be triggered every time a listener comes. This should be a stateless object.
+     * @param <T>       The type of object that is received from the server.
+     */
+    <T> void registerTriggerAndWait(String event, String handleId, Type eventType, PolyEventConsumer<T> trigger);
+
     /**
      * Registers a listener for error messages.
      *
@@ -29,5 +41,14 @@ public interface WebSocketClient extends AutoCloseable {
      */
     Handle registerErrorHandler(String path, Consumer<PolyErrorEvent> listener);
 
+
+    /**
+     * Registers a listener for error messages and blocks the current thread.
+     *
+     * @param path     The path that will filter the messages.
+     * @param listener The {@link Consumer} of {@link PolyErrorEvent}s that will work as a listener.
+     */
+    void registerErrorHandlerAndWait(String path, Consumer<PolyErrorEvent> listener);
+
     <T> Handle registerAuthFunctionEventHandler(String id, PolyEventConsumer<T> trigger);
 }

commons/src/main/java/io/polyapi/commons/internal/websocket/SocketIOWebSocketClient.java

@@ -69,16 +69,27 @@ public <T> Handle registerTrigger(String event, String handleId, Type eventType,
             }
             String eventKey = format("%s:%s", event, handleId);
             return new EmitterHandle(eventKey, getSocket().on(eventKey, new PolyEventListener<>(event, handleId, jsonParser, EventMessage.class, message -> {
-                    log.debug("Parsing payload to {}.", eventType);
-                    T parsedInput = jsonParser.parseString(message.getBody(), eventType);
-                    log.debug("Input parsed. Passing it to listener.");
-                    trigger.accept(parsedInput, message.getHeaders(), message.getParams());
+                log.debug("Parsing payload to {}.", eventType);
+                T parsedInput = jsonParser.parseString(message.getBody(), eventType);
+                log.debug("Input parsed. Passing it to listener.");
+                trigger.accept(parsedInput, message.getHeaders(), message.getParams());
             })));
         } catch (InterruptedException | ExecutionException e) {
             throw new EventRegistrationException(event, handleId, e);
         }
     }
 
+    @Override
+    public <T> void registerTriggerAndWait(String event, String handleId, Type eventType, PolyEventConsumer<T> trigger) {
+        try (Handle handle = registerTrigger(event, handleId, eventType, trigger)) {
+            synchronized (this) {
+                this.wait();
+            }
+        } catch (InterruptedException e) {
+            log.warn("Event listener for '{}' with ID '{}' interrupted.", event, handleId, e);
+        }
+    }
+
     @Override
     public Handle registerErrorHandler(String path, Consumer<PolyErrorEvent> listener) {
         try {
@@ -102,6 +113,18 @@ public Handle registerErrorHandler(String path, Consumer<PolyErrorEvent> listene
         }
     }
 
+
+    @Override
+    public void registerErrorHandlerAndWait(String path, Consumer<PolyErrorEvent> listener) {
+        try (Handle handle = registerErrorHandler(path, listener)) {
+            synchronized (this) {
+                this.wait();
+            }
+        } catch (InterruptedException e) {
+            log.warn("Error listener for path '{}' interrupted.", path, e);
+        }
+    }
+
     @Override
     public <T> Handle registerAuthFunctionEventHandler(String id, PolyEventConsumer<T> trigger) {
         return registerTrigger("", id, Object[].class, trigger);

library/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.polyapi</groupId>
         <artifactId>parent-pom</artifactId>
-        <version>0.12.1-SNAPSHOT</version>
+        <version>0.13.0-SNAPSHOT</version>
         <relativePath>../parent-pom</relativePath>
     </parent>
     <artifactId>library</artifactId>

library/src/main/java/io/polyapi/client/internal/proxy/invocation/handler/PolyTriggerInvocationHandler.java

@@ -31,7 +31,12 @@ public Object invoke(Object proxy, Method method, Object[] args) {
             log.debug("Executing method {} in proxy class {}.", method, proxy.getClass().getSimpleName());
             log.debug("Registering Poly trigger with ID '{}'.", polyData.value());
             log.debug("Event type: {}.", polyMetadata.paramTypes()[0]);
-            return webSocketClient.registerTrigger("handleWebhookEvent", polyData.value(), Class.forName(polyMetadata.paramTypes()[0]), consumer);
+            if (method.getName().equalsIgnoreCase(invokingClass.getSimpleName())) {
+                webSocketClient.registerTriggerAndWait("handleWebhookEvent", polyData.value(), Class.forName(polyMetadata.paramTypes()[0]), consumer);
+                return null;
+            } else {
+                return webSocketClient.registerTrigger("handleWebhookEvent", polyData.value(), Class.forName(polyMetadata.paramTypes()[0]), consumer);
+            }
         } catch (ClassNotFoundException e) {
             throw new PolyApiLibraryException(e); // FIXME: Throw the appropriate exception.
         }

parent-pom/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.polyapi</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>0.12.1-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Poly API Java parent POM</name>
     <url>https://polyapi.io</url>

polyapi-maven-plugin/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.polyapi</groupId>
         <artifactId>parent-pom</artifactId>
-        <version>0.12.1-SNAPSHOT</version>
+        <version>0.13.0-SNAPSHOT</version>
         <relativePath>../parent-pom</relativePath>
     </parent>
     <artifactId>polyapi-maven-plugin</artifactId>

polyapi-maven-plugin/src/main/java/io/polyapi/plugin/mojo/createServerVariableMojo.java renamed to polyapi-maven-plugin/src/main/java/io/polyapi/plugin/mojo/CreateServerVariableMojo.java

@@ -17,7 +17,7 @@
 @Slf4j
 @Setter
 @Mojo(name = "create-server-variable", requiresProject = false)
-public class createServerVariableMojo extends PolyApiMojo {
+public class CreateServerVariableMojo extends PolyApiMojo {
     @Parameter(property = "name", required = true)
     private String name;
 

polyapi-maven-plugin/src/main/resources/templates/ResolvedContext.hbs

@@ -87,13 +87,22 @@ public class {{className}} extends PolyContext {
 {{~/each}}
 
 {{~#each webhookHandlerSpecifications}}
-    public Handle {{this.name}}(Consumer<{{{this.eventType}}}> callback) {
-        return this.{{this.name}}.{{this.name}}(callback);
+    public Handle handle{{this.className}}(Consumer<{{{this.eventType}}}> callback) {
+        return this.{{this.name}}.handle{{this.className}}(callback);
     }
 
-    public Handle {{this.name}}(PolyEventConsumer<{{{this.eventType}}}> callback) {
-        return this.{{this.name}}.{{this.name}}(callback);
+    public Handle handle{{this.className}}(PolyEventConsumer<{{{this.eventType}}}> callback) {
+        return this.{{this.name}}.handle{{this.className}}(callback);
     }
+
+    public void {{this.name}}(Consumer<{{{this.eventType}}}> callback) {
+        this.{{this.name}}.{{this.name}}(callback);
+    }
+
+    public void {{this.name}}(PolyEventConsumer<{{{this.eventType}}}> callback) {
+        this.{{this.name}}.{{this.name}}(callback);
+    }
+
 {{~/each}}
 
 {{~#each specifications}}