diff --git a/client/src/endToEndManualTest/java/io/obswebsocket/community/client/test/AbstractObsE2ETest.java b/client/src/endToEndManualTest/java/io/obswebsocket/community/client/test/AbstractObsE2ETest.java index 39e54888..6662d730 100644 --- a/client/src/endToEndManualTest/java/io/obswebsocket/community/client/test/AbstractObsE2ETest.java +++ b/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) { diff --git a/client/src/endToEndManualTest/java/io/obswebsocket/community/client/test/ObsRemoteE2eIT.java b/client/src/endToEndManualTest/java/io/obswebsocket/community/client/test/ObsRemoteE2eIT.java index d41371fb..b3a1b1b1 100644 --- a/client/src/endToEndManualTest/java/io/obswebsocket/community/client/test/ObsRemoteE2eIT.java +++ b/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); } diff --git a/client/src/main/java/io/obswebsocket/community/client/OBSCommunicator.java b/client/src/main/java/io/obswebsocket/community/client/OBSCommunicator.java index 078b0d5c..4df7c6af 100644 --- a/client/src/main/java/io/obswebsocket/community/client/OBSCommunicator.java +++ b/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 )); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/OBSRemoteController.java b/client/src/main/java/io/obswebsocket/community/client/OBSRemoteController.java index e961e21a..01a439fb 100644 --- a/client/src/main/java/io/obswebsocket/community/client/OBSRemoteController.java +++ b/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; diff --git a/client/src/main/java/io/obswebsocket/community/client/listener/lifecycle/communicator/DelegatingCommunicatorLifecycleListener.java b/client/src/main/java/io/obswebsocket/community/client/listener/lifecycle/communicator/DelegatingCommunicatorLifecycleListener.java index dda3a466..f61a5013 100644 --- a/client/src/main/java/io/obswebsocket/community/client/listener/lifecycle/communicator/DelegatingCommunicatorLifecycleListener.java +++ b/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; diff --git a/client/src/main/java/io/obswebsocket/community/client/listener/lifecycle/controller/ControllerLifecycleListener.java b/client/src/main/java/io/obswebsocket/community/client/listener/lifecycle/controller/ControllerLifecycleListener.java index bd7166d3..de81f34c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/listener/lifecycle/controller/ControllerLifecycleListener.java +++ b/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; /** diff --git a/client/src/main/java/io/obswebsocket/community/client/listener/lifecycle/controller/DelegatingControllerLifecycleListener.java b/client/src/main/java/io/obswebsocket/community/client/listener/lifecycle/controller/DelegatingControllerLifecycleListener.java index a34d6ff2..0e2a9a3f 100644 --- a/client/src/main/java/io/obswebsocket/community/client/listener/lifecycle/controller/DelegatingControllerLifecycleListener.java +++ b/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; diff --git a/client/src/main/java/io/obswebsocket/community/client/listener/request/ObsRequestListenerImpl.java b/client/src/main/java/io/obswebsocket/community/client/listener/request/ObsRequestListenerImpl.java index 408a142c..9e6e062c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/listener/request/ObsRequestListenerImpl.java +++ b/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()); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/Request.java b/client/src/main/java/io/obswebsocket/community/client/message/request/Request.java index 1c0ea27b..778b9595 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/Request.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/Request.java @@ -254,212 +254,228 @@ import java.util.UUID; import lombok.Getter; import lombok.ToString; +import lombok.experimental.SuperBuilder; @Getter @ToString(callSuper = true) public abstract class Request extends Message { - protected Type requestType; - protected String requestId; + protected Data data; - protected Request(Type type) { + protected Request(Data.Type type) { super(OperationCode.Request); - this.requestType = type; - this.requestId = UUID.randomUUID().toString(); + this.data = Data.builder().requestType(type).requestId(UUID.randomUUID().toString()).build(); } + public String getRequestId() { + return this.data.requestId; + } + + public Data.Type getRequestType() { + return this.data.requestType; + } + + @SuperBuilder @Getter - public enum Type { - // General - GetVersion(GetVersionRequest.class, GetVersionResponse.class), - BroadcastCustomEvent(BroadcastCustomEventRequest.class, BroadcastCustomEventResponse.class), - GetSystemStats(GetSystemStatsRequest.class, GetSystemStatsResponse.class), - GetHotkeyList(GetHotkeyListRequest.class, GetHotkeyListResponse.class), - TriggerHotkeyByName(TriggerHotkeyByNameRequest.class, TriggerHotkeyByNameResponse.class), - TriggerHotkeyByKeySequence(TriggerHotkeyByKeySequenceRequest.class, - TriggerHotkeyByKeySequenceResponse.class), - GetProjectorList(GetProjectorListRequest.class, GetProjectorListResponse.class), - GetStudioModeEnabled(GetStudioModeEnabledRequest.class, GetStudioModeEnabledResponse.class), - SetStudioModeEnabled(SetStudioModeEnabledRequest.class, SetStudioModeEnabledResponse.class), - Sleep(SleepRequest.class, SleepResponse.class), - OpenProjector(OpenProjectorRequest.class, OpenProjectorResponse.class), - CloseProjector(CloseProjectorRequest.class, CloseProjectorResponse.class), - GetStats(GetStatsRequest.class, GetSystemStatsResponse.class), + @ToString + public static class Data { + protected Type requestType; + protected String requestId; + + @Getter + public enum Type { + // General + GetVersion(GetVersionRequest.class, GetVersionResponse.class), + BroadcastCustomEvent(BroadcastCustomEventRequest.class, BroadcastCustomEventResponse.class), + GetSystemStats(GetSystemStatsRequest.class, GetSystemStatsResponse.class), + GetHotkeyList(GetHotkeyListRequest.class, GetHotkeyListResponse.class), + TriggerHotkeyByName(TriggerHotkeyByNameRequest.class, TriggerHotkeyByNameResponse.class), + TriggerHotkeyByKeySequence(TriggerHotkeyByKeySequenceRequest.class, + TriggerHotkeyByKeySequenceResponse.class), + GetProjectorList(GetProjectorListRequest.class, GetProjectorListResponse.class), + GetStudioModeEnabled(GetStudioModeEnabledRequest.class, GetStudioModeEnabledResponse.class), + SetStudioModeEnabled(SetStudioModeEnabledRequest.class, SetStudioModeEnabledResponse.class), + Sleep(SleepRequest.class, SleepResponse.class), + OpenProjector(OpenProjectorRequest.class, OpenProjectorResponse.class), + CloseProjector(CloseProjectorRequest.class, CloseProjectorResponse.class), + GetStats(GetStatsRequest.class, GetSystemStatsResponse.class), - // Config - GetPersistentData(GetPersistentDataRequest.class, - GetPersistentDataResponse.class), - SetPersistentData(SetPersistentDataRequest.class, - SetPersistentDataResponse.class), - GetSceneCollectionList(GetSceneCollectionListRequest.class, - GetSceneCollectionListResponse.class), - SetCurrentSceneCollection(SetCurrentSceneCollectionRequest.class, - SetCurrentSceneCollectionResponse.class), - CreateSceneCollection(CreateSceneCollectionRequest.class, CreateSceneCollectionResponse.class), - RemoveSceneCollection(RemoveSceneCollectionRequest.class, RemoveSceneCollectionResponse.class), - GetProfileList(GetProfileListRequest.class, GetProfileListResponse.class), - GetProfileParameter(GetProfileParameterRequest.class, GetProfileParameterResponse.class), - SetProfileParameter(SetProfileParameterRequest.class, SetProfileParameterResponse.class), - GetVideoSettings(GetVideoSettingsRequest.class, GetVideoSettingsResponse.class), - SetCurrentProfile(SetCurrentProfileRequest.class, SetCurrentProfileResponse.class), - CreateProfile(CreateProfileRequest.class, CreateProfileResponse.class), - RemoveProfile(RemoveProfileRequest.class, RemoveProfileResponse.class), - SetVideoSettings(SetVideoSettingsRequest.class, SetVideoSettingsResponse.class), + // Config + GetPersistentData(GetPersistentDataRequest.class, + GetPersistentDataResponse.class), + SetPersistentData(SetPersistentDataRequest.class, + SetPersistentDataResponse.class), + GetSceneCollectionList(GetSceneCollectionListRequest.class, + GetSceneCollectionListResponse.class), + SetCurrentSceneCollection(SetCurrentSceneCollectionRequest.class, + SetCurrentSceneCollectionResponse.class), + CreateSceneCollection(CreateSceneCollectionRequest.class, CreateSceneCollectionResponse.class), + RemoveSceneCollection(RemoveSceneCollectionRequest.class, RemoveSceneCollectionResponse.class), + GetProfileList(GetProfileListRequest.class, GetProfileListResponse.class), + GetProfileParameter(GetProfileParameterRequest.class, GetProfileParameterResponse.class), + SetProfileParameter(SetProfileParameterRequest.class, SetProfileParameterResponse.class), + GetVideoSettings(GetVideoSettingsRequest.class, GetVideoSettingsResponse.class), + SetCurrentProfile(SetCurrentProfileRequest.class, SetCurrentProfileResponse.class), + CreateProfile(CreateProfileRequest.class, CreateProfileResponse.class), + RemoveProfile(RemoveProfileRequest.class, RemoveProfileResponse.class), + SetVideoSettings(SetVideoSettingsRequest.class, SetVideoSettingsResponse.class), - // Scenes - GetSceneList(GetSceneListRequest.class, GetSceneListResponse.class), - GetCurrentProgramScene(GetCurrentProgramSceneRequest.class, - GetCurrentProgramSceneResponse.class), - SetCurrentProgramScene(SetCurrentProgramSceneRequest.class, - SetCurrentProgramSceneResponse.class), - GetCurrentPreviewScene(GetCurrentPreviewSceneRequest.class, - GetCurrentPreviewSceneResponse.class), - SetCurrentPreviewScene(SetCurrentPreviewSceneRequest.class, - SetCurrentPreviewSceneResponse.class), - CreateScene(CreateSceneRequest.class, CreateSceneResponse.class), - SetSceneIndex(SetSceneIndexRequest.class, SetSceneIndexResponse.class), - SetSceneName(SetSceneNameRequest.class, SetSceneNameResponse.class), - RemoveScene(RemoveSceneRequest.class, RemoveSceneResponse.class), - GetSceneTransitionOverride(GetSceneTransitionOverrideRequest.class, - GetSceneTransitionOverrideResponse.class), - SetSceneTransitionOverride(SetSceneTransitionOverrideRequest.class, - SetSceneTransitionOverrideResponse.class), - DeleteSceneTransitionOverride(DeleteSceneTransitionOverrideRequest.class, - DeleteSceneTransitionOverrideResponse.class), + // Scenes + GetSceneList(GetSceneListRequest.class, GetSceneListResponse.class), + GetCurrentProgramScene(GetCurrentProgramSceneRequest.class, + GetCurrentProgramSceneResponse.class), + SetCurrentProgramScene(SetCurrentProgramSceneRequest.class, + SetCurrentProgramSceneResponse.class), + GetCurrentPreviewScene(GetCurrentPreviewSceneRequest.class, + GetCurrentPreviewSceneResponse.class), + SetCurrentPreviewScene(SetCurrentPreviewSceneRequest.class, + SetCurrentPreviewSceneResponse.class), + CreateScene(CreateSceneRequest.class, CreateSceneResponse.class), + SetSceneIndex(SetSceneIndexRequest.class, SetSceneIndexResponse.class), + SetSceneName(SetSceneNameRequest.class, SetSceneNameResponse.class), + RemoveScene(RemoveSceneRequest.class, RemoveSceneResponse.class), + GetSceneTransitionOverride(GetSceneTransitionOverrideRequest.class, + GetSceneTransitionOverrideResponse.class), + SetSceneTransitionOverride(SetSceneTransitionOverrideRequest.class, + SetSceneTransitionOverrideResponse.class), + DeleteSceneTransitionOverride(DeleteSceneTransitionOverrideRequest.class, + DeleteSceneTransitionOverrideResponse.class), - // Sources - GetSourceActive(GetSourceActiveRequest.class, GetSourceActiveResponse.class), - GetSourceScreenshot(GetSourceScreenshotRequest.class, GetSourceScreenshotResponse.class), - SaveSourceScreenshot(SaveSourceScreenshotRequest.class, SaveSourceScreenshotResponse.class), + // Sources + GetSourceActive(GetSourceActiveRequest.class, GetSourceActiveResponse.class), + GetSourceScreenshot(GetSourceScreenshotRequest.class, GetSourceScreenshotResponse.class), + SaveSourceScreenshot(SaveSourceScreenshotRequest.class, SaveSourceScreenshotResponse.class), - // Inputs - GetInputList(GetInputListRequest.class, GetInputListResponse.class), - GetInputKindList(GetInputKindListRequest.class, GetInputKindListResponse.class), - GetInputDefaultSettings(GetInputDefaultSettingsRequest.class, - GetInputDefaultSettingsResponse.class), - GetInputSettings(GetInputSettingsRequest.class, GetInputSettingsResponse.class), - SetInputSettings(SetInputSettingsRequest.class, SetInputSettingsResponse.class), - GetInputMute(GetInputMuteRequest.class, GetInputMuteResponse.class), - SetInputMute(SetInputMuteRequest.class, SetInputMuteResponse.class), - ToggleInputMute(ToggleInputMuteRequest.class, ToggleInputMuteResponse.class), - GetInputVolume(GetInputVolumeRequest.class, GetInputVolumeResponse.class), - GetSpecialInputNames(GetSpecialInputNamesRequest.class, GetSpecialInputNamesResponse.class), - SetInputName(SetInputNameRequest.class, SetInputNameResponse.class), - SetInputVolume(SetInputVolumeRequest.class, SetInputVolumeResponse.class), - CreateInput(CreateInputRequest.class, CreateInputResponse.class), - RemoveInput(RemoveInputRequest.class, RemoveInputResponse.class), - GetInputAudioTracks(GetInputAudioTracksRequest.class, GetInputAudioTracksResponse.class), - GetInputAudioMonitorType(GetInputAudioMonitorTypeRequest.class, - GetInputAudioMonitorTypeResponse.class), - SetInputAudioMonitorType(SetInputAudioMonitorTypeRequest.class, - SetInputAudioMonitorTypeResponse.class), - GetInputAudioSyncOffset(GetInputAudioSyncOffsetRequest.class, - GetInputAudioSyncOffsetResponse.class), - SetInputAudioSyncOffset(SetInputAudioSyncOffsetRequest.class, - SetInputAudioSyncOffsetResponse.class), - GetInputPropertiesListPropertyItems(GetInputPropertiesListPropertyItemsRequest.class, - GetInputPropertiesListPropertyItemsResponse.class), - PressInputPropertiesButton(PressInputPropertiesButtonRequest.class, - PressInputPropertiesButtonResponse.class), + // Inputs + GetInputList(GetInputListRequest.class, GetInputListResponse.class), + GetInputKindList(GetInputKindListRequest.class, GetInputKindListResponse.class), + GetInputDefaultSettings(GetInputDefaultSettingsRequest.class, + GetInputDefaultSettingsResponse.class), + GetInputSettings(GetInputSettingsRequest.class, GetInputSettingsResponse.class), + SetInputSettings(SetInputSettingsRequest.class, SetInputSettingsResponse.class), + GetInputMute(GetInputMuteRequest.class, GetInputMuteResponse.class), + SetInputMute(SetInputMuteRequest.class, SetInputMuteResponse.class), + ToggleInputMute(ToggleInputMuteRequest.class, ToggleInputMuteResponse.class), + GetInputVolume(GetInputVolumeRequest.class, GetInputVolumeResponse.class), + GetSpecialInputNames(GetSpecialInputNamesRequest.class, GetSpecialInputNamesResponse.class), + SetInputName(SetInputNameRequest.class, SetInputNameResponse.class), + SetInputVolume(SetInputVolumeRequest.class, SetInputVolumeResponse.class), + CreateInput(CreateInputRequest.class, CreateInputResponse.class), + RemoveInput(RemoveInputRequest.class, RemoveInputResponse.class), + GetInputAudioTracks(GetInputAudioTracksRequest.class, GetInputAudioTracksResponse.class), + GetInputAudioMonitorType(GetInputAudioMonitorTypeRequest.class, + GetInputAudioMonitorTypeResponse.class), + SetInputAudioMonitorType(SetInputAudioMonitorTypeRequest.class, + SetInputAudioMonitorTypeResponse.class), + GetInputAudioSyncOffset(GetInputAudioSyncOffsetRequest.class, + GetInputAudioSyncOffsetResponse.class), + SetInputAudioSyncOffset(SetInputAudioSyncOffsetRequest.class, + SetInputAudioSyncOffsetResponse.class), + GetInputPropertiesListPropertyItems(GetInputPropertiesListPropertyItemsRequest.class, + GetInputPropertiesListPropertyItemsResponse.class), + PressInputPropertiesButton(PressInputPropertiesButtonRequest.class, + PressInputPropertiesButtonResponse.class), - // Stream - GetStreamStatus(GetStreamStatusRequest.class, GetStreamStatusResponse.class), - ToggleStream(ToggleStreamRequest.class, ToggleStreamResponse.class), - StartStream(StartStreamRequest.class, StartStreamResponse.class), - StopStream(StopStreamRequest.class, StopStreamResponse.class), - SendStreamCaption(SendStreamCaptionRequest.class, SendStreamCaptionResponse.class), - GetStreamServiceSettings(GetStreamServiceSettingsRequest.class, - GetStreamServiceSettingsResponse.class), - SetStreamServiceSettings(SetStreamServiceSettingsRequest.class, - SetStreamServiceSettingsResponse.class), + // Stream + GetStreamStatus(GetStreamStatusRequest.class, GetStreamStatusResponse.class), + ToggleStream(ToggleStreamRequest.class, ToggleStreamResponse.class), + StartStream(StartStreamRequest.class, StartStreamResponse.class), + StopStream(StopStreamRequest.class, StopStreamResponse.class), + SendStreamCaption(SendStreamCaptionRequest.class, SendStreamCaptionResponse.class), + GetStreamServiceSettings(GetStreamServiceSettingsRequest.class, + GetStreamServiceSettingsResponse.class), + SetStreamServiceSettings(SetStreamServiceSettingsRequest.class, + SetStreamServiceSettingsResponse.class), - // Transitions - GetTransitionList(GetTransitionListRequest.class, GetTransitionListResponse.class), - GetCurrentTransition(GetCurrentTransitionRequest.class, GetCurrentTransitionResponse.class), - SetCurrentTransition(SetCurrentTransitionRequest.class, SetCurrentTransitionResponse.class), - SetCurrentTransitionDuration(SetCurrentTransitionDurationRequest.class, - SetCurrentTransitionDurationResponse.class), - GetTransitionSettings(GetTransitionSettingsRequest.class, GetTransitionSettingsResponse.class), - SetTransitionSettings(SetTransitionSettingsRequest.class, SetTransitionSettingsResponse.class), - ReleaseTbar(ReleaseTbarRequest.class, ReleaseTbarResponse.class), - SetTbarPosition(SetTbarPositionRequest.class, SetTbarPositionResponse.class), - TriggerStudioModeTransition(TriggerStudioModeTransitionRequest.class, - TriggerStudioModeTransitionResponse.class), + // Transitions + GetTransitionList(GetTransitionListRequest.class, GetTransitionListResponse.class), + GetCurrentTransition(GetCurrentTransitionRequest.class, GetCurrentTransitionResponse.class), + SetCurrentTransition(SetCurrentTransitionRequest.class, SetCurrentTransitionResponse.class), + SetCurrentTransitionDuration(SetCurrentTransitionDurationRequest.class, + SetCurrentTransitionDurationResponse.class), + GetTransitionSettings(GetTransitionSettingsRequest.class, GetTransitionSettingsResponse.class), + SetTransitionSettings(SetTransitionSettingsRequest.class, SetTransitionSettingsResponse.class), + ReleaseTbar(ReleaseTbarRequest.class, ReleaseTbarResponse.class), + SetTbarPosition(SetTbarPositionRequest.class, SetTbarPositionResponse.class), + TriggerStudioModeTransition(TriggerStudioModeTransitionRequest.class, + TriggerStudioModeTransitionResponse.class), - // Filters - GetSourceFilterList(GetSourceFilterListRequest.class, GetSourceFilterListResponse.class), - GetSourceFilter(GetSourceFilterRequest.class, GetSourceFilterResponse.class), - SetSourceFilterIndex(SetSourceFilterIndexRequest.class, SetSourceFilterIndexResponse.class), - SetSourceFilterSettings(SetSourceFilterSettingsRequest.class, - SetSourceFilterSettingsResponse.class), - SetSourceFilterEnabled(SetSourceFilterEnabledRequest.class, - SetSourceFilterEnabledResponse.class), - CreateSourceFilter(CreateSourceFilterRequest.class, CreateSourceFilterResponse.class), - RemoveSourceFilter(RemoveSourceFilterRequest.class, RemoveSourceFilterResponse.class), + // Filters + GetSourceFilterList(GetSourceFilterListRequest.class, GetSourceFilterListResponse.class), + GetSourceFilter(GetSourceFilterRequest.class, GetSourceFilterResponse.class), + SetSourceFilterIndex(SetSourceFilterIndexRequest.class, SetSourceFilterIndexResponse.class), + SetSourceFilterSettings(SetSourceFilterSettingsRequest.class, + SetSourceFilterSettingsResponse.class), + SetSourceFilterEnabled(SetSourceFilterEnabledRequest.class, + SetSourceFilterEnabledResponse.class), + CreateSourceFilter(CreateSourceFilterRequest.class, CreateSourceFilterResponse.class), + RemoveSourceFilter(RemoveSourceFilterRequest.class, RemoveSourceFilterResponse.class), - // Scene Items - GetSceneItemList(GetSceneItemListRequest.class, GetSceneItemListResponse.class), - GetSceneItemEnabled(GetSceneItemEnabledRequest.class, GetSceneItemEnabledResponse.class), - SetSceneItemEnabled(SetSceneItemEnabledRequest.class, SetSceneItemEnabledResponse.class), - GetSceneItemLocked(GetSceneItemLockedRequest.class, GetSceneItemLockedResponse.class), - SetSceneItemLocked(SetSceneItemLockedRequest.class, SetSceneItemLockedResponse.class), - GetSceneItemColor(GetSceneItemColorRequest.class, GetSceneItemColorResponse.class), - SetSceneItemIndex(SetSceneItemIndexRequest.class, SetSceneItemIndexResponse.class), - CreateSceneItem(CreateSceneItemRequest.class, CreateSceneItemResponse.class), - RemoveSceneItem(RemoveSceneItemRequest.class, RemoveSceneItemResponse.class), - DuplicateSceneItem(DuplicateSceneItemRequest.class, DuplicateSceneItemResponse.class), + // Scene Items + GetSceneItemList(GetSceneItemListRequest.class, GetSceneItemListResponse.class), + GetSceneItemEnabled(GetSceneItemEnabledRequest.class, GetSceneItemEnabledResponse.class), + SetSceneItemEnabled(SetSceneItemEnabledRequest.class, SetSceneItemEnabledResponse.class), + GetSceneItemLocked(GetSceneItemLockedRequest.class, GetSceneItemLockedResponse.class), + SetSceneItemLocked(SetSceneItemLockedRequest.class, SetSceneItemLockedResponse.class), + GetSceneItemColor(GetSceneItemColorRequest.class, GetSceneItemColorResponse.class), + SetSceneItemIndex(SetSceneItemIndexRequest.class, SetSceneItemIndexResponse.class), + CreateSceneItem(CreateSceneItemRequest.class, CreateSceneItemResponse.class), + RemoveSceneItem(RemoveSceneItemRequest.class, RemoveSceneItemResponse.class), + DuplicateSceneItem(DuplicateSceneItemRequest.class, DuplicateSceneItemResponse.class), - // Outputs - GetReplayBufferStatus(GetReplayBufferStatusRequest.class, GetReplayBufferStatusResponse.class), - ToggleReplayBuffer(ToggleReplayBufferRequest.class, ToggleReplayBufferResponse.class), - StartReplayBuffer(StartReplayBufferRequest.class, StartReplayBufferResponse.class), - StopReplayBuffer(StopReplayBufferRequest.class, StopReplayBufferResponse.class), - SaveReplayBuffer(SaveReplayBufferRequest.class, SaveReplayBufferResponse.class), - GetLastReplayBufferReplay(GetLastReplayBufferReplayRequest.class, - GetLastReplayBufferReplayResponse.class), - GetOutputList(GetOutputListRequest.class, GetOutputListResponse.class), - ToggleOutput(ToggleOutputRequest.class, ToggleOutputResponse.class), - StartOutput(StartOutputRequest.class, StartOutputResponse.class), - StopOutput(StopOutputRequest.class, StopOutputResponse.class), + // Outputs + GetReplayBufferStatus(GetReplayBufferStatusRequest.class, GetReplayBufferStatusResponse.class), + ToggleReplayBuffer(ToggleReplayBufferRequest.class, ToggleReplayBufferResponse.class), + StartReplayBuffer(StartReplayBufferRequest.class, StartReplayBufferResponse.class), + StopReplayBuffer(StopReplayBufferRequest.class, StopReplayBufferResponse.class), + SaveReplayBuffer(SaveReplayBufferRequest.class, SaveReplayBufferResponse.class), + GetLastReplayBufferReplay(GetLastReplayBufferReplayRequest.class, + GetLastReplayBufferReplayResponse.class), + GetOutputList(GetOutputListRequest.class, GetOutputListResponse.class), + ToggleOutput(ToggleOutputRequest.class, ToggleOutputResponse.class), + StartOutput(StartOutputRequest.class, StartOutputResponse.class), + StopOutput(StopOutputRequest.class, StopOutputResponse.class), - // Record - GetRecordStatus(GetRecordStatusRequest.class, GetRecordStatusResponse.class), - ToggleRecord(ToggleRecordRequest.class, ToggleRecordResponse.class), - StartRecord(StartRecordRequest.class, StartRecordResponse.class), - StopRecord(StopRecordRequest.class, StopRecordResponse.class), - ToggleRecordPause(ToggleRecordPauseRequest.class, ToggleRecordPauseResponse.class), - PauseRecord(PauseRecordRequest.class, PauseRecordResponse.class), - ResumeRecord(ResumeRecordRequest.class, ResumeRecordResponse.class), - GetRecordDirectory(GetRecordDirectoryRequest.class, GetRecordDirectoryResponse.class), - SetRecordDirectory(SetRecordDirectoryRequest.class, SetRecordDirectoryResponse.class), - GetRecordFilenameFormatting(GetRecordFilenameFormattingRequest.class, - GetRecordFilenameFormattingResponse.class), - SetRecordFilenameFormatting(SetRecordFilenameFormattingRequest.class, - SetRecordFilenameFormattingResponse.class), + // Record + GetRecordStatus(GetRecordStatusRequest.class, GetRecordStatusResponse.class), + ToggleRecord(ToggleRecordRequest.class, ToggleRecordResponse.class), + StartRecord(StartRecordRequest.class, StartRecordResponse.class), + StopRecord(StopRecordRequest.class, StopRecordResponse.class), + ToggleRecordPause(ToggleRecordPauseRequest.class, ToggleRecordPauseResponse.class), + PauseRecord(PauseRecordRequest.class, PauseRecordResponse.class), + ResumeRecord(ResumeRecordRequest.class, ResumeRecordResponse.class), + GetRecordDirectory(GetRecordDirectoryRequest.class, GetRecordDirectoryResponse.class), + SetRecordDirectory(SetRecordDirectoryRequest.class, SetRecordDirectoryResponse.class), + GetRecordFilenameFormatting(GetRecordFilenameFormattingRequest.class, + GetRecordFilenameFormattingResponse.class), + SetRecordFilenameFormatting(SetRecordFilenameFormattingRequest.class, + SetRecordFilenameFormattingResponse.class), - // Media Inputs - GetMediaInputStatus(GetMediaInputStatusRequest.class, GetMediaInputStatusResponse.class), - OffsetMediaInputTimecode(OffsetMediaInputTimecodeRequest.class, - OffsetMediaInputTimecodeResponse.class), - SetMediaInputTimecode(SetMediaInputTimecodeRequest.class, SetMediaInputTimecodeResponse.class), - SetMediaInputPauseState(SetMediaInputPauseStateRequest.class, - SetMediaInputPauseStateResponse.class), - StopMediaInput(StopMediaInputRequest.class, StopMediaInputResponse.class), - RestartMediaInput(RestartMediaInputRequest.class, RestartMediaInputResponse.class), - NextMediaInputPlaylistItem(NextMediaInputPlaylistItemRequest.class, - NextMediaInputPlaylistItemResponse.class), - PreviousMediaInputPlaylistItem(PreviousMediaInputPlaylistItemRequest.class, - PreviousMediaInputPlaylistItemResponse.class), - ; + // Media Inputs + GetMediaInputStatus(GetMediaInputStatusRequest.class, GetMediaInputStatusResponse.class), + OffsetMediaInputTimecode(OffsetMediaInputTimecodeRequest.class, + OffsetMediaInputTimecodeResponse.class), + SetMediaInputTimecode(SetMediaInputTimecodeRequest.class, SetMediaInputTimecodeResponse.class), + SetMediaInputPauseState(SetMediaInputPauseStateRequest.class, + SetMediaInputPauseStateResponse.class), + StopMediaInput(StopMediaInputRequest.class, StopMediaInputResponse.class), + RestartMediaInput(RestartMediaInputRequest.class, RestartMediaInputResponse.class), + NextMediaInputPlaylistItem(NextMediaInputPlaylistItemRequest.class, + NextMediaInputPlaylistItemResponse.class), + PreviousMediaInputPlaylistItem(PreviousMediaInputPlaylistItemRequest.class, + PreviousMediaInputPlaylistItemResponse.class), + ; - private final Class requestClass; - private final Class requestResponseClass; + private final Class requestClass; + private final Class requestResponseClass; - Type(Class requestClass, - Class requestResponseClass) { - this.requestClass = requestClass; - this.requestResponseClass = requestResponseClass; + Type(Class requestClass, + Class requestResponseClass) { + this.requestClass = requestClass; + this.requestResponseClass = requestResponseClass; + } } } + } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/RequestSerialization.java b/client/src/main/java/io/obswebsocket/community/client/message/request/RequestSerialization.java index 5b537a52..7bad63e6 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/RequestSerialization.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/RequestSerialization.java @@ -18,16 +18,19 @@ public Request deserialize(JsonElement jsonElement, Type typeOfT, if (jsonElement.isJsonObject()) { JsonObject jsonObject = jsonElement.getAsJsonObject(); - if (jsonObject.has("requestType")) { - Request.Type requestType = null; - try { - requestType = Request.Type.valueOf(jsonObject.get("requestType").getAsString()); - } catch (IllegalArgumentException illegalArgumentException) { - // unknown RequestType - } + if (jsonObject.has("d")) { + JsonObject messageData = jsonObject.getAsJsonObject("d"); + if (messageData.has("requestType")) { + Request.Data.Type requestType = null; + try { + requestType = Request.Data.Type.valueOf(messageData.get("requestType").getAsString()); + } catch (IllegalArgumentException illegalArgumentException) { + // unknown RequestType + } - if (requestType != null) { - request = context.deserialize(jsonElement, requestType.getRequestClass()); + if (requestType != null) { + request = context.deserialize(jsonElement, requestType.getRequestClass()); + } } } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/CreateProfileRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/CreateProfileRequest.java index 96399f4a..c47edc0f 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/CreateProfileRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/CreateProfileRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.config; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class CreateProfileRequest extends ProfileRequest { @Builder private CreateProfileRequest(String profileName) { - super(Type.CreateProfile); + super(Request.Data.Type.CreateProfile); this.requestData = Data.builder().profileName(profileName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/CreateSceneCollectionRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/CreateSceneCollectionRequest.java index 03519918..c89d4437 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/CreateSceneCollectionRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/CreateSceneCollectionRequest.java @@ -1,5 +1,7 @@ package io.obswebsocket.community.client.message.request.config; +import com.google.gson.annotations.SerializedName; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -8,12 +10,15 @@ @ToString(callSuper = true) public class CreateSceneCollectionRequest extends SceneCollectionRequest { - public final Data requestData; + @SerializedName("d") + private final Data data; @Builder private CreateSceneCollectionRequest(String sceneCollectionName) { - super(Type.SetCurrentSceneCollection); + super(Request.Data.Type.SetCurrentSceneCollection); - this.requestData = Data.builder().sceneCollectionName(sceneCollectionName).build(); + this.data = Data.builder().requestId(this.getRequestId()).requestType(this.getRequestType()) + .requestData(SpecificData.builder().sceneCollectionName(sceneCollectionName).build()) + .build(); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetPersistentDataRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetPersistentDataRequest.java index 85f4adcc..4d12efb3 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetPersistentDataRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetPersistentDataRequest.java @@ -1,5 +1,7 @@ package io.obswebsocket.community.client.message.request.config; +import com.google.gson.annotations.SerializedName; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -8,13 +10,14 @@ @ToString(callSuper = true) public class GetPersistentDataRequest extends PersistentDataRequest { - private final Data requestData; + @SerializedName("d") + private final PersistentDataRequest.Data data; @Builder private GetPersistentDataRequest(String realm, String slotName) { - super(Type.GetPersistentData); + super(Request.Data.Type.GetPersistentData); - this.requestData = Data.builder().realm(realm).slotName(slotName).build(); + this.data = Data.builder().requestId(this.getRequestId()).requestType(this.getRequestType()).requestData(SpecificData.builder().realm(realm).slotName(slotName).build()).build(); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetProfileListRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetProfileListRequest.java index a16a140f..0a609442 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetProfileListRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetProfileListRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.config; +import com.google.gson.annotations.SerializedName; import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; @@ -9,8 +10,14 @@ @ToString(callSuper = true) public class GetProfileListRequest extends Request { + @SerializedName("d") + private final Data data; + @Builder private GetProfileListRequest() { - super(Type.GetProfileList); + super(Data.Type.GetProfileList); + + this.data = Data.builder().requestId(this.getRequestId()).requestType(this.getRequestType()) + .build(); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetProfileParameterRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetProfileParameterRequest.java index b7f683aa..fc3dc73a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetProfileParameterRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetProfileParameterRequest.java @@ -1,29 +1,42 @@ package io.obswebsocket.community.client.message.request.config; +import com.google.gson.annotations.SerializedName; import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; import lombok.ToString; +import lombok.experimental.SuperBuilder; @Getter @ToString(callSuper = true) public class GetProfileParameterRequest extends Request { - private final Data requestData; + @SerializedName("d") + private final Data data; @Builder private GetProfileParameterRequest(String parameterCategory, String parameterName) { - super(Type.GetProfileParameter); + super(Request.Data.Type.GetProfileParameter); - this.requestData = Data.builder().parameterCategory(parameterCategory) - .parameterName(parameterName).build(); + this.data = Data.builder().requestId(this.getRequestId()).requestType(this.getRequestType()) + .requestData( + SpecificData.builder().parameterCategory(parameterCategory).parameterName(parameterName) + .build()).build(); + } + + @SuperBuilder + @Getter + @ToString + static class Data extends Request.Data { + + private SpecificData requestData; } @Getter @ToString @Builder - static class Data { + static class SpecificData { @NonNull private final String parameterCategory; diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetSceneCollectionListRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetSceneCollectionListRequest.java index e342de89..eb0578bb 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetSceneCollectionListRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetSceneCollectionListRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.config; +import com.google.gson.annotations.SerializedName; import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; @@ -9,8 +10,14 @@ @ToString(callSuper = true) public class GetSceneCollectionListRequest extends Request { + @SerializedName("d") + private final Data data; + @Builder private GetSceneCollectionListRequest() { - super(Type.GetSceneCollectionList); + super(Data.Type.GetSceneCollectionList); + + this.data = Data.builder().requestId(this.getRequestId()).requestType(this.getRequestType()) + .build(); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetVideoSettingsRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetVideoSettingsRequest.java index 7b35c785..3de9652b 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetVideoSettingsRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/GetVideoSettingsRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.config; +import com.google.gson.annotations.SerializedName; import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; @@ -9,8 +10,14 @@ @ToString(callSuper = true) public class GetVideoSettingsRequest extends Request { + @SerializedName("d") + private final Data data; + @Builder private GetVideoSettingsRequest() { - super(Type.GetVideoSettings); + super(Data.Type.GetVideoSettings); + + this.data = Data.builder().requestId(this.getRequestId()).requestType(this.getRequestType()) + .build(); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/PersistentDataRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/PersistentDataRequest.java index 091940ba..a6f11742 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/PersistentDataRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/PersistentDataRequest.java @@ -10,14 +10,21 @@ @ToString(callSuper = true) abstract class PersistentDataRequest extends Request { - PersistentDataRequest(Type type) { + PersistentDataRequest(Request.Data.Type type) { super(type); } + @SuperBuilder + @Getter + @ToString + static class Data extends Request.Data { + private SpecificData requestData; + } + @Getter @ToString @SuperBuilder - static class Data { + static class SpecificData { @NonNull private final String realm; diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/ProfileRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/ProfileRequest.java index 5b05a7de..ea97b495 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/ProfileRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/ProfileRequest.java @@ -5,13 +5,12 @@ import lombok.Getter; import lombok.NonNull; import lombok.ToString; -import lombok.experimental.SuperBuilder; @Getter @ToString(callSuper = true) abstract class ProfileRequest extends Request { - ProfileRequest(Type type) { + ProfileRequest(Request.Data.Type type) { super(type); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/RemoveProfileRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/RemoveProfileRequest.java index f06af85a..9a98782c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/RemoveProfileRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/RemoveProfileRequest.java @@ -3,7 +3,6 @@ import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; -import lombok.NonNull; import lombok.ToString; @Getter @@ -14,7 +13,7 @@ public class RemoveProfileRequest extends ProfileRequest { @Builder private RemoveProfileRequest(String profileName) { - super(Type.RemoveProfile); + super(Request.Data.Type.RemoveProfile); this.requestData = Data.builder().profileName(profileName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/RemoveSceneCollectionRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/RemoveSceneCollectionRequest.java index 06b39ae4..64722ace 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/RemoveSceneCollectionRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/RemoveSceneCollectionRequest.java @@ -1,5 +1,7 @@ package io.obswebsocket.community.client.message.request.config; +import com.google.gson.annotations.SerializedName; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -8,12 +10,15 @@ @ToString(callSuper = true) public class RemoveSceneCollectionRequest extends SceneCollectionRequest { - private final Data requestData; + @SerializedName("d") + private final Data data; @Builder private RemoveSceneCollectionRequest(String sceneCollectionName) { - super(Type.RemoveSceneCollection); + super(Request.Data.Type.RemoveSceneCollection); - this.requestData = Data.builder().sceneCollectionName(sceneCollectionName).build(); + this.data = Data.builder().requestId(this.getRequestId()).requestType(this.getRequestType()) + .requestData(SpecificData.builder().sceneCollectionName(sceneCollectionName).build()) + .build(); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/SceneCollectionRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/SceneCollectionRequest.java index 4c892ef9..3d09c750 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/SceneCollectionRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/SceneCollectionRequest.java @@ -10,14 +10,23 @@ @ToString(callSuper = true) abstract class SceneCollectionRequest extends Request { - SceneCollectionRequest(Request.Type requestType) { + SceneCollectionRequest(Request.Data.Type requestType) { super(requestType); } + + @SuperBuilder + @Getter + @ToString + static class Data extends Request.Data { + + private SpecificData requestData; + } + @Getter @ToString @SuperBuilder - static class Data { + static class SpecificData { @NonNull private final String sceneCollectionName; diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetCurrentProfileRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetCurrentProfileRequest.java index ee0e1002..8ffec5f3 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetCurrentProfileRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetCurrentProfileRequest.java @@ -3,7 +3,6 @@ import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; -import lombok.NonNull; import lombok.ToString; @Getter @@ -14,7 +13,7 @@ public class SetCurrentProfileRequest extends ProfileRequest { @Builder private SetCurrentProfileRequest(String profileName) { - super(Type.SetCurrentProfile); + super(Request.Data.Type.SetCurrentProfile); this.requestData = Data.builder().profileName(profileName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetCurrentSceneCollectionRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetCurrentSceneCollectionRequest.java index c83d5e2d..a7b98e93 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetCurrentSceneCollectionRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetCurrentSceneCollectionRequest.java @@ -1,5 +1,7 @@ package io.obswebsocket.community.client.message.request.config; +import com.google.gson.annotations.SerializedName; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -8,12 +10,15 @@ @ToString(callSuper = true) public class SetCurrentSceneCollectionRequest extends SceneCollectionRequest { - private final Data requestData; + @SerializedName("d") + private final Data data; @Builder private SetCurrentSceneCollectionRequest(String sceneCollectionName) { - super(Type.SetCurrentSceneCollection); + super(Request.Data.Type.SetCurrentSceneCollection); - this.requestData = Data.builder().sceneCollectionName(sceneCollectionName).build(); + this.data = Data.builder().requestId(this.getRequestId()).requestType(this.getRequestType()) + .requestData(SpecificData.builder().sceneCollectionName(sceneCollectionName).build()) + .build(); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetPersistentDataRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetPersistentDataRequest.java index db7fe19d..70f69626 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetPersistentDataRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetPersistentDataRequest.java @@ -1,5 +1,7 @@ package io.obswebsocket.community.client.message.request.config; +import com.google.gson.annotations.SerializedName; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -10,19 +12,20 @@ @ToString(callSuper = true) public class SetPersistentDataRequest extends PersistentDataRequest { - private final Data requestData; + @SerializedName("d") + private final Data data; @Builder private SetPersistentDataRequest(String realm, String slotName, Object slotValue) { - super(Type.SetPersistentData); + super(Request.Data.Type.SetPersistentData); - this.requestData = Data.builder().realm(realm).slotName(slotName).slotValue(slotValue).build(); + this.data = Data.builder().requestId(this.getRequestId()).requestType(this.getRequestType()).requestData(SpecificData.builder().realm(realm).slotName(slotName).slotValue(slotValue).build()).build(); } @Getter @ToString @SuperBuilder - static class Data extends PersistentDataRequest.Data { + static class SpecificData extends PersistentDataRequest.SpecificData { @NonNull private final Object slotValue; // TODO: type might change diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetProfileParameterRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetProfileParameterRequest.java index 1bbe1941..6787b85c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetProfileParameterRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetProfileParameterRequest.java @@ -1,30 +1,43 @@ package io.obswebsocket.community.client.message.request.config; +import com.google.gson.annotations.SerializedName; import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; import lombok.ToString; +import lombok.experimental.SuperBuilder; @Getter @ToString(callSuper = true) public class SetProfileParameterRequest extends Request { - private final Data requestData; + @SerializedName("d") + private final Data data; @Builder private SetProfileParameterRequest(String parameterCategory, String parameterName, String parameterValue) { - super(Type.SetProfileParameter); + super(Request.Data.Type.SetProfileParameter); - this.requestData = Data.builder().parameterCategory(parameterCategory) - .parameterName(parameterName).parameterValue(parameterValue).build(); + this.data = Data.builder().requestId(this.getRequestId()).requestType(this.getRequestType()) + .requestData( + SpecificData.builder().parameterCategory(parameterCategory).parameterName(parameterName) + .parameterValue(parameterValue).build()).build(); + } + + @SuperBuilder + @Getter + @ToString + static class Data extends Request.Data { + + private SpecificData requestData; } @Getter @ToString @Builder - static class Data { + static class SpecificData { @NonNull private final String parameterCategory; diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetVideoSettingsRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetVideoSettingsRequest.java index 012fdb47..3e44bb2e 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetVideoSettingsRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/config/SetVideoSettingsRequest.java @@ -18,7 +18,7 @@ private SetVideoSettingsRequest(Integer baseWidth, Integer outputHeight, Integer fpsNumerator, Integer fpsDenominator) { - super(Type.SetVideoSettings); + super(Request.Data.Type.SetVideoSettings); this.requestData = Data.builder() .baseWidth(baseWidth) diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/CreateSourceFilterRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/CreateSourceFilterRequest.java index 2d38111d..3b0c3dd6 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/CreateSourceFilterRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/CreateSourceFilterRequest.java @@ -1,6 +1,7 @@ package io.obswebsocket.community.client.message.request.filters; import com.google.gson.JsonObject; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -16,7 +17,7 @@ public class CreateSourceFilterRequest extends FilterRequest { @Builder private CreateSourceFilterRequest(String sourceName, String filterName, Integer filterIndex, String filterKind, JsonObject filterSettings) { - super(Type.CreateSourceFilter); + super(Request.Data.Type.CreateSourceFilter); this.requestData = Data.builder().sourceName(sourceName).filterName(filterName) .filterIndex(filterIndex).filterKind(filterKind).filterSettings(filterSettings).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/FilterRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/FilterRequest.java index f919d70c..09abeeac 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/FilterRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/FilterRequest.java @@ -10,7 +10,7 @@ @ToString(callSuper = true) abstract class FilterRequest extends Request { - FilterRequest(Type requestType) { + FilterRequest(Request.Data.Type requestType) { super(requestType); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/GetSourceFilterListRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/GetSourceFilterListRequest.java index 5f44719d..2acf9f3a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/GetSourceFilterListRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/GetSourceFilterListRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.filters; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class GetSourceFilterListRequest extends FilterRequest { @Builder private GetSourceFilterListRequest(String sourceName) { - super(Type.GetSourceFilterList); + super(Request.Data.Type.GetSourceFilterList); this.requestData = Data.builder().sourceName(sourceName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/GetSourceFilterRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/GetSourceFilterRequest.java index 266ddaf2..8abc0475 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/GetSourceFilterRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/GetSourceFilterRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.filters; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ public class GetSourceFilterRequest extends FilterRequest { @Builder private GetSourceFilterRequest(String sourceName, String filterName) { - super(Type.GetSourceFilter); + super(Request.Data.Type.GetSourceFilter); this.requestData = Data.builder().sourceName(sourceName).filterName(filterName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/RemoveSourceFilterRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/RemoveSourceFilterRequest.java index 57e07909..919c0a9a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/RemoveSourceFilterRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/RemoveSourceFilterRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.filters; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ public class RemoveSourceFilterRequest extends FilterRequest { @Builder private RemoveSourceFilterRequest(String sourceName, String filterName) { - super(Type.RemoveSourceFilter); + super(Request.Data.Type.RemoveSourceFilter); this.requestData = Data.builder().sourceName(sourceName).filterName(filterName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/SetSourceFilterEnabledRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/SetSourceFilterEnabledRequest.java index 14609eaf..4ea6125a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/SetSourceFilterEnabledRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/SetSourceFilterEnabledRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.filters; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -15,7 +16,7 @@ public class SetSourceFilterEnabledRequest extends FilterRequest { @Builder private SetSourceFilterEnabledRequest(String sourceName, String filterName, Boolean filterEnabled) { - super(Type.SetSourceFilterEnabled); + super(Request.Data.Type.SetSourceFilterEnabled); this.requestData = Data.builder().sourceName(sourceName).filterName(filterName) .filterEnabled(filterEnabled).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/SetSourceFilterIndexRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/SetSourceFilterIndexRequest.java index 286f6705..48371f5c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/SetSourceFilterIndexRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/SetSourceFilterIndexRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.filters; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ public class SetSourceFilterIndexRequest extends FilterRequest { @Builder private SetSourceFilterIndexRequest(String sourceName, String filterName, Integer filterIndex) { - super(Type.SetSourceFilterIndex); + super(Request.Data.Type.SetSourceFilterIndex); this.requestData = Data.builder().sourceName(sourceName).filterName(filterName) .filterIndex(filterIndex).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/SetSourceFilterSettingsRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/SetSourceFilterSettingsRequest.java index 9daa2e91..6c6e1bbf 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/filters/SetSourceFilterSettingsRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/filters/SetSourceFilterSettingsRequest.java @@ -1,6 +1,7 @@ package io.obswebsocket.community.client.message.request.filters; import com.google.gson.JsonObject; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -16,7 +17,7 @@ public class SetSourceFilterSettingsRequest extends FilterRequest { @Builder private SetSourceFilterSettingsRequest(String sourceName, String filterName, JsonObject filterSettings) { - super(Type.SetSourceFilterSettings); + super(Request.Data.Type.SetSourceFilterSettings); this.requestData = Data.builder().sourceName(sourceName).filterName(filterName) .filterSettings(filterSettings).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/general/BroadcastCustomEventRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/general/BroadcastCustomEventRequest.java index 1ec933eb..d567eaa2 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/general/BroadcastCustomEventRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/general/BroadcastCustomEventRequest.java @@ -16,7 +16,7 @@ public class BroadcastCustomEventRequest extends Request { @Builder private BroadcastCustomEventRequest(JsonObject requestData) { - super(Type.BroadcastCustomEvent); + super(Data.Type.BroadcastCustomEvent); this.requestData = requestData; } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/general/CloseProjectorRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/general/CloseProjectorRequest.java index f8c5d9c0..4729b861 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/general/CloseProjectorRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/general/CloseProjectorRequest.java @@ -14,7 +14,7 @@ public class CloseProjectorRequest extends Request { @Builder private CloseProjectorRequest(String projectorName) { - super(Type.CloseProjector); + super(Request.Data.Type.CloseProjector); this.requestData = Data.builder().projectorName(projectorName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetHotkeyListRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetHotkeyListRequest.java index ed79c619..6369a6d5 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetHotkeyListRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetHotkeyListRequest.java @@ -11,6 +11,6 @@ public class GetHotkeyListRequest extends Request { @Builder private GetHotkeyListRequest() { - super(Type.GetHotkeyList); + super(Data.Type.GetHotkeyList); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetProjectorListRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetProjectorListRequest.java index 8b21b881..e3e1ec18 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetProjectorListRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetProjectorListRequest.java @@ -11,6 +11,6 @@ public class GetProjectorListRequest extends Request { @Builder private GetProjectorListRequest() { - super(Type.GetProjectorList); + super(Data.Type.GetProjectorList); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetStatsRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetStatsRequest.java index aa79a9ae..e3a6f527 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetStatsRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetStatsRequest.java @@ -11,6 +11,6 @@ public class GetStatsRequest extends Request { @Builder private GetStatsRequest() { - super(Type.GetStats); + super(Data.Type.GetStats); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetStudioModeEnabledRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetStudioModeEnabledRequest.java index f4cb6258..61fceb80 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetStudioModeEnabledRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetStudioModeEnabledRequest.java @@ -11,6 +11,6 @@ public class GetStudioModeEnabledRequest extends Request { @Builder private GetStudioModeEnabledRequest() { - super(Type.GetStudioModeEnabled); + super(Data.Type.GetStudioModeEnabled); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetSystemStatsRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetSystemStatsRequest.java index 27a8a7a3..7b6ff136 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetSystemStatsRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetSystemStatsRequest.java @@ -11,6 +11,6 @@ public class GetSystemStatsRequest extends Request { @Builder private GetSystemStatsRequest() { - super(Type.GetSystemStats); + super(Data.Type.GetSystemStats); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetVersionRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetVersionRequest.java index d9fb531a..2b4f9dd8 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetVersionRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/general/GetVersionRequest.java @@ -11,6 +11,6 @@ public class GetVersionRequest extends Request { @Builder private GetVersionRequest() { - super(Type.GetVersion); + super(Data.Type.GetVersion); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/general/OpenProjectorRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/general/OpenProjectorRequest.java index e5aa876a..4144762f 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/general/OpenProjectorRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/general/OpenProjectorRequest.java @@ -16,7 +16,7 @@ public class OpenProjectorRequest extends Request { @Builder private OpenProjectorRequest(Projector.Type projectorType, Integer projectorMonitor, String projectorGeometry, String sourceName) { - super(Type.OpenProjector); + super(Request.Data.Type.OpenProjector); this.requestData = Data.builder().projectorType(projectorType) .projectorMonitor(projectorMonitor).projectorGeometry(projectorGeometry) diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/general/SetStudioModeEnabledRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/general/SetStudioModeEnabledRequest.java index b9a2ea4b..ca22e407 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/general/SetStudioModeEnabledRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/general/SetStudioModeEnabledRequest.java @@ -14,7 +14,7 @@ public class SetStudioModeEnabledRequest extends Request { @Builder private SetStudioModeEnabledRequest(Boolean studioModeEnabled) { - super(Type.SetStudioModeEnabled); + super(Request.Data.Type.SetStudioModeEnabled); this.requestData = Data.builder().studioModeEnabled(studioModeEnabled).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/general/SleepRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/general/SleepRequest.java index c4a2431d..c5e076ae 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/general/SleepRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/general/SleepRequest.java @@ -14,7 +14,7 @@ public class SleepRequest extends Request { @Builder private SleepRequest(Long sleepMillis) { - super(Type.Sleep); + super(Request.Data.Type.Sleep); this.requestData = Data.builder().sleepMillis(sleepMillis).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/general/TriggerHotkeyByKeySequenceRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/general/TriggerHotkeyByKeySequenceRequest.java index 0fcc3a6a..6068b097 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/general/TriggerHotkeyByKeySequenceRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/general/TriggerHotkeyByKeySequenceRequest.java @@ -13,7 +13,7 @@ public class TriggerHotkeyByKeySequenceRequest extends Request { @Builder private TriggerHotkeyByKeySequenceRequest(String keyId, KeyModifiers keyModifiers) { - super(Type.TriggerHotkeyByName); + super(Request.Data.Type.TriggerHotkeyByName); this.requestData = Data.builder().keyId(keyId).keyModifiers(keyModifiers).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/general/TriggerHotkeyByNameRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/general/TriggerHotkeyByNameRequest.java index 53865f70..5cda228a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/general/TriggerHotkeyByNameRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/general/TriggerHotkeyByNameRequest.java @@ -14,7 +14,7 @@ public class TriggerHotkeyByNameRequest extends Request { @Builder private TriggerHotkeyByNameRequest(String hotkeyName) { - super(Type.TriggerHotkeyByName); + super(Request.Data.Type.TriggerHotkeyByName); this.requestData = Data.builder().hotkeyName(hotkeyName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/CreateInputRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/CreateInputRequest.java index 47889bbe..2cd65380 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/CreateInputRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/CreateInputRequest.java @@ -1,6 +1,7 @@ package io.obswebsocket.community.client.message.request.inputs; import com.google.gson.JsonObject; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -16,7 +17,7 @@ public class CreateInputRequest extends InputRequest { @Builder private CreateInputRequest(String inputName, String inputKind, String sceneName, JsonObject inputSettings, Boolean sceneItemEnabled) { - super(Type.CreateInput); + super(Request.Data.Type.CreateInput); this.requestData = Data.builder().inputName(inputName).inputKind(inputKind).sceneName(sceneName) .inputSettings(inputSettings).sceneItemEnabled(sceneItemEnabled).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputAudioMonitorTypeRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputAudioMonitorTypeRequest.java index f4db30ae..3c409594 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputAudioMonitorTypeRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputAudioMonitorTypeRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.inputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class GetInputAudioMonitorTypeRequest extends InputRequest { @Builder private GetInputAudioMonitorTypeRequest(String inputName) { - super(Type.GetInputAudioMonitorType); + super(Request.Data.Type.GetInputAudioMonitorType); this.requestData = Data.builder().inputName(inputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputAudioSyncOffsetRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputAudioSyncOffsetRequest.java index 840afb36..c916ec63 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputAudioSyncOffsetRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputAudioSyncOffsetRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.inputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class GetInputAudioSyncOffsetRequest extends InputRequest { @Builder private GetInputAudioSyncOffsetRequest(String inputName) { - super(Type.GetInputAudioSyncOffset); + super(Request.Data.Type.GetInputAudioSyncOffset); this.requestData = Data.builder().inputName(inputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputAudioTracksRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputAudioTracksRequest.java index c47fd5c1..4ddad201 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputAudioTracksRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputAudioTracksRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.inputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class GetInputAudioTracksRequest extends InputRequest { @Builder private GetInputAudioTracksRequest(String inputName) { - super(Type.GetInputAudioTracks); + super(Request.Data.Type.GetInputAudioTracks); this.requestData = Data.builder().inputName(inputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputDefaultSettingsRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputDefaultSettingsRequest.java index 948d7a71..df3bcb0a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputDefaultSettingsRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputDefaultSettingsRequest.java @@ -14,7 +14,7 @@ public class GetInputDefaultSettingsRequest extends Request { @Builder private GetInputDefaultSettingsRequest(String inputKind) { - super(Type.GetInputDefaultSettings); + super(Request.Data.Type.GetInputDefaultSettings); this.requestData = Data.builder().inputKind(inputKind).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputKindListRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputKindListRequest.java index a7a7fae6..74445fba 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputKindListRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputKindListRequest.java @@ -13,7 +13,7 @@ public class GetInputKindListRequest extends Request { @Builder private GetInputKindListRequest(Boolean unversioned) { - super(Type.GetInputKindList); + super(Request.Data.Type.GetInputKindList); this.requestData = Data.builder().unversioned(unversioned).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputListRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputListRequest.java index 91adf964..a0e3abe1 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputListRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputListRequest.java @@ -13,7 +13,7 @@ public class GetInputListRequest extends Request { @Builder private GetInputListRequest(String inputKind) { - super(Type.GetInputList); + super(Request.Data.Type.GetInputList); this.requestData = Data.builder().inputKind(inputKind).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputMuteRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputMuteRequest.java index 7c6699f5..29ac8536 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputMuteRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputMuteRequest.java @@ -13,7 +13,7 @@ public class GetInputMuteRequest extends InputRequest { @Builder private GetInputMuteRequest(String inputName) { - super(Request.Type.GetInputMute); + super(Request.Data.Type.GetInputMute); this.requestData = Data.builder().inputName(inputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputPropertiesListPropertyItemsRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputPropertiesListPropertyItemsRequest.java index dc90fac0..aa8daaed 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputPropertiesListPropertyItemsRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputPropertiesListPropertyItemsRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.inputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ public class GetInputPropertiesListPropertyItemsRequest extends InputRequest { @Builder private GetInputPropertiesListPropertyItemsRequest(String inputName, String propertyName) { - super(Type.GetInputPropertiesListPropertyItems); + super(Request.Data.Type.GetInputPropertiesListPropertyItems); this.requestData = Data.builder().inputName(inputName).propertyName(propertyName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputSettingsRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputSettingsRequest.java index 7f8717c6..022b600f 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputSettingsRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputSettingsRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.inputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class GetInputSettingsRequest extends InputRequest { @Builder private GetInputSettingsRequest(String inputName) { - super(Type.GetInputSettings); + super(Request.Data.Type.GetInputSettings); this.requestData = Data.builder().inputName(inputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputVolumeRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputVolumeRequest.java index 281e0cf0..cf5b0c57 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputVolumeRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetInputVolumeRequest.java @@ -13,7 +13,7 @@ public class GetInputVolumeRequest extends InputRequest { @Builder private GetInputVolumeRequest(String inputName) { - super(Request.Type.GetInputVolume); + super(Request.Data.Type.GetInputVolume); this.requestData = Data.builder().inputName(inputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetSpecialInputNamesRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetSpecialInputNamesRequest.java index b26dcb98..98fd1035 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetSpecialInputNamesRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/GetSpecialInputNamesRequest.java @@ -11,6 +11,6 @@ public class GetSpecialInputNamesRequest extends Request { @Builder private GetSpecialInputNamesRequest() { - super(Type.GetSpecialInputNames); + super(Data.Type.GetSpecialInputNames); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/InputRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/InputRequest.java index a5667f6d..5abc4350 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/InputRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/InputRequest.java @@ -10,7 +10,7 @@ @ToString(callSuper = true) abstract class InputRequest extends Request { - InputRequest(Type type) { + InputRequest(Request.Data.Type type) { super(type); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/PressInputPropertiesButtonRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/PressInputPropertiesButtonRequest.java index 40171743..8778f2d1 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/PressInputPropertiesButtonRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/PressInputPropertiesButtonRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.inputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ public class PressInputPropertiesButtonRequest extends InputRequest { @Builder private PressInputPropertiesButtonRequest(String inputName, String propertyName) { - super(Type.PressInputPropertiesButton); + super(Request.Data.Type.PressInputPropertiesButton); this.requestData = Data.builder().inputName(inputName).propertyName(propertyName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/RemoveInputRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/RemoveInputRequest.java index 7bb6b3f3..dfb6e24f 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/RemoveInputRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/RemoveInputRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.inputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class RemoveInputRequest extends InputRequest { @Builder private RemoveInputRequest(String inputName) { - super(Type.RemoveInput); + super(Request.Data.Type.RemoveInput); this.requestData = Data.builder().inputName(inputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputAudioMonitorTypeRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputAudioMonitorTypeRequest.java index 6fcbc08c..49f4430d 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputAudioMonitorTypeRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputAudioMonitorTypeRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.inputs; +import io.obswebsocket.community.client.message.request.Request; import io.obswebsocket.community.client.model.Input; import lombok.Builder; import lombok.Getter; @@ -15,7 +16,7 @@ public class SetInputAudioMonitorTypeRequest extends InputRequest { @Builder private SetInputAudioMonitorTypeRequest(String inputName, Input.MonitorType monitorType) { - super(Type.SetInputAudioMonitorType); + super(Request.Data.Type.SetInputAudioMonitorType); this.requestData = Data.builder().inputName(inputName).monitorType(monitorType).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputAudioSyncOffsetRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputAudioSyncOffsetRequest.java index faa6d510..96223f00 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputAudioSyncOffsetRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputAudioSyncOffsetRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.inputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ public class SetInputAudioSyncOffsetRequest extends InputRequest { @Builder private SetInputAudioSyncOffsetRequest(String inputName, Long inputAudioSyncOffset) { - super(Type.SetInputAudioSyncOffset); + super(Request.Data.Type.SetInputAudioSyncOffset); this.requestData = Data.builder().inputName(inputName) .inputAudioSyncOffset(inputAudioSyncOffset).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputMuteRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputMuteRequest.java index 4d1f933e..400ed9fb 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputMuteRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputMuteRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.inputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ public class SetInputMuteRequest extends InputRequest { @Builder private SetInputMuteRequest(String inputName, Boolean inputMuted) { - super(Type.SetInputMute); + super(Request.Data.Type.SetInputMute); this.requestData = Data.builder().inputName(inputName).inputMuted(inputMuted).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputNameRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputNameRequest.java index 0d0cbca4..456cf080 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputNameRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputNameRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.inputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ public class SetInputNameRequest extends InputRequest { @Builder private SetInputNameRequest(String inputName, String newInputName) { - super(Type.SetInputName); + super(Request.Data.Type.SetInputName); this.requestData = Data.builder().inputName(inputName).newInputName(newInputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputSettingsRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputSettingsRequest.java index e03293a7..5eaf59dc 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputSettingsRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputSettingsRequest.java @@ -1,6 +1,7 @@ package io.obswebsocket.community.client.message.request.inputs; import com.google.gson.JsonObject; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -15,7 +16,7 @@ public class SetInputSettingsRequest extends InputRequest { @Builder private SetInputSettingsRequest(String inputName, JsonObject inputSettings, Boolean overlay) { - super(Type.SetInputSettings); + super(Request.Data.Type.SetInputSettings); this.requestData = Data.builder().inputName(inputName).inputSettings(inputSettings) .overlay(overlay).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputVolumeRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputVolumeRequest.java index 165b1486..1f899c38 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputVolumeRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/SetInputVolumeRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.inputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -13,7 +14,7 @@ public class SetInputVolumeRequest extends InputRequest { @Builder private SetInputVolumeRequest(String inputName, Float inputVolumeDb, Float inputVolumeMul) { - super(Type.SetInputVolume); + super(Request.Data.Type.SetInputVolume); this.requestData = Data.builder().inputName(inputName).inputVolumeDb(inputVolumeDb) .inputVolumeMul(inputVolumeMul).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/ToggleInputMuteRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/ToggleInputMuteRequest.java index 5b06e0f9..46741176 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/ToggleInputMuteRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/inputs/ToggleInputMuteRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.inputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class ToggleInputMuteRequest extends InputRequest { @Builder private ToggleInputMuteRequest(String inputName) { - super(Type.ToggleInputMute); + super(Request.Data.Type.ToggleInputMute); this.requestData = Data.builder().inputName(inputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/GetMediaInputStatusRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/GetMediaInputStatusRequest.java index 98d9b67d..88fe80e7 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/GetMediaInputStatusRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/GetMediaInputStatusRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.mediainputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class GetMediaInputStatusRequest extends MediaInputRequest { @Builder private GetMediaInputStatusRequest(String inputName) { - super(Type.GetMediaInputStatus); + super(Request.Data.Type.GetMediaInputStatus); this.requestData = Data.builder().inputName(inputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/MediaInputRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/MediaInputRequest.java index 2597f31b..3b1fe5af 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/MediaInputRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/MediaInputRequest.java @@ -10,7 +10,7 @@ @ToString(callSuper = true) abstract class MediaInputRequest extends Request { - MediaInputRequest(Type type) { + MediaInputRequest(Request.Data.Type type) { super(type); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/NextMediaInputPlaylistItemRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/NextMediaInputPlaylistItemRequest.java index e60aa69e..a625addc 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/NextMediaInputPlaylistItemRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/NextMediaInputPlaylistItemRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.mediainputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class NextMediaInputPlaylistItemRequest extends MediaInputRequest { @Builder private NextMediaInputPlaylistItemRequest(String inputName) { - super(Type.NextMediaInputPlaylistItem); + super(Request.Data.Type.NextMediaInputPlaylistItem); this.requestData = Data.builder().inputName(inputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/OffsetMediaInputTimecodeRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/OffsetMediaInputTimecodeRequest.java index c12b7157..409138da 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/OffsetMediaInputTimecodeRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/OffsetMediaInputTimecodeRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.mediainputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ public class OffsetMediaInputTimecodeRequest extends MediaInputRequest { @Builder private OffsetMediaInputTimecodeRequest(String inputName, Long timestampOffset) { - super(Type.OffsetMediaInputTimecode); + super(Request.Data.Type.OffsetMediaInputTimecode); this.requestData = Data.builder().inputName(inputName).timestampOffset(timestampOffset).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/PreviousMediaInputPlaylistItemRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/PreviousMediaInputPlaylistItemRequest.java index 2dc95bcc..8574818a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/PreviousMediaInputPlaylistItemRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/PreviousMediaInputPlaylistItemRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.mediainputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class PreviousMediaInputPlaylistItemRequest extends MediaInputRequest { @Builder private PreviousMediaInputPlaylistItemRequest(String inputName) { - super(Type.PreviousMediaInputPlaylistItem); + super(Request.Data.Type.PreviousMediaInputPlaylistItem); this.requestData = Data.builder().inputName(inputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/RestartMediaInputRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/RestartMediaInputRequest.java index c6ac40a3..ef5be531 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/RestartMediaInputRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/RestartMediaInputRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.mediainputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class RestartMediaInputRequest extends MediaInputRequest { @Builder private RestartMediaInputRequest(String inputName) { - super(Type.RestartMediaInput); + super(Request.Data.Type.RestartMediaInput); this.requestData = Data.builder().inputName(inputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/SetMediaInputPauseStateRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/SetMediaInputPauseStateRequest.java index a46956d3..c1581f9f 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/SetMediaInputPauseStateRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/SetMediaInputPauseStateRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.mediainputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ public class SetMediaInputPauseStateRequest extends MediaInputRequest { @Builder private SetMediaInputPauseStateRequest(String inputName, Boolean pause) { - super(Type.SetMediaInputPauseState); + super(Request.Data.Type.SetMediaInputPauseState); this.requestData = Data.builder().inputName(inputName).pause(pause).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/SetMediaInputTimecodeRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/SetMediaInputTimecodeRequest.java index 617a92ac..3a0897a1 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/SetMediaInputTimecodeRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/SetMediaInputTimecodeRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.mediainputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ public class SetMediaInputTimecodeRequest extends MediaInputRequest { @Builder private SetMediaInputTimecodeRequest(String inputName, Long mediaTimestamp) { - super(Type.SetMediaInputTimecode); + super(Request.Data.Type.SetMediaInputTimecode); this.requestData = Data.builder().inputName(inputName).mediaTimestamp(mediaTimestamp).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/StopMediaInputRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/StopMediaInputRequest.java index c55dd6cc..01c75cff 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/StopMediaInputRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/mediainputs/StopMediaInputRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.mediainputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class StopMediaInputRequest extends MediaInputRequest { @Builder private StopMediaInputRequest(String inputName) { - super(Type.StopMediaInput); + super(Request.Data.Type.StopMediaInput); this.requestData = Data.builder().inputName(inputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/GetLastReplayBufferReplayRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/GetLastReplayBufferReplayRequest.java index 6d18e112..a7d31447 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/GetLastReplayBufferReplayRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/GetLastReplayBufferReplayRequest.java @@ -11,6 +11,6 @@ public class GetLastReplayBufferReplayRequest extends Request { @Builder private GetLastReplayBufferReplayRequest() { - super(Type.GetLastReplayBufferReplay); + super(Data.Type.GetLastReplayBufferReplay); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/GetOutputListRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/GetOutputListRequest.java index 9e856e31..17cb849c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/GetOutputListRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/GetOutputListRequest.java @@ -11,6 +11,6 @@ public class GetOutputListRequest extends Request { @Builder private GetOutputListRequest() { - super(Type.GetOutputList); + super(Data.Type.GetOutputList); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/GetReplayBufferStatusRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/GetReplayBufferStatusRequest.java index 9776f3d2..35953a72 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/GetReplayBufferStatusRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/GetReplayBufferStatusRequest.java @@ -11,6 +11,6 @@ public class GetReplayBufferStatusRequest extends Request { @Builder private GetReplayBufferStatusRequest() { - super(Type.GetReplayBufferStatus); + super(Data.Type.GetReplayBufferStatus); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/OutputRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/OutputRequest.java index 2e431c2c..99cacd16 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/OutputRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/OutputRequest.java @@ -10,7 +10,7 @@ @ToString(callSuper = true) abstract class OutputRequest extends Request { - OutputRequest(Type type) { + OutputRequest(Request.Data.Type type) { super(type); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/SaveReplayBufferRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/SaveReplayBufferRequest.java index c0f12933..eeba98aa 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/SaveReplayBufferRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/SaveReplayBufferRequest.java @@ -11,6 +11,6 @@ public class SaveReplayBufferRequest extends Request { @Builder private SaveReplayBufferRequest() { - super(Type.SaveReplayBuffer); + super(Data.Type.SaveReplayBuffer); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StartOutputRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StartOutputRequest.java index c1367afb..82f0098c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StartOutputRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StartOutputRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.outputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class StartOutputRequest extends OutputRequest { @Builder private StartOutputRequest(String outputName) { - super(Type.StartOutput); + super(Request.Data.Type.StartOutput); this.requestData = Data.builder().outputName(outputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StartReplayBufferRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StartReplayBufferRequest.java index b8ad76eb..a2fd445e 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StartReplayBufferRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StartReplayBufferRequest.java @@ -11,6 +11,6 @@ public class StartReplayBufferRequest extends Request { @Builder private StartReplayBufferRequest() { - super(Type.StartReplayBuffer); + super(Data.Type.StartReplayBuffer); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StopOutputRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StopOutputRequest.java index c12c77aa..ac65a02d 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StopOutputRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StopOutputRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.outputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class StopOutputRequest extends OutputRequest { @Builder private StopOutputRequest(String outputName) { - super(Type.StopOutput); + super(Request.Data.Type.StopOutput); this.requestData = Data.builder().outputName(outputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StopReplayBufferRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StopReplayBufferRequest.java index 05ff9c7f..fff99bb7 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StopReplayBufferRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/StopReplayBufferRequest.java @@ -11,6 +11,6 @@ public class StopReplayBufferRequest extends Request { @Builder private StopReplayBufferRequest() { - super(Type.StopReplayBuffer); + super(Data.Type.StopReplayBuffer); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/ToggleOutputRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/ToggleOutputRequest.java index 606b891e..607edd9c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/ToggleOutputRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/ToggleOutputRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.outputs; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class ToggleOutputRequest extends OutputRequest { @Builder private ToggleOutputRequest(String outputName) { - super(Type.ToggleOutput); + super(Request.Data.Type.ToggleOutput); this.requestData = Data.builder().outputName(outputName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/ToggleReplayBufferRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/ToggleReplayBufferRequest.java index 781bd56f..044fbbaf 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/ToggleReplayBufferRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/outputs/ToggleReplayBufferRequest.java @@ -11,6 +11,6 @@ public class ToggleReplayBufferRequest extends Request { @Builder private ToggleReplayBufferRequest() { - super(Type.ToggleReplayBuffer); + super(Data.Type.ToggleReplayBuffer); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/record/GetRecordDirectoryRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/record/GetRecordDirectoryRequest.java index db03aed4..571b5d86 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/record/GetRecordDirectoryRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/record/GetRecordDirectoryRequest.java @@ -11,6 +11,6 @@ public class GetRecordDirectoryRequest extends Request { @Builder private GetRecordDirectoryRequest() { - super(Type.GetRecordDirectory); + super(Data.Type.GetRecordDirectory); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/record/GetRecordFilenameFormattingRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/record/GetRecordFilenameFormattingRequest.java index dbf13bf5..6ca2c4b9 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/record/GetRecordFilenameFormattingRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/record/GetRecordFilenameFormattingRequest.java @@ -11,6 +11,6 @@ public class GetRecordFilenameFormattingRequest extends Request { @Builder private GetRecordFilenameFormattingRequest() { - super(Type.GetRecordFilenameFormatting); + super(Data.Type.GetRecordFilenameFormatting); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/record/GetRecordStatusRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/record/GetRecordStatusRequest.java index e09280e4..603bc5e4 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/record/GetRecordStatusRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/record/GetRecordStatusRequest.java @@ -11,6 +11,6 @@ public class GetRecordStatusRequest extends Request { @Builder private GetRecordStatusRequest() { - super(Type.GetRecordStatus); + super(Data.Type.GetRecordStatus); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/record/PauseRecordRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/record/PauseRecordRequest.java index bf0a5034..0559f73c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/record/PauseRecordRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/record/PauseRecordRequest.java @@ -11,6 +11,6 @@ public class PauseRecordRequest extends Request { @Builder private PauseRecordRequest() { - super(Type.PauseRecord); + super(Data.Type.PauseRecord); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/record/ResumeRecordRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/record/ResumeRecordRequest.java index 4c6dd83c..72b9438a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/record/ResumeRecordRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/record/ResumeRecordRequest.java @@ -11,6 +11,6 @@ public class ResumeRecordRequest extends Request { @Builder private ResumeRecordRequest() { - super(Type.ResumeRecord); + super(Data.Type.ResumeRecord); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/record/SetRecordDirectoryRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/record/SetRecordDirectoryRequest.java index 6934b800..412220c7 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/record/SetRecordDirectoryRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/record/SetRecordDirectoryRequest.java @@ -14,7 +14,7 @@ public class SetRecordDirectoryRequest extends Request { @Builder private SetRecordDirectoryRequest(String recordDirectory, Boolean createIfNotExist) { - super(Type.SetRecordDirectory); + super(Request.Data.Type.SetRecordDirectory); this.requestData = Data.builder().recordDirectory(recordDirectory) .createIfNotExist(createIfNotExist).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/record/SetRecordFilenameFormattingRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/record/SetRecordFilenameFormattingRequest.java index 50d348aa..12512ab4 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/record/SetRecordFilenameFormattingRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/record/SetRecordFilenameFormattingRequest.java @@ -14,7 +14,7 @@ public class SetRecordFilenameFormattingRequest extends Request { @Builder private SetRecordFilenameFormattingRequest(String filenameFormatting) { - super(Type.SetRecordFilenameFormatting); + super(Request.Data.Type.SetRecordFilenameFormatting); this.requestData = Data.builder().filenameFormatting(filenameFormatting).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/record/StartRecordRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/record/StartRecordRequest.java index f75e244e..b0f483f5 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/record/StartRecordRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/record/StartRecordRequest.java @@ -14,7 +14,7 @@ public class StartRecordRequest extends Request { @Builder private StartRecordRequest(Boolean waitForResult) { - super(Type.StartRecord); + super(Request.Data.Type.StartRecord); this.requestData = Data.builder().waitForResult(waitForResult).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/record/StopRecordRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/record/StopRecordRequest.java index ea725c02..55f01bb2 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/record/StopRecordRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/record/StopRecordRequest.java @@ -14,7 +14,7 @@ public class StopRecordRequest extends Request { @Builder private StopRecordRequest(Boolean waitForResult) { - super(Type.StopRecord); + super(Request.Data.Type.StopRecord); this.requestData = Data.builder().waitForResult(waitForResult).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/record/ToggleRecordPauseRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/record/ToggleRecordPauseRequest.java index 531209e7..dddfa101 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/record/ToggleRecordPauseRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/record/ToggleRecordPauseRequest.java @@ -11,6 +11,6 @@ public class ToggleRecordPauseRequest extends Request { @Builder private ToggleRecordPauseRequest() { - super(Type.ToggleRecordPause); + super(Data.Type.ToggleRecordPause); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/record/ToggleRecordRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/record/ToggleRecordRequest.java index f40fa173..4f780272 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/record/ToggleRecordRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/record/ToggleRecordRequest.java @@ -11,6 +11,6 @@ public class ToggleRecordRequest extends Request { @Builder private ToggleRecordRequest() { - super(Type.ToggleRecord); + super(Data.Type.ToggleRecord); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/CreateSceneItemRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/CreateSceneItemRequest.java index 32fd8254..54ff54f7 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/CreateSceneItemRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/CreateSceneItemRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.sceneitems; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ public class CreateSceneItemRequest extends SceneItemRequest { @Builder private CreateSceneItemRequest(String sceneName, String sourceName, Boolean sceneItemEnabled) { - super(Type.CreateSceneItem); + super(Request.Data.Type.CreateSceneItem); this.requestData = Data.builder().sceneName(sceneName).sourceName(sourceName) .sceneItemEnabled(sceneItemEnabled).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/DuplicateSceneItemRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/DuplicateSceneItemRequest.java index d26bf926..668cfb19 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/DuplicateSceneItemRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/DuplicateSceneItemRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.sceneitems; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -15,7 +16,7 @@ public class DuplicateSceneItemRequest extends SceneItemRequest { @Builder private DuplicateSceneItemRequest(String sceneName, Integer sceneItemId, String destinationSceneName) { - super(Type.DuplicateSceneItem); + super(Request.Data.Type.DuplicateSceneItem); this.requestData = Data.builder().sceneName(sceneName).sceneItemId(sceneItemId) .destinationSceneName(destinationSceneName).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemColorRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemColorRequest.java index e27df4d3..f328f6de 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemColorRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemColorRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.sceneitems; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class GetSceneItemColorRequest extends SceneItemRequest { @Builder private GetSceneItemColorRequest(String sceneName, Integer sceneItemId) { - super(Type.GetSceneItemColor); + super(Request.Data.Type.GetSceneItemColor); this.requestData = DataWithId.builder().sceneName(sceneName).sceneItemId(sceneItemId).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemEnabledRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemEnabledRequest.java index efca693c..4370e6f0 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemEnabledRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemEnabledRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.sceneitems; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class GetSceneItemEnabledRequest extends SceneItemRequest { @Builder private GetSceneItemEnabledRequest(String sceneName, Integer sceneItemId) { - super(Type.GetSceneItemEnabled); + super(Request.Data.Type.GetSceneItemEnabled); this.requestData = DataWithId.builder().sceneName(sceneName).sceneItemId(sceneItemId).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemListRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemListRequest.java index 053e6380..536ad062 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemListRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemListRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.sceneitems; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class GetSceneItemListRequest extends SceneItemRequest { @Builder private GetSceneItemListRequest(String sceneName) { - super(Type.GetSceneItemList); + super(Request.Data.Type.GetSceneItemList); this.requestData = Data.builder().sceneName(sceneName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemLockedRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemLockedRequest.java index 9dc03a08..efc9a160 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemLockedRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/GetSceneItemLockedRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.sceneitems; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class GetSceneItemLockedRequest extends SceneItemRequest { @Builder private GetSceneItemLockedRequest(String sceneName, Integer sceneItemId) { - super(Type.GetSceneItemLocked); + super(Request.Data.Type.GetSceneItemLocked); this.requestData = DataWithId.builder().sceneName(sceneName).sceneItemId(sceneItemId).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/RemoveSceneItemRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/RemoveSceneItemRequest.java index 889bc305..470b3234 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/RemoveSceneItemRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/RemoveSceneItemRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.sceneitems; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class RemoveSceneItemRequest extends SceneItemRequest { @Builder private RemoveSceneItemRequest(String sceneName, Integer sceneItemId) { - super(Type.RemoveSceneItem); + super(Request.Data.Type.RemoveSceneItem); this.requestData = DataWithId.builder().sceneName(sceneName).sceneItemId(sceneItemId).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SceneItemRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SceneItemRequest.java index fbee58a4..f9bde29a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SceneItemRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SceneItemRequest.java @@ -10,7 +10,7 @@ @ToString(callSuper = true) abstract class SceneItemRequest extends Request { - SceneItemRequest(Type type) { + SceneItemRequest(Request.Data.Type type) { super(type); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SetSceneItemEnabledRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SetSceneItemEnabledRequest.java index 7ae32a87..817016a1 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SetSceneItemEnabledRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SetSceneItemEnabledRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.sceneitems; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -15,7 +16,7 @@ public class SetSceneItemEnabledRequest extends SceneItemRequest { @Builder private SetSceneItemEnabledRequest(String sceneName, Integer sceneItemId, Boolean sceneItemEnabled) { - super(Type.SetSceneItemEnabled); + super(Request.Data.Type.SetSceneItemEnabled); this.requestData = Data.builder().sceneName(sceneName).sceneItemId(sceneItemId) .sceneItemEnabled(sceneItemEnabled).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SetSceneItemIndexRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SetSceneItemIndexRequest.java index bda295fa..b4f2495a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SetSceneItemIndexRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SetSceneItemIndexRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.sceneitems; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ public class SetSceneItemIndexRequest extends SceneItemRequest { @Builder private SetSceneItemIndexRequest(String sceneName, Integer sceneItemId, Integer sceneItemIndex) { - super(Type.SetSceneItemIndex); + super(Request.Data.Type.SetSceneItemIndex); this.requestData = Data.builder().sceneName(sceneName).sceneItemId(sceneItemId) .sceneItemIndex(sceneItemIndex).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SetSceneItemLockedRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SetSceneItemLockedRequest.java index 3c2b4fe1..c30469f7 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SetSceneItemLockedRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sceneitems/SetSceneItemLockedRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.sceneitems; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -15,7 +16,7 @@ public class SetSceneItemLockedRequest extends SceneItemRequest { @Builder private SetSceneItemLockedRequest(String sceneName, Integer sceneItemId, Boolean sceneItemLocked) { - super(Type.SetSceneItemLocked); + super(Request.Data.Type.SetSceneItemLocked); this.requestData = Data.builder().sceneName(sceneName).sceneItemId(sceneItemId) .sceneItemLocked(sceneItemLocked).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/CreateSceneRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/CreateSceneRequest.java index 2482e2ec..6d81c0da 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/CreateSceneRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/CreateSceneRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.scenes; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class CreateSceneRequest extends SceneRequest { @Builder private CreateSceneRequest(String sceneName) { - super(Type.CreateScene); + super(Request.Data.Type.CreateScene); this.requestData = Data.builder().sceneName(sceneName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/DeleteSceneTransitionOverrideRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/DeleteSceneTransitionOverrideRequest.java index d0f26d37..00cd4832 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/DeleteSceneTransitionOverrideRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/DeleteSceneTransitionOverrideRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.scenes; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class DeleteSceneTransitionOverrideRequest extends SceneRequest { @Builder private DeleteSceneTransitionOverrideRequest(String sceneName) { - super(Type.DeleteSceneTransitionOverride); + super(Request.Data.Type.DeleteSceneTransitionOverride); this.requestData = Data.builder().sceneName(sceneName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetCurrentPreviewSceneRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetCurrentPreviewSceneRequest.java index 5dbe2c8d..87075de5 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetCurrentPreviewSceneRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetCurrentPreviewSceneRequest.java @@ -11,6 +11,6 @@ public class GetCurrentPreviewSceneRequest extends Request { @Builder private GetCurrentPreviewSceneRequest() { - super(Type.GetCurrentPreviewScene); + super(Data.Type.GetCurrentPreviewScene); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetCurrentProgramSceneRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetCurrentProgramSceneRequest.java index b20f7698..59e39d93 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetCurrentProgramSceneRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetCurrentProgramSceneRequest.java @@ -11,6 +11,6 @@ public class GetCurrentProgramSceneRequest extends Request { @Builder private GetCurrentProgramSceneRequest() { - super(Type.GetCurrentProgramScene); + super(Data.Type.GetCurrentProgramScene); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetSceneListRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetSceneListRequest.java index 6b2b68ee..1d793573 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetSceneListRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetSceneListRequest.java @@ -11,6 +11,6 @@ public class GetSceneListRequest extends Request { @Builder private GetSceneListRequest() { - super(Type.GetSceneList); + super(Data.Type.GetSceneList); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetSceneTransitionOverrideRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetSceneTransitionOverrideRequest.java index 5fd8aa86..939235d6 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetSceneTransitionOverrideRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/GetSceneTransitionOverrideRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.scenes; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class GetSceneTransitionOverrideRequest extends SceneRequest { @Builder private GetSceneTransitionOverrideRequest(String sceneName) { - super(Type.GetSceneTransitionOverride); + super(Request.Data.Type.GetSceneTransitionOverride); this.requestData = Data.builder().sceneName(sceneName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/RemoveSceneRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/RemoveSceneRequest.java index dd052ccb..3d0a8b67 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/RemoveSceneRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/RemoveSceneRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.scenes; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class RemoveSceneRequest extends SceneRequest { @Builder private RemoveSceneRequest(String sceneName) { - super(Type.RemoveScene); + super(Request.Data.Type.RemoveScene); this.requestData = Data.builder().sceneName(sceneName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SceneRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SceneRequest.java index 8582fc87..5714e38b 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SceneRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SceneRequest.java @@ -10,14 +10,14 @@ @ToString(callSuper = true) abstract class SceneRequest extends Request { - SceneRequest(Type requestType) { + SceneRequest(Request.Data.Type requestType) { super(requestType); } @Getter @ToString @SuperBuilder - static class Data { + static class Data extends Request.Data { @NonNull private final String sceneName; diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetCurrentPreviewSceneRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetCurrentPreviewSceneRequest.java index b087980e..201ef7c8 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetCurrentPreviewSceneRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetCurrentPreviewSceneRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.scenes; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class SetCurrentPreviewSceneRequest extends SceneRequest { @Builder private SetCurrentPreviewSceneRequest(String sceneName) { - super(Type.SetCurrentPreviewScene); + super(Request.Data.Type.SetCurrentPreviewScene); this.requestData = Data.builder().sceneName(sceneName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetCurrentProgramSceneRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetCurrentProgramSceneRequest.java index ae05b81a..2ac9529a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetCurrentProgramSceneRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetCurrentProgramSceneRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.scenes; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class SetCurrentProgramSceneRequest extends SceneRequest { @Builder private SetCurrentProgramSceneRequest(String sceneName) { - super(Type.SetCurrentProgramScene); + super(Request.Data.Type.SetCurrentProgramScene); this.requestData = Data.builder().sceneName(sceneName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetSceneIndexRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetSceneIndexRequest.java index 25aea7ea..98d07a33 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetSceneIndexRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetSceneIndexRequest.java @@ -15,7 +15,7 @@ public class SetSceneIndexRequest extends Request { @Builder private SetSceneIndexRequest(String sceneName, Integer sceneIndex) { - super(Type.SetSceneIndex); + super(Request.Data.Type.SetSceneIndex); this.requestData = Data.builder().sceneName(sceneName).sceneIndex(sceneIndex).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetSceneNameRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetSceneNameRequest.java index 6b6d4416..d7c70a1b 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetSceneNameRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetSceneNameRequest.java @@ -15,7 +15,7 @@ public class SetSceneNameRequest extends Request { @Builder private SetSceneNameRequest(String sceneName, String newSceneName) { - super(Type.SetSceneName); + super(Request.Data.Type.SetSceneName); this.requestData = Data.builder().sceneName(sceneName).newSceneName(newSceneName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetSceneTransitionOverrideRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetSceneTransitionOverrideRequest.java index 26e98aeb..36bb25e2 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetSceneTransitionOverrideRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/scenes/SetSceneTransitionOverrideRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.scenes; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -14,7 +15,7 @@ public class SetSceneTransitionOverrideRequest extends SceneRequest { @Builder private SetSceneTransitionOverrideRequest(String sceneName, String transitionName, Integer transitionDuration) { - super(Type.SetSceneTransitionOverride); + super(Request.Data.Type.SetSceneTransitionOverride); this.requestData = Data.builder().sceneName(sceneName).transitionName(transitionName) .transitionDuration(transitionDuration).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sources/GetSourceActiveRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sources/GetSourceActiveRequest.java index 12a5500c..edb94bcf 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sources/GetSourceActiveRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sources/GetSourceActiveRequest.java @@ -13,7 +13,7 @@ public class GetSourceActiveRequest extends SourceRequest { @Builder private GetSourceActiveRequest(String sourceName) { - super(Request.Type.GetSourceActive); + super(Request.Data.Type.GetSourceActive); this.requestData = Data.builder().sourceName(sourceName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sources/GetSourceScreenshotRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sources/GetSourceScreenshotRequest.java index 73bd776a..958d4716 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sources/GetSourceScreenshotRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sources/GetSourceScreenshotRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.sources; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -16,7 +17,7 @@ private GetSourceScreenshotRequest(String sourceName, Integer imageWidth, Integer imageHeight, Integer imageCompressionQuality) { - super(Type.GetSourceScreenshot); + super(Request.Data.Type.GetSourceScreenshot); this.requestData = Data.builder() .sourceName(sourceName) diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sources/SaveSourceScreenshotRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sources/SaveSourceScreenshotRequest.java index 046fa41d..9543eeeb 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sources/SaveSourceScreenshotRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sources/SaveSourceScreenshotRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.sources; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -15,7 +16,7 @@ public class SaveSourceScreenshotRequest extends SourceScreenshotRequest { @Builder private SaveSourceScreenshotRequest(String sourceName, String imageFilePath, String imageFormat, Integer imageWidth, Integer imageHeight, Integer imageCompressionQuality) { - super(Type.SaveSourceScreenshot); + super(Request.Data.Type.SaveSourceScreenshot); this.requestData = Data.builder().sourceName(sourceName).imageFilePath(imageFilePath) .imageFormat(imageFormat).imageWidth(imageWidth).imageHeight(imageHeight) diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sources/SourceRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sources/SourceRequest.java index 157d4281..c8cb739c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sources/SourceRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sources/SourceRequest.java @@ -10,7 +10,7 @@ @ToString(callSuper = true) abstract class SourceRequest extends Request { - SourceRequest(Type requestType) { + SourceRequest(Request.Data.Type requestType) { super(requestType); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/sources/SourceScreenshotRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/sources/SourceScreenshotRequest.java index 42c9c61c..0ccc35f0 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/sources/SourceScreenshotRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/sources/SourceScreenshotRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.sources; +import io.obswebsocket.community.client.message.request.Request; import lombok.Getter; import lombok.NonNull; import lombok.ToString; @@ -9,7 +10,7 @@ @ToString(callSuper = true) abstract class SourceScreenshotRequest extends SourceRequest { - SourceScreenshotRequest(Type requestType) { + SourceScreenshotRequest(Request.Data.Type requestType) { super(requestType); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/GetStreamServiceSettingsRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/GetStreamServiceSettingsRequest.java index ed8da152..5f166256 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/GetStreamServiceSettingsRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/GetStreamServiceSettingsRequest.java @@ -11,6 +11,6 @@ public class GetStreamServiceSettingsRequest extends Request { @Builder private GetStreamServiceSettingsRequest() { - super(Type.GetStreamServiceSettings); + super(Data.Type.GetStreamServiceSettings); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/GetStreamStatusRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/GetStreamStatusRequest.java index 18adcc8c..42601452 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/GetStreamStatusRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/GetStreamStatusRequest.java @@ -11,6 +11,6 @@ public class GetStreamStatusRequest extends Request { @Builder private GetStreamStatusRequest() { - super(Type.GetStreamStatus); + super(Data.Type.GetStreamStatus); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/SendStreamCaptionRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/SendStreamCaptionRequest.java index 66647e90..5313cb0c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/SendStreamCaptionRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/SendStreamCaptionRequest.java @@ -14,7 +14,7 @@ public class SendStreamCaptionRequest extends Request { @Builder private SendStreamCaptionRequest(String captionText) { - super(Type.SendStreamCaption); + super(Request.Data.Type.SendStreamCaption); this.requestData = Data.builder().captionText(captionText).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/SetStreamServiceSettingsRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/SetStreamServiceSettingsRequest.java index c17cd1b1..e595c6c7 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/SetStreamServiceSettingsRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/SetStreamServiceSettingsRequest.java @@ -15,7 +15,7 @@ public class SetStreamServiceSettingsRequest extends Request { @Builder private SetStreamServiceSettingsRequest(String streamServiceType, JsonObject serviceSettings) { - super(Type.SetStreamServiceSettings); + super(Request.Data.Type.SetStreamServiceSettings); this.requestData = Data.builder().streamServiceType(streamServiceType) .serviceSettings(serviceSettings).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/StartStreamRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/StartStreamRequest.java index 683f49cc..f6eeaf6e 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/StartStreamRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/StartStreamRequest.java @@ -11,6 +11,6 @@ public class StartStreamRequest extends Request { @Builder private StartStreamRequest() { - super(Type.StartStream); + super(Data.Type.StartStream); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/StopStreamRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/StopStreamRequest.java index 856f75e5..c9bf65ef 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/StopStreamRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/StopStreamRequest.java @@ -11,6 +11,6 @@ public class StopStreamRequest extends Request { @Builder private StopStreamRequest() { - super(Type.StopStream); + super(Data.Type.StopStream); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/ToggleStreamRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/ToggleStreamRequest.java index 2b03fd13..b1e87389 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/stream/ToggleStreamRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/stream/ToggleStreamRequest.java @@ -11,6 +11,6 @@ public class ToggleStreamRequest extends Request { @Builder private ToggleStreamRequest() { - super(Type.ToggleStream); + super(Data.Type.ToggleStream); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/GetCurrentTransitionRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/GetCurrentTransitionRequest.java index 24a8cf7d..a8180e87 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/GetCurrentTransitionRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/GetCurrentTransitionRequest.java @@ -11,6 +11,6 @@ public class GetCurrentTransitionRequest extends Request { @Builder private GetCurrentTransitionRequest() { - super(Type.GetCurrentTransition); + super(Data.Type.GetCurrentTransition); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/GetTransitionListRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/GetTransitionListRequest.java index 7a0c882d..33cee732 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/GetTransitionListRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/GetTransitionListRequest.java @@ -11,6 +11,6 @@ public class GetTransitionListRequest extends Request { @Builder private GetTransitionListRequest() { - super(Type.GetTransitionList); + super(Data.Type.GetTransitionList); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/GetTransitionSettingsRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/GetTransitionSettingsRequest.java index ccfc40ca..c03a3314 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/GetTransitionSettingsRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/GetTransitionSettingsRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.transitions; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class GetTransitionSettingsRequest extends TransitionRequest { @Builder private GetTransitionSettingsRequest(String transitionName) { - super(Type.GetTransitionSettings); + super(Request.Data.Type.GetTransitionSettings); this.requestData = Data.builder().transitionName(transitionName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/ReleaseTbarRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/ReleaseTbarRequest.java index 75d93007..722df398 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/ReleaseTbarRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/ReleaseTbarRequest.java @@ -11,6 +11,6 @@ public class ReleaseTbarRequest extends Request { @Builder private ReleaseTbarRequest() { - super(Type.ReleaseTbar); + super(Data.Type.ReleaseTbar); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetCurrentTransitionDurationRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetCurrentTransitionDurationRequest.java index 71929c94..f6f60cb3 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetCurrentTransitionDurationRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetCurrentTransitionDurationRequest.java @@ -14,7 +14,7 @@ public class SetCurrentTransitionDurationRequest extends Request { @Builder private SetCurrentTransitionDurationRequest(Integer transitionDuration) { - super(Type.SetCurrentTransitionDuration); + super(Request.Data.Type.SetCurrentTransitionDuration); this.requestData = Data.builder().transitionDuration(transitionDuration).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetCurrentTransitionRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetCurrentTransitionRequest.java index 5941dae2..0f7a8028 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetCurrentTransitionRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetCurrentTransitionRequest.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.request.transitions; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -12,7 +13,7 @@ public class SetCurrentTransitionRequest extends TransitionRequest { @Builder private SetCurrentTransitionRequest(String transitionName) { - super(Type.SetCurrentTransition); + super(Request.Data.Type.SetCurrentTransition); this.requestData = Data.builder().transitionName(transitionName).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetTbarPositionRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetTbarPositionRequest.java index bf8f7cb8..503dc062 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetTbarPositionRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetTbarPositionRequest.java @@ -14,7 +14,7 @@ public class SetTbarPositionRequest extends Request { @Builder private SetTbarPositionRequest(Double position, Boolean release) { - super(Type.SetTbarPosition); + super(Request.Data.Type.SetTbarPosition); this.requestData = Data.builder().position(position).release(release).build(); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetTransitionSettingsRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetTransitionSettingsRequest.java index 4b7bc830..dc63719e 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetTransitionSettingsRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/SetTransitionSettingsRequest.java @@ -1,6 +1,7 @@ package io.obswebsocket.community.client.message.request.transitions; import com.google.gson.JsonObject; +import io.obswebsocket.community.client.message.request.Request; import lombok.Builder; import lombok.Getter; import lombok.NonNull; @@ -15,7 +16,7 @@ public class SetTransitionSettingsRequest extends TransitionRequest { @Builder private SetTransitionSettingsRequest(String transitionName, JsonObject transitionSettings) { - super(Type.SetTransitionSettings); + super(Request.Data.Type.SetTransitionSettings); this.requestData = Data.builder().transitionName(transitionName) .transitionSettings(transitionSettings).build(); diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/TransitionRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/TransitionRequest.java index a00f0618..6307b704 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/TransitionRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/TransitionRequest.java @@ -10,7 +10,7 @@ @ToString(callSuper = true) abstract class TransitionRequest extends Request { - TransitionRequest(Type requestType) { + TransitionRequest(Request.Data.Type requestType) { super(requestType); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/TriggerStudioModeTransitionRequest.java b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/TriggerStudioModeTransitionRequest.java index 013ef09a..d20fda94 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/TriggerStudioModeTransitionRequest.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/request/transitions/TriggerStudioModeTransitionRequest.java @@ -11,6 +11,6 @@ public class TriggerStudioModeTransitionRequest extends Request { @Builder private TriggerStudioModeTransitionRequest() { - super(Type.TriggerStudioModeTransition); + super(Data.Type.TriggerStudioModeTransition); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/RequestResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/RequestResponse.java index 1efdf62b..7e5531e1 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/RequestResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/RequestResponse.java @@ -4,23 +4,29 @@ import io.obswebsocket.community.client.message.request.Request; import lombok.Getter; import lombok.ToString; +import lombok.experimental.SuperBuilder; @Getter @ToString(callSuper = true) public abstract class RequestResponse extends Message { - protected Request.Type requestType; - protected String requestId; - protected Status requestStatus; + private transient Data messageData; - protected RequestResponse(Request.Type requestType) { + protected RequestResponse(Request.Data.Type requestType) { super(OperationCode.RequestResponse); - this.requestType = requestType; + this.messageData = Data.builder().requestType(requestType).build(); + } + + @SuperBuilder + @ToString(callSuper = true) + @Getter + public static class Data extends Request.Data { + protected Status requestStatus; } public boolean isSuccessful() { - return this.requestStatus != null && this.requestStatus.result; + return this.messageData.requestStatus != null && this.messageData.requestStatus.result; } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/RequestResponseSerialization.java b/client/src/main/java/io/obswebsocket/community/client/message/response/RequestResponseSerialization.java index 05276979..6d7489c5 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/RequestResponseSerialization.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/RequestResponseSerialization.java @@ -20,16 +20,19 @@ public RequestResponse deserialize(JsonElement jsonElement, Type typeOfT, if (jsonElement.isJsonObject()) { JsonObject jsonObject = jsonElement.getAsJsonObject(); - if (jsonObject.has("requestType")) { - Request.Type eventType = null; - try { - eventType = Request.Type.valueOf(jsonObject.get("requestType").getAsString()); - } catch (IllegalArgumentException illegalArgumentException) { - // unknown RequestType - } + if (jsonObject.has("d")) { + JsonObject messageData = jsonObject.getAsJsonObject("d"); + if (messageData.has("requestType")) { + Request.Data.Type requestType = null; + try { + requestType = Request.Data.Type.valueOf(messageData.get("requestType").getAsString()); + } catch (IllegalArgumentException illegalArgumentException) { + // unknown RequestType + } - if (eventType != null) { - requestResponse = context.deserialize(jsonElement, eventType.getRequestResponseClass()); + if (requestType != null) { + requestResponse = context.deserialize(jsonElement, requestType.getRequestResponseClass()); + } } } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/config/CreateSceneCollectionResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/config/CreateSceneCollectionResponse.java index 8f7c0e7b..76ad682e 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/config/CreateSceneCollectionResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/config/CreateSceneCollectionResponse.java @@ -10,6 +10,6 @@ public class CreateSceneCollectionResponse extends RequestResponse { public CreateSceneCollectionResponse() { - super(Request.Type.CreateSceneCollection); + super(Request.Data.Type.CreateSceneCollection); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetPersistentDataResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetPersistentDataResponse.java index 3044b616..969e9195 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetPersistentDataResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetPersistentDataResponse.java @@ -13,7 +13,7 @@ public class GetPersistentDataResponse extends RequestResponse { private Data responseData; public GetPersistentDataResponse() { - super(Request.Type.GetPersistentData); + super(Request.Data.Type.GetPersistentData); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetProfileListResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetProfileListResponse.java index 757e748c..bd3a97e7 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetProfileListResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetProfileListResponse.java @@ -14,7 +14,7 @@ public class GetProfileListResponse extends RequestResponse { private Data responseData; public GetProfileListResponse() { - super(Request.Type.GetProfileList); + super(Request.Data.Type.GetProfileList); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetProfileParameterResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetProfileParameterResponse.java index 302060ff..338a4287 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetProfileParameterResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetProfileParameterResponse.java @@ -12,7 +12,7 @@ public class GetProfileParameterResponse extends RequestResponse { private Data responseData; public GetProfileParameterResponse() { - super(Request.Type.GetProfileParameter); + super(Request.Data.Type.GetProfileParameter); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetSceneCollectionListResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetSceneCollectionListResponse.java index a17a065f..4f904fcc 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetSceneCollectionListResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetSceneCollectionListResponse.java @@ -14,7 +14,7 @@ public class GetSceneCollectionListResponse extends RequestResponse { private Data responseData; public GetSceneCollectionListResponse() { - super(Request.Type.GetSceneCollectionList); + super(Request.Data.Type.GetSceneCollectionList); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetVideoSettingsResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetVideoSettingsResponse.java index 9c590da7..b465bf9c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetVideoSettingsResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/config/GetVideoSettingsResponse.java @@ -12,7 +12,7 @@ public class GetVideoSettingsResponse extends RequestResponse { private Data responseData; public GetVideoSettingsResponse() { - super(Request.Type.GetVideoSettings); + super(Request.Data.Type.GetVideoSettings); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/config/RemoveSceneCollectionResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/config/RemoveSceneCollectionResponse.java index dafec346..73af6da8 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/config/RemoveSceneCollectionResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/config/RemoveSceneCollectionResponse.java @@ -10,6 +10,6 @@ public class RemoveSceneCollectionResponse extends RequestResponse { public RemoveSceneCollectionResponse() { - super(Request.Type.RemoveSceneCollection); + super(Request.Data.Type.RemoveSceneCollection); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/config/SetCurrentSceneCollectionResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/config/SetCurrentSceneCollectionResponse.java index 89bc19d1..406a41bd 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/config/SetCurrentSceneCollectionResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/config/SetCurrentSceneCollectionResponse.java @@ -10,6 +10,6 @@ public class SetCurrentSceneCollectionResponse extends RequestResponse { public SetCurrentSceneCollectionResponse() { - super(Request.Type.SetCurrentSceneCollection); + super(Request.Data.Type.SetCurrentSceneCollection); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/config/SetPersistentDataResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/config/SetPersistentDataResponse.java index 0fe6ae7d..229badd5 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/config/SetPersistentDataResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/config/SetPersistentDataResponse.java @@ -10,7 +10,7 @@ public class SetPersistentDataResponse extends RequestResponse { public SetPersistentDataResponse() { - super(Request.Type.SetPersistentData); + super(Request.Data.Type.SetPersistentData); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/config/SetProfileParameterResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/config/SetProfileParameterResponse.java index f50e95e1..fa9781a1 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/config/SetProfileParameterResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/config/SetProfileParameterResponse.java @@ -10,6 +10,6 @@ public class SetProfileParameterResponse extends RequestResponse { public SetProfileParameterResponse() { - super(Request.Type.SetProfileParameter); + super(Request.Data.Type.SetProfileParameter); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/CreateSourceFilterResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/CreateSourceFilterResponse.java index e8c38a20..f01527a1 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/CreateSourceFilterResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/CreateSourceFilterResponse.java @@ -10,6 +10,6 @@ public class CreateSourceFilterResponse extends RequestResponse { public CreateSourceFilterResponse() { - super(Request.Type.CreateSourceFilter); + super(Request.Data.Type.CreateSourceFilter); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/GetSourceFilterListResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/GetSourceFilterListResponse.java index 2ccf83c4..b81deb62 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/GetSourceFilterListResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/GetSourceFilterListResponse.java @@ -14,7 +14,7 @@ public class GetSourceFilterListResponse extends RequestResponse { private Data responseData; public GetSourceFilterListResponse() { - super(Request.Type.GetSourceFilterList); + super(Request.Data.Type.GetSourceFilterList); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/GetSourceFilterResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/GetSourceFilterResponse.java index 63c2ecb0..2392c6f6 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/GetSourceFilterResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/GetSourceFilterResponse.java @@ -13,6 +13,6 @@ public class GetSourceFilterResponse extends RequestResponse { private Filter responseData; public GetSourceFilterResponse() { - super(Request.Type.GetSourceFilter); + super(Request.Data.Type.GetSourceFilter); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/RemoveSourceFilterResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/RemoveSourceFilterResponse.java index 0a6b1617..a50304d5 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/RemoveSourceFilterResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/RemoveSourceFilterResponse.java @@ -10,6 +10,6 @@ public class RemoveSourceFilterResponse extends RequestResponse { public RemoveSourceFilterResponse() { - super(Request.Type.RemoveSourceFilter); + super(Request.Data.Type.RemoveSourceFilter); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/SetSourceFilterEnabledResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/SetSourceFilterEnabledResponse.java index 2277c04c..d367420a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/SetSourceFilterEnabledResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/SetSourceFilterEnabledResponse.java @@ -10,6 +10,6 @@ public class SetSourceFilterEnabledResponse extends RequestResponse { public SetSourceFilterEnabledResponse() { - super(Request.Type.SetSourceFilterEnabled); + super(Request.Data.Type.SetSourceFilterEnabled); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/SetSourceFilterIndexResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/SetSourceFilterIndexResponse.java index e7c683ae..a1698505 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/SetSourceFilterIndexResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/SetSourceFilterIndexResponse.java @@ -10,6 +10,6 @@ public class SetSourceFilterIndexResponse extends RequestResponse { public SetSourceFilterIndexResponse() { - super(Request.Type.SetSourceFilterIndex); + super(Request.Data.Type.SetSourceFilterIndex); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/SetSourceFilterSettingsResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/SetSourceFilterSettingsResponse.java index e2eb6bcf..ebfe5fdc 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/filters/SetSourceFilterSettingsResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/filters/SetSourceFilterSettingsResponse.java @@ -10,6 +10,6 @@ public class SetSourceFilterSettingsResponse extends RequestResponse { public SetSourceFilterSettingsResponse() { - super(Request.Type.SetSourceFilterSettings); + super(Request.Data.Type.SetSourceFilterSettings); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/BroadcastCustomEventResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/BroadcastCustomEventResponse.java index c0eaeb7c..7af8fda2 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/BroadcastCustomEventResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/BroadcastCustomEventResponse.java @@ -10,6 +10,6 @@ public class BroadcastCustomEventResponse extends RequestResponse { public BroadcastCustomEventResponse() { - super(Request.Type.BroadcastCustomEvent); + super(Request.Data.Type.BroadcastCustomEvent); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/CloseProjectorResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/CloseProjectorResponse.java index 0a11fce7..e112b73c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/CloseProjectorResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/CloseProjectorResponse.java @@ -10,6 +10,6 @@ public class CloseProjectorResponse extends RequestResponse { public CloseProjectorResponse() { - super(Request.Type.CloseProjector); + super(Request.Data.Type.CloseProjector); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/CreateProfileResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/CreateProfileResponse.java index 35eabbe4..621055a2 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/CreateProfileResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/CreateProfileResponse.java @@ -10,6 +10,6 @@ public class CreateProfileResponse extends RequestResponse { public CreateProfileResponse() { - super(Request.Type.CreateProfile); + super(Request.Data.Type.CreateProfile); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetHotkeyListResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetHotkeyListResponse.java index ab121d6c..d22b12e0 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetHotkeyListResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetHotkeyListResponse.java @@ -13,7 +13,7 @@ public class GetHotkeyListResponse extends RequestResponse { private Data responseData; public GetHotkeyListResponse() { - super(Request.Type.GetHotkeyList); + super(Request.Data.Type.GetHotkeyList); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetProjectorListResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetProjectorListResponse.java index 3dc03094..b876c97a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetProjectorListResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetProjectorListResponse.java @@ -14,7 +14,7 @@ public class GetProjectorListResponse extends RequestResponse { private Data responseData; protected GetProjectorListResponse() { - super(Request.Type.GetProjectorList); + super(Request.Data.Type.GetProjectorList); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetStatsResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetStatsResponse.java index f6b3ea9d..d5c7f336 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetStatsResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetStatsResponse.java @@ -12,7 +12,7 @@ public class GetStatsResponse extends RequestResponse { private Data responseData; public GetStatsResponse() { - super(Request.Type.GetStats); + super(Request.Data.Type.GetStats); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetStudioModeEnabledResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetStudioModeEnabledResponse.java index 7fba284c..b2b19dc5 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetStudioModeEnabledResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetStudioModeEnabledResponse.java @@ -12,7 +12,7 @@ public class GetStudioModeEnabledResponse extends RequestResponse { private Data responseData; public GetStudioModeEnabledResponse() { - super(Request.Type.GetStudioModeEnabled); + super(Request.Data.Type.GetStudioModeEnabled); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetSystemStatsResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetSystemStatsResponse.java index 165ade52..a005b753 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetSystemStatsResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetSystemStatsResponse.java @@ -12,7 +12,7 @@ public class GetSystemStatsResponse extends RequestResponse { private Data responseData; private GetSystemStatsResponse() { - super(Request.Type.GetSystemStats); + super(Request.Data.Type.GetSystemStats); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetVersionResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetVersionResponse.java index e09fd387..59006400 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetVersionResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/GetVersionResponse.java @@ -13,7 +13,7 @@ public class GetVersionResponse extends RequestResponse { private Data responseData; public GetVersionResponse() { - super(Request.Type.GetVersion); + super(Request.Data.Type.GetVersion); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/OpenProjectorResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/OpenProjectorResponse.java index 793ce493..7ad1184f 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/OpenProjectorResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/OpenProjectorResponse.java @@ -10,6 +10,6 @@ public class OpenProjectorResponse extends RequestResponse { public OpenProjectorResponse() { - super(Request.Type.OpenProjector); + super(Request.Data.Type.OpenProjector); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/RemoveProfileResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/RemoveProfileResponse.java index 6724151c..0d0b0a61 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/RemoveProfileResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/RemoveProfileResponse.java @@ -10,6 +10,6 @@ public class RemoveProfileResponse extends RequestResponse { public RemoveProfileResponse() { - super(Request.Type.RemoveProfile); + super(Request.Data.Type.RemoveProfile); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/SetCurrentProfileResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/SetCurrentProfileResponse.java index ec4533f5..ed57fbb1 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/SetCurrentProfileResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/SetCurrentProfileResponse.java @@ -10,6 +10,6 @@ public class SetCurrentProfileResponse extends RequestResponse { public SetCurrentProfileResponse() { - super(Request.Type.SetCurrentProfile); + super(Request.Data.Type.SetCurrentProfile); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/SetStudioModeEnabledResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/SetStudioModeEnabledResponse.java index f6ffdf81..3dc55a73 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/SetStudioModeEnabledResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/SetStudioModeEnabledResponse.java @@ -10,6 +10,6 @@ public class SetStudioModeEnabledResponse extends RequestResponse { public SetStudioModeEnabledResponse() { - super(Request.Type.SetStudioModeEnabled); + super(Request.Data.Type.SetStudioModeEnabled); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/SetVideoSettingsResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/SetVideoSettingsResponse.java index cf49cfcd..5569a877 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/SetVideoSettingsResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/SetVideoSettingsResponse.java @@ -10,6 +10,6 @@ public class SetVideoSettingsResponse extends RequestResponse { public SetVideoSettingsResponse() { - super(Request.Type.SetVideoSettings); + super(Request.Data.Type.SetVideoSettings); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/SleepResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/SleepResponse.java index b2624d39..29081518 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/SleepResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/SleepResponse.java @@ -10,6 +10,6 @@ public class SleepResponse extends RequestResponse { public SleepResponse() { - super(Request.Type.Sleep); + super(Request.Data.Type.Sleep); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/TriggerHotkeyByKeySequenceResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/TriggerHotkeyByKeySequenceResponse.java index 84d2cabb..47c748ed 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/TriggerHotkeyByKeySequenceResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/TriggerHotkeyByKeySequenceResponse.java @@ -10,6 +10,6 @@ public class TriggerHotkeyByKeySequenceResponse extends RequestResponse { public TriggerHotkeyByKeySequenceResponse() { - super(Request.Type.TriggerHotkeyByKeySequence); + super(Request.Data.Type.TriggerHotkeyByKeySequence); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/general/TriggerHotkeyByNameResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/general/TriggerHotkeyByNameResponse.java index 6958b64a..fcb3830f 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/general/TriggerHotkeyByNameResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/general/TriggerHotkeyByNameResponse.java @@ -10,6 +10,6 @@ public class TriggerHotkeyByNameResponse extends RequestResponse { public TriggerHotkeyByNameResponse() { - super(Request.Type.TriggerHotkeyByName); + super(Request.Data.Type.TriggerHotkeyByName); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/CreateInputResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/CreateInputResponse.java index e29ff5b0..0daed44e 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/CreateInputResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/CreateInputResponse.java @@ -12,7 +12,7 @@ public class CreateInputResponse extends RequestResponse { private Data responseData; public CreateInputResponse() { - super(Request.Type.CreateInput); + super(Request.Data.Type.CreateInput); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputAudioMonitorTypeResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputAudioMonitorTypeResponse.java index 3406bd40..75f2c3cf 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputAudioMonitorTypeResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputAudioMonitorTypeResponse.java @@ -13,7 +13,7 @@ public class GetInputAudioMonitorTypeResponse extends RequestResponse { private Data responseData; public GetInputAudioMonitorTypeResponse() { - super(Request.Type.GetInputAudioMonitorType); + super(Request.Data.Type.GetInputAudioMonitorType); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputAudioSyncOffsetResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputAudioSyncOffsetResponse.java index c169f58c..b5a7f565 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputAudioSyncOffsetResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputAudioSyncOffsetResponse.java @@ -12,7 +12,7 @@ public class GetInputAudioSyncOffsetResponse extends RequestResponse { private Data responseData; public GetInputAudioSyncOffsetResponse() { - super(Request.Type.GetInputAudioSyncOffset); + super(Request.Data.Type.GetInputAudioSyncOffset); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputAudioTracksResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputAudioTracksResponse.java index 8a6542ba..d65bf884 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputAudioTracksResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputAudioTracksResponse.java @@ -13,7 +13,7 @@ public class GetInputAudioTracksResponse extends RequestResponse { private Data responseData; public GetInputAudioTracksResponse() { - super(Request.Type.GetInputAudioTracks); + super(Request.Data.Type.GetInputAudioTracks); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputDefaultSettingsResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputDefaultSettingsResponse.java index 97ccab86..a9cce6ab 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputDefaultSettingsResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputDefaultSettingsResponse.java @@ -13,7 +13,7 @@ public class GetInputDefaultSettingsResponse extends RequestResponse { private Data responseData; public GetInputDefaultSettingsResponse() { - super(Request.Type.GetInputDefaultSettings); + super(Request.Data.Type.GetInputDefaultSettings); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputKindListResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputKindListResponse.java index 2e369597..a7fc9ea5 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputKindListResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputKindListResponse.java @@ -13,7 +13,7 @@ public class GetInputKindListResponse extends RequestResponse { private Data responseData; public GetInputKindListResponse() { - super(Request.Type.GetInputKindList); + super(Request.Data.Type.GetInputKindList); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputListResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputListResponse.java index 138b7ace..f4a53f1f 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputListResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputListResponse.java @@ -14,7 +14,7 @@ public class GetInputListResponse extends RequestResponse { private Data responseData; public GetInputListResponse() { - super(Request.Type.GetInputList); + super(Request.Data.Type.GetInputList); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputMuteResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputMuteResponse.java index 39485aef..c523604c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputMuteResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputMuteResponse.java @@ -12,7 +12,7 @@ public class GetInputMuteResponse extends RequestResponse { private Data responseData; public GetInputMuteResponse() { - super(Request.Type.GetInputMute); + super(Request.Data.Type.GetInputMute); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputPropertiesListPropertyItemsResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputPropertiesListPropertyItemsResponse.java index f184c11d..a74d78b7 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputPropertiesListPropertyItemsResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputPropertiesListPropertyItemsResponse.java @@ -14,7 +14,7 @@ private Data responseData; public GetInputPropertiesListPropertyItemsResponse() { - super(Request.Type.GetInputPropertiesListPropertyItems); + super(Request.Data.Type.GetInputPropertiesListPropertyItems); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputSettingsResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputSettingsResponse.java index e4f0ae2f..29f39944 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputSettingsResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputSettingsResponse.java @@ -13,7 +13,7 @@ public class GetInputSettingsResponse extends RequestResponse { private Data responseData; public GetInputSettingsResponse() { - super(Request.Type.GetInputSettings); + super(Request.Data.Type.GetInputSettings); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputVolumeResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputVolumeResponse.java index c6e13d61..e83a8f49 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputVolumeResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetInputVolumeResponse.java @@ -12,7 +12,7 @@ public class GetInputVolumeResponse extends RequestResponse { private Data responseData; public GetInputVolumeResponse() { - super(Request.Type.GetInputVolume); + super(Request.Data.Type.GetInputVolume); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetSpecialInputNamesResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetSpecialInputNamesResponse.java index af7fe206..aad5a34e 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetSpecialInputNamesResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/GetSpecialInputNamesResponse.java @@ -13,7 +13,7 @@ public class GetSpecialInputNamesResponse extends RequestResponse { private Data responseData; public GetSpecialInputNamesResponse() { - super(Request.Type.GetSpecialInputNames); + super(Request.Data.Type.GetSpecialInputNames); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/PressInputPropertiesButtonResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/PressInputPropertiesButtonResponse.java index 3319df86..d2a9b40e 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/PressInputPropertiesButtonResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/PressInputPropertiesButtonResponse.java @@ -10,6 +10,6 @@ public class PressInputPropertiesButtonResponse extends RequestResponse { public PressInputPropertiesButtonResponse() { - super(Request.Type.PressInputPropertiesButton); + super(Request.Data.Type.PressInputPropertiesButton); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/RemoveInputResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/RemoveInputResponse.java index a6429f33..8f3322ab 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/RemoveInputResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/RemoveInputResponse.java @@ -10,6 +10,6 @@ public class RemoveInputResponse extends RequestResponse { public RemoveInputResponse() { - super(Request.Type.RemoveInput); + super(Request.Data.Type.RemoveInput); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputAudioMonitorTypeResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputAudioMonitorTypeResponse.java index 827fe729..87fa73c4 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputAudioMonitorTypeResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputAudioMonitorTypeResponse.java @@ -10,6 +10,6 @@ public class SetInputAudioMonitorTypeResponse extends RequestResponse { public SetInputAudioMonitorTypeResponse() { - super(Request.Type.SetInputAudioMonitorType); + super(Request.Data.Type.SetInputAudioMonitorType); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputAudioSyncOffsetResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputAudioSyncOffsetResponse.java index 2ad383e1..627ed413 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputAudioSyncOffsetResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputAudioSyncOffsetResponse.java @@ -10,6 +10,6 @@ public class SetInputAudioSyncOffsetResponse extends RequestResponse { public SetInputAudioSyncOffsetResponse() { - super(Request.Type.SetInputAudioSyncOffset); + super(Request.Data.Type.SetInputAudioSyncOffset); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputMuteResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputMuteResponse.java index 1df05ae9..4ad50884 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputMuteResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputMuteResponse.java @@ -10,6 +10,6 @@ public class SetInputMuteResponse extends RequestResponse { public SetInputMuteResponse() { - super(Request.Type.SetInputMute); + super(Request.Data.Type.SetInputMute); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputNameResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputNameResponse.java index d7c278e8..2020d8cc 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputNameResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputNameResponse.java @@ -10,6 +10,6 @@ public class SetInputNameResponse extends RequestResponse { public SetInputNameResponse() { - super(Request.Type.SetInputName); + super(Request.Data.Type.SetInputName); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputSettingsResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputSettingsResponse.java index 5a585e72..194df0e0 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputSettingsResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputSettingsResponse.java @@ -10,6 +10,6 @@ public class SetInputSettingsResponse extends RequestResponse { public SetInputSettingsResponse() { - super(Request.Type.SetInputSettings); + super(Request.Data.Type.SetInputSettings); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputVolumeResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputVolumeResponse.java index 3f2a8062..71cf3921 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputVolumeResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/SetInputVolumeResponse.java @@ -10,6 +10,6 @@ public class SetInputVolumeResponse extends RequestResponse { public SetInputVolumeResponse() { - super(Request.Type.SetInputVolume); + super(Request.Data.Type.SetInputVolume); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/ToggleInputMuteResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/ToggleInputMuteResponse.java index 4faf21bb..7ac911cc 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/ToggleInputMuteResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/inputs/ToggleInputMuteResponse.java @@ -12,7 +12,7 @@ public class ToggleInputMuteResponse extends RequestResponse { private Data responseData; public ToggleInputMuteResponse() { - super(Request.Type.ToggleInputMute); + super(Request.Data.Type.ToggleInputMute); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/GetMediaInputStatusResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/GetMediaInputStatusResponse.java index 7164efee..74626908 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/GetMediaInputStatusResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/GetMediaInputStatusResponse.java @@ -13,7 +13,7 @@ public class GetMediaInputStatusResponse extends RequestResponse { private Data responseData; public GetMediaInputStatusResponse() { - super(Request.Type.GetMediaInputStatus); + super(Request.Data.Type.GetMediaInputStatus); } public enum MediaState { diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/NextMediaInputPlaylistItemResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/NextMediaInputPlaylistItemResponse.java index 857ffe8c..815f6db7 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/NextMediaInputPlaylistItemResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/NextMediaInputPlaylistItemResponse.java @@ -10,6 +10,6 @@ public class NextMediaInputPlaylistItemResponse extends RequestResponse { public NextMediaInputPlaylistItemResponse() { - super(Request.Type.NextMediaInputPlaylistItem); + super(Request.Data.Type.NextMediaInputPlaylistItem); } } \ No newline at end of file diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/OffsetMediaInputTimecodeResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/OffsetMediaInputTimecodeResponse.java index ec12ff67..028f65fe 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/OffsetMediaInputTimecodeResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/OffsetMediaInputTimecodeResponse.java @@ -12,7 +12,7 @@ public class OffsetMediaInputTimecodeResponse extends RequestResponse { private Data responseData; public OffsetMediaInputTimecodeResponse() { - super(Request.Type.OffsetMediaInputTimecode); + super(Request.Data.Type.OffsetMediaInputTimecode); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/PreviousMediaInputPlaylistItemResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/PreviousMediaInputPlaylistItemResponse.java index b8d05114..01d5dca8 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/PreviousMediaInputPlaylistItemResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/PreviousMediaInputPlaylistItemResponse.java @@ -10,6 +10,6 @@ public class PreviousMediaInputPlaylistItemResponse extends RequestResponse { public PreviousMediaInputPlaylistItemResponse() { - super(Request.Type.PreviousMediaInputPlaylistItem); + super(Request.Data.Type.PreviousMediaInputPlaylistItem); } } \ No newline at end of file diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/RestartMediaInputResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/RestartMediaInputResponse.java index cb3738f1..7dc1a696 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/RestartMediaInputResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/RestartMediaInputResponse.java @@ -10,6 +10,6 @@ public class RestartMediaInputResponse extends RequestResponse { public RestartMediaInputResponse() { - super(Request.Type.RestartMediaInput); + super(Request.Data.Type.RestartMediaInput); } } \ No newline at end of file diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/SetMediaInputPauseStateResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/SetMediaInputPauseStateResponse.java index 461f0f55..03160ba3 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/SetMediaInputPauseStateResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/SetMediaInputPauseStateResponse.java @@ -10,6 +10,6 @@ public class SetMediaInputPauseStateResponse extends RequestResponse { public SetMediaInputPauseStateResponse() { - super(Request.Type.SetMediaInputPauseState); + super(Request.Data.Type.SetMediaInputPauseState); } } \ No newline at end of file diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/SetMediaInputTimecodeResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/SetMediaInputTimecodeResponse.java index fbea4c0c..da81f325 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/SetMediaInputTimecodeResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/SetMediaInputTimecodeResponse.java @@ -10,6 +10,6 @@ public class SetMediaInputTimecodeResponse extends RequestResponse { public SetMediaInputTimecodeResponse() { - super(Request.Type.SetMediaInputTimecode); + super(Request.Data.Type.SetMediaInputTimecode); } } \ No newline at end of file diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/StopMediaInputResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/StopMediaInputResponse.java index 44b4b378..e9245e84 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/StopMediaInputResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/mediainputs/StopMediaInputResponse.java @@ -10,6 +10,6 @@ public class StopMediaInputResponse extends RequestResponse { public StopMediaInputResponse() { - super(Request.Type.StopMediaInput); + super(Request.Data.Type.StopMediaInput); } } \ No newline at end of file diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/GetLastReplayBufferReplayResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/GetLastReplayBufferReplayResponse.java index f3b99a8b..f210ee35 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/GetLastReplayBufferReplayResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/GetLastReplayBufferReplayResponse.java @@ -12,7 +12,7 @@ public class GetLastReplayBufferReplayResponse extends RequestResponse { private Data responseData; public GetLastReplayBufferReplayResponse() { - super(Request.Type.GetLastReplayBufferReplay); + super(Request.Data.Type.GetLastReplayBufferReplay); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/GetOutputListResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/GetOutputListResponse.java index cc371bd5..f59401ea 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/GetOutputListResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/GetOutputListResponse.java @@ -14,7 +14,7 @@ public class GetOutputListResponse extends RequestResponse { private Data responseData; public GetOutputListResponse() { - super(Request.Type.GetOutputList); + super(Request.Data.Type.GetOutputList); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/GetReplayBufferStatusResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/GetReplayBufferStatusResponse.java index ca892d00..e318a20d 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/GetReplayBufferStatusResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/GetReplayBufferStatusResponse.java @@ -12,7 +12,7 @@ public class GetReplayBufferStatusResponse extends RequestResponse { private Data responseData; public GetReplayBufferStatusResponse() { - super(Request.Type.GetReplayBufferStatus); + super(Request.Data.Type.GetReplayBufferStatus); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/SaveReplayBufferResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/SaveReplayBufferResponse.java index b2e6883c..589e7dbc 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/SaveReplayBufferResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/SaveReplayBufferResponse.java @@ -10,6 +10,6 @@ public class SaveReplayBufferResponse extends RequestResponse { public SaveReplayBufferResponse() { - super(Request.Type.SaveReplayBuffer); + super(Request.Data.Type.SaveReplayBuffer); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StartOutputResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StartOutputResponse.java index 2a5b975b..f6a69661 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StartOutputResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StartOutputResponse.java @@ -10,6 +10,6 @@ public class StartOutputResponse extends RequestResponse { public StartOutputResponse() { - super(Request.Type.StartOutput); + super(Request.Data.Type.StartOutput); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StartReplayBufferResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StartReplayBufferResponse.java index 58372b4e..9ea2920b 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StartReplayBufferResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StartReplayBufferResponse.java @@ -10,6 +10,6 @@ public class StartReplayBufferResponse extends RequestResponse { public StartReplayBufferResponse() { - super(Request.Type.StartReplayBuffer); + super(Request.Data.Type.StartReplayBuffer); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StopOutputResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StopOutputResponse.java index 3e8a8abd..c386b54c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StopOutputResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StopOutputResponse.java @@ -10,6 +10,6 @@ public class StopOutputResponse extends RequestResponse { public StopOutputResponse() { - super(Request.Type.StopOutput); + super(Request.Data.Type.StopOutput); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StopReplayBufferResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StopReplayBufferResponse.java index bad02878..d57d2c4a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StopReplayBufferResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/StopReplayBufferResponse.java @@ -10,6 +10,6 @@ public class StopReplayBufferResponse extends RequestResponse { public StopReplayBufferResponse() { - super(Request.Type.StopReplayBuffer); + super(Request.Data.Type.StopReplayBuffer); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/ToggleOutputResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/ToggleOutputResponse.java index 02995f74..3a879496 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/ToggleOutputResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/ToggleOutputResponse.java @@ -12,7 +12,7 @@ public class ToggleOutputResponse extends RequestResponse { private Data responseData; public ToggleOutputResponse() { - super(Request.Type.ToggleOutput); + super(Request.Data.Type.ToggleOutput); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/ToggleReplayBufferResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/ToggleReplayBufferResponse.java index 7c1f19ac..425b475a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/ToggleReplayBufferResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/outputs/ToggleReplayBufferResponse.java @@ -12,7 +12,7 @@ public class ToggleReplayBufferResponse extends RequestResponse { private Data responseData; public ToggleReplayBufferResponse() { - super(Request.Type.ToggleReplayBuffer); + super(Request.Data.Type.ToggleReplayBuffer); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/record/GetRecordDirectoryResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/record/GetRecordDirectoryResponse.java index 205a3790..29c64350 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/record/GetRecordDirectoryResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/record/GetRecordDirectoryResponse.java @@ -13,7 +13,7 @@ public class GetRecordDirectoryResponse extends RequestResponse { private Data responseData; public GetRecordDirectoryResponse() { - super(Request.Type.GetRecordDirectory); + super(Request.Data.Type.GetRecordDirectory); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/record/GetRecordFilenameFormattingResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/record/GetRecordFilenameFormattingResponse.java index 17db4136..2d2bb404 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/record/GetRecordFilenameFormattingResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/record/GetRecordFilenameFormattingResponse.java @@ -12,7 +12,7 @@ public class GetRecordFilenameFormattingResponse extends RequestResponse { private Data responseData; public GetRecordFilenameFormattingResponse() { - super(Request.Type.GetRecordFilenameFormatting); + super(Request.Data.Type.GetRecordFilenameFormatting); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/record/GetRecordStatusResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/record/GetRecordStatusResponse.java index 07553cd4..faec54bf 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/record/GetRecordStatusResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/record/GetRecordStatusResponse.java @@ -12,7 +12,7 @@ public class GetRecordStatusResponse extends RequestResponse { private Data responseData; public GetRecordStatusResponse() { - super(Request.Type.GetRecordStatus); + super(Request.Data.Type.GetRecordStatus); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/record/PauseRecordResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/record/PauseRecordResponse.java index aba50f96..b6b24533 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/record/PauseRecordResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/record/PauseRecordResponse.java @@ -10,6 +10,6 @@ public class PauseRecordResponse extends RequestResponse { public PauseRecordResponse() { - super(Request.Type.PauseRecord); + super(Request.Data.Type.PauseRecord); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/record/ResumeRecordResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/record/ResumeRecordResponse.java index 82981d35..fde7c2d4 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/record/ResumeRecordResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/record/ResumeRecordResponse.java @@ -10,6 +10,6 @@ public class ResumeRecordResponse extends RequestResponse { public ResumeRecordResponse() { - super(Request.Type.ResumeRecord); + super(Request.Data.Type.ResumeRecord); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/record/SetRecordDirectoryResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/record/SetRecordDirectoryResponse.java index 4f13823e..058caed3 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/record/SetRecordDirectoryResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/record/SetRecordDirectoryResponse.java @@ -10,6 +10,6 @@ public class SetRecordDirectoryResponse extends RequestResponse { public SetRecordDirectoryResponse() { - super(Request.Type.SetRecordDirectory); + super(Request.Data.Type.SetRecordDirectory); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/record/SetRecordFilenameFormattingResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/record/SetRecordFilenameFormattingResponse.java index cf2a7637..dda2efd7 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/record/SetRecordFilenameFormattingResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/record/SetRecordFilenameFormattingResponse.java @@ -10,6 +10,6 @@ public class SetRecordFilenameFormattingResponse extends RequestResponse { public SetRecordFilenameFormattingResponse() { - super(Request.Type.SetRecordFilenameFormatting); + super(Request.Data.Type.SetRecordFilenameFormatting); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/record/StartRecordResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/record/StartRecordResponse.java index 46575ac8..69b28fdd 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/record/StartRecordResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/record/StartRecordResponse.java @@ -10,6 +10,6 @@ public class StartRecordResponse extends RequestResponse { public StartRecordResponse() { - super(Request.Type.StartRecord); + super(Request.Data.Type.StartRecord); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/record/StopRecordResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/record/StopRecordResponse.java index 86510d58..d4d595bd 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/record/StopRecordResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/record/StopRecordResponse.java @@ -10,6 +10,6 @@ public class StopRecordResponse extends RequestResponse { public StopRecordResponse() { - super(Request.Type.StopRecord); + super(Request.Data.Type.StopRecord); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/record/ToggleRecordPauseResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/record/ToggleRecordPauseResponse.java index 295b2e1f..cafc9768 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/record/ToggleRecordPauseResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/record/ToggleRecordPauseResponse.java @@ -12,7 +12,7 @@ public class ToggleRecordPauseResponse extends RequestResponse { private Data responseData; public ToggleRecordPauseResponse() { - super(Request.Type.ToggleRecordPause); + super(Request.Data.Type.ToggleRecordPause); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/record/ToggleRecordResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/record/ToggleRecordResponse.java index 8d826b66..cb435198 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/record/ToggleRecordResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/record/ToggleRecordResponse.java @@ -12,7 +12,7 @@ public class ToggleRecordResponse extends RequestResponse { private Data responseData; public ToggleRecordResponse() { - super(Request.Type.ToggleRecord); + super(Request.Data.Type.ToggleRecord); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/CreateSceneItemResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/CreateSceneItemResponse.java index b348c8da..6cb45bed 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/CreateSceneItemResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/CreateSceneItemResponse.java @@ -12,7 +12,7 @@ public class CreateSceneItemResponse extends RequestResponse { private Data responseData; public CreateSceneItemResponse() { - super(Request.Type.CreateSceneItem); + super(Request.Data.Type.CreateSceneItem); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/DuplicateSceneItemResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/DuplicateSceneItemResponse.java index 66f8ef60..b28c3fe2 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/DuplicateSceneItemResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/DuplicateSceneItemResponse.java @@ -12,7 +12,7 @@ public class DuplicateSceneItemResponse extends RequestResponse { private Data responseData; public DuplicateSceneItemResponse() { - super(Request.Type.DuplicateSceneItem); + super(Request.Data.Type.DuplicateSceneItem); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemColorResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemColorResponse.java index 39b89f85..68a2d3c6 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemColorResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemColorResponse.java @@ -12,7 +12,7 @@ public class GetSceneItemColorResponse extends RequestResponse { private Data responseData; public GetSceneItemColorResponse() { - super(Request.Type.GetSceneItemColor); + super(Request.Data.Type.GetSceneItemColor); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemEnabledResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemEnabledResponse.java index 8191c449..23e8a8d7 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemEnabledResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemEnabledResponse.java @@ -12,7 +12,7 @@ public class GetSceneItemEnabledResponse extends RequestResponse { private Data responseData; public GetSceneItemEnabledResponse() { - super(Request.Type.GetSceneItemEnabled); + super(Request.Data.Type.GetSceneItemEnabled); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemListResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemListResponse.java index e4a94c30..b3b60c50 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemListResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemListResponse.java @@ -14,7 +14,7 @@ public class GetSceneItemListResponse extends RequestResponse { private Data responseData; public GetSceneItemListResponse() { - super(Request.Type.GetSceneItemList); + super(Request.Data.Type.GetSceneItemList); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemLockedResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemLockedResponse.java index 1c325f20..3482efcf 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemLockedResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/GetSceneItemLockedResponse.java @@ -12,7 +12,7 @@ public class GetSceneItemLockedResponse extends RequestResponse { private Data responseData; public GetSceneItemLockedResponse() { - super(Request.Type.GetSceneItemLocked); + super(Request.Data.Type.GetSceneItemLocked); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/RemoveSceneItemResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/RemoveSceneItemResponse.java index 45953e01..6e0e3f60 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/RemoveSceneItemResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/RemoveSceneItemResponse.java @@ -10,6 +10,6 @@ public class RemoveSceneItemResponse extends RequestResponse { public RemoveSceneItemResponse() { - super(Request.Type.RemoveSceneItem); + super(Request.Data.Type.RemoveSceneItem); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/SetSceneItemEnabledResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/SetSceneItemEnabledResponse.java index c9ef5fdd..8e99b405 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/SetSceneItemEnabledResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/SetSceneItemEnabledResponse.java @@ -10,6 +10,6 @@ public class SetSceneItemEnabledResponse extends RequestResponse { public SetSceneItemEnabledResponse() { - super(Request.Type.SetSceneItemEnabled); + super(Request.Data.Type.SetSceneItemEnabled); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/SetSceneItemIndexResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/SetSceneItemIndexResponse.java index 8c57ef11..a1d5437c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/SetSceneItemIndexResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/SetSceneItemIndexResponse.java @@ -10,6 +10,6 @@ public class SetSceneItemIndexResponse extends RequestResponse { public SetSceneItemIndexResponse() { - super(Request.Type.SetSceneItemIndex); + super(Request.Data.Type.SetSceneItemIndex); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/SetSceneItemLockedResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/SetSceneItemLockedResponse.java index 8f172fbf..d96e9002 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/SetSceneItemLockedResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/sceneitems/SetSceneItemLockedResponse.java @@ -10,6 +10,6 @@ public class SetSceneItemLockedResponse extends RequestResponse { public SetSceneItemLockedResponse() { - super(Request.Type.SetSceneItemLocked); + super(Request.Data.Type.SetSceneItemLocked); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/CreateSceneResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/CreateSceneResponse.java index 4b9793f7..f3c0485c 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/CreateSceneResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/CreateSceneResponse.java @@ -10,6 +10,6 @@ public class CreateSceneResponse extends RequestResponse { public CreateSceneResponse() { - super(Request.Type.CreateScene); + super(Request.Data.Type.CreateScene); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/CurrentSceneResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/CurrentSceneResponse.java index b195ab55..f70906b1 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/CurrentSceneResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/CurrentSceneResponse.java @@ -9,7 +9,7 @@ @ToString(callSuper = true) abstract class CurrentSceneResponse extends RequestResponse { - CurrentSceneResponse(Request.Type requestType) { + CurrentSceneResponse(Request.Data.Type requestType) { super(requestType); } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/DeleteSceneTransitionOverrideResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/DeleteSceneTransitionOverrideResponse.java index c5a9a8b9..d96ebad0 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/DeleteSceneTransitionOverrideResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/DeleteSceneTransitionOverrideResponse.java @@ -10,6 +10,6 @@ public class DeleteSceneTransitionOverrideResponse extends RequestResponse { public DeleteSceneTransitionOverrideResponse() { - super(Request.Type.DeleteSceneTransitionOverride); + super(Request.Data.Type.DeleteSceneTransitionOverride); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetCurrentPreviewSceneResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetCurrentPreviewSceneResponse.java index 035299f2..9efb3fb2 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetCurrentPreviewSceneResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetCurrentPreviewSceneResponse.java @@ -11,6 +11,6 @@ public class GetCurrentPreviewSceneResponse extends CurrentSceneResponse { private Data responseData; public GetCurrentPreviewSceneResponse() { - super(Request.Type.GetCurrentPreviewScene); + super(Request.Data.Type.GetCurrentPreviewScene); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetCurrentProgramSceneResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetCurrentProgramSceneResponse.java index ff4fd798..ae487644 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetCurrentProgramSceneResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetCurrentProgramSceneResponse.java @@ -11,6 +11,6 @@ public class GetCurrentProgramSceneResponse extends CurrentSceneResponse { private Data responseData; public GetCurrentProgramSceneResponse() { - super(Request.Type.GetCurrentProgramScene); + super(Request.Data.Type.GetCurrentProgramScene); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetSceneListResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetSceneListResponse.java index 9ea7c2a7..4a9c8a92 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetSceneListResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetSceneListResponse.java @@ -1,5 +1,6 @@ package io.obswebsocket.community.client.message.response.scenes; +import com.google.gson.annotations.SerializedName; import io.obswebsocket.community.client.message.request.Request; import io.obswebsocket.community.client.message.response.RequestResponse; import io.obswebsocket.community.client.model.Scene; @@ -7,24 +8,32 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.ToString; +import lombok.experimental.SuperBuilder; @Getter @ToString(callSuper = true) public class GetSceneListResponse extends RequestResponse { - private Data responseData; + @SerializedName("d") + private Data messageData; public GetSceneListResponse() { - super(Request.Type.GetSceneList); + super(Request.Data.Type.GetSceneList); } - @AllArgsConstructor @Getter - @ToString - public static class Data { + @ToString(callSuper = true) + @SuperBuilder + public static class Data extends RequestResponse.Data { + private SpecificData responseData; - private final String currentProgramSceneName; - private final String currentPreviewSceneName; - private final List scenes; + @AllArgsConstructor + @Getter + @ToString + public static class SpecificData { + private final String currentProgramSceneName; + private final String currentPreviewSceneName; + private final List scenes; + } } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetSceneTransitionOverrideResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetSceneTransitionOverrideResponse.java index 6bb1d4f4..4d3b25d2 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetSceneTransitionOverrideResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/GetSceneTransitionOverrideResponse.java @@ -12,7 +12,7 @@ public class GetSceneTransitionOverrideResponse extends RequestResponse { private Data responseData; public GetSceneTransitionOverrideResponse() { - super(Request.Type.GetSceneTransitionOverride); + super(Request.Data.Type.GetSceneTransitionOverride); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/RemoveSceneResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/RemoveSceneResponse.java index 282d9804..4fe26b56 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/RemoveSceneResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/RemoveSceneResponse.java @@ -10,6 +10,6 @@ public class RemoveSceneResponse extends RequestResponse { public RemoveSceneResponse() { - super(Request.Type.RemoveScene); + super(Request.Data.Type.RemoveScene); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetCurrentPreviewSceneResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetCurrentPreviewSceneResponse.java index 7c5449a0..2cdf4bae 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetCurrentPreviewSceneResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetCurrentPreviewSceneResponse.java @@ -10,6 +10,6 @@ public class SetCurrentPreviewSceneResponse extends RequestResponse { public SetCurrentPreviewSceneResponse() { - super(Request.Type.SetCurrentPreviewScene); + super(Request.Data.Type.SetCurrentPreviewScene); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetCurrentProgramSceneResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetCurrentProgramSceneResponse.java index 10f9b98d..47a1af0a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetCurrentProgramSceneResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetCurrentProgramSceneResponse.java @@ -10,6 +10,6 @@ public class SetCurrentProgramSceneResponse extends RequestResponse { public SetCurrentProgramSceneResponse() { - super(Request.Type.SetCurrentProgramScene); + super(Request.Data.Type.SetCurrentProgramScene); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetSceneIndexResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetSceneIndexResponse.java index e20e6c4b..85ec67b7 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetSceneIndexResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetSceneIndexResponse.java @@ -10,6 +10,6 @@ public class SetSceneIndexResponse extends RequestResponse { public SetSceneIndexResponse() { - super(Request.Type.SetSceneIndex); + super(Request.Data.Type.SetSceneIndex); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetSceneNameResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetSceneNameResponse.java index fb7e3301..b1a7acca 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetSceneNameResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetSceneNameResponse.java @@ -10,6 +10,6 @@ public class SetSceneNameResponse extends RequestResponse { public SetSceneNameResponse() { - super(Request.Type.SetSceneName); + super(Request.Data.Type.SetSceneName); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetSceneTransitionOverrideResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetSceneTransitionOverrideResponse.java index 37880306..367190cf 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetSceneTransitionOverrideResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/scenes/SetSceneTransitionOverrideResponse.java @@ -10,6 +10,6 @@ public class SetSceneTransitionOverrideResponse extends RequestResponse { public SetSceneTransitionOverrideResponse() { - super(Request.Type.SetSceneTransitionOverride); + super(Request.Data.Type.SetSceneTransitionOverride); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/sources/GetSourceActiveResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/sources/GetSourceActiveResponse.java index 6029121a..2210da78 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/sources/GetSourceActiveResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/sources/GetSourceActiveResponse.java @@ -12,7 +12,7 @@ public class GetSourceActiveResponse extends RequestResponse { private Data responseData; public GetSourceActiveResponse() { - super(Request.Type.GetSourceActive); + super(Request.Data.Type.GetSourceActive); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/sources/GetSourceScreenshotResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/sources/GetSourceScreenshotResponse.java index 58b00d80..bac8f4a5 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/sources/GetSourceScreenshotResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/sources/GetSourceScreenshotResponse.java @@ -12,7 +12,7 @@ public class GetSourceScreenshotResponse extends RequestResponse { private Data responseData; public GetSourceScreenshotResponse() { - super(Request.Type.GetSourceScreenshot); + super(Request.Data.Type.GetSourceScreenshot); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/sources/SaveSourceScreenshotResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/sources/SaveSourceScreenshotResponse.java index c41a44f1..18515058 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/sources/SaveSourceScreenshotResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/sources/SaveSourceScreenshotResponse.java @@ -10,6 +10,6 @@ public class SaveSourceScreenshotResponse extends RequestResponse { public SaveSourceScreenshotResponse() { - super(Request.Type.SaveSourceScreenshot); + super(Request.Data.Type.SaveSourceScreenshot); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/GetStreamServiceSettingsResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/GetStreamServiceSettingsResponse.java index aab14cb1..f397f575 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/GetStreamServiceSettingsResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/GetStreamServiceSettingsResponse.java @@ -13,7 +13,7 @@ public class GetStreamServiceSettingsResponse extends RequestResponse { private Data responseData; public GetStreamServiceSettingsResponse() { - super(Request.Type.GetStreamServiceSettings); + super(Request.Data.Type.GetStreamServiceSettings); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/GetStreamStatusResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/GetStreamStatusResponse.java index b2f42419..87efedfc 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/GetStreamStatusResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/GetStreamStatusResponse.java @@ -12,7 +12,7 @@ public class GetStreamStatusResponse extends RequestResponse { private Data responseData; public GetStreamStatusResponse() { - super(Request.Type.GetStreamStatus); + super(Request.Data.Type.GetStreamStatus); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/SendStreamCaptionResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/SendStreamCaptionResponse.java index f4e1b15f..6b706866 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/SendStreamCaptionResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/SendStreamCaptionResponse.java @@ -10,6 +10,6 @@ public class SendStreamCaptionResponse extends RequestResponse { public SendStreamCaptionResponse() { - super(Request.Type.SendStreamCaption); + super(Request.Data.Type.SendStreamCaption); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/SetStreamServiceSettingsResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/SetStreamServiceSettingsResponse.java index d85b7836..48df1575 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/SetStreamServiceSettingsResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/SetStreamServiceSettingsResponse.java @@ -10,6 +10,6 @@ public class SetStreamServiceSettingsResponse extends RequestResponse { public SetStreamServiceSettingsResponse() { - super(Request.Type.SetStreamServiceSettings); + super(Request.Data.Type.SetStreamServiceSettings); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/StartStreamResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/StartStreamResponse.java index 3e9fca40..fc4479e6 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/StartStreamResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/StartStreamResponse.java @@ -10,6 +10,6 @@ public class StartStreamResponse extends RequestResponse { public StartStreamResponse() { - super(Request.Type.StartStream); + super(Request.Data.Type.StartStream); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/StopStreamResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/StopStreamResponse.java index 527cfe75..30845f06 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/StopStreamResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/StopStreamResponse.java @@ -10,6 +10,6 @@ public class StopStreamResponse extends RequestResponse { public StopStreamResponse() { - super(Request.Type.StopStream); + super(Request.Data.Type.StopStream); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/ToggleStreamResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/ToggleStreamResponse.java index 8d9b65ad..8a936dbe 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/stream/ToggleStreamResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/stream/ToggleStreamResponse.java @@ -12,7 +12,7 @@ public class ToggleStreamResponse extends RequestResponse { private Data responseData; public ToggleStreamResponse() { - super(Request.Type.ToggleStream); + super(Request.Data.Type.ToggleStream); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/GetCurrentTransitionResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/GetCurrentTransitionResponse.java index 688ac202..ae7b8588 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/GetCurrentTransitionResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/GetCurrentTransitionResponse.java @@ -13,7 +13,7 @@ public class GetCurrentTransitionResponse extends RequestResponse { private Data responseData; public GetCurrentTransitionResponse() { - super(Request.Type.GetTransitionList); + super(Request.Data.Type.GetTransitionList); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/GetTransitionListResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/GetTransitionListResponse.java index 117deaf7..1f2a71f6 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/GetTransitionListResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/GetTransitionListResponse.java @@ -14,7 +14,7 @@ public class GetTransitionListResponse extends RequestResponse { private Data responseData; public GetTransitionListResponse() { - super(Request.Type.GetTransitionList); + super(Request.Data.Type.GetTransitionList); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/GetTransitionSettingsResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/GetTransitionSettingsResponse.java index a2f35f7f..ba5ba270 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/GetTransitionSettingsResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/GetTransitionSettingsResponse.java @@ -13,7 +13,7 @@ public class GetTransitionSettingsResponse extends RequestResponse { private Data responseData; public GetTransitionSettingsResponse() { - super(Request.Type.GetTransitionSettings); + super(Request.Data.Type.GetTransitionSettings); } @Getter diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/ReleaseTbarResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/ReleaseTbarResponse.java index dd5ff494..12145dc2 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/ReleaseTbarResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/ReleaseTbarResponse.java @@ -10,6 +10,6 @@ public class ReleaseTbarResponse extends RequestResponse { public ReleaseTbarResponse() { - super(Request.Type.ReleaseTbar); + super(Request.Data.Type.ReleaseTbar); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetCurrentTransitionDurationResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetCurrentTransitionDurationResponse.java index a84b42ad..906d4734 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetCurrentTransitionDurationResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetCurrentTransitionDurationResponse.java @@ -10,6 +10,6 @@ public class SetCurrentTransitionDurationResponse extends RequestResponse { public SetCurrentTransitionDurationResponse() { - super(Request.Type.SetCurrentTransitionDuration); + super(Request.Data.Type.SetCurrentTransitionDuration); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetCurrentTransitionResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetCurrentTransitionResponse.java index adabe4b1..6348fd31 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetCurrentTransitionResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetCurrentTransitionResponse.java @@ -10,6 +10,6 @@ public class SetCurrentTransitionResponse extends RequestResponse { public SetCurrentTransitionResponse() { - super(Request.Type.SetCurrentTransition); + super(Request.Data.Type.SetCurrentTransition); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetTbarPositionResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetTbarPositionResponse.java index a2bc6e48..eae3f866 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetTbarPositionResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetTbarPositionResponse.java @@ -10,6 +10,6 @@ public class SetTbarPositionResponse extends RequestResponse { public SetTbarPositionResponse() { - super(Request.Type.SetTbarPosition); + super(Request.Data.Type.SetTbarPosition); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetTransitionSettingsResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetTransitionSettingsResponse.java index 21912de0..26288d00 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetTransitionSettingsResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/SetTransitionSettingsResponse.java @@ -10,6 +10,6 @@ public class SetTransitionSettingsResponse extends RequestResponse { public SetTransitionSettingsResponse() { - super(Request.Type.SetTransitionSettings); + super(Request.Data.Type.SetTransitionSettings); } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/TriggerStudioModeTransitionResponse.java b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/TriggerStudioModeTransitionResponse.java index 34d50fcf..9aed2e10 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/TriggerStudioModeTransitionResponse.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/response/transitions/TriggerStudioModeTransitionResponse.java @@ -10,6 +10,6 @@ public class TriggerStudioModeTransitionResponse extends RequestResponse { public TriggerStudioModeTransitionResponse() { - super(Request.Type.TriggerStudioModeTransition); + super(Request.Data.Type.TriggerStudioModeTransition); } } diff --git a/client/src/test/java/io/obswebsocket/community/client/OBSRemoteControllerTest.java b/client/src/test/java/io/obswebsocket/community/client/OBSRemoteControllerTest.java index 1f60b904..97908ed6 100644 --- a/client/src/test/java/io/obswebsocket/community/client/OBSRemoteControllerTest.java +++ b/client/src/test/java/io/obswebsocket/community/client/OBSRemoteControllerTest.java @@ -2,7 +2,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; -import io.obswebsocket.community.client.OBSRemoteController; import org.junit.jupiter.api.Test; public class OBSRemoteControllerTest { diff --git a/client/src/test/java/io/obswebsocket/community/client/WebSocketCloseCodeTest.java b/client/src/test/java/io/obswebsocket/community/client/WebSocketCloseCodeTest.java index faa0f483..0733cf1d 100644 --- a/client/src/test/java/io/obswebsocket/community/client/WebSocketCloseCodeTest.java +++ b/client/src/test/java/io/obswebsocket/community/client/WebSocketCloseCodeTest.java @@ -3,7 +3,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; -import io.obswebsocket.community.client.WebSocketCloseCode; import org.junit.jupiter.api.Test; public class WebSocketCloseCodeTest { diff --git a/client/src/test/java/io/obswebsocket/community/client/message/request/config/ConfigRequestsSerializationTest.java b/client/src/test/java/io/obswebsocket/community/client/message/request/config/ConfigRequestsSerializationTest.java index 5dfec7fa..37d71081 100644 --- a/client/src/test/java/io/obswebsocket/community/client/message/request/config/ConfigRequestsSerializationTest.java +++ b/client/src/test/java/io/obswebsocket/community/client/message/request/config/ConfigRequestsSerializationTest.java @@ -12,11 +12,13 @@ void getPersistentDataRequest() { String json = "{\n" + "\t'op': 6\n," + - "\t'requestType': 'GetPersistentData',\n" + - "\t'requestId': " + getPersistentDataRequest.getRequestId() + ",\n" + - "\t'requestData': {\n" + - "\t\t'realm': 'Realm',\n" + - "\t\t'slotName': 'Slot Name'\n" + + "\t'd': {\n" + + "\t\t'requestType': 'GetPersistentData',\n" + + "\t\t'requestId': " + getPersistentDataRequest.getRequestId() + ",\n" + + "\t\t'requestData': {\n" + + "\t\t\t'realm': 'Realm',\n" + + "\t\t\t'slotName': 'Slot Name'\n" + + "\t\t}\n" + "\t}\n" + "}"; @@ -30,12 +32,14 @@ void setPersistentDataRequest() { String json = "{\n" + "\t'op': 6\n," + - "\t'requestType': 'SetPersistentData',\n" + - "\t'requestId': " + setPersistentDataRequest.getRequestId() + ",\n" + - "\t'requestData': {\n" + - "\t\t'realm': 'Realm'\n," + - "\t\t'slotName': 'Slot Name',\n" + - "\t\t'slotValue': 'value'\n" + + "\t'd': {\n" + + "\t\t'requestType': 'SetPersistentData',\n" + + "\t\t'requestId': " + setPersistentDataRequest.getRequestId() + ",\n" + + "\t\t'requestData': {\n" + + "\t\t\t'realm': 'Realm'\n," + + "\t\t\t'slotName': 'Slot Name',\n" + + "\t\t\t'slotValue': 'value'\n" + + "\t\t}\n" + "\t}\n" + "}"; @@ -49,10 +53,12 @@ void createSceneCollectionRequest() { String json = "{\n" + "\t'op': 6,\n" + - "\t'requestType': 'SetCurrentSceneCollection',\n" + - "\t'requestId': " + createSceneCollectionRequest.getRequestId() + ",\n" + - "\t'requestData': {\n" + - "\t\t'sceneCollectionName': 'Collection Name'\n" + + "\t'd': {\n" + + "\t\t'requestType': 'SetCurrentSceneCollection',\n" + + "\t\t'requestId': " + createSceneCollectionRequest.getRequestId() + ",\n" + + "\t\t'requestData': {\n" + + "\t\t\t'sceneCollectionName': 'Collection Name'\n" + + "\t\t}\n" + "\t}\n" + "}"; @@ -65,8 +71,10 @@ void getProfileListRequest() { String json = "{\n" + "\t'op': 6,\n" + - "\t'requestType': 'GetProfileList',\n" + - "\t'requestId': " + getProfileListRequest.getRequestId() + "\n" + + "\t'd': {\n" + + "\t\t'requestType': 'GetProfileList',\n" + + "\t\t'requestId': " + getProfileListRequest.getRequestId() + "\n" + + "\t}\n" + "}"; assertSerializationAndDeserialization(json, getProfileListRequest); @@ -81,11 +89,13 @@ void getProfileParameterRequest() { String json = "{\n" + "\t'op': 6,\n" + - "\t'requestType': 'GetProfileParameter',\n" + - "\t'requestId': " + getProfileParameterRequest.getRequestId() + ",\n" + - "\t'requestData': {\n" + - "\t\t'parameterCategory': 'Category Name',\n" + - "\t\t'parameterName': 'Parameter Name'\n" + + "\t'd': {\n" + + "\t\t'requestType': 'GetProfileParameter',\n" + + "\t\t'requestId': " + getProfileParameterRequest.getRequestId() + ",\n" + + "\t\t'requestData': {\n" + + "\t\t\t'parameterCategory': 'Category Name',\n" + + "\t\t\t'parameterName': 'Parameter Name'\n" + + "\t\t}\n" + "\t}\n" + "}"; @@ -99,8 +109,10 @@ void getSceneCollectionListRequest() { String json = "{\n" + "\t'op': 6,\n" + - "\t'requestType': 'GetSceneCollectionList',\n" + - "\t'requestId': " + getSceneCollectionListRequest.getRequestId() + "\n" + + "\t'd': {\n" + + "\t\t'requestType': 'GetSceneCollectionList',\n" + + "\t\t'requestId': " + getSceneCollectionListRequest.getRequestId() + "\n" + + "\t}\n" + "}"; assertSerializationAndDeserialization(json, getSceneCollectionListRequest); @@ -112,8 +124,10 @@ void getVideoSettingsRequest() { String json = "{\n" + "\t'op': 6,\n" + - "\t'requestType': 'GetVideoSettings',\n" + - "\t'requestId': " + getVideoSettingsRequest.getRequestId() + "\n" + + "\t'd': {\n" + + "\t\t'requestType': 'GetVideoSettings',\n" + + "\t\t'requestId': " + getVideoSettingsRequest.getRequestId() + "\n" + + "\t}\n" + "}"; assertSerializationAndDeserialization(json, getVideoSettingsRequest); @@ -128,10 +142,12 @@ void removeSceneCollectionRequest() { String json = "{\n" + "\t'op': 6,\n" + - "\t'requestType': 'RemoveSceneCollection',\n" + - "\t'requestId': " + removeSceneCollectionRequest.getRequestId() + ",\n" + - "\t'requestData': {\n" + - "\t\t'sceneCollectionName': 'Collection Name'\n" + + "\t'd': {\n" + + "\t\t'requestType': 'RemoveSceneCollection',\n" + + "\t\t'requestId': " + removeSceneCollectionRequest.getRequestId() + ",\n" + + "\t\t'requestData': {\n" + + "\t\t\t'sceneCollectionName': 'Collection Name'\n" + + "\t\t}\n" + "\t}\n" + "}"; @@ -147,10 +163,12 @@ void setCurrentSceneCollectionRequest() { String json = "{\n" + "\t'op': 6,\n" + - "\t'requestType': 'SetCurrentSceneCollection',\n" + - "\t'requestId': " + setCurrentSceneCollectionRequest.getRequestId() + ",\n" + - "\t'requestData': {\n" + - "\t\t'sceneCollectionName': 'Collection Name'\n" + + "\t'd': {\n" + + "\t\t'requestType': 'SetCurrentSceneCollection',\n" + + "\t\t'requestId': " + setCurrentSceneCollectionRequest.getRequestId() + ",\n" + + "\t\t'requestData': {\n" + + "\t\t\t'sceneCollectionName': 'Collection Name'\n" + + "\t\t}\n" + "\t}\n" + "}"; @@ -167,12 +185,14 @@ void setProfileParameterRequest() { String json = "{\n" + "\t'op': 6,\n" + - "\t'requestType': 'SetProfileParameter',\n" + - "\t'requestId': " + setProfileParameterRequest.getRequestId() + ",\n" + - "\t'requestData': {\n" + - "\t\t'parameterCategory': 'Category',\n" + - "\t\t'parameterName': 'Param',\n" + - "\t\t'parameterValue': 'new Value'\n" + + "\t'd': {\n" + + "\t\t'requestType': 'SetProfileParameter',\n" + + "\t\t'requestId': " + setProfileParameterRequest.getRequestId() + ",\n" + + "\t\t'requestData': {\n" + + "\t\t\t'parameterCategory': 'Category',\n" + + "\t\t\t'parameterName': 'Param',\n" + + "\t\t\t'parameterValue': 'new Value'\n" + + "\t\t}\n" + "\t}\n" + "}"; diff --git a/client/src/test/java/io/obswebsocket/community/client/message/request/filters/FiltersRequestsSerializationTest.java b/client/src/test/java/io/obswebsocket/community/client/message/request/filters/FiltersRequestsSerializationTest.java index f34cd631..93f92fd7 100644 --- a/client/src/test/java/io/obswebsocket/community/client/message/request/filters/FiltersRequestsSerializationTest.java +++ b/client/src/test/java/io/obswebsocket/community/client/message/request/filters/FiltersRequestsSerializationTest.java @@ -73,7 +73,7 @@ void createSourceFilterRequest() { .isEqualTo(createSourceFilterRequest.getRequestData().getFilterSettings() .get("randomIntegerSetting").getAsInt()); assertThat(actualObject.getRequestId()).isEqualTo(createSourceFilterRequest.getRequestId()); - assertThat(actualObject.getRequestType()).isEqualTo(Request.Type.CreateSourceFilter); + assertThat(actualObject.getRequestType()).isEqualTo(Request.Data.Type.CreateSourceFilter); assertThat(actualObject.getOperationCode()).isEqualTo(OperationCode.Request); try { String actualJson = translator.toJson(createSourceFilterRequest); @@ -217,7 +217,7 @@ void setSourceFilterSettingsRequest() { .get("randomIntegerSetting").getAsInt()); assertThat(actualObject.getRequestId()) .isEqualTo(setSourceFilterSettingsRequest.getRequestId()); - assertThat(actualObject.getRequestType()).isEqualTo(Request.Type.SetSourceFilterSettings); + assertThat(actualObject.getRequestType()).isEqualTo(Request.Data.Type.SetSourceFilterSettings); assertThat(actualObject.getOperationCode()).isEqualTo(OperationCode.Request); try { String actualJson = translator.toJson(setSourceFilterSettingsRequest); diff --git a/client/src/test/java/io/obswebsocket/community/client/message/request/general/GeneralRequestsSerializationTest.java b/client/src/test/java/io/obswebsocket/community/client/message/request/general/GeneralRequestsSerializationTest.java index 16fedc4b..1ea4ab34 100644 --- a/client/src/test/java/io/obswebsocket/community/client/message/request/general/GeneralRequestsSerializationTest.java +++ b/client/src/test/java/io/obswebsocket/community/client/message/request/general/GeneralRequestsSerializationTest.java @@ -62,7 +62,7 @@ void broadcastCustomEventRequest() { Assertions.assertThat(actualObject.getRequestId()) .isEqualTo(broadcastCustomEventRequest.getRequestId()); Assertions.assertThat(actualObject.getRequestType()) - .isEqualTo(Request.Type.BroadcastCustomEvent); + .isEqualTo(Request.Data.Type.BroadcastCustomEvent); assertThat(actualObject.getOperationCode()).isEqualTo(OperationCode.Request); try { String actualJson = translator.toJson(broadcastCustomEventRequest); @@ -201,7 +201,7 @@ void sleepRequest() { Request request = deserializeTo(json, Request.class); assertThat(request).isNotNull(); - assertThat(request.getRequestType()).isEqualTo(Request.Type.Sleep); + assertThat(request.getRequestType()).isEqualTo(Request.Data.Type.Sleep); } @Test diff --git a/client/src/test/java/io/obswebsocket/community/client/message/request/inputs/InputsRequestSerializationTest.java b/client/src/test/java/io/obswebsocket/community/client/message/request/inputs/InputsRequestSerializationTest.java index 5c5e1bfa..bc1de94b 100644 --- a/client/src/test/java/io/obswebsocket/community/client/message/request/inputs/InputsRequestSerializationTest.java +++ b/client/src/test/java/io/obswebsocket/community/client/message/request/inputs/InputsRequestSerializationTest.java @@ -73,7 +73,7 @@ void createInputRequest() { createInputRequest.getRequestData().getInputSettings().get("randomIntegerSetting") .getAsInt()); assertThat(actualObject.getRequestId()).isEqualTo(createInputRequest.getRequestId()); - assertThat(actualObject.getRequestType()).isEqualTo(Request.Type.CreateInput); + assertThat(actualObject.getRequestType()).isEqualTo(Request.Data.Type.CreateInput); assertThat(actualObject.getOperationCode()).isEqualTo(OperationCode.Request); try { String actualJson = translator.toJson(createInputRequest); @@ -341,7 +341,7 @@ void setInputSettingsRequest() { setInputSettingsRequest.getRequestData().getInputSettings().get("randomIntegerSetting") .getAsInt()); assertThat(actualObject.getRequestId()).isEqualTo(setInputSettingsRequest.getRequestId()); - assertThat(actualObject.getRequestType()).isEqualTo(Request.Type.SetInputSettings); + assertThat(actualObject.getRequestType()).isEqualTo(Request.Data.Type.SetInputSettings); assertThat(actualObject.getOperationCode()).isEqualTo(OperationCode.Request); try { String actualJson = translator.toJson(setInputSettingsRequest); diff --git a/client/src/test/java/io/obswebsocket/community/client/message/request/stream/StreamRequestsSerializationTest.java b/client/src/test/java/io/obswebsocket/community/client/message/request/stream/StreamRequestsSerializationTest.java index 9d61e758..7368dc0d 100644 --- a/client/src/test/java/io/obswebsocket/community/client/message/request/stream/StreamRequestsSerializationTest.java +++ b/client/src/test/java/io/obswebsocket/community/client/message/request/stream/StreamRequestsSerializationTest.java @@ -106,7 +106,7 @@ void setStreamServiceSettingsRequest() { .get("randomIntegerSetting").getAsInt()); assertThat(actualObject.getRequestId()) .isEqualTo(setStreamServiceSettingsRequest.getRequestId()); - assertThat(actualObject.getRequestType()).isEqualTo(Request.Type.SetStreamServiceSettings); + assertThat(actualObject.getRequestType()).isEqualTo(Request.Data.Type.SetStreamServiceSettings); assertThat(actualObject.getOperationCode()).isEqualTo(OperationCode.Request); try { String actualJson = translator.toJson(setStreamServiceSettingsRequest); diff --git a/client/src/test/java/io/obswebsocket/community/client/message/request/transitions/TransitionsRequestSerializationTest.java b/client/src/test/java/io/obswebsocket/community/client/message/request/transitions/TransitionsRequestSerializationTest.java index 005efc8c..8755c0de 100644 --- a/client/src/test/java/io/obswebsocket/community/client/message/request/transitions/TransitionsRequestSerializationTest.java +++ b/client/src/test/java/io/obswebsocket/community/client/message/request/transitions/TransitionsRequestSerializationTest.java @@ -159,7 +159,7 @@ void setTransitionSettingsRequest() { setTransitionSettingsRequest.getRequestData().getTransitionSettings() .get("randomIntegerSetting").getAsBoolean()); assertThat(actualObject.getRequestId()).isEqualTo(setTransitionSettingsRequest.getRequestId()); - assertThat(actualObject.getRequestType()).isEqualTo(Request.Type.SetTransitionSettings); + assertThat(actualObject.getRequestType()).isEqualTo(Request.Data.Type.SetTransitionSettings); assertThat(actualObject.getOperationCode()).isEqualTo(OperationCode.Request); try { String actualJson = translator.toJson(setTransitionSettingsRequest); diff --git a/example/src/main/java/io/obswebsocket/community/client/example/Example.java b/example/src/main/java/io/obswebsocket/community/client/example/Example.java index 0c564db4..fb3c23e0 100644 --- a/example/src/main/java/io/obswebsocket/community/client/example/Example.java +++ b/example/src/main/java/io/obswebsocket/community/client/example/Example.java @@ -50,7 +50,8 @@ private void onFirstConnection() { this.obsRemoteController.getSceneList(getSceneListResponse -> { if (getSceneListResponse.isSuccessful()) { // Filter by isGroup - List groups = getSceneListResponse.getResponseData().getScenes().stream().filter(Scene::getIsGroup).collect(Collectors.toList()); + List groups = getSceneListResponse.getMessageData().getResponseData().getScenes() + .stream().filter(Scene::getIsGroup).collect(Collectors.toList()); // Print each Scene groups.forEach(System.out::println); }