Bug #9681: Now the filtering of the SQL query result is done directly in Java

and no more in JDBC.
Add an operation item in the menu to reload the result (hence to execute again
the query).

Author: mmoqui

jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector.properties

@@ -85,4 +85,5 @@ dataSourceField=Source de donn\u00E9es
 parametresConnectionIncorrects=mauvais param\u00E8tres de connexions
 erreurRequeteIncorrect=La requ\u00E8te SQL est incorrecte
 critereSupprimes=Les crit\u00E8res ont \u00E9t\u00E9 enlev\u00E9s
-sqlRequestExecutionFailure=L'ex\u00E9cution de la requ\u00E8te SQL a \u00E9chou\u00E9
+sqlRequestExecutionFailure=L'ex\u00E9cution de la requ\u00E8te SQL a \u00E9chou\u00E9
+reloadRequest=Rafra\u00EEchir

jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_de.properties

@@ -86,4 +86,5 @@ dataSourceField=Datenquelle
 parametresConnectionIncorrects=schlechte Verbindungseinstellungen
 erreurRequeteIncorrect=die SQL-Abfrage ist falsch
 critereSupprimes=Die Kriterien wurden entfernt
-sqlRequestExecutionFailure=The execution of the SQL request failed
+sqlRequestExecutionFailure=Die Ausführung der SQL-Anfrage ist fehlgeschlagen
+reloadRequest=Aufladen

jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_en.properties

@@ -85,4 +85,5 @@ contient = contains
 dataSourceField=Data Source
 erreurRequeteIncorrect=The SQL request is incorrect
 critereSupprimes=Criteria are removed
-sqlRequestExecutionFailure=The execution of the SQL request failed
+sqlRequestExecutionFailure=The execution of the SQL request failed
+reloadRequest=Reload

jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_fr.properties

@@ -85,4 +85,5 @@ dataSourceField=Source de donn\u00E9es
 parametresConnectionIncorrects=mauvais param\u00E8tres de connexions
 erreurRequeteIncorrect=La requ\u00E8te SQL est incorrecte
 critereSupprimes=Les crit\u00E8res ont \u00E9t\u00E9 enlev\u00E9s
-sqlRequestExecutionFailure=L'ex\u00E9cution de la requ\u00E8te SQL a \u00E9chou\u00E9
+sqlRequestExecutionFailure=L'ex\u00E9cution de la requ\u00E8te SQL a \u00E9chou\u00E9
+reloadRequest=Rafra\u00EEchir

jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/JdbcRequester.java

@@ -25,13 +25,15 @@
 package org.silverpeas.components.jdbcconnector.service;
 
 import org.silverpeas.components.jdbcconnector.model.DataSourceConnectionInfo;
+import org.silverpeas.core.util.StringUtil;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -115,6 +117,16 @@ public boolean isDataSourceDefined() {
     return currentConnectionInfo.isDefined();
   }
 
+  /**
+   * Is there is any default SQL request set with this requester? A request is set when there is a
+   * {@link DataSourceConnectionInfo} instance defined for the component instance to which this
+   * request is related and a SQL query has been defined for that connection information.
+   * @return true if there is a SQL query defined for the current underlying connection information.
+   */
+  public boolean isSQLRequestDefined() {
+    return StringUtil.isNotDefined(currentConnectionInfo.getSqlRequest());
+  }
+
   /**
    * Gets all the tables in the data source (only public tables and views are fetched). If an error
    * occurs while requesting the data source, a {@link JdbcConnectorRuntimeException} is thrown.
@@ -158,12 +170,18 @@ public List<String> getColumnNames(final String tableName) {
   /**
    * Requests the data source by using the SQL query that was set with the current underlying
    * {@link DataSourceConnectionInfo} instance. A {@link JdbcConnectorRuntimeException} is thrown
-   * if the data returned by the requesting fails to be read.
-   * @return a list of rows, each of them represented by a {@link TableRow} instance.
+   * if the data returned by the requesting fails to be read. If no request was set, then nothing
+   * is requested and hence nothing is returned.
+   * @return a list of rows, each of them represented by a {@link TableRow} instance. If no SQL
+   * query is defined with the underlying {@link DataSourceConnectionInfo} instance, then an empty
+   * list is returned.
    * @throws JdbcConnectorException if either no connection can be established or the requesting
    * failed.
    */
   public List<TableRow> request() throws JdbcConnectorException {
+    if (isSQLRequestDefined()) {
+      return Collections.emptyList();
+    }
     return request(currentConnectionInfo.getSqlRequest());
   }
 

jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/TableFieldValue.java

@@ -24,12 +24,11 @@
 
 package org.silverpeas.components.jdbcconnector.service;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.Objects;
 
 /**
- * The value of a field in a table row.
+ * The value of a field in a table row. Such instance is used instead of a given true field value
+ * when that field value doesn't satisfy the {@link Comparable} interface.
  * @author mmoquillon
  */
 public class TableFieldValue implements Comparable<TableFieldValue> {
@@ -40,6 +39,16 @@ public class TableFieldValue implements Comparable<TableFieldValue> {
     this.value = value;
   }
 
+  /**
+   * Constructs a {@link TableFieldValue} instance from the specified {@link String} encoded field
+   * value.
+   * @param value the value from which a {@link TableFieldValue} has to be built.
+   * @return a {@link TableFieldValue} instance wrapping the specified {@link String} value.
+   */
+  public static TableFieldValue valueOf(final String value) {
+    return new TableFieldValue(value);
+  }
+
   @Override
   public boolean equals(final Object o) {
     if (this == o) {
@@ -57,6 +66,15 @@ public int hashCode() {
     return Objects.hash(value);
   }
 
+  /**
+   * Compares this {@link TableFieldValue} with the specified one. The comparing is actually done
+   * on the wrapped values themselves. If the wrapped values satisfy the {@link Comparable}
+   * interface then the {@link Comparable#compareTo(Object)} method is used, otherwise both of them
+   * are converted in {@link String} objects and these {@link String} instances are then compared
+   * between themselves.
+   * @param o another {@link TableFieldValue} with which this one is compared.
+   * @return the comparing distance between the two {@link TableFieldValue} instances.
+   */
   @Override
   public int compareTo(final TableFieldValue o) {
     if (o.value == null && value == null) {
@@ -65,20 +83,14 @@ public int compareTo(final TableFieldValue o) {
       return 1;
     } else if (value == null) {
       return -1;
-    } else if (o.value.getClass().equals(value.getClass())) {
-      try {
-        Method m = o.getClass().getMethod("compareTo", o.getClass());
-        return (Integer) m.invoke(value, o.value);
-      } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
-        return toString().compareTo(o.toString());
-      }
+    } else if (value instanceof Comparable) {
+      return ((Comparable) value).compareTo(o.value);
     }
-    throw new IllegalArgumentException("The table field value isn't of the same type than this");
+    return toString().compareTo(o.toString());
   }
 
   @Override
   public String toString() {
     return value == null ? null : value.toString();
   }
 }
-  

jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/TableRow.java

@@ -41,7 +41,7 @@
  */
 public class TableRow {
 
-  private final Map<String, Object> fields = new LinkedHashMap<>();
+  private final Map<String, Comparable> fields = new LinkedHashMap<>();
 
   /**
    * Constructs a {@link TableRow} from the specified {@link ResultSet}.
@@ -51,7 +51,16 @@ public class TableRow {
     try {
       ResultSetMetaData rsMetaData = rs.getMetaData();
       for (int i = 1; i <= rsMetaData.getColumnCount(); i++) {
-        this.fields.put(rsMetaData.getColumnName(i), rs.getObject(i));
+        Object value = rs.getObject(i);
+        Comparable valueToStore;
+        if (value == null) {
+          valueToStore = null;
+        } else if (value instanceof Comparable) {
+          valueToStore = (Comparable) value;
+        } else {
+          valueToStore = new TableFieldValue(value);
+        }
+        this.fields.put(rsMetaData.getColumnName(i), valueToStore);
       }
     } catch (SQLException e) {
       throw new JdbcConnectorRuntimeException(e);
@@ -79,7 +88,7 @@ public Map<String, Object> getFields() {
    * @param field the name of the field.
    * @return the value of the asked field.
    */
-  public Object getFieldValue(final String field) {
+  public Comparable getFieldValue(final String field) {
     return fields.get(field);
   }
 }

jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/AbstractFieldComparatorBuilder.java

@@ -24,19 +24,19 @@
 
 package org.silverpeas.components.jdbcconnector.service.comparators;
 
-import java.text.MessageFormat;
+import java.util.Objects;
 
 /**
  * The equality comparator.
  * @author mmoquillon
  */
-public class EqualityBuilder extends AbstractFieldComparatorBuilder {
-
-  private static final MessageFormat EQUALITY = new MessageFormat("{0} = {1}");
+public class Equality implements FieldValueComparator {
 
   @Override
-  protected MessageFormat getFormatter() {
-    return EQUALITY;
+  public <T extends Comparable<T>> boolean compare(final T left, final T right) {
+    Objects.requireNonNull(left);
+    Objects.requireNonNull(right);
+    return left.compareTo(right) == 0;
   }
 }
 

jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/EqualityBuilder.java renamed to jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Equality.java

@@ -24,21 +24,21 @@
 
 package org.silverpeas.components.jdbcconnector.service.comparators;
 
-import org.silverpeas.components.jdbcconnector.service.TableRow;
-
 /**
- * A comparator of a field in a table row with a given value.
+ * A comparator of comparable values. Such comparator is a comparing predicate between two
+ * comparable objects.
  * @author mmoquillon
  */
-public interface FieldComparatorBuilder {
+@FunctionalInterface
+public interface FieldValueComparator {
 
   /**
-   * Builds the comparator that compares the specified field of a table row with the specified
-   * value.
-   * @param fieldName the name of a field of a {@link TableRow} to compare.
-   * @param value the value with which the field has to be compared.
-   * @return the comparing statement according to the comparator this builder builds.
+   * Compares the left value with the right one. The two specified values must be comparable and
+   * instances of a same class.
+   * @param left the left value. Must be non null.
+   * @param right the right value. Must be non null.
+   * @return true if the comparing predicate between the two specified values is satisfied.
    */
-  String compare(final String fieldName, final String value, final Class<?> type);
+  <T extends Comparable<T>> boolean compare(final T left, final T right);
 }