Bug #13726 Fix the error coming from an orderBy null value

Author: mmoqui

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/MyDBInstancePreDestruction.java

@@ -25,6 +25,7 @@
 
 import org.silverpeas.components.mydb.model.MyDBConnectionInfo;
 import org.silverpeas.core.admin.component.ComponentInstancePreDestruction;
+import org.silverpeas.core.annotation.Bean;
 
 import javax.inject.Named;
 import javax.transaction.Transactional;
@@ -35,6 +36,7 @@
  * @author mmoquillon
  */
 @Named
+@Bean
 public class MyDBInstancePreDestruction implements ComponentInstancePreDestruction {
 
   /**

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DataSourceDefinition.java

@@ -31,8 +31,8 @@
  */
 public class DataSourceDefinition {
 
-  private String dataSource;
-  private String description;
+  private final String dataSource;
+  private final String description;
 
   public static List<DataSourceDefinition> getAll() {
     return MyDBConnectionInfoService.get().getAllDataSourceDefinitions();

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DbColumn.java

@@ -40,14 +40,14 @@
  */
 public class DbColumn {
 
-  private JdbcRequester.ColumnDescriptor descriptor;
+  private final JdbcRequester.ColumnDescriptor descriptor;
 
   /**
    * Constructs a new {@link DbColumn} instance of the specified SQL type and with the specified
    * name.
    * @param descriptor a descriptor of the column.
    */
-  public DbColumn(final JdbcRequester.ColumnDescriptor descriptor) {
+  DbColumn(final JdbcRequester.ColumnDescriptor descriptor) {
     this.descriptor = descriptor;
   }
 
@@ -85,7 +85,7 @@ public String getTypeName() {
   public int getSize() {
     int size = descriptor.getSize();
     if (getType() == Types.BIT && descriptor.getSize() == 1) {
-      size = Math.max("true".length(), "false".length());
+      size = "false".length();
     }
     return size;
   }
@@ -190,24 +190,6 @@ public boolean isOfTypeBinary() {
     return SqlTypes.isBinary(getType());
   }
 
-  /**
-   * Is this column of type number (INTEGER, BIGDECIMAL, ...)?
-   * @return true if the values of this column are numbers. False otherwise.
-   */
-  public boolean isOfTypeNumber() {
-    final int type = getType();
-    return SqlTypes.isBigInteger(type) || SqlTypes.isDouble(type) || SqlTypes.isFloat(type) ||
-        SqlTypes.isInteger(type) || SqlTypes.isDecimal(type);
-  }
-
-  /**
-   * Is this column of type date time (TIMESTAMP, TIMESTAMP_WITH_TIMEZONE, ...)?
-   * @return true if the values of this column are date times. False otherwise.
-   */
-  public boolean isOfTypeDateTime() {
-    return SqlTypes.isTimestamp(getType());
-  }
-
   /**
    * Gets a JDBC value of given value. The aim is to get a value to fill into
    * JDBC query criteria filters.

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DbTable.java

@@ -166,7 +166,6 @@ public Optional<DbColumn> getColumn(final String name) {
    * content of this table. The number of table rows is limited by the
    * {@link MyDBConnectionInfo#getDataMaxNumber()} property.
    */
-  @SuppressWarnings("unchecked")
   public SilverpeasList<TableRow> getRows(final ColumnValuePredicate filter, final String orderBy,
       final PaginationPage pagination) {
     if (!(filter instanceof AbstractColumnValuePredicate)) {
@@ -175,7 +174,7 @@ public SilverpeasList<TableRow> getRows(final ColumnValuePredicate filter, final
     }
     return requester.perform((r, c) -> {
       final JdbcRequester.DataConverters<TableFieldValue, TableRow> converters =
-          new JdbcRequester.DataConverters(TableFieldValue::new, TableRow::new);
+          new JdbcRequester.DataConverters<>(TableFieldValue::new, TableRow::new);
       return r.request(c, this.name, (AbstractColumnValuePredicate) filter, orderBy, converters,
           pagination);
     });

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/JdbcRequester.java

@@ -47,6 +47,8 @@
 import java.util.Map;
 import java.util.Objects;
 
+import static org.silverpeas.core.util.StringUtil.isDefined;
+
 /**
  * A requester of a remote enterprise data source by using the yet configured
  * {@link MyDBConnectionInfo} instance. If
@@ -225,7 +227,7 @@ <V, R> SilverpeasList<R> request(final Connection connection, final String table
     Objects.requireNonNull(tableName);
     Objects.requireNonNull(predicate);
     JdbcSqlQuery query = JdbcSqlQuery.select("*").from(tableName);
-    query = predicate.apply(query).orderBy(orderBy);
+    query = isDefined(orderBy) ? predicate.apply(query).orderBy(orderBy) : predicate.apply(query);
     if (pagination != null) {
       query.withPagination(pagination.asCriterion());
     }

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/MyDBConnectionInfo.java

@@ -31,7 +31,6 @@
 import javax.naming.NamingException;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.sql.DataSource;
@@ -46,10 +45,10 @@
  * @author mmoquillon
  */
 @Entity
-@NamedQueries({@NamedQuery(name = "MyDBConnectionInfo.findByInstanceId",
-    query = "select ds from MyDBConnectionInfo ds where ds.instanceId = :instanceId"),
-    @NamedQuery(name = "MyDBConnectionInfo.deleteByInstanceId",
-        query = "delete MyDBConnectionInfo where instanceId = :instanceId")})
+@NamedQuery(name = "MyDBConnectionInfo.findByInstanceId",
+    query = "select ds from MyDBConnectionInfo ds where ds.instanceId = :instanceId")
+@NamedQuery(name = "MyDBConnectionInfo.deleteByInstanceId",
+    query = "delete MyDBConnectionInfo where instanceId = :instanceId")
 @Table(name = "sc_mydb_connectinfo")
 public class MyDBConnectionInfo
     extends BasicJpaEntity<MyDBConnectionInfo, UniqueIntegerIdentifier> {
@@ -68,10 +67,6 @@ public class MyDBConnectionInfo
   @NotNull
   private String instanceId;
 
-  public static MyDBConnectionInfo getById(String id) {
-    return MyDBConnectionInfoService.get().getConnectionInfo(id);
-  }
-
   public static List<MyDBConnectionInfo> getFromComponentInstance(String instanceId) {
     return MyDBConnectionInfoService.get().getConnectionInfoList(instanceId);
   }
@@ -90,9 +85,9 @@ public MyDBConnectionInfo(String dataSource, String instanceId) {
 
   /**
    * Is this connection information defined? Information about a connection to a data source is
-   * defined if both it is related to a ConnecteurJDBC application instance and the name of the
+   * defined if both it is related to a myDB application instance and the name of the
    * data source is defined.
-   * @return
+   * @return true if the connection is defined. False otherwise.
    */
   public boolean isDefined() {
     return StringUtil.isDefined(this.dataSource) && StringUtil.isDefined(this.instanceId);
@@ -149,14 +144,6 @@ public String getDataSourceName() {
     return dataSource;
   }
 
-  /**
-   * Gets the unique identifier of the component instance this connection info belongs to.
-   * @return the unique identifier of the component instance.
-   */
-  public String getInstanceId() {
-    return instanceId;
-  }
-
   /**
    * Gets the user identifier used in the data source authentication.
    * @return the login.
@@ -228,11 +215,7 @@ public void setDefaultTableName(String tableName) {
    * @param maxNumber the maximum number of data to return. 0 means all.
    */
   public void setDataMaxNumber(int maxNumber) {
-    if (maxNumber <= 0) {
-      this.rowLimit = 0;
-    } else {
-      this.rowLimit = maxNumber;
-    }
+    this.rowLimit = Math.max(maxNumber, 0);
   }
 
   /**
@@ -243,13 +226,6 @@ public void save() {
     MyDBConnectionInfoService.get().saveConnectionInfo(this);
   }
 
-  /**
-   * Removes this connection information from the persistence context.
-   */
-  public void remove() {
-    MyDBConnectionInfoService.get().removeConnectionInfo(this);
-  }
-
   /**
    * Opens a connection to the data source targeted by this connection information.
    * @return a connection against the data source referred by this object.

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/TableFieldValue.java

@@ -123,9 +123,9 @@ public void update(final String value) {
     } else if (SqlTypes.isBoolean(this.type)) {
       this.value = StringUtil.getBooleanValue(value);
     } else if (SqlTypes.isBigInteger(this.type)) {
-      this.value = BigInteger.valueOf(Long.valueOf(value));
+      this.value = BigInteger.valueOf(Long.parseLong(value));
     } else if (SqlTypes.isDecimal(this.type)) {
-      this.value = BigDecimal.valueOf(Double.valueOf(value));
+      this.value = BigDecimal.valueOf(Double.parseDouble(value));
     } else if (SqlTypes.isInteger(this.type)) {
       this.value = Integer.valueOf(value);
     } else if (SqlTypes.isFloat(this.type)) {
@@ -172,7 +172,8 @@ public int compareTo(final TableFieldValue o) {
     final int compare;
     if (o.value == null && this.value == null) {
       compare = 0;
-    } else if (this.value instanceof Comparable) {
+    } else if (o.value != null && this.value instanceof Comparable) {
+      //noinspection unchecked,rawtypes
       compare = ((Comparable) this.value).compareTo(o.value);
     } else if (o.value == null) {
       return 1;

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/TableRow.java

@@ -24,10 +24,8 @@
 
 package org.silverpeas.components.mydb.model;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -49,14 +47,6 @@ public TableRow(final Map<String, TableFieldValue> fields) {
     this.fields = fields;
   }
 
-  /**
-   * Gets the name of all the fields in this table row.
-   * @return a list with the name of all of the fields in this table row.
-   */
-  public List<String> getFieldNames() {
-    return new ArrayList<>(fields.keySet());
-  }
-
   /**
    * Gets all the fields of this table row.
    * @return a {@link Map} between a field name and its value.

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/AbstractColumnValuePredicate.java

@@ -36,7 +36,6 @@ public abstract class AbstractColumnValuePredicate implements ColumnValuePredica
   public static final String NULL_VALUE = "null";
   public static final String EMPTY_VALUE = "@empty@";
   private DbColumn column;
-  private String value;
   private Object normalizedValue;
 
   /**
@@ -47,7 +46,6 @@ public abstract class AbstractColumnValuePredicate implements ColumnValuePredica
    */
   public AbstractColumnValuePredicate(final DbColumn column, final String refValue) {
     this.column = column;
-    this.value = refValue;
     this.normalizedValue = normalizeValue(column, refValue);
   }
 
@@ -80,11 +78,6 @@ public DbColumn getColumn() {
     return this.column;
   }
 
-  @Override
-  public Comparable getReferenceValue() {
-    return this.value;
-  }
-
   public abstract JdbcSqlQuery apply(final JdbcSqlQuery query);
 }
 

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/ColumnValuePredicate.java

@@ -39,11 +39,5 @@ public interface ColumnValuePredicate {
    */
   DbColumn getColumn();
 
-  /**
-   * Gets the value with which all the column's values will be compared when playing the predicate.
-   * @return a {@link Comparable} value.
-   */
-  Comparable getReferenceValue();
-
 }
 

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Identity.java

@@ -28,7 +28,7 @@
 import org.silverpeas.core.persistence.jdbc.sql.JdbcSqlQuery;
 
 /**
- * Identity predicate. Similar to an empty predicate as it is always true: the columns'value is
+ * Identity predicate. Similar to an empty predicate as it is always true: the column value is
  * compared with itself (identity).
  * @author mmoquillon
  */

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBConnectionInfoService.java

@@ -37,13 +37,10 @@ static MyDBConnectionInfoService get() {
 
   List<MyDBConnectionInfo> getConnectionInfoList(String instanceId);
 
-  void removeConnectionInfo(MyDBConnectionInfo connectionInfo);
-
   void removeConnectionInfoOfComponentInstance(String componentInstanceId);
 
-  MyDBConnectionInfo getConnectionInfo(String id);
 
-  MyDBConnectionInfo saveConnectionInfo(MyDBConnectionInfo connectionInfo);
+  void saveConnectionInfo(MyDBConnectionInfo connectionInfo);
 
   List<DataSourceDefinition> getAllDataSourceDefinitions();
 

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBException.java

@@ -35,10 +35,6 @@ public MyDBException(final String message, final String... parameters) {
     super(message, parameters);
   }
 
-  public MyDBException(final String message, final Throwable cause) {
-    super(message, cause);
-  }
-
   public MyDBException(final Throwable cause) {
     super(cause);
   }

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBRuntimeException.java

@@ -36,10 +36,6 @@ public MyDBRuntimeException(final String message) {
     super(message);
   }
 
-  public MyDBRuntimeException(final String message, final Throwable cause) {
-    super(message, cause);
-  }
-
   public MyDBRuntimeException(final Throwable cause) {
     super(cause);
   }

mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/impl/SimpleMyDBConnectionInfoService.java

@@ -52,25 +52,15 @@ public List<MyDBConnectionInfo> getConnectionInfoList(final String instanceId) {
     return repository.findByInstanceId(instanceId);
   }
 
-  @Override
-  public void removeConnectionInfo(final MyDBConnectionInfo connectionInfo) {
-    repository.delete(connectionInfo);
-  }
-
   @Override
   public void removeConnectionInfoOfComponentInstance(final String componentInstanceId) {
     repository.deleteByInstanceId(componentInstanceId);
   }
 
   @Override
-  public MyDBConnectionInfo getConnectionInfo(final String id) {
-    return repository.getById(id);
-  }
-
-  @Override
-  public MyDBConnectionInfo saveConnectionInfo(
+  public void saveConnectionInfo(
       final MyDBConnectionInfo connectionInfo) {
-    return repository.save(connectionInfo);
+    repository.save(connectionInfo);
   }
 
   @Override

mydb/mydb-library/src/main/resources/META-INF/beans.xml

@@ -4,5 +4,5 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
                       http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
-    bean-discovery-mode="all">
+    bean-discovery-mode="annotated">
 </beans>

mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/MyDBMessageManager.java

@@ -52,10 +52,12 @@ private MyDBMessageManager() {
     // internal initialization
   }
 
+  @SuppressWarnings("unused")
   public boolean isError() {
     return error != null && isDefined(error.getFirst());
   }
 
+  @SuppressWarnings("unused")
   public Pair<String, String> getError() {
     return error;
   }