Changeset 6733

Timestamp:

Feb 13, 2015, 12:55:05 PM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #1910: Disable annotation inheritance for annotation types

Do not return annotations for annotation types with inheritance disabled when using the SnapshotManager to find inherited annotations. This is needed when inheriting an annotation set, since all annotations would otherwise be included.

Location:

trunk/src/core/net/sf/basedb/core

Files:

• AnnotationType.java (modified) (1 diff)
• snapshot/DisabledInheritanceFilter.java (added)
• snapshot/SnapshotManager.java (modified) (3 diffs)

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

@@ -144 +144 @@
   }
 
+  /**
+    Load the IDs of all annotation types with the disable inheritance flag set.
+    This method will return all such IDs without checking permissions of the 
+    current user. The returned set is not modifiable.
+    @since 3.5
+  */
+  public static Set<Integer> getAllAnnotationTypesWithInheritanceDisabled(DbControl dc)
+  {
+    org.hibernate.Query query = HibernateUtil.createQuery(dc.getHibernateSession(), 
+      "SELECT at.id FROM AnnotationTypeData at WHERE at.disableInheritance=true");
+    return Collections.unmodifiableSet(new HashSet<Integer>(HibernateUtil.loadList(Integer.class, query, dc.getSessionControl())));
+  }
+  
   AnnotationType(AnnotationTypeData annotationTypeData)
   {

trunk/src/core/net/sf/basedb/core/snapshot/SnapshotManager.java

@@ -51 +51 @@
 
   private final Map<Integer, AnnotationSetSnapshot> snapshots;
+  private DisabledInheritanceFilter disabledInheritanceFilter;
   
   /**
@@ -164 +165 @@
     
     if (filter == null) filter = new StaticFilter<AnnotationSnapshot>(true);
+
     // Needed for recursive searching of inherited annotations
-    AnnotationFilter annotationFilter = new AnnotationFilter();
+    AnnotationFilter annotationFilter = null;
+    DisabledInheritanceFilter recursiveFilter = null;
+    if (searchInherited)
+    {
+      if (disabledInheritanceFilter == null) disabledInheritanceFilter = new DisabledInheritanceFilter(dc);
+      recursiveFilter = new DisabledInheritanceFilter(disabledInheritanceFilter);
+      annotationFilter = new AnnotationFilter();
+    }
     
     for (AnnotationSnapshot shot : snapshot.getAnnotations())
@@ -181 +190 @@
           if (recursive != null)
           {
-            Filter<? super AnnotationSnapshot> recursiveFilter = filter;
             if (annotationId != 0) 
             {
               // The main filter has already matched this annotation
               // Use the recursive filter to load the specific annotation only
-              recursiveFilter = annotationFilter;
               annotationFilter.setAnnotationId(annotationId);
+              recursiveFilter.setParentFilter(annotationFilter);
             }
+            else
+            {
+              recursiveFilter.setParentFilter(filter);
+            }
+            
             for (AnnotationSnapshot primary : findAnnotations(dc, recursive, recursiveFilter, false))
             {