Changeset 6780 for extensions/net.sf.basedb.relax/trunk

Timestamp:

Jun 17, 2022, 1:38:12 PM (16 months ago)

Author:

Nicklas Nordborg

Message:

Fixes #1401: Update to Open Grid/Job? scheduler 1.6

Location:

extensions/net.sf.basedb.relax/trunk

Files:

• README (modified) (1 diff)
• lib/opengrid.jar (modified) (previous)
• src/net/sf/basedb/relax/plugins/ReleaseImporterPlugin.java (modified) (6 diffs)

extensions/net.sf.basedb.relax/trunk/README

@@ -3 +3 @@
  1. BASE 3.19 or later.
  2. Java 11 or later.
- 3. Open Grid Scheduler extension 1.3 must be installed.
+ 3. Job Scheduler extension 1.6 must be installed.
  4. External files extension 1.5 must be installed.
 

extensions/net.sf.basedb.relax/trunk/src/net/sf/basedb/relax/plugins/ReleaseImporterPlugin.java

@@ -65 +65 @@
 import net.sf.basedb.core.Type;
 import net.sf.basedb.core.Unit;
+import net.sf.basedb.core.Annotation.Source;
 import net.sf.basedb.core.Job.ExecutionTime;
 import net.sf.basedb.core.MultiPermissions;
@@ -612 +613 @@
   private Map<String, AnnotationTypeCategory> categories;
   private Map<String, AnnotationType> annotationTypes;
+  private Map<String, Set<Integer>> projectsWithAnnotationType;
   private Map<String, Map<String, ?>> lookups;
   private Set<String> newAnnotationTypes;
@@ -642 +644 @@
     lookups = new HashMap<>();
     newAnnotationTypes = new HashSet<>();
+    projectsWithAnnotationType = new HashMap<>();
     fileTypes = new HashMap<>();
     namedItems = new HashMap<>();
@@ -847 +850 @@
       for (AnnotationType at : annotationTypes.values())
       {
-        if (at.getProjectKey().getProjectIds(Permission.READ).size() == 1)
+        Set<Integer> inProjects = at.getProjectKey().getProjectIds(Permission.READ);
+        projectsWithAnnotationType.put(at.getName(), inProjects);
+        if (inProjects.size() == 1)
         {
           newAnnotationTypes.add(at.getName());
@@ -952 +957 @@
                 Object aValue = jsonAnnotation.get("value");
                 Map<String, ?> indexLookup = lookups.get(aName);
-                if (indexLookup != null)
+                if (aValue != null)
                 {
-                  aValue = indexLookup.get((String)aValue);
-                }
-                Type valueType = at.getValueType();
-                if (valueType == Type.DATE)
-                {
-                  aValue = dateFormat.convert((String)aValue);
-                }
-                else if (valueType == Type.TIMESTAMP)
-                {
-                  aValue = dateTimeFormat.convert((String)aValue);
-                }
-                else if (valueType.isNumerical())
-                {
-                  aValue = valueType.convertNumber((Number)aValue);
+                  if (indexLookup != null)
+                  {
+                    aValue = indexLookup.get((String)aValue);
+                  }
+                  Type valueType = at.getValueType();
+                  if (valueType == Type.DATE)
+                  {
+                    aValue = dateFormat.convert((String)aValue);
+                  }
+                  else if (valueType == Type.TIMESTAMP)
+                  {
+                    aValue = dateTimeFormat.convert((String)aValue);
+                  }
+                  else if (valueType.isNumerical())
+                  {
+                    aValue = valueType.convertNumber((Number)aValue);
+                  }
                 }
                 
@@ -985 +993 @@
                 else
                 {
-                  if ((isNewItem || isNewAnnotationType) && projectAnnotations)
+                  if (aValue == null)
+                  {
+                    // If there is no value for a project-specific annotation we
+                    // may have to convert an existing default annotation to
+                    // project-specific annotations for all releases the current
+                    // item is part of that doesn't have a project-specific value already
+                    log("   Annotation with null: "+aName);
+                    if (projectAnnotations && !isNewItem & !isNewAnnotationType && aSet.hasProjectAnnotation(at, Source.PRIMARY, null))
+                    {
+                      //log("    Annotation " + (isNew ? "created" : "updated") + ": " + aName + (a.getProjectId() !=0 ? " (project-specific)" : "" ));
+                      Annotation aDefault = aSet.getProjectAnnotation(at, null);
+                      List<?> defaultValues = aDefault.getValues();
+                      aSet.removeProjectAnnotation(at, null);
+                      log("    Annotation removed: " + aName + " (project-default)");
+                      Set<Integer> itemProjects = ((SharedItem)aItem).getProjectKey().getProjectIds(Permission.READ);
+                      Set<Integer> annotationProjects = projectsWithAnnotationType.get(aName);
+                      //itemProjects.retainAll(projectsWithAnnotationType.get(aName));
+                      for (int pid : itemProjects)
+                      {
+                        Project p = Project.getById(dc, pid);
+                        if (annotationProjects.contains(pid) && pid != currentProject.getId())
+                        {
+                          Annotation aProject = aSet.getProjectAnnotation(at, p);
+                          if (!aProject.isInDatabase())
+                          {
+                            aProject.setValuesIfDifferent(defaultValues, null);
+                            log("    Annotation created: " + aName + " (project-specific: " + p.getName() + ")");
+                          }
+                        }
+                        else
+                        {
+                          log("    Annotation not copied: " + aName + " (project-specific: " + p.getName() + ")");
+                        }
+                      }
+                    }
+                  }
+                  else if ((isNewItem || isNewAnnotationType) && projectAnnotations)
                   {
                     // Always set default value