Schedule ROA load each 15 minutes

whois-commons/src/main/java/net/ripe/db/whois/common/rpki/RpkiService.java

@@ -2,12 +2,15 @@
 
 import com.google.common.collect.Sets;
 import net.ripe.db.whois.common.collect.CollectionHelper;
+import net.ripe.db.whois.common.etree.IntervalMap;
 import net.ripe.db.whois.common.etree.NestedIntervalMap;
+import net.ripe.db.whois.common.etree.SynchronizedIntervalMap;
 import net.ripe.db.whois.common.ip.IpInterval;
 import net.ripe.db.whois.common.ip.Ipv4Resource;
 import net.ripe.db.whois.common.ip.Ipv6Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -20,24 +23,35 @@ public class RpkiService {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RpkiService.class);
 
-    private final NestedIntervalMap<Ipv4Resource, Set<Roa>> ipv4Tree = new NestedIntervalMap<>();
-    private final NestedIntervalMap<Ipv6Resource, Set<Roa>> ipv6Tree = new NestedIntervalMap<>();
+    final IntervalMap<Ipv4Resource, Set<Roa>> ipv4Tree = SynchronizedIntervalMap.synchronizedMap(new NestedIntervalMap<Ipv4Resource, Set<Roa>>());
+    final IntervalMap<Ipv6Resource, Set<Roa>> ipv6Tree = SynchronizedIntervalMap.synchronizedMap(new NestedIntervalMap<Ipv6Resource, Set<Roa>>());
+
+    private final RpkiDataProvider rpkiDataProvider;
 
     public RpkiService(final RpkiDataProvider rpkiDataProvider) {
+        this.rpkiDataProvider = rpkiDataProvider;
+        loadRoas();
+    }
+
+    @Scheduled(cron = "* /15 * * * *")
+    private void loadRoas() {
         final List<Roa> loadedRoas = rpkiDataProvider.loadRoas();
         if (loadedRoas != null && !loadedRoas.isEmpty()){
             final List<Roa> roas = loadedRoas.stream()
                     .filter(roa -> roa.getTrustAnchor() != TrustAnchor.UNSUPPORTED)
                     .collect(Collectors.toList());
 
+            ipv4Tree.clear();
+            ipv6Tree.clear();
+
             LOGGER.info("downloaded {} roas from rpki", roas.size());
             buildTrees(roas, ipv4Tree, ipv6Tree);
         }
     }
 
     private void buildTrees(final List<Roa> roas,
-                            final NestedIntervalMap<Ipv4Resource, Set<Roa>> ipv4Tree,
-                            final NestedIntervalMap<Ipv6Resource, Set<Roa>> ipv6Tree) {
+                            final IntervalMap<Ipv4Resource, Set<Roa>> ipv4Tree,
+                            final IntervalMap<Ipv6Resource, Set<Roa>> ipv6Tree) {
         for (Roa roa : roas) {
             if (isIpv4(roa.getPrefix())) {
                 addRoaToTree(ipv4Tree, Ipv4Resource.parse(roa.getPrefix()), roa);
@@ -47,7 +61,7 @@ private void buildTrees(final List<Roa> roas,
         }
     }
 
-    private <T extends IpInterval<T>> void addRoaToTree(final NestedIntervalMap<T, Set<Roa>> tree,
+    private <T extends IpInterval<T>> void addRoaToTree(final IntervalMap<T, Set<Roa>> tree,
                                                         final T prefix,
                                                         final Roa roa) {
         Set<Roa> roas = CollectionHelper.uniqueResult(tree.findExact(prefix));