Skip to content

Commit d4bf84a

Browse files
jviajvia
committed
Run cljfmt
1 parent 76ed2b8 commit d4bf84a

File tree

3 files changed

+51
-51
lines changed

3 files changed

+51
-51
lines changed

‎src/com/nytimes/querqy/commonrules.clj

+21-21
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
"CommonRules based rewriter"
33
(:refer-clojure :exclude [filter])
44
(:require
5-
[clojure.java.io :as io]
6-
[clojure.string :as str]
7-
[com.nytimes.querqy.model :as model]
8-
[com.nytimes.querqy.parser :as parser])
5+
[clojure.java.io :as io]
6+
[clojure.string :as str]
7+
[com.nytimes.querqy.model :as model]
8+
[com.nytimes.querqy.parser :as parser])
99
(:import
10-
(java.io Reader)
11-
(java.net URL)
12-
(java.util List UUID)
13-
(querqy.model Input Input$BooleanInput Input$SimpleInput)
14-
(querqy.parser QuerqyParser)
15-
(querqy.rewrite RewriterFactory)
16-
(querqy.rewrite.commonrules CommonRulesRewriter LineParser QuerqyParserFactory SimpleCommonRulesParser WhiteSpaceQuerqyParserFactory)
17-
(querqy.rewrite.commonrules.model BoostInstruction BoostInstruction$BoostDirection DeleteInstruction FilterInstruction Instructions SynonymInstruction TrieMapRulesCollectionBuilder)
18-
(querqy.rewrite.commonrules.select SelectionStrategyFactory)
19-
(querqy.rewrite.commonrules.select.booleaninput BooleanInputParser)
20-
(querqy.rewrite.commonrules.select.booleaninput.model BooleanInputElement BooleanInputElement$Type BooleanInputLiteral)))
10+
(java.io Reader)
11+
(java.net URL)
12+
(java.util List UUID)
13+
(querqy.model Input Input$BooleanInput Input$SimpleInput)
14+
(querqy.parser QuerqyParser)
15+
(querqy.rewrite RewriterFactory)
16+
(querqy.rewrite.commonrules CommonRulesRewriter LineParser QuerqyParserFactory SimpleCommonRulesParser WhiteSpaceQuerqyParserFactory)
17+
(querqy.rewrite.commonrules.model BoostInstruction BoostInstruction$BoostDirection DeleteInstruction FilterInstruction Instructions SynonymInstruction TrieMapRulesCollectionBuilder)
18+
(querqy.rewrite.commonrules.select SelectionStrategyFactory)
19+
(querqy.rewrite.commonrules.select.booleaninput BooleanInputParser)
20+
(querqy.rewrite.commonrules.select.booleaninput.model BooleanInputElement BooleanInputElement$Type BooleanInputLiteral)))
2121

2222
(set! *warn-on-reflection* true)
2323

@@ -44,8 +44,8 @@
4444
(proxy [RewriterFactory] [(str (UUID/randomUUID))]
4545
(createRewriter [_ _]
4646
(CommonRulesRewriter.
47-
rules
48-
SelectionStrategyFactory/DEFAULT_SELECTION_STRATEGY))
47+
rules
48+
SelectionStrategyFactory/DEFAULT_SELECTION_STRATEGY))
4949
(getCacheableGenerableTerms [] #{})))
5050

5151
;; ----------------------------------------------------------------------
@@ -59,10 +59,10 @@
5959
ignore-case true
6060
parser (WhiteSpaceQuerqyParserFactory.)}}]
6161
(let [rules-parser (SimpleCommonRulesParser.
62-
^Reader stream
63-
^boolean boolean-input
64-
^QuerqyParserFactory parser
65-
^boolean ignore-case)]
62+
^Reader stream
63+
^boolean boolean-input
64+
^QuerqyParserFactory parser
65+
^boolean ignore-case)]
6666
(.parse rules-parser))))
6767

6868
(extend-protocol CommonRulesRewriterBuilder

‎src/com/nytimes/querqy/model.clj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
(ns com.nytimes.querqy.model
22
"Builders for classes in the `querqy.model` package."
33
(:require
4-
[clojure.core.protocols :as cp]
5-
[clojure.datafy :refer [datafy]]
6-
[clojure.string :as str])
4+
[clojure.core.protocols :as cp]
5+
[clojure.datafy :refer [datafy]]
6+
[clojure.string :as str])
77
(:import
8-
(querqy.model BooleanParent BooleanQuery BoostQuery BoostedTerm Clause Clause$Occur DisjunctionMaxQuery ExpandedQuery Input$SimpleInput MatchAllQuery QuerqyQuery Query Term)))
8+
(querqy.model BooleanParent BooleanQuery BoostQuery BoostedTerm Clause Clause$Occur DisjunctionMaxQuery ExpandedQuery Input$SimpleInput MatchAllQuery QuerqyQuery Query Term)))
99

1010
(def should Clause$Occur/SHOULD)
1111
(def must Clause$Occur/MUST)

‎test/com/nytimes/querqy/commonrules_test.clj

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
(ns com.nytimes.querqy.commonrules-test
22
(:refer-clojure :exclude [filter])
33
(:require
4-
[clojure.datafy :refer [datafy]]
5-
[clojure.java.io :as io]
6-
[clojure.test :refer [deftest is]]
7-
[com.nytimes.querqy :as querqy]
8-
[com.nytimes.querqy.commonrules :as r :refer [boost delete filter match match* synonym]]
9-
[testit.core :refer [=> =in=> facts]])
4+
[clojure.datafy :refer [datafy]]
5+
[clojure.java.io :as io]
6+
[clojure.test :refer [deftest is]]
7+
[com.nytimes.querqy :as querqy]
8+
[com.nytimes.querqy.commonrules :as r :refer [boost delete filter match match* synonym]]
9+
[testit.core :refer [=> =in=> facts]])
1010
(:import
11-
(querqy.rewrite.commonrules.select.booleaninput BooleanInputParser)
12-
(querqy.rewrite.commonrules.select.booleaninput.model BooleanInputElement BooleanInputElement$Type)))
11+
(querqy.rewrite.commonrules.select.booleaninput BooleanInputParser)
12+
(querqy.rewrite.commonrules.select.booleaninput.model BooleanInputElement BooleanInputElement$Type)))
1313

1414
(deftest match-macro-inputs
1515
(facts "valid inputs to match macro"
@@ -52,30 +52,30 @@
5252

5353
(def resource-rewriter
5454
(r/rules-rewriter
55-
(io/resource "com/nytimes/querqy/common-rules.txt")))
55+
(io/resource "com/nytimes/querqy/common-rules.txt")))
5656

5757
(def dsl-rewriter
5858
(r/rules-rewriter
5959
;; basics
60-
(match "A1" (synonym "B1"))
61-
(match "A2 B2" (synonym "C2"))
62-
(match "A3" (synonym "B3") (synonym "C3"))
63-
(match "A4 B4" (synonym "C4") (synonym "D4"))
64-
(match "A5" (boost 2 "B5"))
65-
(match "A6" (filter "B6"))
66-
(match "A7 B7" (delete "B7"))
67-
(match "A8" (synonym "B8") (boost 2 "C8"))
60+
(match "A1" (synonym "B1"))
61+
(match "A2 B2" (synonym "C2"))
62+
(match "A3" (synonym "B3") (synonym "C3"))
63+
(match "A4 B4" (synonym "C4") (synonym "D4"))
64+
(match "A5" (boost 2 "B5"))
65+
(match "A6" (filter "B6"))
66+
(match "A7 B7" (delete "B7"))
67+
(match "A8" (synonym "B8") (boost 2 "C8"))
6868
;; boolean rules
69-
(match (or "A9" "B9") (boost 2 "C9"))
70-
(match (and "A10" "B10") (boost 2 "C10"))
71-
(match (and "A11" (not "B11")) (boost 2 "C11"))
69+
(match (or "A9" "B9") (boost 2 "C9"))
70+
(match (and "A10" "B10") (boost 2 "C10"))
71+
(match (and "A11" (not "B11")) (boost 2 "C11"))
7272

7373
;; multi anchor rules
74-
(match (and "best" "netflix" "show")
75-
(boost 2 "netflix"))
74+
(match (and "best" "netflix" "show")
75+
(boost 2 "netflix"))
7676

77-
(match (and "best" "amazon" "show")
78-
(boost 2 "amazon"))))
77+
(match (and "best" "amazon" "show")
78+
(boost 2 "amazon"))))
7979

8080
(defn rewrite
8181
"util to do a rewrite and datafy the result for easier comparison"
@@ -110,8 +110,8 @@
110110

111111
(def rules-with-custom-functions
112112
(r/rules-rewriter
113-
(synonyms "chickpea" "garbanzo bean")
114-
(synonyms "chickpeas" "garbanzo beans")))
113+
(synonyms "chickpea" "garbanzo bean")
114+
(synonyms "chickpeas" "garbanzo beans")))
115115

116116
(deftest custom-functions-test
117117
(facts "helper functions can return multiple match rules"

0 commit comments

Comments
 (0)