Changeset 7489

Timestamp:

May 28, 2018, 11:13:22 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2120: Can't filter with multiple values on inherited annotations

A method that was deprecated in 3.11 [7340] never got a proper replacement.

File:

• branches/3.12-stable/src/core/net/sf/basedb/core/AnnotationSimpleRestriction.java (modified) (2 diffs)

branches/3.12-stable/src/core/net/sf/basedb/core/AnnotationSimpleRestriction.java

@@ -113 +113 @@
   
   /**
+    Creates a new annotation restriction for a specific <code>valueType</code>.
+    The restriction is with a list of values.
+    
+    @param alias The alias of a joined item where the annotations are
+      located or null to use the root entity of the query
+    @param annotationType The annotation type to use in the query
+      @param operator The operator, it must be one of the expression
+      operators, EQ, NEQ, etc., not a boolean operator, AND, OR, etc.
+      @param values The list of values that should be used in the query, they must be of the 
+      correct value type for the annotation as defined by the 
+      {@link AnnotationType#getValueType()} property.
+    @param options Options that specify which annotations to consider when searching
+      @throws InvalidDataException If any of the parameters are null
+      or not follow the rules above
+    @since 3.12.3
+  */
+  public AnnotationSimpleRestriction(String alias, AnnotationType annotationType, Operator operator, List<Object> values, 
+    Options options)
+    throws InvalidDataException
+  {
+    super(alias, annotationType, options);
+    if (operator == null) throw new InvalidUseOfNullException("operator");
+    if (values == null) throw new InvalidUseOfNullException("values");
+    if (!operator.isExpressionOperator())
+    {
+      throw new InvalidDataException("Invalid operator for expression: "+operator);
+    }
+    for (Object obj : values)
+    {
+      if (obj != null && !valueType.isCorrectType(obj) && !(valueType.isNumerical() && obj instanceof Number))
+      {
+        throw new InvalidDataException("Value '"+obj+"' is a "+
+          obj.getClass()+", not a "+valueType);
+      }
+    }
+    this.operator = operator;
+    this.value = null;
+    this.values = values;
+  }
+
+  
+  /**
     @since 2.4
     @deprecated in 3.5; Use {@link #AnnotationSimpleRestriction(String, int, Type, Operator, Object, boolean, boolean)} instead
@@ -163 +205 @@
   /**
     @since 3.5
-    @deprecated In 3.11, use {@link #AnnotationSimpleRestriction(String, AnnotationType, Operator, Object, AnnotationRestriction.Options)} instead
+    @deprecated In 3.11, use {@link #AnnotationSimpleRestriction(String, AnnotationType, Operator, List, AnnotationRestriction.Options)} instead
   */
   @Deprecated