Skip to content

Commit cf6781c

Browse files
hazzikhazzik
committed
fix: resolve warnings
1 parent b0c5307 commit cf6781c

40 files changed

+212
-131
lines changed

‎src/NHibernate.Search.Tests/Analyzer/AbstractTestAnalyzer.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.IO;
23
using Lucene.Net.Analysis;
34

@@ -24,6 +25,7 @@ public InternalTokenStream(string[] tokens)
2425
this.tokens = tokens;
2526
}
2627

28+
[Obsolete]
2729
public override Token Next()
2830
{
2931
return position >= tokens.Length ? null : new Token(tokens[position++], 0, 0);

‎src/NHibernate.Search.Tests/Analyzer/AnalyzerTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Collections;
22
using Lucene.Net.Analysis.Standard;
33
using Lucene.Net.QueryParsers;
4+
using Lucene.Net.Util;
45
using NUnit.Framework;
56

67
namespace NHibernate.Search.Tests.Analyzer
@@ -31,7 +32,7 @@ public void TestScopedAnalyzers()
3132

3233
tx = s.BeginTransaction();
3334

34-
QueryParser parser = new QueryParser("id", new StandardAnalyzer());
35+
QueryParser parser = new QueryParser(Version.LUCENE_24, "id", new StandardAnalyzer(Version.LUCENE_24));
3536
Lucene.Net.Search.Query luceneQuery = parser.Parse("entity:alarm");
3637
IFullTextQuery query = s.CreateFullTextQuery(luceneQuery, typeof(MyEntity));
3738
Assert.AreEqual(1, query.ResultSize, "Entity query");

‎src/NHibernate.Search.Tests/Bridge/BridgeTest.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Lucene.Net.QueryParsers;
66
using NHibernate.Cfg;
77
using NUnit.Framework;
8+
using Version = Lucene.Net.Util.Version;
89

910
namespace NHibernate.Search.Tests.Bridge
1011
{
@@ -36,7 +37,7 @@ public void CustomBridges()
3637

3738
tx = s.BeginTransaction();
3839
IFullTextSession session = Search.CreateFullTextSession(s);
39-
QueryParser parser = new QueryParser("id", new SimpleAnalyzer());
40+
QueryParser parser = new QueryParser(Version.LUCENE_24, "id", new SimpleAnalyzer());
4041

4142
Lucene.Net.Search.Query query = parser.Parse("CustomFieldBridge:This AND CustomStringBridge:This");
4243
IList result = session.CreateFullTextQuery(query).List();
@@ -73,7 +74,7 @@ public void DateTimeBridge()
7374

7475
tx = s.BeginTransaction();
7576
IFullTextSession session = Search.CreateFullTextSession(s);
76-
QueryParser parser = new QueryParser("id", new StandardAnalyzer());
77+
QueryParser parser = new QueryParser(Version.LUCENE_24, "id", new StandardAnalyzer(Version.LUCENE_24));
7778

7879
Lucene.Net.Search.Query query = parser.Parse("DateTime:[19900101 TO 20060101]"
7980
+ " AND DateTimeDay:[20001214 TO 2000121501]"
@@ -116,7 +117,7 @@ public void DefaultAndNullBridges()
116117

117118
tx = s.BeginTransaction();
118119
IFullTextSession session = Search.CreateFullTextSession(s);
119-
QueryParser parser = new QueryParser("id", new StandardAnalyzer());
120+
QueryParser parser = new QueryParser(Version.LUCENE_24, "id", new StandardAnalyzer(Version.LUCENE_24));
120121

121122
Lucene.Net.Search.Query query = parser.Parse("Double2:[2 TO 2.1] AND Float2:[2 TO 2.1] " +
122123
"AND Int2:[2 TO 2.1] AND Long2:[2 TO 2.1] AND Type:\"Dog\" AND Storm:false");

‎src/NHibernate.Search.Tests/Bridge/ClassBridgeTest.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using Lucene.Net.Util;
2+
13
namespace NHibernate.Search.Tests.Bridge
24
{
35
using System.Collections;
@@ -49,7 +51,7 @@ public void ClassBridge()
4951
// the branch field and the network field of the Department
5052
// class. This is in the Lucene document but not in the
5153
// Department entity itself.
52-
QueryParser parser = new QueryParser("branchnetwork", new SimpleAnalyzer());
54+
QueryParser parser = new QueryParser(Version.LUCENE_24, "branchnetwork", new SimpleAnalyzer());
5355

5456
Query query = parser.Parse("branchnetwork:layton 2B");
5557
IFullTextQuery hibQuery = session.CreateFullTextQuery(query, typeof(Department));
@@ -76,7 +78,7 @@ public void ClassBridge()
7678
Assert.IsTrue(result.Count == 0, "problem with field cross-ups");
7779

7880
// Non-ClassBridge field.
79-
parser = new QueryParser("BranchHead", new SimpleAnalyzer());
81+
parser = new QueryParser(Version.LUCENE_24, "BranchHead", new SimpleAnalyzer());
8082
query = parser.Parse("BranchHead:Kent Lewin");
8183
hibQuery = session.CreateFullTextQuery(query, typeof(Department));
8284
result = hibQuery.List();
@@ -117,7 +119,7 @@ public void ClassBridges()
117119
// Departments entity after being massaged by passing it
118120
// through the EquipmentType class. This field is in
119121
// the Lucene document but not in the Department entity itself.
120-
QueryParser parser = new QueryParser("equipment", new SimpleAnalyzer());
122+
QueryParser parser = new QueryParser(Version.LUCENE_24, "equipment", new SimpleAnalyzer());
121123

122124
// Check the second ClassBridge annotation
123125
Query query = parser.Parse("equiptype:Cisco");
@@ -138,7 +140,7 @@ public void ClassBridges()
138140
Assert.IsTrue(result.Count == 0, "problem with field cross-ups");
139141

140142
// Non-ClassBridge field.
141-
parser = new QueryParser("BranchHead", new SimpleAnalyzer());
143+
parser = new QueryParser(Version.LUCENE_24, "BranchHead", new SimpleAnalyzer());
142144
query = parser.Parse("BranchHead:Kent Lewin");
143145
hibQuery = session.CreateFullTextQuery(query, typeof(Departments));
144146
result = hibQuery.List();
@@ -147,7 +149,7 @@ public void ClassBridges()
147149
Assert.AreEqual("Kent Lewin", ((Departments)result[0]).BranchHead, "incorrect entity returned");
148150

149151
// Check other ClassBridge annotation.
150-
parser = new QueryParser("branchnetwork", new SimpleAnalyzer());
152+
parser = new QueryParser(Version.LUCENE_24, "branchnetwork", new SimpleAnalyzer());
151153
query = parser.Parse("branchnetwork:st. george 1D");
152154
hibQuery = session.CreateFullTextQuery(query, typeof(Departments));
153155
result = hibQuery.List();
@@ -189,7 +191,7 @@ public void ClassBridgesWithProjection()
189191
// Departments entity after being massaged by passing it
190192
// through the EquipmentType class. This field is in
191193
// the Lucene document but not in the Department entity itself.
192-
QueryParser parser = new QueryParser("equipment", new SimpleAnalyzer());
194+
QueryParser parser = new QueryParser(Version.LUCENE_24, "equipment", new SimpleAnalyzer());
193195

194196
// Check the second ClassBridge annotation
195197
Query query = parser.Parse("equiptype:Cisco");

‎src/NHibernate.Search.Tests/DirectoryProvider/FSSlaveAndMasterDPTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void ProperCopy()
3333
// Assert that the slave index is empty
3434
IFullTextSession fullTextSession = Search.CreateFullTextSession(GetSlaveSession());
3535
ITransaction tx = fullTextSession.BeginTransaction();
36-
QueryParser parser = new QueryParser("id", new StopAnalyzer());
36+
QueryParser parser = new QueryParser(Lucene.Net.Util.Version.LUCENE_24, "id", new StopAnalyzer(Lucene.Net.Util.Version.LUCENE_24));
3737
IList result = fullTextSession.CreateFullTextQuery(parser.Parse("Location:texas")).List();
3838
Assert.AreEqual(0, result.Count, "No copy yet, fresh index expected");
3939
tx.Commit();

‎src/NHibernate.Search.Tests/Embedded/EmbeddedTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
using Lucene.Net.Analysis.Standard;
44
using Lucene.Net.QueryParsers;
5-
5+
using Lucene.Net.Util;
66
using NUnit.Framework;
77

88
namespace NHibernate.Search.Tests.Embedded
@@ -70,7 +70,7 @@ public void EmbeddedIndexing()
7070
tx.Commit();
7171

7272
IFullTextSession session = Search.CreateFullTextSession(s);
73-
QueryParser parser = new QueryParser("id", new StandardAnalyzer());
73+
QueryParser parser = new QueryParser(Version.LUCENE_24, "id", new StandardAnalyzer(Version.LUCENE_24));
7474

7575
Lucene.Net.Search.Query query = parser.Parse("address.street:place");
7676
IList result = session.CreateFullTextQuery(query).List();
@@ -150,7 +150,7 @@ public void ContainedIn()
150150
s.Clear();
151151

152152
IFullTextSession session = Search.CreateFullTextSession(s);
153-
QueryParser parser = new QueryParser("id", new StandardAnalyzer());
153+
QueryParser parser = new QueryParser(Version.LUCENE_24, "id", new StandardAnalyzer(Version.LUCENE_24));
154154

155155
Lucene.Net.Search.Query query = parser.Parse("address.street:peachtree");
156156
IList result = session.CreateFullTextQuery(query).List();

‎src/NHibernate.Search.Tests/Embedded/IndexedEmbeddedAndCollections.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using Lucene.Net.Util;
2+
13
namespace NHibernate.Search.Tests.Embedded
24
{
35
using System.Collections;
@@ -101,7 +103,7 @@ public void CanLookupEntityByValueOfEmbeddedSetValues()
101103
{
102104
IFullTextSession session = Search.CreateFullTextSession(s);
103105

104-
QueryParser parser = new MultiFieldQueryParser(new string[] { "name", "authors.name" }, new StandardAnalyzer());
106+
QueryParser parser = new MultiFieldQueryParser(Version.LUCENE_24, new string[] { "name", "authors.name" }, new StandardAnalyzer(Version.LUCENE_24));
105107

106108
Lucene.Net.Search.Query query = parser.Parse("Hugo");
107109
IList result = session.CreateFullTextQuery(query).List();
@@ -135,7 +137,7 @@ public void CanLookupEntityByUpdatedValueInSet()
135137
tx = s.BeginTransaction();
136138

137139
IFullTextSession session = Search.CreateFullTextSession(s);
138-
QueryParser parser = new MultiFieldQueryParser(new string[] { "name", "authors.name" }, new StandardAnalyzer());
140+
QueryParser parser = new MultiFieldQueryParser(Version.LUCENE_24, new string[] { "name", "authors.name" }, new StandardAnalyzer(Version.LUCENE_24));
139141
Query query = parser.Parse("Proust");
140142
IList result = session.CreateFullTextQuery(query, typeof(Product)).List();
141143

‎src/NHibernate.Search.Tests/FieldAccess/FieldAccessTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
using Lucene.Net.Analysis.Standard;
44
using Lucene.Net.QueryParsers;
5-
5+
using Lucene.Net.Util;
66
using NUnit.Framework;
77

88
namespace NHibernate.Search.Tests.FieldAccess
@@ -33,7 +33,7 @@ public void FieldBoost()
3333

3434
IFullTextSession session = Search.CreateFullTextSession(s);
3535
tx = session.BeginTransaction();
36-
QueryParser p = new QueryParser("id", new StandardAnalyzer());
36+
QueryParser p = new QueryParser(Version.LUCENE_24, "id", new StandardAnalyzer(Version.LUCENE_24));
3737
IList result = session.CreateFullTextQuery(p.Parse("title:Action OR Abstract:Action")).List();
3838
Assert.AreEqual(2, result.Count, "Query by field");
3939
Assert.AreEqual("Hibernate in Action", ((Document)result[0]).Title, "@Boost fails");
@@ -57,7 +57,7 @@ public void Fields()
5757

5858
IFullTextSession session = Search.CreateFullTextSession(s);
5959
tx = session.BeginTransaction();
60-
QueryParser p = new QueryParser("id", new StandardAnalyzer());
60+
QueryParser p = new QueryParser(Version.LUCENE_24, "id", new StandardAnalyzer(Version.LUCENE_24));
6161
IList result = session.CreateFullTextQuery(p.Parse("Abstract:Hibernate")).List();
6262
Assert.AreEqual(1, result.Count, "Query by field");
6363
s.Delete(result[0]);

‎src/NHibernate.Search.Tests/Filter/ExcludeAllFilter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace NHibernate.Search.Tests.Filter
77
{
88
public class ExcludeAllFilter : Lucene.Net.Search.Filter
99
{
10-
private static bool done = false;
10+
//private static bool done = false;
1111

1212
public override DocIdSet GetDocIdSet(IndexReader reader)
1313
{

‎src/NHibernate.Search.Tests/Filter/FilterTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public void StraightFilters()
194194

195195
IFullTextQuery ftQuery = s.CreateFullTextQuery(query, typeof(Driver));
196196
ftQuery.EnableFullTextFilter("bestDriver");
197-
Lucene.Net.Search.Filter dateFilter = new RangeFilter("delivery", "2001", "2005", true, true);
197+
Lucene.Net.Search.Filter dateFilter = new TermRangeFilter("delivery", "2001", "2005", true, true);
198198
ftQuery.SetFilter(dateFilter);
199199
Assert.AreEqual(1, ftQuery.ResultSize, "Should select only liz");
200200

0 commit comments

Comments
 (0)