Avoid querying deprecated types (#1725)

* Add isDeprecated method
* Avoid querying deprecated types

Author: kwahlin

whelk-core/src/main/groovy/whelk/JsonLd.groovy

@@ -104,6 +104,7 @@ class JsonLd {
         public static final String EQUIVALENT_CLASS = "equivalentClass"
         public static final String EQUIVALENT_PROPERTY = "equivalentProperty"
         public static final String SAME_AS = "sameAs"
+        public static final String DEPRECATED = "deprecated"
     }
 
     static final class Rdfs {
@@ -785,6 +786,10 @@ class JsonLd {
         getCategoryMembers(Category.PENDING).contains(property)
     }
 
+    boolean isDeprecated(String term) {
+        return vocabIndex[term]?[Owl.DEPRECATED];
+    }
+
     /**
      * @param type
      * @return properties with range or rangeIncludes type

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

@@ -204,6 +204,7 @@ private Node expandType(JsonLd jsonLd) {
         }
 
         List<Condition> altFields = Stream.concat(Stream.of(baseType), subtypes.stream())
+                .filter(Predicate.not(jsonLd::isDeprecated))
                 .sorted()
                 .map(t -> withValue(new VocabTerm(t, jsonLd.vocabIndex.get(t))))
                 .toList();