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/01/28 10:15:47 UTC

[04/22] lucenenet git commit: Lucene.Net.Queries.Function.FunctionValues refactor: ValueFiller > GetValueFiller()

Lucene.Net.Queries.Function.FunctionValues refactor: ValueFiller > GetValueFiller()


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/dffc898c
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/dffc898c
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/dffc898c

Branch: refs/heads/api-work
Commit: dffc898c9ff40a60de585c397b828d5d8a370338
Parents: a1e8494
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 07:46:03 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 07:47:12 2017 +0700

----------------------------------------------------------------------
 .../Function/FunctionAllGroupHeadsCollector.cs     |  2 +-
 .../Function/FunctionAllGroupsCollector.cs         |  2 +-
 .../Function/FunctionDistinctValuesCollector.cs    |  4 ++--
 .../Function/FunctionFirstPassGroupingCollector.cs |  2 +-
 .../FunctionSecondPassGroupingCollector.cs         |  2 +-
 .../Function/DocValues/BoolDocValues.cs            |  7 ++-----
 .../Function/DocValues/DocTermsIndexDocValues.cs   |  7 ++-----
 .../Function/DocValues/DoubleDocValues.cs          |  7 ++-----
 .../Function/DocValues/FloatDocValues.cs           |  7 ++-----
 .../Function/DocValues/IntDocValues.cs             |  7 ++-----
 .../Function/DocValues/LongDocValues.cs            |  7 ++-----
 .../Function/DocValues/StrDocValues.cs             |  7 ++-----
 src/Lucene.Net.Queries/Function/FunctionValues.cs  |  4 ++--
 .../Function/ValueSources/DefFunction.cs           |  9 +++------
 .../Function/ValueSources/DoubleFieldSource.cs     |  7 ++-----
 .../Function/ValueSources/EnumFieldSource.cs       |  7 ++-----
 .../Function/ValueSources/FloatFieldSource.cs      |  7 ++-----
 .../Function/ValueSources/IfFunction.cs            | 11 ++++-------
 .../Function/ValueSources/IntFieldSource.cs        |  7 ++-----
 .../Function/ValueSources/LongFieldSource.cs       |  7 ++-----
 .../Function/ValueSources/OrdFieldSource.cs        |  7 ++-----
 .../Function/ValueSources/QueryValueSource.cs      | 17 +++++++----------
 22 files changed, 48 insertions(+), 96 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
index 17a4142..c8a42be 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
@@ -101,7 +101,7 @@ namespace Lucene.Net.Search.Grouping.Function
         {
             this.readerContext = context;
             FunctionValues values = groupBy.GetValues(vsContext, context);
-            filler = values.ValueFiller;
+            filler = values.GetValueFiller();
             mval = filler.Value;
 
             foreach (GroupHead groupHead in groups.Values)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs
index fc5848b..0381eeb 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs
@@ -75,7 +75,7 @@ namespace Lucene.Net.Search.Grouping.Function
         public override void SetNextReader(AtomicReaderContext context)
         {
             FunctionValues values = groupBy.GetValues(vsContext, context);
-            filler = values.ValueFiller;
+            filler = values.GetValueFiller();
             mval = filler.Value;
         }
     }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs
index dc882bf..f1f0e5c 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs
@@ -72,10 +72,10 @@ namespace Lucene.Net.Search.Grouping.Function
         public override void SetNextReader(AtomicReaderContext context)
         {
             FunctionValues values = groupSource.GetValues(vsContext, context);
-            groupFiller = values.ValueFiller;
+            groupFiller = values.GetValueFiller();
             groupMval = groupFiller.Value;
             values = countSource.GetValues(vsContext, context);
-            countFiller = values.ValueFiller;
+            countFiller = values.GetValueFiller();
             countMval = countFiller.Value;
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs
index 3821319..20441f7 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs
@@ -78,7 +78,7 @@ namespace Lucene.Net.Search.Grouping.Function
         {
             base.SetNextReader(context);
             FunctionValues values = groupByVS.GetValues(vsContext, context);
-            filler = values.ValueFiller;
+            filler = values.GetValueFiller();
             mval = filler.Value;
         }
     }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs
index 5953839..be66fe4 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs
@@ -71,7 +71,7 @@ namespace Lucene.Net.Search.Grouping.Function
         {
             base.SetNextReader(context);
             FunctionValues values = groupByVS.GetValues(vsContext, context);
-            filler = values.ValueFiller;
+            filler = values.GetValueFiller();
             mval = filler.Value;
         }
     }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
index 05611e9..c64c7be 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
@@ -80,12 +80,9 @@ namespace Lucene.Net.Queries.Function.DocValues
             return vs.GetDescription() + '=' + StrVal(doc);
         }
 
-        public override AbstractValueFiller ValueFiller
+        public override AbstractValueFiller GetValueFiller()
         {
-            get
-            {
-                return new ValueFillerAnonymousInnerClassHelper(this);
-            }
+            return new ValueFillerAnonymousInnerClassHelper(this);
         }
 
         private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
index 728f62b..9583dd3 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
@@ -156,12 +156,9 @@ namespace Lucene.Net.Queries.Function.DocValues
             return vs.GetDescription() + '=' + StrVal(doc);
         }
 
-        public override AbstractValueFiller ValueFiller
+        public override AbstractValueFiller GetValueFiller()
         {
-            get
-            {
-                return new ValueFillerAnonymousInnerClassHelper(this);
-            }
+            return new ValueFillerAnonymousInnerClassHelper(this);
         }
 
         private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
index 400681d..245e8af 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
@@ -213,12 +213,9 @@ namespace Lucene.Net.Queries.Function.DocValues
             }
         }
 
-        public override AbstractValueFiller ValueFiller
+        public override AbstractValueFiller GetValueFiller()
         {
-            get
-            {
-                return new ValueFillerAnonymousInnerClassHelper(this);
-            }
+            return new ValueFillerAnonymousInnerClassHelper(this);
         }
 
         private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
index ab41ba0..a587453 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
@@ -75,12 +75,9 @@ namespace Lucene.Net.Queries.Function.DocValues
             return vs.GetDescription() + '=' + StrVal(doc);
         }
 
-        public override AbstractValueFiller ValueFiller
+        public override AbstractValueFiller GetValueFiller()
         {
-            get
-            {
-                return new ValueFillerAnonymousInnerClassHelper(this);
-            }
+            return new ValueFillerAnonymousInnerClassHelper(this);
         }
 
         private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
index a306656..4c46547 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
@@ -138,12 +138,9 @@ namespace Lucene.Net.Queries.Function.DocValues
             }
         }
 
-        public override AbstractValueFiller ValueFiller
+        public override AbstractValueFiller GetValueFiller()
         {
-            get
-            {
-                return new ValueFillerAnonymousInnerClassHelper(this);
-            }
+            return new ValueFillerAnonymousInnerClassHelper(this);
         }
 
         private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
index 6bf1813..9d4edbe 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
@@ -148,12 +148,9 @@ namespace Lucene.Net.Queries.Function.DocValues
             }
         }
 
-        public override AbstractValueFiller ValueFiller
+        public override AbstractValueFiller GetValueFiller()
         {
-            get
-            {
-                return new ValueFillerAnonymousInnerClassHelper(this);
-            }
+            return new ValueFillerAnonymousInnerClassHelper(this);
         }
 
         private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
index 8601f78..7258ea5 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
@@ -49,12 +49,9 @@ namespace Lucene.Net.Queries.Function.DocValues
             return vs.GetDescription() + "='" + StrVal(doc) + "'";
         }
 
-        public override AbstractValueFiller ValueFiller
+        public override AbstractValueFiller GetValueFiller()
         {
-            get
-            {
-                return new ValueFillerAnonymousInnerClassHelper(this);
-            }
+            return new ValueFillerAnonymousInnerClassHelper(this);
         }
 
         private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/FunctionValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/FunctionValues.cs b/src/Lucene.Net.Queries/Function/FunctionValues.cs
index a14ce75..e7b4446 100644
--- a/src/Lucene.Net.Queries/Function/FunctionValues.cs
+++ b/src/Lucene.Net.Queries/Function/FunctionValues.cs
@@ -145,9 +145,9 @@ namespace Lucene.Net.Queries.Function
 
         /// <summary>
         /// @lucene.experimental </summary>
-        public virtual AbstractValueFiller ValueFiller // LUCENENET TODO: Make GetValueFiller() (returns new object)
+        public virtual AbstractValueFiller GetValueFiller()
         {
-            get { return new ValueFillerAnonymousInnerClassHelper(this); }
+            return new ValueFillerAnonymousInnerClassHelper(this);
         }
 
         private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
index 5f90ada..20dc76c 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
@@ -128,13 +128,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
                 return valsArr.Any(vals => vals.Exists(doc));
             }
 
-            public override AbstractValueFiller ValueFiller
+            public override AbstractValueFiller GetValueFiller()
             {
-                get
-                {
-                    // TODO: need ValueSource.type() to determine correct type
-                    return base.ValueFiller;
-                }
+                // TODO: need ValueSource.type() to determine correct type
+                return base.GetValueFiller();
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
index 6b35d47..ecdec6e 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
@@ -77,12 +77,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
                 return arr.Get(doc) != 0 || valid.Get(doc);
             }
 
-            public override AbstractValueFiller ValueFiller
+            public override AbstractValueFiller GetValueFiller()
             {
-                get
-                {
-                    return new ValueFillerAnonymousInnerClassHelper(this);
-                }
+                return new ValueFillerAnonymousInnerClassHelper(this);
             }
 
             private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
index 84a89c0..02f91bc 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
@@ -241,12 +241,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
                 }
             }
 
-            public override AbstractValueFiller ValueFiller
+            public override AbstractValueFiller GetValueFiller()
             {
-                get
-                {
-                    return new ValueFillerAnonymousInnerClassHelper(this);
-                }
+                return new ValueFillerAnonymousInnerClassHelper(this);
             }
 
             private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
index b1aa5ba..2cb9171 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
@@ -83,12 +83,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
                 return arr.Get(doc) != 0 || valid.Get(doc);
             }
 
-            public override AbstractValueFiller ValueFiller
+            public override AbstractValueFiller GetValueFiller()
             {
-                get
-                {
-                    return new ValueFillerAnonymousInnerClassHelper(this);
-                }
+                return new ValueFillerAnonymousInnerClassHelper(this);
             }
 
             private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
index 208d259..a17c6d2 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
@@ -117,14 +117,11 @@ namespace Lucene.Net.Queries.Function.ValueSources
                 return true; // TODO: flow through to any sub-sources?
             }
 
-            public override AbstractValueFiller ValueFiller
+            public override AbstractValueFiller GetValueFiller()
             {
-                get
-                {
-                    // TODO: we need types of trueSource / falseSource to handle this
-                    // for now, use float.
-                    return base.ValueFiller;
-                }
+                // TODO: we need types of trueSource / falseSource to handle this
+                // for now, use float.
+                return base.GetValueFiller();
             }
 
             public override string ToString(int doc)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
index 45a7c74..0dbe02e 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
@@ -115,12 +115,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
                 return outerInstance.GetDescription() + '=' + IntVal(doc);
             }
 
-            public override AbstractValueFiller ValueFiller
+            public override AbstractValueFiller GetValueFiller()
             {
-                get
-                {
-                    return new ValueFillerAnonymousInnerClassHelper(this);
-                }
+                return new ValueFillerAnonymousInnerClassHelper(this);
             }
 
             private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
index 8623c3d..1f3efb3 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
@@ -111,12 +111,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
                 return outerInstance.ExternalToLong(extVal);
             }
 
-            public override AbstractValueFiller ValueFiller
+            public override AbstractValueFiller GetValueFiller()
             {
-                get
-                {
-                    return new ValueFillerAnonymousInnerClassHelper(this);
-                }
+                return new ValueFillerAnonymousInnerClassHelper(this);
             }
 
             private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
index 035c3f3..9be4993 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
@@ -104,12 +104,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
                 return sindex.GetOrd(doc + off) != 0;
             }
 
-            public override AbstractValueFiller ValueFiller
+            public override AbstractValueFiller GetValueFiller()
             {
-                get
-                {
-                    return new ValueFillerAnonymousInnerClassHelper(this);
-                }
+                return new ValueFillerAnonymousInnerClassHelper(this);
             }
 
             private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
index 4630094..4f4feda 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
@@ -233,17 +233,14 @@ namespace Lucene.Net.Queries.Function.ValueSources
             }
         }
 
-        public override AbstractValueFiller ValueFiller
+        public override AbstractValueFiller GetValueFiller()
         {
-            get
-            {
-                //
-                // TODO: if we want to support more than one value-filler or a value-filler in conjunction with
-                // the FunctionValues, then members like "scorer" should be per ValueFiller instance.
-                // Or we can say that the user should just instantiate multiple FunctionValues.
-                //
-                return new ValueFillerAnonymousInnerClassHelper(this);
-            }
+            //
+            // TODO: if we want to support more than one value-filler or a value-filler in conjunction with
+            // the FunctionValues, then members like "scorer" should be per ValueFiller instance.
+            // Or we can say that the user should just instantiate multiple FunctionValues.
+            //
+            return new ValueFillerAnonymousInnerClassHelper(this);
         }
 
         private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller