Replace origin with editor in rewrites.
See discussions in #782
Change-Id: Ie7b6e2b1a01288c56f3c33e31f1317647bd147d2
diff --git a/Changes b/Changes
index ce0baaf..ddf3b85 100644
--- a/Changes
+++ b/Changes
@@ -14,6 +14,7 @@
- Rename CollectionRewrite to AvailabilityRewrite
- Improve AvailabilityRewrite and implement operation:override (#781)
- Disabled mysql connector Java due to CVE-2023-22102
+- Replace origin with editor in rewrites (#782)
# version 0.75
diff --git a/src/main/java/de/ids_mannheim/korap/rewrite/KoralNode.java b/src/main/java/de/ids_mannheim/korap/rewrite/KoralNode.java
index 0de662c..bbc9cd2 100644
--- a/src/main/java/de/ids_mannheim/korap/rewrite/KoralNode.java
+++ b/src/main/java/de/ids_mannheim/korap/rewrite/KoralNode.java
@@ -284,7 +284,7 @@
this.map = new LinkedHashMap<>();
this.map.put("@type", "koral:rewrite");
this.map.put("src", "Kustvakt");
- this.map.put("origin", "Kustvakt");
+ this.map.put("editor", "Kustvakt");
}
public void setOperation (String op) {
diff --git a/src/test/java/de/ids_mannheim/korap/rewrite/QueryContextRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/QueryContextRewriteTest.java
index 3ee6feb..ccf6f1c 100644
--- a/src/test/java/de/ids_mannheim/korap/rewrite/QueryContextRewriteTest.java
+++ b/src/test/java/de/ids_mannheim/korap/rewrite/QueryContextRewriteTest.java
@@ -69,7 +69,7 @@
assertEquals(40, context.at("/right/1").asInt());
assertEquals("koral:rewrite", context.at("/rewrites/0/@type").asText());
- assertEquals("Kustvakt", context.at("/rewrites/0/origin").asText());
+ assertEquals("Kustvakt", context.at("/rewrites/0/editor").asText());
assertEquals("operation:override", context.at("/rewrites/0/operation").asText());
assertEquals("left", context.at("/rewrites/0/scope").asText());
assertEquals("token", context.at("/rewrites/0/source/0").asText());
diff --git a/src/test/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewriteTest.java
index 1fe9089..c40811f 100644
--- a/src/test/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewriteTest.java
+++ b/src/test/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewriteTest.java
@@ -40,7 +40,7 @@
JsonNode node = JsonUtils.readTree(ent);
node = node.at("/query/operands/1/rewrites");
assertEquals(1, node.size());
- assertEquals("Kustvakt", node.at("/0/origin").asText());
+ assertEquals("Kustvakt", node.at("/0/editor").asText());
assertEquals("operation:override", node.at("/0/operation").asText());
assertEquals("koral:queryRef", node.at("/0/source/@type").asText());
assertEquals("system-q", node.at("/0/source/ref").asText());
@@ -63,7 +63,7 @@
node = node.at("/query/operands/1/rewrites");
assertEquals(1, node.size());
- assertEquals("Kustvakt", node.at("/0/origin").asText());
+ assertEquals("Kustvakt", node.at("/0/editor").asText());
assertEquals("operation:override", node.at("/0/operation").asText());
assertEquals("koral:queryRef", node.at("/0/source/@type").asText());
assertEquals("dory/dory-q", node.at("/0/source/ref").asText());
diff --git a/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusReferenceRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusReferenceRewriteTest.java
index f71c9fa..d851a52 100644
--- a/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusReferenceRewriteTest.java
+++ b/src/test/java/de/ids_mannheim/korap/rewrite/VirtualCorpusReferenceRewriteTest.java
@@ -72,7 +72,7 @@
assertEquals(1, node.size());
assertEquals("koral:rewrite", node.at("/0/@type").asText());
- assertEquals("Kustvakt", node.at("/0/origin").asText());
+ assertEquals("Kustvakt", node.at("/0/editor").asText());
assertEquals("operation:override", node.at("/0/operation").asText());
assertEquals("ref", node.at("/0/scope").asText());
assertEquals("system/named-vc1", node.at("/0/source").asText());
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java
index 98cf4fb..ae9b93b 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java
@@ -43,7 +43,7 @@
assertNotNull(node);
assertEquals("operation:and", node.at("/operation").asText());
assertEquals("koral:rewrite", node.at("/rewrites/0/@type").asText());
- assertEquals("Kustvakt", node.at("/rewrites/0/origin").asText());
+ assertEquals("Kustvakt", node.at("/rewrites/0/editor").asText());
assertEquals("operation:override", node.at("/rewrites/0/operation").asText());
assertEquals(source, node.at("/rewrites/0/source"));
@@ -68,7 +68,7 @@
assertEquals("operation:and", node.at("/operation").asText());
assertEquals("operation:and", node.at("/operation").asText());
assertEquals("koral:rewrite", node.at("/rewrites/0/@type").asText());
- assertEquals("Kustvakt", node.at("/rewrites/0/origin").asText());
+ assertEquals("Kustvakt", node.at("/rewrites/0/editor").asText());
assertEquals("operation:override", node.at("/rewrites/0/operation").asText());
assertEquals(source, node.at("/rewrites/0/source"));
@@ -167,7 +167,7 @@
"rewrites" : [ {
"@type" : "koral:rewrite",
"src" : "Kustvakt",
- "origin" : "Kustvakt",
+ "editor" : "Kustvakt",
"operation" : "operation:injection",
"scope" : "availability(PUB)"
} ]
@@ -230,7 +230,7 @@
"rewrites" : [ {
"@type" : "koral:rewrite",
"src" : "Kustvakt",
- "origin" : "Kustvakt",
+ "editor" : "Kustvakt",
"operation" : "operation:injection",
"scope" : "availability(ALL)"
} ]