[Core] Fix to properly delete old FOIs

Author: alexrobin

sensorhub-core/src/main/java/org/sensorhub/impl/database/system/MaxAgeAutoPurgePolicy.java

@@ -64,8 +64,10 @@ public void trimStorage(IObsSystemDatabase db, Logger log, Collection<String> sy
                 .withOperator(RangeOp.CONTAINS)
                 .withRange(Instant.MIN, oldestRecordTime)
                 .build())
-            .withUniqueIDs(systemUIDs)
-            .includeMembers(true)
+            .withParents(new SystemFilter.Builder()
+                .withUniqueIDs(systemUIDs)
+                .includeMembers(true)
+                .build())
             .build());
 
         long numFoisRemoved = db.getFoiStore().removeEntries(new FoiFilter.Builder()
@@ -83,9 +85,9 @@ public void trimStorage(IObsSystemDatabase db, Logger log, Collection<String> sy
                 .withRange(Instant.MIN, oldestRecordTime)
                 .build())
             .withSystems(new SystemFilter.Builder()
-                    .withUniqueIDs(systemUIDs)
-                    .includeMembers(true)
-                    .build())
+                .withUniqueIDs(systemUIDs)
+                .includeMembers(true)
+                .build())
             .build());
 
         long numCsRemoved = db.getCommandStreamStore().removeEntries(new CommandStreamFilter.Builder()
@@ -94,9 +96,9 @@ public void trimStorage(IObsSystemDatabase db, Logger log, Collection<String> sy
                 .withRange(Instant.MIN, oldestRecordTime)
                 .build())
             .withSystems(new SystemFilter.Builder()
-                    .withUniqueIDs(systemUIDs)
-                    .includeMembers(true)
-                    .build())
+                .withUniqueIDs(systemUIDs)
+                .includeMembers(true)
+                .build())
             .build());
 
         // for each remaining datastream, remove all obs with a timestamp older than