Factor out PropertyLike

whelk-core/src/main/groovy/whelk/search2/querytree/InvalidKey.java

@@ -5,16 +5,14 @@
 
 import static whelk.JsonLd.TYPE_KEY;
 
-public sealed interface InvalidKey {
-    record UnrecognizedKey(String key) implements InvalidKey {}
-    record AmbiguousKey(String key) implements InvalidKey {}
+public sealed interface InvalidKey extends PropertyLike {
+    record UnrecognizedKey(String name) implements InvalidKey {}
+    record AmbiguousKey(String name) implements InvalidKey {}
 
-    String key();
-
-    default Map<String, Object> getDefinition() {
+    default Map<String, Object> definition() {
         var m = new LinkedHashMap<String, Object>();
         m.put(TYPE_KEY, "_Invalid");
-        m.put("label", key());
+        m.put("label", name());
         return m;
     }
 }

whelk-core/src/main/groovy/whelk/search2/querytree/Path.java

@@ -26,9 +26,7 @@ public Path(List<Object> path) {
     @Override
     public String toString() {
         return path.stream()
-                .map(x -> x instanceof Property p
-                        ? p.name() :
-                        (x instanceof InvalidKey i ? i.key() : (String) x))
+                .map(x -> x instanceof PropertyLike p ? p.name() : (String) x)
                 .map(this::substitute)
                 .collect(Collectors.joining("."));
     }

whelk-core/src/main/groovy/whelk/search2/querytree/PathValue.java

@@ -47,12 +47,10 @@ public Map<String, Object> toSearchMapping(QueryTree qt, Map<String, String> non
         var propertyChainAxiom = new LinkedList<>();
 
         for (int i = getPath().size() - 1; i >= 0; i--) {
-            if (getPath().get(i) instanceof Property property) {
+            if (getPath().get(i) instanceof PropertyLike property) {
                 propertyChainAxiom.push(i > 0 && getPath().get(i - 1).equals(JsonLd.REVERSE_KEY)
                         ? Map.of("inverseOf", property.definition())
                         : property.definition());
-            } else if (getPath().get(i) instanceof InvalidKey invalid) {
-                propertyChainAxiom.push(invalid.getDefinition());
             }
         }
 

whelk-core/src/main/groovy/whelk/search2/querytree/Property.java

@@ -9,12 +9,10 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.Function;
-import java.util.function.Predicate;
 
 import static whelk.search2.Disambiguate.RDF_TYPE;
 
-public class Property {
+public class Property implements PropertyLike {
     public enum DomainCategory {
         ADMIN_METADATA,
         WORK,

whelk-core/src/main/groovy/whelk/search2/querytree/PropertyLike.java

@@ -0,0 +1,8 @@
+package whelk.search2.querytree;
+
+import java.util.Map;
+
+public interface PropertyLike {
+    String name();
+    Map<String, Object> definition();
+}