5.x.x/protocol update requests config

client/src/endToEndManualTest/java/io/obswebsocket/community/client/test/AbstractObsE2ETest.java

@@ -116,7 +116,7 @@ protected void cleanupScenes() {
   };
 
   protected void waitReasonably() {
-    waitReasonably(50);
+    waitReasonably(500);
   }
 
   protected void waitReasonably(long ms) {

client/src/endToEndManualTest/java/io/obswebsocket/community/client/test/ObsRemoteE2eIT.java

@@ -45,7 +45,7 @@ void getScenes() {
         new Scene(SCENE2, 1, false),
         new Scene(SCENE3, 0, false)
     );
-    GetSceneListResponse.Data expectedResponseData = new GetSceneListResponse.Data(
+    GetSceneListResponse.Data.SpecificData expectedResponseData = new GetSceneListResponse.Data.SpecificData(
         SCENE1,
         null,
         expectedScenes
@@ -57,7 +57,7 @@ void getScenes() {
 
     // Then scenes match as expected
     GetSceneListResponse res = getPreviousResponseAs(GetSceneListResponse.class);
-    assertThat(res.getResponseData())
+    assertThat(res.getMessageData().getResponseData())
         .usingRecursiveComparison().ignoringCollectionOrder().isEqualTo(expectedResponseData);
 
   }

client/src/main/java/io/obswebsocket/community/client/OBSCommunicator.java

@@ -225,7 +225,7 @@ private void onRequestResponse(RequestResponse requestResponse) {
       obsRequestListener.onRequestResponse(requestResponse);
     } catch (Throwable t) {
       this.communicatorLifecycleListener.onError(new ReasonThrowable(
-          "Failed to execute callback for RequestResponse: " + requestResponse.getRequestType(), t
+          "Failed to execute callback for RequestResponse: " + requestResponse.getMessageData().getRequestType(), t
       ));
     }
   }

client/src/main/java/io/obswebsocket/community/client/OBSRemoteController.java

@@ -38,15 +38,15 @@
 import io.obswebsocket.community.client.message.request.general.TriggerHotkeyByKeySequenceRequest;
 import io.obswebsocket.community.client.message.request.general.TriggerHotkeyByNameRequest;
 import io.obswebsocket.community.client.message.request.inputs.CreateInputRequest;
+import io.obswebsocket.community.client.message.request.inputs.GetInputAudioMonitorTypeRequest;
 import io.obswebsocket.community.client.message.request.inputs.GetInputAudioSyncOffsetRequest;
+import io.obswebsocket.community.client.message.request.inputs.GetInputAudioTracksRequest;
 import io.obswebsocket.community.client.message.request.inputs.GetInputDefaultSettingsRequest;
 import io.obswebsocket.community.client.message.request.inputs.GetInputKindListRequest;
 import io.obswebsocket.community.client.message.request.inputs.GetInputListRequest;
-import io.obswebsocket.community.client.message.request.inputs.GetInputAudioMonitorTypeRequest;
 import io.obswebsocket.community.client.message.request.inputs.GetInputMuteRequest;
 import io.obswebsocket.community.client.message.request.inputs.GetInputPropertiesListPropertyItemsRequest;
 import io.obswebsocket.community.client.message.request.inputs.GetInputSettingsRequest;
-import io.obswebsocket.community.client.message.request.inputs.GetInputAudioTracksRequest;
 import io.obswebsocket.community.client.message.request.inputs.GetInputVolumeRequest;
 import io.obswebsocket.community.client.message.request.inputs.GetSpecialInputNamesRequest;
 import io.obswebsocket.community.client.message.request.inputs.PressInputPropertiesButtonRequest;
@@ -158,14 +158,14 @@
 import io.obswebsocket.community.client.message.response.general.TriggerHotkeyByKeySequenceResponse;
 import io.obswebsocket.community.client.message.response.general.TriggerHotkeyByNameResponse;
 import io.obswebsocket.community.client.message.response.inputs.CreateInputResponse;
+import io.obswebsocket.community.client.message.response.inputs.GetInputAudioMonitorTypeResponse;
 import io.obswebsocket.community.client.message.response.inputs.GetInputAudioSyncOffsetResponse;
+import io.obswebsocket.community.client.message.response.inputs.GetInputAudioTracksResponse;
 import io.obswebsocket.community.client.message.response.inputs.GetInputDefaultSettingsResponse;
 import io.obswebsocket.community.client.message.response.inputs.GetInputListResponse;
-import io.obswebsocket.community.client.message.response.inputs.GetInputAudioMonitorTypeResponse;
 import io.obswebsocket.community.client.message.response.inputs.GetInputMuteResponse;
 import io.obswebsocket.community.client.message.response.inputs.GetInputPropertiesListPropertyItemsResponse;
 import io.obswebsocket.community.client.message.response.inputs.GetInputSettingsResponse;
-import io.obswebsocket.community.client.message.response.inputs.GetInputAudioTracksResponse;
 import io.obswebsocket.community.client.message.response.inputs.GetInputVolumeResponse;
 import io.obswebsocket.community.client.message.response.inputs.GetSpecialInputNamesResponse;
 import io.obswebsocket.community.client.message.response.inputs.PressInputPropertiesButtonResponse;

client/src/main/java/io/obswebsocket/community/client/listener/lifecycle/communicator/DelegatingCommunicatorLifecycleListener.java

@@ -1,11 +1,9 @@
 package io.obswebsocket.community.client.listener.lifecycle.communicator;
 
-import io.obswebsocket.community.client.OBSCommunicator;
 import io.obswebsocket.community.client.WebSocketCloseCode;
 import io.obswebsocket.community.client.listener.lifecycle.ReasonThrowable;
 import io.obswebsocket.community.client.message.authentication.Hello;
 import io.obswebsocket.community.client.message.authentication.Identified;
-import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.jetty.websocket.api.Session;

client/src/main/java/io/obswebsocket/community/client/listener/lifecycle/controller/ControllerLifecycleListener.java

@@ -1,6 +1,5 @@
 package io.obswebsocket.community.client.listener.lifecycle.controller;
 
-import io.obswebsocket.community.client.OBSRemoteController;
 import io.obswebsocket.community.client.listener.lifecycle.ReasonThrowable;
 
 /**

client/src/main/java/io/obswebsocket/community/client/listener/lifecycle/controller/DelegatingControllerLifecycleListener.java

@@ -1,8 +1,6 @@
 package io.obswebsocket.community.client.listener.lifecycle.controller;
 
-import io.obswebsocket.community.client.OBSRemoteController;
 import io.obswebsocket.community.client.listener.lifecycle.ReasonThrowable;
-import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import lombok.extern.slf4j.Slf4j;
 

client/src/main/java/io/obswebsocket/community/client/listener/request/ObsRequestListenerImpl.java

@@ -13,17 +13,17 @@ public class ObsRequestListenerImpl implements ObsRequestListener {
 
   @Override
   public void registerRequest(Request request, Consumer callback) {
-    this.requestListeners.put(request.getRequestId(), callback);
+    this.requestListeners.put(request.getData().getRequestId(), callback);
   }
 
   @Override
   public void onRequestResponse(RequestResponse requestResponse) {
     try {
-      if (this.requestListeners.containsKey(requestResponse.getRequestId())) {
-        this.requestListeners.get(requestResponse.getRequestId()).accept(requestResponse);
+      if (this.requestListeners.containsKey(requestResponse.getMessageData().getRequestId())) {
+        this.requestListeners.get(requestResponse.getMessageData().getRequestId()).accept(requestResponse);
       }
     } finally {
-      this.requestListeners.remove(requestResponse.getRequestId());
+      this.requestListeners.remove(requestResponse.getMessageData().getRequestId());
     }
   }