You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/03/11 06:03:56 UTC
[1/5] lucenenet git commit: Lucene.Net.TestFramework: Added exception
logic for Nullable Enum convention [Forced Update!]
Repository: lucenenet
Updated Branches:
refs/heads/api-work cd52681c8 -> 7c282a491 (forced update)
Lucene.Net.TestFramework: Added exception logic for Nullable Enum convention
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/12c4d91b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/12c4d91b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/12c4d91b
Branch: refs/heads/api-work
Commit: 12c4d91bf3d79c512a3348078de787fa889ee4ed
Parents: da64d38
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Fri Mar 10 22:56:34 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Mar 11 13:03:29 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Core/Lucene.Net.csproj | 1 +
.../Support/ExceptionToNullableEnumConvention.cs | 13 +++++++++++++
src/Lucene.Net.TestFramework/Util/ApiScanTestBase.cs | 11 +++++++++--
.../Util/TestRuleSetupAndRestoreClassEnv.cs | 2 +-
4 files changed, 24 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/12c4d91b/src/Lucene.Net.Core/Lucene.Net.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Lucene.Net.csproj b/src/Lucene.Net.Core/Lucene.Net.csproj
index d094f47..db7adab 100644
--- a/src/Lucene.Net.Core/Lucene.Net.csproj
+++ b/src/Lucene.Net.Core/Lucene.Net.csproj
@@ -637,6 +637,7 @@
<Compile Include="Support\DataOutputStream.cs" />
<Compile Include="Support\Codecs\DefaultCodecFactory.cs" />
<Compile Include="Support\ExceptionToClassNameConventionAttribute.cs" />
+ <Compile Include="Support\ExceptionToNullableEnumConvention.cs" />
<Compile Include="Support\FileStreamExtensions.cs" />
<Compile Include="Support\HashHelpers.cs" />
<Compile Include="Support\ICallable.cs" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/12c4d91b/src/Lucene.Net.Core/Support/ExceptionToNullableEnumConvention.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Support/ExceptionToNullableEnumConvention.cs b/src/Lucene.Net.Core/Support/ExceptionToNullableEnumConvention.cs
new file mode 100644
index 0000000..db046ba
--- /dev/null
+++ b/src/Lucene.Net.Core/Support/ExceptionToNullableEnumConvention.cs
@@ -0,0 +1,13 @@
+\ufeffusing System;
+
+namespace Lucene.Net.Support
+{
+ /// <summary>
+ /// Use this attribute to make an exception to the nullable enum rule.
+ /// Some of these cannot be avoided.
+ /// </summary>
+ [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Constructor, AllowMultiple = false)]
+ public class ExceptionToNullableEnumConvention : Attribute
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/12c4d91b/src/Lucene.Net.TestFramework/Util/ApiScanTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/ApiScanTestBase.cs b/src/Lucene.Net.TestFramework/Util/ApiScanTestBase.cs
index fc8b96b..42423c0 100644
--- a/src/Lucene.Net.TestFramework/Util/ApiScanTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Util/ApiScanTestBase.cs
@@ -325,8 +325,9 @@ namespace Lucene.Net.Util
//}
Assert.IsFalse(names.Any(), names.Count() + " members that are type nullable enum detected. " +
- "Nullable enum parameters, fields, methods, and properties should be eliminated, either by " +
- "eliminating the logic that depends on 'null' or by adding a NOT_SET=0 state to the enum.");
+ "Nullable enum parameters, fields, methods, and properties should be eliminated (where possible), either by " +
+ "eliminating the logic that depends on 'null'. Sometimes, it makes sense to keep a nullable enum parameter. " +
+ "In those cases, mark the member with the [ExceptionToNullableEnumConvention] attribute.");
}
//[Test, LuceneNetSpecific]
@@ -869,6 +870,12 @@ namespace Lucene.Net.Util
continue;
}
+ // Ignore properties, methods, and events with IgnoreNetNumericConventionAttribute
+ if (System.Attribute.IsDefined(member, typeof(ExceptionToNullableEnumConvention)))
+ {
+ continue;
+ }
+
if (member.DeclaringType.Equals(t.UnderlyingSystemType))
{
if (member.MemberType == MemberTypes.Method && !(member.Name.StartsWith("get_") || member.Name.StartsWith("set_")))
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/12c4d91b/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs b/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
index 34ad216..abcae63 100644
--- a/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
+++ b/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
@@ -266,7 +266,7 @@ namespace Lucene.Net.Util
//TimeZoneInfo.ConvertTime() // LUCENENET TODO: Everywhere TimeZoneInfo is supposed to be used, use this method to convert a dateTime object to the time zone
similarity = random.NextBoolean() ? (Similarity)new DefaultSimilarity() : new RandomSimilarityProvider(random);
-
+
// Check codec restrictions once at class level.
try
{
[3/5] lucenenet git commit: Lucene.Net.Codecs: Added
ExceptionToNullableEnumConvention attribute to members where it is not
possible to eliminate nullables
Posted by ni...@apache.org.
Lucene.Net.Codecs: Added ExceptionToNullableEnumConvention attribute to members where it is not possible to eliminate nullables
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/a7edd89f
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/a7edd89f
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/a7edd89f
Branch: refs/heads/api-work
Commit: a7edd89f823f48d6c8134fc99c7e2e043b26e56b
Parents: 7c938be
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Fri Mar 10 23:11:06 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Mar 11 13:03:32 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs | 6 ++++--
src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a7edd89f/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs
index e173c24..1d8fe3e 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs
@@ -1,4 +1,5 @@
-\ufeffusing System;
+\ufeffusing Lucene.Net.Support;
+using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
@@ -157,9 +158,10 @@ namespace Lucene.Net.Codecs.SimpleText
}
}
+ [ExceptionToNullableEnumConvention]
public virtual Index.DocValuesType? DocValuesType(string dvType)
{
- return "false".Equals(dvType) ? null : (Index.DocValuesType?)Enum.Parse(typeof(Index.DocValuesType), dvType);
+ return "false".Equals(dvType) ? null : (Index.DocValuesType?)Enum.Parse(typeof(Index.DocValuesType), dvType, true);
}
private string ReadString(int offset, BytesRef scratch)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a7edd89f/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
index 11516ee..ab64fca 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
@@ -1,4 +1,5 @@
\ufeffusing Lucene.Net.Index;
+using Lucene.Net.Support;
using Lucene.Net.Util.Fst;
using System;
using System.Collections.Generic;
@@ -115,6 +116,7 @@ namespace Lucene.Net.Codecs.SimpleText
private readonly BytesRefFSTEnum<PairOutputs<long?, PairOutputs<long?,long?>.Pair>.Pair> _fstEnum;
+ [ExceptionToNullableEnumConvention]
public SimpleTextTermsEnum(SimpleTextFieldsReader outerInstance,
FST<PairOutputs<long?, PairOutputs<long?,long?>.Pair>.Pair> fst, IndexOptions? indexOptions)
{
[4/5] lucenenet git commit: Lucene.Net.Tests.TestApiConsistency:
Commented TestForPublicMembersWithNullableEnum test and added TODO about
reviewing nullable enums.
Posted by ni...@apache.org.
Lucene.Net.Tests.TestApiConsistency: Commented TestForPublicMembersWithNullableEnum test and added TODO about reviewing nullable enums.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/6864d4a4
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/6864d4a4
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/6864d4a4
Branch: refs/heads/api-work
Commit: 6864d4a450b2d6a5622e4a84a147a2126eab7e68
Parents: a7edd89
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Fri Mar 10 23:16:47 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Mar 11 13:03:33 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/TestApiConsistency.cs | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6864d4a4/src/Lucene.Net.Tests/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/TestApiConsistency.cs b/src/Lucene.Net.Tests/TestApiConsistency.cs
index f0dde4a..75c0e21 100644
--- a/src/Lucene.Net.Tests/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests/TestApiConsistency.cs
@@ -101,12 +101,13 @@ namespace Lucene.Net
base.TestForTypesContainingNonNetNumeric(typeFromTargetAssembly);
}
- [Test, LuceneNetSpecific]
- [TestCase(typeof(Lucene.Net.Analysis.Analyzer))]
- public override void TestForPublicMembersWithNullableEnum(Type typeFromTargetAssembly)
- {
- base.TestForPublicMembersWithNullableEnum(typeFromTargetAssembly);
- }
+ // LUCENENET TODO: Re-enable this and try to eliminate more nullable enums, if possible.
+ //[Test, LuceneNetSpecific]
+ //[TestCase(typeof(Lucene.Net.Analysis.Analyzer))]
+ //public override void TestForPublicMembersWithNullableEnum(Type typeFromTargetAssembly)
+ //{
+ // base.TestForPublicMembersWithNullableEnum(typeFromTargetAssembly);
+ //}
// LUCENENET NOTE: This test is only for identifying members who were changed from
// ICollection, IList or ISet to IEnumerable during the port (that should be changed back)
[2/5] lucenenet git commit:
Lucene.Net.Misc.Index.Sorter.SortingMergePolicy: Added
ExceptionToNullableConvention to FindMerges method.
Posted by ni...@apache.org.
Lucene.Net.Misc.Index.Sorter.SortingMergePolicy: Added ExceptionToNullableConvention to FindMerges method.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/7c938bef
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/7c938bef
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/7c938bef
Branch: refs/heads/api-work
Commit: 7c938beffd8506006c85e63f847107d3cd7dd676
Parents: 12c4d91
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Fri Mar 10 23:03:20 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Mar 11 13:03:31 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7c938bef/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs b/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs
index e46647b..a70a5f1 100644
--- a/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs
+++ b/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs
@@ -1,5 +1,6 @@
\ufeffusing Lucene.Net.Search;
using Lucene.Net.Store;
+using Lucene.Net.Support;
using Lucene.Net.Util;
using Lucene.Net.Util.Packed;
using System;
@@ -234,6 +235,7 @@ namespace Lucene.Net.Index.Sorter
this.sort = sort;
}
+ [ExceptionToNullableEnumConvention]
public override MergeSpecification FindMerges(MergeTrigger? mergeTrigger, SegmentInfos segmentInfos)
{
return SortedMergeSpecification(@in.FindMerges(mergeTrigger, segmentInfos));
[5/5] lucenenet git commit: BUG: Lucene.Net.Tests.QueryParser: Fixed
TestParser resource files for .NET Core
Posted by ni...@apache.org.
BUG: Lucene.Net.Tests.QueryParser: Fixed TestParser resource files for .NET Core
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/7c282a49
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/7c282a49
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/7c282a49
Branch: refs/heads/api-work
Commit: 7c282a4917054f0b6a04add5690d7b15fdbd9a85
Parents: 6864d4a
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Mar 11 11:43:05 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Mar 11 13:03:34 2017 +0700
----------------------------------------------------------------------
.../Xml/TestParser.cs | 7 ++++-
src/Lucene.Net.Tests.QueryParser/project.json | 32 ++++++++++++++++++++
2 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7c282a49/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs b/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
index 6aae1a4..80d0ee5 100644
--- a/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
@@ -31,7 +31,12 @@ namespace Lucene.Net.QueryParsers.Xml
public class TestParser : LuceneTestCase
{
- internal const string RESOURCE_PATH = "Lucene.Net.QueryParsers.Xml.";
+ internal const string RESOURCE_PATH =
+#if NETSTANDARD
+ "Lucene.Net.Tests.QueryParser.Xml.";
+#else
+ "Lucene.Net.QueryParsers.Xml.";
+#endif
private static CoreParser builder;
private static Store.Directory dir;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7c282a49/src/Lucene.Net.Tests.QueryParser/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/project.json b/src/Lucene.Net.Tests.QueryParser/project.json
index b2ff80a..b786d58 100644
--- a/src/Lucene.Net.Tests.QueryParser/project.json
+++ b/src/Lucene.Net.Tests.QueryParser/project.json
@@ -9,6 +9,37 @@
},
"testRunner": "nunit",
+ "buildOptions": {
+ "embed": {
+ "includeFiles": [
+ "Xml/albumBooleanQuery.xsl",
+ "Xml/albumFilteredQuery.xsl",
+ "Xml/albumLuceneClassicQuery.xsl",
+ "Xml/BooleanFilter.xml",
+ "Xml/BooleanQuery.xml",
+ "Xml/BoostingQuery.xml",
+ "Xml/BoostingTermQuery.xml",
+ "Xml/CachedFilter.xml",
+ "Xml/ConstantScoreQuery.xml",
+ "Xml/DisjunctionMaxQuery.xml",
+ "Xml/DuplicateFilterQuery.xml",
+ "Xml/FuzzyLikeThisQuery.xml",
+ "Xml/LikeThisQuery.xml",
+ "Xml/MatchAllDocsQuery.xml",
+ "Xml/NestedBooleanQuery.xml",
+ "Xml/NumericRangeFilterQuery.xml",
+ "Xml/NumericRangeQueryQuery.xml",
+ "Xml/RangeFilterQuery.xml",
+ "Xml/reuters21578.txt",
+ "Xml/SpanQuery.xml",
+ "Xml/TermQuery.xml",
+ "Xml/TermsFilterQuery.xml",
+ "Xml/TermsQuery.xml",
+ "Xml/UserInputQuery.xml",
+ "Xml/UserInputQueryCustomField.xml"
+ ]
+ }
+ },
"frameworks": {
"netcoreapp1.0": {
"imports": "dnxcore50",
@@ -19,6 +50,7 @@
}
},
"buildOptions": {
+ "define": [ "NETSTANDARD" ],
"compile": {
"excludeFiles": [
"Xml/TestQueryTemplateManager.cs",