Merge pull request #41 from ChristopheCVB/fix/mute

fix: GetMute package

Author: TinaTiel

src/integrationTest/java/net/twasi/obsremotejava/test/manual/ObsRemoteE2eObservationIT.java

@@ -1,17 +1,14 @@
 package net.twasi.obsremotejava.test.manual;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
+import net.twasi.obsremotejava.requests.GetMute.GetMuteResponse;
+import net.twasi.obsremotejava.test.AbstractObsE2ETest;
+import org.junit.jupiter.api.*;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
-import net.twasi.obsremotejava.test.AbstractObsE2ETest;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 /**
  * This test should be run manually, following the prompts in the command-line and
@@ -170,8 +167,16 @@ void setVolumeAndMute() {
     remote.setVolume(SOURCE_MEDIA, 0.50, loggingCallback);
     obsShould("Mute the volume");
     remote.setMute(SOURCE_MEDIA, true, loggingCallback);
+    remote.getMute(SOURCE_MEDIA, capturingCallback);
+    waitReasonably();
+    assertThat(getPreviousResponseAs(GetMuteResponse.class).isMuted()).isTrue();
+
     obsShould("Unmute the volume");
     remote.setMute(SOURCE_MEDIA, false, loggingCallback);
+    remote.getMute(SOURCE_MEDIA, capturingCallback);
+    waitReasonably();
+    assertThat(getPreviousResponseAs(GetMuteResponse.class).isMuted()).isFalse();
+
     obsShould("Set the volume to 100%");
     remote.setVolume(SOURCE_MEDIA, 1.00, loggingCallback);
 

src/main/java/net/twasi/obsremotejava/OBSCommunicator.java

@@ -102,8 +102,8 @@
 import net.twasi.obsremotejava.requests.StopStreaming.StopStreamingResponse;
 import net.twasi.obsremotejava.requests.TakeSourceScreenshot.TakeSourceScreenshotRequest;
 import net.twasi.obsremotejava.requests.TakeSourceScreenshot.TakeSourceScreenshotResponse;
-import net.twasi.obsremotejava.requests.ToggleMute.GetMute.ToggleMuteRequest;
-import net.twasi.obsremotejava.requests.ToggleMute.GetMute.ToggleMuteResponse;
+import net.twasi.obsremotejava.requests.ToggleMute.ToggleMuteRequest;
+import net.twasi.obsremotejava.requests.ToggleMute.ToggleMuteResponse;
 import net.twasi.obsremotejava.requests.TransitionToProgram.TransitionToProgramRequest;
 import net.twasi.obsremotejava.requests.TransitionToProgram.TransitionToProgramResponse;
 import net.twasi.obsremotejava.requests.TriggerHotkeyByName.TriggerHotkeyByNameRequest;
@@ -787,14 +787,14 @@ public void setMute(String source, boolean mute, Consumer<SetMuteResponse> callb
         callbacks.put(SetMuteResponse.class, callback);
     }
 
-    public void getMute(String source, Consumer<SetMuteResponse> callback) {
+    public void getMute(String source, Consumer<GetMuteResponse> callback) {
         GetMuteRequest request = new GetMuteRequest(this, source);
 
         session.getRemote().sendStringByFuture(this.gson.toJson(request));
         callbacks.put(GetMuteResponse.class, callback);
     }
 
-    public void toggleMute(String source, Consumer<SetMuteResponse> callback) {
+    public void toggleMute(String source, Consumer<ToggleMuteResponse> callback) {
         ToggleMuteRequest request = new ToggleMuteRequest(this, source);
 
         session.getRemote().sendStringByFuture(this.gson.toJson(request));

src/main/java/net/twasi/obsremotejava/OBSRemoteController.java

@@ -5,6 +5,7 @@
 import net.twasi.obsremotejava.requests.GetAudioMonitorType.GetAudioMonitorTypeResponse;
 import net.twasi.obsremotejava.requests.GetCurrentProfile.GetCurrentProfileResponse;
 import net.twasi.obsremotejava.requests.GetCurrentScene.GetCurrentSceneResponse;
+import net.twasi.obsremotejava.requests.GetMute.GetMuteResponse;
 import net.twasi.obsremotejava.requests.GetPreviewScene.GetPreviewSceneResponse;
 import net.twasi.obsremotejava.requests.GetSceneItemProperties.GetSceneItemPropertiesResponse;
 import net.twasi.obsremotejava.requests.GetSceneList.GetSceneListResponse;
@@ -47,6 +48,7 @@
 import net.twasi.obsremotejava.requests.StopReplayBuffer.StopReplayBufferResponse;
 import net.twasi.obsremotejava.requests.StopStreaming.StopStreamingResponse;
 import net.twasi.obsremotejava.requests.TakeSourceScreenshot.TakeSourceScreenshotResponse;
+import net.twasi.obsremotejava.requests.ToggleMute.ToggleMuteResponse;
 import net.twasi.obsremotejava.requests.TransitionToProgram.TransitionToProgramResponse;
 import net.twasi.obsremotejava.requests.TriggerHotkeyByName.TriggerHotkeyByNameResponse;
 import org.eclipse.jetty.websocket.api.Session;
@@ -418,11 +420,11 @@ public void setMute(String source, boolean mute, Consumer<SetMuteResponse> callb
         communicator.setMute(source, mute, callback);
     }
 
-    public void getMute(String source, Consumer<SetMuteResponse> callback) {
+    public void getMute(String source, Consumer<GetMuteResponse> callback) {
         communicator.getMute(source, callback);
     }
 
-    public void toggleMute(String source, Consumer<SetMuteResponse> callback) {
+    public void toggleMute(String source, Consumer<ToggleMuteResponse> callback) {
         communicator.toggleMute(source, callback);
     }
 

src/main/java/net/twasi/obsremotejava/requests/GetMute/GetMuteResponse.java

@@ -4,13 +4,13 @@
 
 public class GetMuteResponse extends ResponseBase {
     private String source;
-    private boolean mute;
+    private boolean muted;
 
     public String getSource() {
         return source;
     }
 
-    public Boolean getMute() {
-        return mute;
+    public Boolean isMuted() {
+        return muted;
     }
 }

src/main/java/net/twasi/obsremotejava/requests/ToggleMute/GetMute/ToggleMuteRequest.java renamed to src/main/java/net/twasi/obsremotejava/requests/ToggleMute/ToggleMuteRequest.java

@@ -1,4 +1,4 @@
-package net.twasi.obsremotejava.requests.ToggleMute.GetMute;
+package net.twasi.obsremotejava.requests.ToggleMute;
 
 import net.twasi.obsremotejava.OBSCommunicator;
 import net.twasi.obsremotejava.requests.RequestBase;

src/main/java/net/twasi/obsremotejava/requests/ToggleMute/GetMute/ToggleMuteResponse.java renamed to src/main/java/net/twasi/obsremotejava/requests/ToggleMute/ToggleMuteResponse.java

@@ -1,4 +1,4 @@
-package net.twasi.obsremotejava.requests.ToggleMute.GetMute;
+package net.twasi.obsremotejava.requests.ToggleMute;
 
 import net.twasi.obsremotejava.requests.ResponseBase;