Merge pull request #36 from OwnYourData/bugfix_numeric_generalization

Comparison for numeric generation adapted

Author: paul2803-byte

src/main/java/com/example/anonymization/service/AnonymizationService.java

@@ -45,7 +45,6 @@ public static ResponseEntity<String> applyAnonymization(AnonymizationJsonLDReque
     public static ResponseEntity<String> applyAnonymizationFlatJson(
             AnonymizationFlatJsonRequestDto request
     ) throws JsonProcessingException {
-        Map<Property, Configuration> configs = ConfigurationService.fetchFlatConfig(request.getConfigurationUrl());
         Model model = ModelFactory.createDefaultModel();
         FaltJsonService.addDataToFlatModel(model, request.getData(), request.getPrefix());
         Map<Resource, Map<Property, Configuration>> anonymizationObjects =
@@ -55,7 +54,7 @@ public static ResponseEntity<String> applyAnonymizationFlatJson(
         );
         String out = FaltJsonService.createFlatJsonOutput(
                 model,
-                configs,
+                ConfigurationService.createFlatConfig(anonymizationObjects),
                 anonymizationObjects.keySet(),
                 request.getPrefix()
         );

src/main/java/com/example/anonymization/service/ConfigurationService.java

@@ -40,13 +40,12 @@ public static Map<Resource, Map<Property, Configuration>> fetchConfigForObjects(
     }
 
     /**
-     * Fetches the configuration from the given URL and extracts it into a flat map.
-     * @param url The URL to fetch the configuration from.
+     * Creates a flat configuration from anonymization objects
+     * @param configs The map of anonymization objects to their configurations
      * @return A flat map where the key is the Property and the value is its Configuration.
      */
     @NotNull
-    public static Map<Property, Configuration> fetchFlatConfig(String url) {
-         Map<Resource, Map<Property, Configuration>> configs = fetchConfigForObjects(url);
+    public static Map<Property, Configuration> createFlatConfig(Map<Resource, Map<Property, Configuration>> configs) {
          Map<Property, Configuration> flatConfig = new HashMap<>();
          for (Map<Property, Configuration> configMap : configs.values()) {
              for (Map.Entry<Property, Configuration> entry : configMap.entrySet()) {

src/main/java/com/example/anonymization/service/anonymizer/GeneralizationNumeric.java

@@ -4,6 +4,7 @@
 import org.apache.jena.atlas.lib.Pair;
 import org.apache.jena.rdf.model.*;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -25,7 +26,7 @@ protected List<Pair<Resource, Double>> getSortedValues(Map<Resource, RDFNode> da
         try {
             return data.entrySet().stream()
                     .map(e -> new Pair<>(e.getKey(), e.getValue().asLiteral().getDouble()))
-                    .sorted((e1, e2) -> (int) (e1.getRight() - e2.getRight()))
+                    .sorted(Comparator.comparingDouble(Pair::getRight))
                     .toList();
         } catch (Exception e) {
             throw new IllegalArgumentException("Error while parsing numeric values for generalization.", e);