Add field to change HTTP port

jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java

@@ -58,6 +58,7 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
     @FXML private CheckBox remoteServer;
     @FXML private TextField remotePort;
     @FXML private CheckBox enableHttpServer;
+    @FXML private TextField httpServerPort;
     @FXML private Button remoteHelp;
     @Inject private FileUpdateMonitor fileUpdateMonitor;
     @Inject private BibEntryTypesManager entryTypesManager;
@@ -143,6 +144,7 @@ public void initialize() {
 
         Platform.runLater(() -> {
             validationVisualizer.initVisualization(viewModel.remotePortValidationStatus(), remotePort);
+            validationVisualizer.initVisualization(viewModel.httpPortValidationStatus(), httpServerPort);
             validationVisualizer.initVisualization(viewModel.fontSizeValidationStatus(), fontSize);
             validationVisualizer.initVisualization(viewModel.customPathToThemeValidationStatus(), customThemePath);
         });
@@ -152,6 +154,8 @@ public void initialize() {
         remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
 
         enableHttpServer.selectedProperty().bindBidirectional(viewModel.enableHttpServerProperty());
+        httpServerPort.textProperty().bindBidirectional(viewModel.httpPortProperty());
+        httpServerPort.disableProperty().bind(enableHttpServer.selectedProperty().not());
     }
 
     @FXML

jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java

@@ -111,6 +111,8 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final StringProperty remotePortProperty = new SimpleStringProperty("");
     private final Validator remotePortValidator;
     private final BooleanProperty enableHttpServerProperty = new SimpleBooleanProperty();
+    private final StringProperty httpPortProperty = new SimpleStringProperty("");
+    private final Validator httpPortValidator;
     private final TrustStoreManager trustStoreManager;
 
     private final FileUpdateMonitor fileUpdateMonitor;
@@ -160,14 +162,28 @@ public GeneralTabViewModel(DialogService dialogService, GuiPreferences preferenc
                         Localization.lang("Network"),
                         Localization.lang("Remote operation"),
                         Localization.lang("You must enter an integer value in the interval 1025-65535"))));
-
+        httpPortValidator = new FunctionBasedValidator<>(
+                httpPortProperty,
+                input -> {
+                    try {
+                        int portNumber = Integer.parseInt(httpPortProperty().getValue());
+                        return RemoteUtil.isUserPort(portNumber);
+                    } catch (NumberFormatException ex) {
+                        return false;
+                    }
+                },
+                ValidationMessage.error("%s".formatted(Localization.lang("You must enter an integer value in the interval 1025-65535"))));
         this.trustStoreManager = new TrustStoreManager(Path.of(preferences.getSSLPreferences().getTruststorePath()));
     }
 
     public ValidationStatus remotePortValidationStatus() {
         return remotePortValidator.getValidationStatus();
     }
 
+    public ValidationStatus httpPortValidationStatus() {
+        return httpPortValidator.getValidationStatus();
+    }
+
     @Override
     public void setValues() {
         selectedLanguageProperty.setValue(workspacePreferences.getLanguage());
@@ -210,6 +226,7 @@ public void setValues() {
         remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
 
         enableHttpServerProperty.setValue(remotePreferences.enableHttpServer());
+        httpPortProperty.setValue(String.valueOf(remotePreferences.getHttpPort()));
     }
 
     @Override
@@ -276,6 +293,12 @@ public void storeSettings() {
             remoteListenerServerManager.stop();
         }
 
+        getPortAsInt(httpPortProperty.getValue()).ifPresent(newPort -> {
+            if (remotePreferences.isDifferentHttpPort(newPort)) {
+                remotePreferences.setHttpPort(newPort);
+            }
+        });
+
         HttpServerManager httpServerManager = Injector.instantiateModelOrService(HttpServerManager.class);
         // stop in all cases, because the port might have changed
         httpServerManager.stop();
@@ -308,6 +331,10 @@ public boolean validateSettings() {
             validator.addValidators(remotePortValidator);
         }
 
+        if (enableHttpServerProperty.getValue()) {
+            validator.addValidators(httpPortValidator);
+        }
+
         if (fontOverrideProperty.getValue()) {
             validator.addValidators(fontSizeValidator);
         }
@@ -442,6 +469,10 @@ public BooleanProperty enableHttpServerProperty() {
         return enableHttpServerProperty;
     }
 
+    public StringProperty httpPortProperty() {
+        return httpPortProperty;
+    }
+
     public void openBrowser() {
         String url = "https://themes.jabref.org";
         try {

jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml

@@ -83,7 +83,10 @@
     </HBox>
 
     <Label styleClass="sectionHeader" text="%HTTP Server" />
-    <CheckBox fx:id="enableHttpServer" text="%Enable HTTP Server (e.g., for JabMap)" />
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <CheckBox fx:id="enableHttpServer" text="%Enable HTTP Server (e.g., for JabMap)" />
+        <TextField fx:id="httpServerPort" maxWidth="100.0" HBox.hgrow="ALWAYS" />
+    </HBox>
 
     <Label styleClass="sectionHeader" text="%Libraries"/>
     <GridPane hgap="10.0" vgap="4.0">

jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java

@@ -365,6 +365,7 @@ public class JabRefCliPreferences implements CliPreferences {
     // Remote
     private static final String USE_REMOTE_SERVER = "useRemoteServer";
     private static final String REMOTE_SERVER_PORT = "remoteServerPort";
+    private static final String HTTP_SERVER_PORT = "httpServerPort";
     private static final String ENABLE_HTTP_SERVER = "enableHttpServer";
 
     private static final String AI_ENABLED = "aiEnabled";
@@ -639,6 +640,7 @@ public JabRefCliPreferences() {
         defaults.put(USE_REMOTE_SERVER, Boolean.TRUE);
         defaults.put(REMOTE_SERVER_PORT, 6050);
         defaults.put(ENABLE_HTTP_SERVER, Boolean.FALSE);
+        defaults.put(HTTP_SERVER_PORT, 23119);
 
         defaults.put(EXTERNAL_JOURNAL_LISTS, "");
         defaults.put(USE_AMS_FJOURNAL, true);
@@ -1250,10 +1252,12 @@ public RemotePreferences getRemotePreferences() {
         remotePreferences = new RemotePreferences(
                 getInt(REMOTE_SERVER_PORT),
                 getBoolean(USE_REMOTE_SERVER),
+                getInt(HTTP_SERVER_PORT),
                 getBoolean(ENABLE_HTTP_SERVER));
 
         EasyBind.listen(remotePreferences.portProperty(), (_, _, newValue) -> putInt(REMOTE_SERVER_PORT, newValue));
         EasyBind.listen(remotePreferences.useRemoteServerProperty(), (_, _, newValue) -> putBoolean(USE_REMOTE_SERVER, newValue));
+        EasyBind.listen(remotePreferences.httpPortProperty(), (_, _, newValue) -> putInt(HTTP_SERVER_PORT, newValue));
         EasyBind.listen(remotePreferences.enableHttpServerProperty(), (_, _, newValue) -> putBoolean(ENABLE_HTTP_SERVER, newValue));
 
         return remotePreferences;

jablib/src/main/java/org/jabref/logic/remote/RemotePreferences.java

@@ -24,11 +24,13 @@ public class RemotePreferences {
     private final IntegerProperty port;
     private final BooleanProperty useRemoteServer;
 
+    private final IntegerProperty httpPort;
     private final BooleanProperty enableHttpServer;
 
-    public RemotePreferences(int port, boolean useRemoteServer, boolean enableHttpServer) {
+    public RemotePreferences(int port, boolean useRemoteServer, int httpPort, boolean enableHttpServer) {
         this.port = new SimpleIntegerProperty(port);
         this.useRemoteServer = new SimpleBooleanProperty(useRemoteServer);
+        this.httpPort = new SimpleIntegerProperty(httpPort);
         this.enableHttpServer = new SimpleBooleanProperty(enableHttpServer);
     }
 
@@ -60,6 +62,22 @@ public void setUseRemoteServer(boolean useRemoteServer) {
         this.useRemoteServer.setValue(useRemoteServer);
     }
 
+    public int getHttpPort() {
+        return httpPort.getValue();
+    }
+
+    public IntegerProperty httpPortProperty() {
+        return httpPort;
+    }
+
+    public void setHttpPort(int httpPort) {
+        this.httpPort.setValue(httpPort);
+    }
+
+    public boolean isDifferentHttpPort(int otherHttpPort) {
+        return getHttpPort() != otherHttpPort;
+    }
+
     public boolean enableHttpServer() {
         return enableHttpServer.getValue();
     }

jablib/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java

@@ -13,20 +13,31 @@ class RemotePreferencesTest {
 
     @BeforeEach
     void setUp() {
-        preferences = new RemotePreferences(1000, true, false);
+        preferences = new RemotePreferences(1000, true, 3000, false);
     }
 
     @Test
     void getPort() {
         assertEquals(1000, preferences.getPort());
     }
 
+    @Test
+    void getHttpPort() {
+        assertEquals(3000, preferences.getHttpPort());
+    }
+
     @Test
     void setPort() {
         preferences.setPort(2000);
         assertEquals(2000, preferences.getPort());
     }
 
+    @Test
+    void setHttpPort() {
+        preferences.setHttpPort(4000);
+        assertEquals(4000, preferences.getHttpPort());
+    }
+
     @Test
     void useRemoteServer() {
         assertTrue(preferences.useRemoteServer());
@@ -43,8 +54,18 @@ void isDifferentPortTrue() {
         assertTrue(preferences.isDifferentPort(2000));
     }
 
+    @Test
+    void isDifferentHttpPortTrue() {
+        assertTrue(preferences.isDifferentHttpPort(4000));
+    }
+
     @Test
     void isDifferentPortFalse() {
         assertFalse(preferences.isDifferentPort(1000));
     }
+
+    @Test
+    void isDifferentHttpPortFalse() {
+        assertFalse(preferences.isDifferentHttpPort(3000));
+    }
 }