Clean up and make all tests pass

libris · Dec 19, 2024 · 8d3fa03 · 8d3fa03
1 parent 32af60a
commit 8d3fa03
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 36 deletions.
diff --git a/whelk-core/src/main/groovy/whelk/search2/Stats.java b/whelk-core/src/main/groovy/whelk/search2/Stats.java
@@ -130,7 +130,6 @@ private Map<String, Object> buildSliceByDimension(Map<Property, Map<PropertyValu
                 sliceNode.put("dimension", property.name());
                 sliceNode.put("observation", observations);
                 sliceNode.put("maxItems", sliceParamsByProperty.get(property).size());
-//                property.getAlias(queryTree.getOutsetType()).ifPresent(a -> sliceNode.put("alias", a));
                 sliceByDimension.put(property.name(), sliceNode);
             }
         });

diff --git a/whelk-core/src/main/groovy/whelk/search2/querytree/Node.java b/whelk-core/src/main/groovy/whelk/search2/querytree/Node.java
@@ -46,8 +46,4 @@ default Node reduceTypes(Disambiguate disambiguate) {
     default boolean isTypeNode() {
         return false;
     }
-
-    default List<String> collectTypes(Disambiguate disambiguate) {
-        return List.of();
-    }
 }
diff --git a/whelk-core/src/main/groovy/whelk/search2/querytree/PathValue.java b/whelk-core/src/main/groovy/whelk/search2/querytree/PathValue.java
@@ -44,7 +44,7 @@ public Map<String, Object> toEs() {
 
     @Override
     public Node expand(Disambiguate disambiguate, Collection<String> rulingTypes, Function<Collection<String>, Collection<String>> getBoostFields) {
-        throw new UnsupportedOperationException("");
+        return this;
     }
 
     @Override

diff --git a/whelk-core/src/test/groovy/whelk/search2/querytree/ActiveBoolFilterSpec.groovy b/whelk-core/src/test/groovy/whelk/search2/querytree/ActiveBoolFilterSpec.groovy
@@ -9,13 +9,12 @@ import static whelk.search2.Disambiguate.Rdfs.RESOURCE
 class ActiveBoolFilterSpec extends Specification {
     def "expand"() {
         given:
-        def disambiguate = new Disambiguate(['vocab': [:]])
-        def outset = RESOURCE
+        def disambiguate = new Disambiguate([:])
         def excludeA = new ActiveBoolFilter('excludeA', pathV1, [:])
         def includeA = new ActiveBoolFilter('includeA', new InactiveBoolFilter('excludeA'), [:])
 
         expect:
-        excludeA.expand(disambiguate, outset) == pathV1
-        includeA.expand(disambiguate, outset) == null
+        excludeA.expand(disambiguate, [], x -> []) == pathV1
+        includeA.expand(disambiguate, [], x -> []) == null
     }
 }
diff --git a/whelk-core/src/test/groovy/whelk/search2/querytree/QueryTreeSpec.groovy b/whelk-core/src/test/groovy/whelk/search2/querytree/QueryTreeSpec.groovy
@@ -168,32 +168,6 @@ class QueryTreeSpec extends Specification {
         ])
     }
 
-    def "collect given types"() {
-        given:
-        def rdfType = new Property(RDF_TYPE)
-        QueryTree qt = new QueryTree(and([
-                propV(rdfType, eq, v1),
-                propV(rdfType, neq, v2),
-                or([pathV1, propV(rdfType, eq, v3)]),
-        ]))
-
-        expect:
-        qt.collectRulingTypes() == [v1.string(), v3.string()] as Set
-    }
-
-    def "collect given types"() {
-        given:
-        def rdfType = new Property(RDF_TYPE)
-        QueryTree qt = new QueryTree(and([
-                propV(rdfType, eq, new VocabTerm('type1')),
-                propV(rdfType, neq, new VocabTerm('type2')),
-                or([pathV1, propV(rdfType, eq, new VocabTerm('type3'))]),
-        ]))
-
-        expect:
-        qt.collectRulingTypes() == ['type1', 'type3'] as Set
-    }
-
     def "get top level free text as string"() {
         expect:
         new QueryTree(tree).getTopLevelFreeText() == result