From 59c150f14fb4635d983c0d7f3a6bbeec4fc63635 Mon Sep 17 00:00:00 2001 From: Jeremiah Via Date: Thu, 11 Jan 2024 11:11:44 -0800 Subject: [PATCH] Run cljfmt --- src/com/nytimes/querqy/commonrules.clj | 42 ++++++++-------- src/com/nytimes/querqy/model.clj | 8 +-- test/com/nytimes/querqy/commonrules_test.clj | 52 ++++++++++---------- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/com/nytimes/querqy/commonrules.clj b/src/com/nytimes/querqy/commonrules.clj index 71764c1..e2fbf34 100644 --- a/src/com/nytimes/querqy/commonrules.clj +++ b/src/com/nytimes/querqy/commonrules.clj @@ -2,22 +2,22 @@ "CommonRules based rewriter" (:refer-clojure :exclude [filter]) (:require - [clojure.java.io :as io] - [clojure.string :as str] - [com.nytimes.querqy.model :as model] - [com.nytimes.querqy.parser :as parser]) + [clojure.java.io :as io] + [clojure.string :as str] + [com.nytimes.querqy.model :as model] + [com.nytimes.querqy.parser :as parser]) (:import - (java.io Reader) - (java.net URL) - (java.util List UUID) - (querqy.model Input Input$BooleanInput Input$SimpleInput) - (querqy.parser QuerqyParser) - (querqy.rewrite RewriterFactory) - (querqy.rewrite.commonrules CommonRulesRewriter LineParser QuerqyParserFactory SimpleCommonRulesParser WhiteSpaceQuerqyParserFactory) - (querqy.rewrite.commonrules.model BoostInstruction BoostInstruction$BoostDirection DeleteInstruction FilterInstruction Instructions SynonymInstruction TrieMapRulesCollectionBuilder) - (querqy.rewrite.commonrules.select SelectionStrategyFactory) - (querqy.rewrite.commonrules.select.booleaninput BooleanInputParser) - (querqy.rewrite.commonrules.select.booleaninput.model BooleanInputElement BooleanInputElement$Type BooleanInputLiteral))) + (java.io Reader) + (java.net URL) + (java.util List UUID) + (querqy.model Input Input$BooleanInput Input$SimpleInput) + (querqy.parser QuerqyParser) + (querqy.rewrite RewriterFactory) + (querqy.rewrite.commonrules CommonRulesRewriter LineParser QuerqyParserFactory SimpleCommonRulesParser WhiteSpaceQuerqyParserFactory) + (querqy.rewrite.commonrules.model BoostInstruction BoostInstruction$BoostDirection DeleteInstruction FilterInstruction Instructions SynonymInstruction TrieMapRulesCollectionBuilder) + (querqy.rewrite.commonrules.select SelectionStrategyFactory) + (querqy.rewrite.commonrules.select.booleaninput BooleanInputParser) + (querqy.rewrite.commonrules.select.booleaninput.model BooleanInputElement BooleanInputElement$Type BooleanInputLiteral))) (set! *warn-on-reflection* true) @@ -44,8 +44,8 @@ (proxy [RewriterFactory] [(str (UUID/randomUUID))] (createRewriter [_ _] (CommonRulesRewriter. - rules - SelectionStrategyFactory/DEFAULT_SELECTION_STRATEGY)) + rules + SelectionStrategyFactory/DEFAULT_SELECTION_STRATEGY)) (getCacheableGenerableTerms [] #{}))) ;; ---------------------------------------------------------------------- @@ -59,10 +59,10 @@ ignore-case true parser (WhiteSpaceQuerqyParserFactory.)}}] (let [rules-parser (SimpleCommonRulesParser. - ^Reader stream - ^boolean boolean-input - ^QuerqyParserFactory parser - ^boolean ignore-case)] + ^Reader stream + ^boolean boolean-input + ^QuerqyParserFactory parser + ^boolean ignore-case)] (.parse rules-parser)))) (extend-protocol CommonRulesRewriterBuilder diff --git a/src/com/nytimes/querqy/model.clj b/src/com/nytimes/querqy/model.clj index 8ca671e..019b602 100644 --- a/src/com/nytimes/querqy/model.clj +++ b/src/com/nytimes/querqy/model.clj @@ -1,11 +1,11 @@ (ns com.nytimes.querqy.model "Builders for classes in the `querqy.model` package." (:require - [clojure.core.protocols :as cp] - [clojure.datafy :refer [datafy]] - [clojure.string :as str]) + [clojure.core.protocols :as cp] + [clojure.datafy :refer [datafy]] + [clojure.string :as str]) (:import - (querqy.model BooleanParent BooleanQuery BoostQuery BoostedTerm Clause Clause$Occur DisjunctionMaxQuery ExpandedQuery Input$SimpleInput MatchAllQuery QuerqyQuery Query Term))) + (querqy.model BooleanParent BooleanQuery BoostQuery BoostedTerm Clause Clause$Occur DisjunctionMaxQuery ExpandedQuery Input$SimpleInput MatchAllQuery QuerqyQuery Query Term))) (def should Clause$Occur/SHOULD) (def must Clause$Occur/MUST) diff --git a/test/com/nytimes/querqy/commonrules_test.clj b/test/com/nytimes/querqy/commonrules_test.clj index 896304f..8921c08 100644 --- a/test/com/nytimes/querqy/commonrules_test.clj +++ b/test/com/nytimes/querqy/commonrules_test.clj @@ -1,15 +1,15 @@ (ns com.nytimes.querqy.commonrules-test (:refer-clojure :exclude [filter]) (:require - [clojure.datafy :refer [datafy]] - [clojure.java.io :as io] - [clojure.test :refer [deftest is]] - [com.nytimes.querqy :as querqy] - [com.nytimes.querqy.commonrules :as r :refer [boost delete filter match match* synonym]] - [testit.core :refer [=> =in=> facts]]) + [clojure.datafy :refer [datafy]] + [clojure.java.io :as io] + [clojure.test :refer [deftest is]] + [com.nytimes.querqy :as querqy] + [com.nytimes.querqy.commonrules :as r :refer [boost delete filter match match* synonym]] + [testit.core :refer [=> =in=> facts]]) (:import - (querqy.rewrite.commonrules.select.booleaninput BooleanInputParser) - (querqy.rewrite.commonrules.select.booleaninput.model BooleanInputElement BooleanInputElement$Type))) + (querqy.rewrite.commonrules.select.booleaninput BooleanInputParser) + (querqy.rewrite.commonrules.select.booleaninput.model BooleanInputElement BooleanInputElement$Type))) (deftest match-macro-inputs (facts "valid inputs to match macro" @@ -52,30 +52,30 @@ (def resource-rewriter (r/rules-rewriter - (io/resource "com/nytimes/querqy/common-rules.txt"))) + (io/resource "com/nytimes/querqy/common-rules.txt"))) (def dsl-rewriter (r/rules-rewriter ;; basics - (match "A1" (synonym "B1")) - (match "A2 B2" (synonym "C2")) - (match "A3" (synonym "B3") (synonym "C3")) - (match "A4 B4" (synonym "C4") (synonym "D4")) - (match "A5" (boost 2 "B5")) - (match "A6" (filter "B6")) - (match "A7 B7" (delete "B7")) - (match "A8" (synonym "B8") (boost 2 "C8")) + (match "A1" (synonym "B1")) + (match "A2 B2" (synonym "C2")) + (match "A3" (synonym "B3") (synonym "C3")) + (match "A4 B4" (synonym "C4") (synonym "D4")) + (match "A5" (boost 2 "B5")) + (match "A6" (filter "B6")) + (match "A7 B7" (delete "B7")) + (match "A8" (synonym "B8") (boost 2 "C8")) ;; boolean rules - (match (or "A9" "B9") (boost 2 "C9")) - (match (and "A10" "B10") (boost 2 "C10")) - (match (and "A11" (not "B11")) (boost 2 "C11")) + (match (or "A9" "B9") (boost 2 "C9")) + (match (and "A10" "B10") (boost 2 "C10")) + (match (and "A11" (not "B11")) (boost 2 "C11")) ;; multi anchor rules - (match (and "best" "netflix" "show") - (boost 2 "netflix")) + (match (and "best" "netflix" "show") + (boost 2 "netflix")) - (match (and "best" "amazon" "show") - (boost 2 "amazon")))) + (match (and "best" "amazon" "show") + (boost 2 "amazon")))) (defn rewrite "util to do a rewrite and datafy the result for easier comparison" @@ -110,8 +110,8 @@ (def rules-with-custom-functions (r/rules-rewriter - (synonyms "chickpea" "garbanzo bean") - (synonyms "chickpeas" "garbanzo beans"))) + (synonyms "chickpea" "garbanzo bean") + (synonyms "chickpeas" "garbanzo beans"))) (deftest custom-functions-test (facts "helper functions can return multiple match rules"