From 7d98ea90ec611c00ce6dd970774731cae79e541d Mon Sep 17 00:00:00 2001
From: Jerven Bolleman <jerven.bolleman@sib.swiss>
Date: Mon, 30 Sep 2024 08:37:09 +0200
Subject: [PATCH] Fixer: federation needs to be written out

---
 .../swiss/sib/rdf/sparql/examples/Fixer.java  | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/swiss/sib/rdf/sparql/examples/Fixer.java b/src/main/java/swiss/sib/rdf/sparql/examples/Fixer.java
index 31c7a5f65..000923d8c 100644
--- a/src/main/java/swiss/sib/rdf/sparql/examples/Fixer.java
+++ b/src/main/java/swiss/sib/rdf/sparql/examples/Fixer.java
@@ -75,7 +75,7 @@ public Integer call() {
 		}
 		return 0;
 	}
-	
+
 	public record Fixed(boolean changed, String fixed, String original, Set<String> servicePartners) {
 		public Fixed(boolean changed, String fixed, String original) {
 			this(changed, fixed, original, null);
@@ -191,20 +191,27 @@ static void fix(IRI queryIri, Value query, Path file, Model model, Map<String, S
 			writeFixedModel(file, model);
 			return;
 		}
-		if (!fixedPrefixes.changed() || !fixBlz.changed()) {
-			System.out.println("No change to:" + file);
-		}
+		boolean serviceWithChanged = false;
 		Fixed fixFederatedWith = Federation.fix(fixBlz, queryIriStr);
-		if (fixFederatedWith.servicePartners() != null && !fixFederatedWith.servicePartners().isEmpty()
-				&& !model.filter(queryIri, SIB.FEDERATES_WITH, null).isEmpty()) {
-			boolean removed = model.remove(queryIri, SIB.FEDERATES_WITH, null);
-			for (String fedWith:fixFederatedWith.servicePartners()) {
-				model.add(queryIri, SIB.FEDERATES_WITH, VF.createIRI(fedWith));
+		if (fixFederatedWith.servicePartners() != null && !fixFederatedWith.servicePartners().isEmpty()) {
+			Model filter = model.filter(queryIri, SIB.FEDERATES_WITH, null);
+			if (filter.size() > fixFederatedWith.servicePartners().size()) {
+				model.remove(queryIri, SIB.FEDERATES_WITH, null);
 			}
-			if (removed) {
+			boolean present = true;
+			for (String fedWith : fixFederatedWith.servicePartners()) {
+				if (model.add(queryIri, SIB.FEDERATES_WITH, VF.createIRI(fedWith))) {
+					present = false;
+				}
+			}
+			if (!present) {
 				writeFixedModel(file, model);
+				serviceWithChanged = true;
 			}
 		}
+		if (!fixedPrefixes.changed() && !fixBlz.changed() && !serviceWithChanged) {
+			System.out.println("No change to:" + file);
+		}
 	}
 
 	private static void writeFixedModel(Path file, Model model) {