Use Collection instead of List, use common code path

Author: mrotteveel

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

@@ -20,15 +20,15 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.List;
+import java.util.Collection;
 
 import static org.firebirdsql.gds.ISCConstants.*;
 import static org.firebirdsql.gds.VaxEncoding.iscVaxInteger2;
 import static org.firebirdsql.gds.VaxEncoding.iscVaxLong;
 
 /**
- * The <code>FBStatisticsManager</code> class is responsible for replicating the functionality of
- * the <code>gstat</code> command-line tool.
+ * The {@code FBStatisticsManager} class is responsible for replicating the functionality of
+ * the {@code gstat} command-line tool.
  * <p>
  * This functionality includes:
  * <ul>
@@ -49,16 +49,13 @@ public class FBStatisticsManager extends FBServiceManager implements StatisticsM
                     RECORD_VERSION_STATISTICS;
 
     /**
-     * Create a new instance of <code>FBMaintenanceManager</code> based on
-     * the default GDSType.
+     * Create a new instance of {@code FBMaintenanceManager} based on the default GDSType.
      */
     public FBStatisticsManager() {
-        super();
     }
 
     /**
-     * Create a new instance of <code>FBMaintenanceManager</code> based on
-     * a given GDSType.
+     * Create a new instance of {@code FBMaintenanceManager} based on a given GDSType.
      *
      * @param gdsType
      *         type must be PURE_JAVA, EMBEDDED, or NATIVE
@@ -69,8 +66,7 @@ public FBStatisticsManager(String gdsType) {
     }
 
     /**
-     * Create a new instance of <code>FBMaintenanceManager</code> based on
-     * a given GDSType.
+     * Create a new instance of {@code FBMaintenanceManager} based on a given GDSType.
      *
      * @param gdsType
      *         The GDS implementation type to use
@@ -107,19 +103,18 @@ public void getDatabaseStatistics(int options) throws SQLException {
     }
 
     @Override
-    public void getTableStatistics(List<String> schemas, List<String> tableNames) throws SQLException {
+    public void getTableStatistics(Collection<String> schemas, Collection<String> tableNames) throws SQLException {
         try (FbService service = attachServiceManager()) {
             ServiceRequestBuffer srb;
             GDSServerVersion serverVersion = service.getServerVersion();
-            if (serverVersion.isEqualOrAbove(3)) {
-                srb = createStatsSRB(service, 0);
+            if (serverVersion.isEqualOrAbove(3) || tableNames.isEmpty()) {
+                srb = createDefaultStatsSRB(service);
                 if (serverVersion.isEqualOrAbove(6)) {
                     schemas.forEach(schema -> srb.addArgument(isc_spb_sts_schema, schema));
                 }
                 tableNames.forEach(tableName -> srb.addArgument(isc_spb_sts_table, tableName));
-            } else if (tableNames.isEmpty()) {
-                srb = createStatsSRB(service, 0);
             } else {
+                // Handling of table list is different on older (unsupported) Firebird versions
                 srb = createStatsSRB(service, isc_spb_sts_table);
                 srb.addArgument(SpbItems.isc_spb_command_line, String.join(" ", tableNames));
             }

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

@@ -8,6 +8,7 @@
 
 import java.sql.SQLException;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -114,15 +115,15 @@ public interface StatisticsManager extends ServiceManager {
     /**
      * Get the table statistics.
      * <p>
-     * For a more detailed description, see {@link #getTableStatistics(List, List)}.
+     * For a more detailed description, see {@link #getTableStatistics(Collection, Collection)}.
      * </p>
      *
      * @param tableNames
      *         table names to analyze
      * @throws SQLException
      *         if something went wrong
-     * @see #getTableStatistics(List)
-     * @see #getTableStatistics(List, List)
+     * @see #getTableStatistics(Collection)
+     * @see #getTableStatistics(Collection, Collection)
      */
     default void getTableStatistics(String... tableNames) throws SQLException {
         getTableStatistics(Arrays.asList(tableNames));
@@ -131,17 +132,17 @@ default void getTableStatistics(String... tableNames) throws SQLException {
     /**
      * Get the table statistics.
      * <p>
-     * For a more detailed description, see {@link #getTableStatistics(List, List)}.
+     * For a more detailed description, see {@link #getTableStatistics(Collection, Collection)}.
      * </p>
      *
      * @param tableNames
      *         table names to analyze
      * @throws SQLException
      *         if something went wrong
-     * @see #getTableStatistics(List, List)
+     * @see #getTableStatistics(Collection, Collection)
      * @since 7
      */
-    default void getTableStatistics(List<String> tableNames) throws SQLException {
+    default void getTableStatistics(Collection<String> tableNames) throws SQLException {
         getTableStatistics(List.of(), tableNames);
     }
 
@@ -174,7 +175,7 @@ default void getTableStatistics(List<String> tableNames) throws SQLException {
      *         found)
      * @since 7
      */
-    void getTableStatistics(List<String> schemaNames, List<String> tableNames) throws SQLException;
+    void getTableStatistics(Collection<String> schemaNames, Collection<String> tableNames) throws SQLException;
 
     /**
      * Get transaction information of the database specified in {@code database}.