Changeset 7122

Timestamp:

Apr 19, 2016, 1:00:41 PM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #2000: Batch API for annotation handling

Check that annotation values are valid as specified by the annotation type.

Added support for units.

File:

• trunk/src/core/net/sf/basedb/core/AnnotationBatcher.java (modified) (9 diffs)

trunk/src/core/net/sf/basedb/core/AnnotationBatcher.java

@@ -39 +39 @@
 import net.sf.basedb.core.snapshot.SnapshotManager;
 import net.sf.basedb.util.EqualsHelper;
+import net.sf.basedb.util.units.UnitConverter;
 
 /**
@@ -334 +335 @@
       
       CurrentAnnotationInfo info = new CurrentAnnotationInfo(at);
-//      info.id = at.getId();
-//      info.valueType = at.getValueType();
       currentInfo.put(at.getId(), info);
     }
@@ -511 +510 @@
       else
       {
+        // Check that values are allowed by annotation type
+        // and convert to the default unit if it is needed
+        UnitConverter converter = null;
+        if (unit != null && info.defaultUnit != null && !unit.equals(info.defaultUnit))
+        {
+          // Two different unit, convert the values to the default unit
+          converter = info.defaultUnit.getUnitConverter(unit);
+        }
+        
+        List<Object> convertedValues = new ArrayList<Object>(values.size());
+        for (Object value : values)
+        {
+          if (value instanceof Number)
+          {
+            Number numericValue = (Number)value;
+            if (converter != null) 
+            {
+              numericValue = converter.convertToSpecificUnit(numericValue.doubleValue());
+            }
+            value = info.valueType.convertNumber(numericValue);
+          }
+          annotationType.validateAnnotationValue(value);
+          convertedValues.add(value);
+        }
+        
         if (infoIsForCurrentItem)
         {
           // Update the current annotation if the value(s) have changed
-          if (!EqualsHelper.invariantEquals(values, info.values))
+          if (!EqualsHelper.invariantEquals(convertedValues, info.values))
           {
             // Update
@@ -523 +547 @@
             
             // Insert into **Values
-            for (Object v : values)
+            for (Object v : convertedValues)
             {
               insertValues[info.valueType.ordinal()].addToBatch(info.valueId, v);
@@ -529 +553 @@
             
             // Update last_update, unit, version in Annotations
-            updateAnnotations.addToBatch(info.version+1, info.unitId, batchDate, info.annotationId, info.version);
+            updateAnnotations.addToBatch(info.version+1, unit != null ? unit.getId() : info.unitId, batchDate, info.annotationId, info.version);
           }
         }
@@ -541 +565 @@
           
           // Insert into **Values
-          for (Object v : values)
+          for (Object v : convertedValues)
           {
             insertValues[info.valueType.ordinal()].addToBatch(valueId, v);
@@ -579 +603 @@
   }
   
+  /**
+    A flag indicating what type of change that was made to an
+    annotation as a result of calling
+    {@link AnnotationBatcher#setValues(AnnotationType, List, Unit)}
+  */
   public static enum Change
   {
+    /**
+      The annotation was not changed.
+    */
     NO_CHANGE,
+    
+    /**
+      A new annotation was created.
+    */
     ADDED,
+    
+    /**
+      An existing annotation was updated.
+    */
     UPDATED,
+    
+    /**
+      An existing annotation was deleted.
+    */
     DELETED;
   }
-  
-  /**
-    Holds information about an annotation type.
-  */
-  /*
-  static class AnnotationTypeInfo
-  {
-    int id;
-    Type valueType;
-  }
-  */
   
   /**
@@ -614 +647 @@
     final int annotationTypeId;
     final Type valueType;
+    final Unit defaultUnit;
     
     // Updated in setCurrentItem
@@ -625 +659 @@
     final List<Object> values;
     
-    public CurrentAnnotationInfo(AnnotationType at)
+    CurrentAnnotationInfo(AnnotationType at)
     {
       this.annotationTypeId = at.getId();
       this.valueType = at.getValueType();
+      this.defaultUnit = at.getDefaultUnit();
       this.values = new ArrayList<Object>();
     }