Move RPSL classes in a dedicated module

Author: bchapuis

baremaps-core/pom.xml

@@ -46,10 +46,6 @@ limitations under the License.
       <groupId>it.unimi.dsi</groupId>
       <artifactId>fastutil</artifactId>
     </dependency>
-    <dependency>
-      <groupId>net.ripe.ipresource</groupId>
-      <artifactId>ipresource</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.baremaps</groupId>
       <artifactId>baremaps-csv</artifactId>
@@ -90,6 +86,10 @@ limitations under the License.
       <groupId>org.apache.baremaps</groupId>
       <artifactId>baremaps-postgres</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.baremaps</groupId>
+      <artifactId>baremaps-rpsl</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.baremaps</groupId>
       <artifactId>baremaps-shapefile</artifactId>

baremaps-core/src/main/java/org/apache/baremaps/iploc/IpLocMapper.java

@@ -28,6 +28,8 @@
 import java.util.regex.Pattern;
 import net.ripe.ipresource.IpResourceRange;
 import org.apache.baremaps.geocoder.geonames.GeonamesQueryBuilder;
+import org.apache.baremaps.rpsl.RpslObject;
+import org.apache.baremaps.rpsl.RpslUtils;
 import org.apache.baremaps.utils.IsoCountriesUtils;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.SearcherManager;
@@ -36,7 +38,7 @@
 import org.slf4j.LoggerFactory;
 
 /** Generating pairs of IP address ranges and their locations into an SQLite database */
-public class IpLocMapper implements Function<NicObject, Optional<IpLocObject>> {
+public class IpLocMapper implements Function<RpslObject, Optional<IpLocObject>> {
 
   private static final Logger logger = LoggerFactory.getLogger(IpLocMapper.class);
 
@@ -64,13 +66,13 @@ public IpLocMapper(SearcherManager searcherManager) {
    */
   @Override
   @SuppressWarnings({"squid:S3776", "squid:S1192"})
-  public Optional<IpLocObject> apply(NicObject nicObject) {
+  public Optional<IpLocObject> apply(RpslObject nicObject) {
     try {
       if (nicObject.attributes().isEmpty()) {
         return Optional.empty();
       }
 
-      if (!NicUtils.isInetnum(nicObject)) {
+      if (!RpslUtils.isInetnum(nicObject)) {
         return Optional.empty();
       }
 
@@ -80,7 +82,7 @@ public Optional<IpLocObject> apply(NicObject nicObject) {
       var end = InetAddresses.forString(ipRange.getEnd().toString());
       var inetRange = new InetRange(start, end);
 
-      var attributes = nicObject.toMap();
+      var attributes = nicObject.asMap();
 
       // Use a default name if there is no netname
       var network = attributes.getOrDefault("netname", "unknown");

baremaps-core/src/main/java/org/apache/baremaps/iploc/IpLocObject.java

@@ -28,9 +28,7 @@ public record IpLocObject(
     Coordinate coordinate,
     String network,
     String country,
-
     String source,
-
     IpLocPrecision precision) {
 
 }

baremaps-core/src/main/java/org/apache/baremaps/iploc/IpLocReader.java

@@ -20,6 +20,7 @@
 import java.io.InputStream;
 import java.util.Optional;
 import java.util.stream.Stream;
+import org.apache.baremaps.rpsl.RpslReader;
 import org.apache.lucene.search.SearcherManager;
 
 /** A reader for IP location data. */
@@ -44,7 +45,7 @@ public IpLocReader(SearcherManager searcherManager) {
    * @return a {@link Stream} of IP location objects
    */
   public Stream<IpLocObject> read(InputStream inputStream) {
-    var nicReader = new NicReader();
+    var nicReader = new RpslReader();
     return nicReader.read(inputStream)
         .map(new IpLocMapper(searcherManager))
         .filter(Optional::isPresent)

baremaps-core/src/main/java/org/apache/baremaps/iploc/NicAttribute.java

@@ -28,6 +28,8 @@
 import java.util.List;
 import java.util.Optional;
 import net.ripe.ipresource.IpResourceRange;
+import org.apache.baremaps.rpsl.RpslObject;
+import org.apache.baremaps.rpsl.RpslReader;
 import org.apache.baremaps.tasks.CreateGeonamesIndex;
 import org.apache.baremaps.testing.TestFiles;
 import org.apache.baremaps.utils.FileUtils;
@@ -49,7 +51,7 @@
  */
 class IpLocObjectTest {
 
-  private static List<NicObject> nicObjects;
+  private static List<RpslObject> nicObjects;
   private static IpLocMapper ipLocMapper;
   private static List<IpLocObject> ipLocObjects;
   private static IpLocRepository iplocRepository;
@@ -59,7 +61,10 @@ class IpLocObjectTest {
   @BeforeAll
   public static void beforeAll() throws Exception {
     // Load the NIC sample objects
-    nicObjects = NicData.sample("baremaps-testing/data/ripe/sample.txt");
+    var file = TestFiles.resolve("baremaps-testing/data/ripe/sample.txt");
+    try (var input = Files.newInputStream(file)) {
+      nicObjects = new RpslReader().read(input).toList();
+    }
 
     // Init the geocoder service
     directory = Files.createTempDirectory(Paths.get("."), "geocoder_");

baremaps-core/src/main/java/org/apache/baremaps/iploc/NicSpliterator.java

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.baremaps</groupId>
+    <artifactId>baremaps</artifactId>
+    <version>0.7.4-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>baremaps-rpsl</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>net.ripe.ipresource</groupId>
+      <artifactId>ipresource</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.baremaps</groupId>
+      <artifactId>baremaps-testing</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

baremaps-core/src/test/java/org/apache/baremaps/iploc/IpLocObjectTest.java

@@ -15,23 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.iploc;
+package org.apache.baremaps.rpsl;
 
+/**
+ * Represents a RPSL attribute.
+ */
+public record RpslAttribute(String name, String value) {
 
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.List;
-import org.apache.baremaps.testing.TestFiles;
-
-public class NicData {
-
-  private static final String SAMPLE = "sample.txt";
-
-  public static List<NicObject> sample(String resource) throws IOException {
-    try (InputStream input = Files.newInputStream(TestFiles.resolve(resource))) {
-      return new NicReader().read(input).toList();
-    }
-  }
 }