From 1462dc84f7902479d152712ef326b92b8c6ecd34 Mon Sep 17 00:00:00 2001 From: David Gerber Date: Sat, 4 Jan 2025 15:08:10 +0100 Subject: [PATCH] Fix remote settings and websocket buffer size --- .../app/configuration/WebSocketConfiguration.java | 5 ++--- .../settings/SettingsRemoteController.java | 6 +++--- .../java/io/xeres/ui/model/settings/Settings.java | 12 ++++++------ .../io/xeres/ui/model/settings/SettingsMapper.java | 6 +++--- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/io/xeres/app/configuration/WebSocketConfiguration.java b/app/src/main/java/io/xeres/app/configuration/WebSocketConfiguration.java index 5de62f55..71afa419 100644 --- a/app/src/main/java/io/xeres/app/configuration/WebSocketConfiguration.java +++ b/app/src/main/java/io/xeres/app/configuration/WebSocketConfiguration.java @@ -19,7 +19,7 @@ package io.xeres.app.configuration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.config.annotation.EnableWebSocket; @@ -31,10 +31,9 @@ @Configuration @EnableWebSocket -@ConditionalOnProperty(value = "spring.main.web-application-type", havingValue = "servlet") +@ConditionalOnExpression("'${spring.main.web-application-type}' != 'none'") public class WebSocketConfiguration implements WebSocketConfigurer { - // See https://stackoverflow.com/questions/21730566/how-to-increase-output-buffer-for-spring-sockjs-websocket-server-implementation @Bean public ServletServerContainerFactoryBean createServletServerContainerFactoryBean() { diff --git a/ui/src/main/java/io/xeres/ui/controller/settings/SettingsRemoteController.java b/ui/src/main/java/io/xeres/ui/controller/settings/SettingsRemoteController.java index ffef957c..1a2b13bd 100644 --- a/ui/src/main/java/io/xeres/ui/controller/settings/SettingsRemoteController.java +++ b/ui/src/main/java/io/xeres/ui/controller/settings/SettingsRemoteController.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 by David Gerber - https://zapek.com + * Copyright (c) 2024-2025 by David Gerber - https://zapek.com * * This file is part of Xeres. * @@ -102,7 +102,7 @@ public void onLoad(Settings settings) noUpnp = !settings.isUpnpEnabled(); remoteEnabled.setSelected(settings.isRemoteEnabled()); - remoteUpnpEnabled.setSelected(settings.isRemoteUpnpEnabled()); + remoteUpnpEnabled.setSelected(settings.isUpnpRemoteEnabled()); checkDisabled(); password.setText(settings.getRemotePassword()); port.setText(String.valueOf(StartupProperties.getInteger(CONTROL_PORT))); @@ -118,7 +118,7 @@ public Settings onSave() settings.setRemotePassword(isBlank(password.getPassword()) ? null : password.getPassword()); settings.setRemoteEnabled(remoteEnabled.isSelected()); - settings.setRemoteUpnpEnabled(remoteUpnpEnabled.isSelected()); + settings.setUpnpRemoteEnabled(remoteUpnpEnabled.isSelected()); if (!port.getText().isEmpty()) { var portValue = Integer.parseInt(port.getText()); diff --git a/ui/src/main/java/io/xeres/ui/model/settings/Settings.java b/ui/src/main/java/io/xeres/ui/model/settings/Settings.java index 2c3d742d..3c36a433 100644 --- a/ui/src/main/java/io/xeres/ui/model/settings/Settings.java +++ b/ui/src/main/java/io/xeres/ui/model/settings/Settings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023 by David Gerber - https://zapek.com + * Copyright (c) 2019-2025 by David Gerber - https://zapek.com * * This file is part of Xeres. * @@ -43,7 +43,7 @@ public class Settings implements Cloneable private boolean remoteEnabled; - private boolean isRemoteUpnpEnabled; + private boolean isUpnpRemoteEnabled; private int remotePort; @@ -162,14 +162,14 @@ public void setRemoteEnabled(boolean enabled) remoteEnabled = enabled; } - public boolean isRemoteUpnpEnabled() + public boolean isUpnpRemoteEnabled() { - return isRemoteUpnpEnabled; + return isUpnpRemoteEnabled; } - public void setRemoteUpnpEnabled(boolean remoteUpnpEnabled) + public void setUpnpRemoteEnabled(boolean upnpRemoteEnabled) { - isRemoteUpnpEnabled = remoteUpnpEnabled; + isUpnpRemoteEnabled = upnpRemoteEnabled; } public int getRemotePort() diff --git a/ui/src/main/java/io/xeres/ui/model/settings/SettingsMapper.java b/ui/src/main/java/io/xeres/ui/model/settings/SettingsMapper.java index 87e3729e..495ad59e 100644 --- a/ui/src/main/java/io/xeres/ui/model/settings/SettingsMapper.java +++ b/ui/src/main/java/io/xeres/ui/model/settings/SettingsMapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023 by David Gerber - https://zapek.com + * Copyright (c) 2019-2025 by David Gerber - https://zapek.com * * This file is part of Xeres. * @@ -48,7 +48,7 @@ public static Settings fromDTO(SettingsDTO dto) settings.setIncomingDirectory(dto.incomingDirectory()); settings.setRemotePassword(dto.remotePassword()); settings.setRemoteEnabled(dto.remoteEnabled()); - settings.setRemoteUpnpEnabled(dto.upnpRemoteEnabled()); + settings.setUpnpRemoteEnabled(dto.upnpRemoteEnabled()); settings.setRemotePort(dto.remotePort()); return settings; } @@ -72,7 +72,7 @@ public static SettingsDTO toDTO(Settings settings) settings.getIncomingDirectory(), settings.getRemotePassword(), settings.isRemoteEnabled(), - settings.isRemoteUpnpEnabled(), + settings.isUpnpRemoteEnabled(), settings.getRemotePort() ); }