Remove unused class and some minor cleanup

2 files changed, 1 insertions, 49 deletions

diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/utils/TargetingQueryFileConverter.java b/predicate-search/src/main/java/com/yahoo/search/predicate/utils/TargetingQueryFileConverter.java
index fefa35a0e1c..57635f2c3b2 100644
--- a/predicate-search/src/main/java/com/yahoo/search/predicate/utils/TargetingQueryFileConverter.java
+++ b/predicate-search/src/main/java/com/yahoo/search/predicate/utils/TargetingQueryFileConverter.java
@@ -263,14 +263,11 @@ public class TargetingQueryFileConverter {
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
-            if (!(o instanceof Feature)) return false;
-
-            Feature feature = (Feature) o;
+            if (!(o instanceof Feature feature)) return false;
 
             if (longValue != feature.longValue) return false;
             if (!key.equals(feature.key)) return false;
             return !(strValue != null ? !strValue.equals(feature.strValue) : feature.strValue != null);
-
         }
 
         @Override
diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaFeedWriter.java b/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaFeedWriter.java
deleted file mode 100644
index 7d4a6867405..00000000000
--- a/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaFeedWriter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.search.predicate.utils;
-
-import com.google.common.html.HtmlEscapers;
-import com.yahoo.document.predicate.Predicate;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.Writer;
-
-/**
- * @author Magnar Nedland
- */
-public class VespaFeedWriter extends BufferedWriter {
-
-    private String namespace;
-    private String documentType;
-
-    VespaFeedWriter(Writer writer, String namespace, String documentType) throws IOException {
-        super(writer);
-        this.namespace = namespace;
-        this.documentType = documentType;
-
-        this.append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
-        this.append("<vespafeed>\n");
-    }
-
-    @Override
-    public void close() throws IOException {
-        this.append("</vespafeed>\n");
-        super.close();
-    }
-
-    public void writePredicateDocument(int id, String fieldName, Predicate predicate) {
-        try {
-            this.append(String.format("<document documenttype=\"%2$s\" documentid=\"id:%1$s:%2$s::%3$d\">\n",
-                    namespace, documentType, id));
-            this.append("<" + fieldName + ">" + HtmlEscapers.htmlEscaper().escape(predicate.toString()) + "</" + fieldName + ">\n");
-            this.append("</document>\n");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}