Merge pull request #45 from OwnYourData/disable-multi-attribute-definition

Throw exception if attribute is defined by multiple objects

Author: paul2803-byte

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

@@ -19,9 +19,7 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 @Service
 public class ConfigurationService {
@@ -48,12 +46,7 @@ public static Map<Resource, Map<Property, Configuration>> fetchConfigForObjects(
     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()) {
-                 if (flatConfig.containsKey(entry.getKey())) {
-                     throw new OntologyException("Duplicate Property key found in Flat Ontology: " + entry.getKey());
-                 }
-                 flatConfig.put(entry.getKey(), entry.getValue());
-             }
+             flatConfig.putAll(configMap);
          }
          return flatConfig;
     }
@@ -107,8 +100,15 @@ private static String fetchStringContent(String url) {
     @NotNull
     private static Map<Resource, Map<Property, Configuration>> extractConfig(Model model) {
         Map<Resource, Map<Property, Configuration>> configs = new HashMap<>();
+        Set<Property> properties = new HashSet<>();
         logger.info("Extracting configuration from server response");
         QueryService.getConfigurations(model).forEach(entry -> {
+            if (properties.contains(entry.property())) {
+                throw new OntologyException(
+                        "Duplicate Property key found in Ontology: " + entry.property().toString()
+                );
+            }
+            properties.add(entry.property());
             if (!configs.containsKey(entry.object())) {
                 configs.put(entry.object(), new HashMap<>());
             }