Merge branch 'master' of https://github.com/Twasi/websocket-obs-java into feature/cd

Author: Laraakaa

README.md

@@ -100,5 +100,20 @@ binding you want (depends on the vendor)
 
 If you miss an endpoint feel free to make a pull request. Any help is appreciated.
 
+### Building
+
+If you've forked the repository and want to run the install goal to use your fork in your own project, please be aware
+the artifacts generated require being signed via GPG. 
+
+Once you've installed GPG and created a key-pair, you'll be prompted for your passphrase everytime you run the build. 
+You can automate this by supplying `gpg.passphrase` property during the build, for example:
+
+```
+mvn verify -Dgpg.passphrase=YOURPASSPHRASE
+```
+   
+In IntelliJ, you can supply the property via `File > Settings > Build, Execution, Deployment > Maven > Runner > Properties`.
+Once the `gpg.passphrase` property has been set there, you won't be prompted everytime you run the build.
+
 ---
 **Thanks to Palakis for the great plugin!**

pom.xml

@@ -6,7 +6,7 @@
     <name>obs-websocket-java</name>
     <groupId>net.twasi</groupId>
     <artifactId>obs-websocket-java</artifactId>
-    <version>1.0.7</version>
+    <version>1.1.0</version>
 
     <description>Library to connect to the OBS WebSocket interface.</description>
     <url>https://github.com/Twasi/obs-websocket-java</url>
@@ -88,6 +88,10 @@
                 <version>1.5</version>
                 <configuration>
                     <skip>false</skip>
+                    <gpgArguments>
+                        <arg>--pinentry-mode</arg>
+                        <arg>loopback</arg>
+                    </gpgArguments>
                 </configuration>
                 <executions>
                     <execution>

src/integrationTest/java/net/twasi/obsremotejava/test/OBSCommunicatorSecuredIT.java

@@ -11,7 +11,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Read comment instructions before each test
@@ -33,10 +34,8 @@ class OBSCommunicatorSecuredIT {
      */
     @Test
     void testConnectToSecuredServerWithoutPasswordInvokesConnectionFailedCallback() throws Exception {
-        String websocketPassword = null;
-
         WebSocketClient client = new WebSocketClient();
-        OBSCommunicator connector = new OBSCommunicator(true, websocketPassword);
+        OBSCommunicator connector = new OBSCommunicator(true, null);
 
         AtomicReference<String> testFailedReason = new AtomicReference<>();
         AtomicReference<String> connectionFailedResult = new AtomicReference<>();
@@ -51,7 +50,7 @@ void testConnectToSecuredServerWithoutPasswordInvokesConnectionFailedCallback()
 
             connection.get();
 
-            connector.registerOnDisconnect(response -> System.out.println("Disconnected"));
+            connector.registerOnDisconnect(() -> System.out.println("Disconnected"));
 
             connector.registerOnConnect(response -> {
                 testFailedReason.set("Connected without a password to secured server");
@@ -103,7 +102,7 @@ void testConnectToSecuredServerWithInCorrectPassword() throws Exception {
 
             connection.get();
 
-            connector.registerOnDisconnect(response -> System.out.println("Disconnected"));
+            connector.registerOnDisconnect(() -> System.out.println("Disconnected"));
 
             connector.registerOnConnect(response -> {
                 testFailedReason.set("Connected with an incorrect password to secured server");
@@ -138,10 +137,9 @@ void testConnectToSecuredServerWithInCorrectPassword() throws Exception {
      */
     @Test
     void testConnectToSecuredServerWithCorrectPassword() throws Exception {
-        String websocketPassword = obsPassword;
 
         WebSocketClient client = new WebSocketClient();
-        OBSCommunicator connector = new OBSCommunicator(true, websocketPassword);
+        OBSCommunicator connector = new OBSCommunicator(true, obsPassword);
 
         AtomicReference<String> testFailedReason = new AtomicReference<>();
 
@@ -155,7 +153,7 @@ void testConnectToSecuredServerWithCorrectPassword() throws Exception {
 
             connection.get();
 
-            connector.registerOnDisconnect(response -> System.out.println("Disconnected"));
+            connector.registerOnDisconnect(() -> System.out.println("Disconnected"));
 
             connector.registerOnConnect(response -> {
                 System.out.println("Connected successfully with password!");

src/integrationTest/java/net/twasi/obsremotejava/test/OBSCommunicatorUnsecuredIT.java

@@ -17,6 +17,7 @@ public class OBSCommunicatorUnsecuredIT {
      * - Make sure your OBS is running and available for connection
      */
     private final String obsAddress = "ws://localhost:4444";
+    private final String obsPassword = null;
 
     /**
      * Before running this test:
@@ -39,7 +40,7 @@ void testConnectToUnsecureServerWithoutPassword() throws Exception {
             client.connect(connector, echoUri, request);
             System.out.printf("Connecting to : %s%n", echoUri);
 
-            connector.registerOnDisconnect(response -> System.out.println("Disconnected"));
+            connector.registerOnDisconnect(() -> System.out.println("Disconnected"));
 
             connector.registerOnConnect(response -> {
                 System.out.println("Connected successfully without password!");