Fix iplocmapper

Author: bchapuis

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

@@ -86,9 +86,15 @@ public Optional<IpLocObject> apply(RpslObject nicObject) {
 
       // Use a default name if there is no netname
       var network = String.join(", ", attributes.getOrDefault("netname", List.of("unknown")));
-      var geoloc = String.join(", ", attributes.getOrDefault("geoloc", List.of()));
-      var country = String.join(", ", attributes.getOrDefault("country", List.of()));
-      var source = String.join(", ", attributes.getOrDefault("source", List.of()));
+      var geoloc = attributes.containsKey("geoloc")
+          ? String.join(", ", attributes.getOrDefault("geoloc", List.of()))
+          : null;
+      var country = attributes.containsKey("country")
+          ? String.join(", ", attributes.getOrDefault("country", List.of()))
+          : null;
+      var source = attributes.containsKey("source")
+          ? String.join(", ", attributes.getOrDefault("source", List.of()))
+          : null;
 
       // If there is a geoloc field, we use the latitude and longitude provided
       if (attributes.containsKey("geoloc")) {
@@ -115,8 +121,10 @@ public Optional<IpLocObject> apply(RpslObject nicObject) {
         // build a query text string out of the cherry-picked fields
         var queryTextBuilder = new StringBuilder();
         for (String field : searchedFields) {
-          var fieldValue = String.join(", ", attributes.get(field));
-          if (!Strings.isNullOrEmpty(fieldValue)) {
+          var value = attributes.containsKey(field)
+              ? String.join(", ", attributes.getOrDefault(field, List.of()))
+              : null;
+          if (!Strings.isNullOrEmpty(value)) {
             queryTextBuilder.append(attributes.get(field)).append(" ");
           }
         }

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

@@ -51,7 +51,7 @@
  */
 class IpLocObjectTest {
 
-  private static List<RpslObject> nicObjects;
+  private static List<RpslObject> rpslObjects;
   private static IpLocMapper ipLocMapper;
   private static List<IpLocObject> ipLocObjects;
   private static IpLocRepository iplocRepository;
@@ -63,7 +63,7 @@ public static void beforeAll() throws Exception {
     // Load the NIC sample objects
     var file = TestFiles.resolve("baremaps-testing/data/ripe/sample.txt");
     try (var input = Files.newInputStream(file)) {
-      nicObjects = new RpslReader().read(input).toList();
+      rpslObjects = new RpslReader().read(input).toList();
     }
 
     // Init the geocoder service
@@ -78,7 +78,7 @@ public static void beforeAll() throws Exception {
     var dir = FSDirectory.open(directory);
     var searcherManager = new SearcherManager(dir, new SearcherFactory());
     ipLocMapper = new IpLocMapper(searcherManager);
-    ipLocObjects = nicObjects.stream()
+    ipLocObjects = rpslObjects.stream()
         .map(ipLocMapper)
         .filter(Optional::isPresent)
         .map(Optional::get)