#949 FBManager#setPageSize should accept "use default" value

Author: mrotteveel

src/docs/asciidoc/release_notes.adoc

@@ -688,7 +688,8 @@ See also https://github.com/FirebirdSQL/jaybird/blob/master/devdoc/jdp/jdp-2026-
 * Improvement: Clear warnings on connection close (https://github.com/FirebirdSQL/jaybird/pull/943[#943])
 +
 This change was contributed by https://github.com/FuriousFourier[FuriousFourier^]
-* Improvement: Add getters to BackupManager and allow "`use default`" to be set (https://github.com/FirebirdSQL/jaybird/issues/948[#948])
+* Improvement: Add getters to `BackupManager` and allow "`use default`" to be set (https://github.com/FirebirdSQL/jaybird/issues/948[#948])
+* Improvement: Allow "`use default`" (`-1`) on `FBManager#setPageSize` (https://github.com/FirebirdSQL/jaybird/issues/949[#949])
 * ...
 
 [#compatibility-changes]

src/main/org/firebirdsql/management/FBManager.java

@@ -265,7 +265,9 @@ public int getDialect() {
 
     @Override
     public void setPageSize(int pageSize) {
-        this.pageSize = PageSizeConstants.requireValidPageSize(pageSize);
+        this.pageSize = pageSize != PageSizeConstants.USE_DEFAULT
+                ? PageSizeConstants.requireValidPageSize(pageSize)
+                : PageSizeConstants.USE_DEFAULT;
     }
 
     @Override

src/main/org/firebirdsql/management/FBManagerMBean.java

@@ -195,8 +195,8 @@ public interface FBManagerMBean extends AttachmentProperties, AutoCloseable {
     /**
      * Set the page size to use when creating a new database.
      * <p>
-     * The value for {@code pageSize} must be one of {@link PageSizeConstants}. The default value depends on the
-     * Firebird version.
+     * The value for {@code pageSize} must be one of {@link PageSizeConstants}. Use
+     * {@link PageSizeConstants#USE_DEFAULT} ({@code -1}) for the default size of the Firebird server.
      * </p>
      * <p>
      * Some values are not valid on all Firebird versions.

src/test/org/firebirdsql/management/FBManagerTest.java

@@ -111,13 +111,14 @@ void testSetPageSize_Invalid_throwsIllegalArgumentException() {
         assertThrows(IllegalArgumentException.class, () -> m.setPageSize(4000));
     }
 
-    @SuppressWarnings("resource")
+    @SuppressWarnings({ "resource", "deprecation" })
     @ParameterizedTest
-    @ValueSource(ints = { SIZE_1K, SIZE_2K, SIZE_4K, SIZE_8K, SIZE_16K, SIZE_32K })
+    @ValueSource(ints = { USE_DEFAULT, SIZE_1K, SIZE_2K, SIZE_4K, SIZE_8K, SIZE_16K, SIZE_32K })
     void testSetPageSize_ValidValues(int pageSize) {
         FBManager m = FBTestProperties.createFBManager();
 
         assertDoesNotThrow(() -> m.setPageSize(pageSize));
+        assertEquals(pageSize, m.getPageSize(), "pageSize");
     }
 
     @Test