lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From synhers...@apache.org
Subject [18/46] lucenenet git commit: .NETify Facet: Field names should be camelCase. Fields should not be public (changed to properties with PascalCase names).
Date Tue, 04 Oct 2016 20:01:48 GMT
.NETify Facet: Field names should be camelCase. Fields should not be public (changed to properties with PascalCase names).


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

Branch: refs/heads/master
Commit: e0a73b45dd4a0faf6b128a271971a9d787b85cc3
Parents: 9604c0f
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Sun Sep 25 10:33:03 2016 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Mon Oct 3 23:31:13 2016 +0700

----------------------------------------------------------------------
 src/Lucene.Net.Facet/DrillSideways.cs           |  4 +-
 src/Lucene.Net.Facet/DrillSidewaysScorer.cs     |  4 +-
 src/Lucene.Net.Facet/FacetField.cs              | 10 +--
 src/Lucene.Net.Facet/FacetResult.cs             | 18 ++--
 src/Lucene.Net.Facet/FacetsCollector.cs         | 16 ++--
 src/Lucene.Net.Facet/FacetsConfig.cs            | 39 ++++-----
 src/Lucene.Net.Facet/LabelAndValue.cs           | 32 +++----
 .../RandomSamplingFacetsCollector.cs            | 14 ++--
 src/Lucene.Net.Facet/Range/DoubleRange.cs       |  8 +-
 .../Range/DoubleRangeFacetCounts.cs             | 16 ++--
 src/Lucene.Net.Facet/Range/LongRange.cs         | 16 ++--
 .../Range/LongRangeFacetCounts.cs               | 16 ++--
 src/Lucene.Net.Facet/Range/Range.cs             |  2 +-
 src/Lucene.Net.Facet/Range/RangeFacetCounts.cs  | 30 +++----
 .../SortedSet/SortedSetDocValuesFacetCounts.cs  | 10 +--
 .../SortedSet/SortedSetDocValuesFacetField.cs   |  4 +-
 .../SortedSet/SortedSetDocValuesReaderState.cs  |  4 +-
 .../Taxonomy/AssociationFacetField.cs           | 14 ++--
 .../Taxonomy/CachedOrdinalsReader.cs            | 28 +++----
 src/Lucene.Net.Facet/Taxonomy/CategoryPath.cs   | 88 ++++++++++----------
 src/Lucene.Net.Facet/Taxonomy/FacetLabel.cs     |  4 +-
 .../Taxonomy/FastTaxonomyFacetCounts.cs         |  4 +-
 .../Taxonomy/FloatAssociationFacetField.cs      |  4 +-
 .../Taxonomy/FloatTaxonomyFacets.cs             | 30 +++----
 .../Taxonomy/IntAssociationFacetField.cs        |  2 +-
 .../Taxonomy/IntTaxonomyFacets.cs               | 22 ++---
 src/Lucene.Net.Facet/Taxonomy/LRUHashMap.cs     | 22 ++---
 .../Taxonomy/SearcherTaxonomyManager.cs         | 30 +++----
 .../Taxonomy/TaxonomyFacetCounts.cs             |  4 +-
 .../TaxonomyFacetSumFloatAssociations.cs        |  4 +-
 .../Taxonomy/TaxonomyFacetSumIntAssociations.cs |  4 +-
 .../Taxonomy/TaxonomyFacetSumValueSource.cs     |  8 +-
 src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs | 36 ++++----
 src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs |  8 +-
 .../Taxonomy/WriterCache/CollisionMap.cs        | 30 +++----
 src/Lucene.Net.Facet/TopOrdAndFloatQueue.cs     | 10 +--
 src/Lucene.Net.Facet/TopOrdAndIntQueue.cs       |  4 +-
 src/Lucene.Net.Tests.Facet/FacetTestCase.cs     | 18 ++--
 .../Range/TestRangeFacetCounts.cs               | 24 +++---
 .../Directory/TestConcurrentFacetedIndexing.cs  |  2 +-
 .../Taxonomy/TestSearcherTaxonomyManager.cs     | 16 ++--
 .../Taxonomy/TestTaxonomyFacetCounts.cs         |  8 +-
 .../Taxonomy/TestTaxonomyFacetCounts2.cs        | 34 ++++----
 src/Lucene.Net.Tests.Facet/TestDrillSideways.cs |  8 +-
 src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs  |  2 +-
 .../TestRandomSamplingFacetsCollector.cs        |  6 +-
 46 files changed, 359 insertions(+), 358 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/DrillSideways.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/DrillSideways.cs b/src/Lucene.Net.Facet/DrillSideways.cs
index 2c71be4..457bed3 100644
--- a/src/Lucene.Net.Facet/DrillSideways.cs
+++ b/src/Lucene.Net.Facet/DrillSideways.cs
@@ -272,11 +272,11 @@ namespace Lucene.Net.Facet
         {
             /// <summary>
             /// Combined drill down & sideways results. </summary>
-            public readonly Facets Facets;
+            public Facets Facets { get; private set; }
 
             /// <summary>
             /// Hits. </summary>
-            public readonly TopDocs Hits;
+            public TopDocs Hits { get; private set; }
 
             /// <summary>
             /// Sole constructor. </summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/DrillSidewaysScorer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/DrillSidewaysScorer.cs b/src/Lucene.Net.Facet/DrillSidewaysScorer.cs
index bd045c3..13d51e6 100644
--- a/src/Lucene.Net.Facet/DrillSidewaysScorer.cs
+++ b/src/Lucene.Net.Facet/DrillSidewaysScorer.cs
@@ -723,8 +723,8 @@ namespace Lucene.Net.Facet
         {
             private readonly DrillSidewaysScorer outerInstance;
 
-            internal float score_Renamed;
-            internal int doc;
+            //internal float score_Renamed; // not used
+            //internal int doc; // not used
 
             public FakeScorer(DrillSidewaysScorer outerInstance)
                 : base(null)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/FacetField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/FacetField.cs b/src/Lucene.Net.Facet/FacetField.cs
index 5c85936..794ec31 100644
--- a/src/Lucene.Net.Facet/FacetField.cs
+++ b/src/Lucene.Net.Facet/FacetField.cs
@@ -42,11 +42,11 @@ namespace Lucene.Net.Facet
 
         /// <summary>
         /// Dimension for this field. </summary>
-        public readonly string dim;
+        public string Dim { get; private set; }
 
         /// <summary>
         /// Path for this field. </summary>
-        public readonly string[] path;
+        public string[] Path { get; private set; }
 
         /// <summary>
         /// Creates the this from {@code dim} and
@@ -60,17 +60,17 @@ namespace Lucene.Net.Facet
             {
                 VerifyLabel(label);
             }
-            this.dim = dim;
+            this.Dim = dim;
             if (path.Length == 0)
             {
                 throw new System.ArgumentException("path must have at least one element");
             }
-            this.path = path;
+            this.Path = path;
         }
 
         public override string ToString()
         {
-            return "FacetField(dim=" + dim + " path=[" + Arrays.ToString(path) + "])";
+            return "FacetField(dim=" + Dim + " path=[" + Arrays.ToString(Path) + "])";
         }
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/FacetResult.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/FacetResult.cs b/src/Lucene.Net.Facet/FacetResult.cs
index 5699e6c..7dc73b9 100644
--- a/src/Lucene.Net.Facet/FacetResult.cs
+++ b/src/Lucene.Net.Facet/FacetResult.cs
@@ -28,31 +28,31 @@ namespace Lucene.Net.Facet
     {
         /// <summary>
         /// Dimension that was requested. </summary>
-        public readonly string Dim;
+        public string Dim { get; private set; }
 
         /// <summary>
         /// Path whose children were requested. </summary>
-        public readonly string[] Path;
+        public string[] Path { get; private set; }
 
         /// <summary>
         /// Total value for this path (sum of all child counts, or
         ///  sum of all child values), even those not included in
         ///  the topN. 
         /// </summary>
-        public readonly float Value;
+        public float Value { get; private set; }
 
         /// <summary>
         /// How many child labels were encountered. </summary>
-        public readonly int ChildCount;
+        public int ChildCount { get; private set; }
 
         /// <summary>
         /// Child counts. </summary>
-        public readonly LabelAndValue[] LabelValues;
+        public LabelAndValue[] LabelValues { get; private set; }
 
         /// <summary>
         /// The original data type of <see cref="Value"/> that was passed through the constructor.
         /// </summary>
-        public readonly Type typeOfValue;
+        public Type TypeOfValue { get; private set; }
 
         /// <summary>
         /// Constructor for <see cref="float"/> <paramref name="value"/>. Makes the <see cref="ToString()"/> method 
@@ -62,7 +62,7 @@ namespace Lucene.Net.Facet
             : this(dim, path, labelValues, childCount)
         {
             this.Value = value;
-            this.typeOfValue = typeof(float);
+            this.TypeOfValue = typeof(float);
         }
 
         /// <summary>
@@ -73,7 +73,7 @@ namespace Lucene.Net.Facet
             : this(dim, path, labelValues, childCount)
         {
             this.Value = value;
-            this.typeOfValue = typeof(int);
+            this.TypeOfValue = typeof(int);
         }
 
         /// <summary>
@@ -95,7 +95,7 @@ namespace Lucene.Net.Facet
             sb.Append(" path=");
             sb.Append("[" + Arrays.ToString(Path) + "]");
             sb.Append(" value=");
-            if (typeOfValue == typeof(int))
+            if (TypeOfValue == typeof(int))
             {
                 sb.AppendFormat(CultureInfo.InvariantCulture, "{0:0}", Value); // No formatting (looks like int)
             }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/FacetsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/FacetsCollector.cs b/src/Lucene.Net.Facet/FacetsCollector.cs
index 0739367..d7be2f0 100644
--- a/src/Lucene.Net.Facet/FacetsCollector.cs
+++ b/src/Lucene.Net.Facet/FacetsCollector.cs
@@ -72,28 +72,28 @@ namespace Lucene.Net.Facet
 
             /// <summary>
             /// Context for this segment. </summary>
-            public readonly AtomicReaderContext context;
+            public AtomicReaderContext Context { get; private set; }
 
             /// <summary>
             /// Which documents were seen. </summary>
-            public readonly DocIdSet bits;
+            public DocIdSet Bits { get; private set; }
 
             /// <summary>
             /// Non-sparse scores array. </summary>
-            public readonly float[] scores;
+            public float[] Scores { get; private set; }
 
             /// <summary>
             /// Total number of hits </summary>
-            public readonly int totalHits;
+            public int TotalHits { get; private set; }
 
             /// <summary>
             /// Sole constructor. </summary>
             public MatchingDocs(AtomicReaderContext context, DocIdSet bits, int totalHits, float[] scores)
             {
-                this.context = context;
-                this.bits = bits;
-                this.scores = scores;
-                this.totalHits = totalHits;
+                this.Context = context;
+                this.Bits = bits;
+                this.Scores = scores;
+                this.TotalHits = totalHits;
             }
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/FacetsConfig.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/FacetsConfig.cs b/src/Lucene.Net.Facet/FacetsConfig.cs
index 16a0ea3..48e97a1 100644
--- a/src/Lucene.Net.Facet/FacetsConfig.cs
+++ b/src/Lucene.Net.Facet/FacetsConfig.cs
@@ -80,28 +80,29 @@ namespace Lucene.Net.Facet
         {
             /// <summary>
             /// True if this dimension is hierarchical. </summary>
-            public bool Hierarchical;
+            public bool Hierarchical { get; set; }
 
             /// <summary>
             /// True if this dimension is multi-valued. </summary>
-            public bool MultiValued;
+            public bool MultiValued { get; set; }
 
             /// <summary>
             /// True if the count/aggregate for the entire dimension
             ///  is required, which is unusual (default is false). 
             /// </summary>
-            public bool RequireDimCount;
+            public bool RequireDimCount { get; set; }
 
             /// <summary>
             /// Actual field where this dimension's facet labels
             ///  should be indexed 
             /// </summary>
-            public string IndexFieldName = DEFAULT_INDEX_FIELD_NAME;
+            public string IndexFieldName { get; set; }
 
             /// <summary>
             /// Default constructor. </summary>
             public DimConfig()
             {
+                IndexFieldName = DEFAULT_INDEX_FIELD_NAME;
             }
         }
 
@@ -288,10 +289,10 @@ namespace Lucene.Net.Facet
                 if (field.FieldType == FacetField.TYPE)
                 {
                     FacetField facetField = (FacetField)field;
-                    FacetsConfig.DimConfig dimConfig = GetDimConfig(facetField.dim);
+                    FacetsConfig.DimConfig dimConfig = GetDimConfig(facetField.Dim);
                     if (dimConfig.MultiValued == false)
                     {
-                        CheckSeen(seenDims, facetField.dim);
+                        CheckSeen(seenDims, facetField.Dim);
                     }
                     string indexFieldName = dimConfig.IndexFieldName;
                     IList<FacetField> fields;
@@ -324,18 +325,18 @@ namespace Lucene.Net.Facet
                 if (field.FieldType == AssociationFacetField.TYPE)
                 {
                     AssociationFacetField facetField = (AssociationFacetField)field;
-                    FacetsConfig.DimConfig dimConfig = GetDimConfig(facetField.dim);
+                    FacetsConfig.DimConfig dimConfig = GetDimConfig(facetField.Dim);
                     if (dimConfig.MultiValued == false)
                     {
-                        CheckSeen(seenDims, facetField.dim);
+                        CheckSeen(seenDims, facetField.Dim);
                     }
                     if (dimConfig.Hierarchical)
                     {
-                        throw new System.ArgumentException("AssociationFacetField cannot be hierarchical (dim=\"" + facetField.dim + "\")");
+                        throw new System.ArgumentException("AssociationFacetField cannot be hierarchical (dim=\"" + facetField.Dim + "\")");
                     }
                     if (dimConfig.RequireDimCount)
                     {
-                        throw new System.ArgumentException("AssociationFacetField cannot requireDimCount (dim=\"" + facetField.dim + "\")");
+                        throw new System.ArgumentException("AssociationFacetField cannot requireDimCount (dim=\"" + facetField.Dim + "\")");
                     }
 
                     string indexFieldName = dimConfig.IndexFieldName;
@@ -408,13 +409,13 @@ namespace Lucene.Net.Facet
                 foreach (FacetField facetField in ent.Value)
                 {
 
-                    FacetsConfig.DimConfig ft = GetDimConfig(facetField.dim);
-                    if (facetField.path.Length > 1 && ft.Hierarchical == false)
+                    FacetsConfig.DimConfig ft = GetDimConfig(facetField.Dim);
+                    if (facetField.Path.Length > 1 && ft.Hierarchical == false)
                     {
-                        throw new System.ArgumentException("dimension \"" + facetField.dim + "\" is not hierarchical yet has " + facetField.path.Length + " components");
+                        throw new System.ArgumentException("dimension \"" + facetField.Dim + "\" is not hierarchical yet has " + facetField.Path.Length + " components");
                     }
 
-                    FacetLabel cp = new FacetLabel(facetField.dim, facetField.path);
+                    FacetLabel cp = new FacetLabel(facetField.Dim, facetField.Path);
 
                     CheckTaxoWriter(taxoWriter);
                     int ordinal = taxoWriter.AddCategory(cp);
@@ -497,7 +498,7 @@ namespace Lucene.Net.Facet
                 {
                     // NOTE: we don't add parents for associations
                     CheckTaxoWriter(taxoWriter);
-                    FacetLabel label = new FacetLabel(field.dim, field.path);
+                    FacetLabel label = new FacetLabel(field.Dim, field.Path);
                     int ordinal = taxoWriter.AddCategory(label);
                     if (upto + 4 > bytes.Length)
                     {
@@ -508,12 +509,12 @@ namespace Lucene.Net.Facet
                     bytes[upto++] = (byte)(ordinal >> 16);
                     bytes[upto++] = (byte)(ordinal >> 8);
                     bytes[upto++] = (byte)ordinal;
-                    if (upto + field.assoc.Length > bytes.Length)
+                    if (upto + field.Assoc.Length > bytes.Length)
                     {
-                        bytes = ArrayUtil.Grow(bytes, upto + field.assoc.Length);
+                        bytes = ArrayUtil.Grow(bytes, upto + field.Assoc.Length);
                     }
-                    Array.Copy(field.assoc.Bytes, field.assoc.Offset, bytes, upto, field.assoc.Length);
-                    upto += field.assoc.Length;
+                    Array.Copy(field.Assoc.Bytes, field.Assoc.Offset, bytes, upto, field.Assoc.Length);
+                    upto += field.Assoc.Length;
 
                     // Drill down:
                     for (int i = 1; i <= label.Length; i++)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/LabelAndValue.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/LabelAndValue.cs b/src/Lucene.Net.Facet/LabelAndValue.cs
index 1503e3e..bf6271c 100644
--- a/src/Lucene.Net.Facet/LabelAndValue.cs
+++ b/src/Lucene.Net.Facet/LabelAndValue.cs
@@ -28,16 +28,16 @@ namespace Lucene.Net.Facet
     {
         /// <summary>
         /// Facet's label. </summary>
-        public readonly string label;
+        public string Label { get; private set; }
 
         /// <summary>
         /// Value associated with this label. </summary>
-        public readonly float value;
+        public float Value { get; private set; }
 
         /// <summary>
-        /// The original data type of <see cref="value"/> that was passed through the constructor.
+        /// The original data type of <see cref="Value"/> that was passed through the constructor.
         /// </summary>
-        public readonly Type typeOfValue;
+        public Type TypeOfValue { get; private set; }
 
         /// <summary>
         /// Constructor for <see cref="float"/> <paramref name="value"/>. Makes the <see cref="ToString()"/> method 
@@ -45,9 +45,9 @@ namespace Lucene.Net.Facet
         /// </summary>
         public LabelAndValue(string label, float value)
         {
-            this.label = label;
-            this.value = value;
-            this.typeOfValue = typeof(float);
+            this.Label = label;
+            this.Value = value;
+            this.TypeOfValue = typeof(float);
         }
 
         /// <summary>
@@ -56,17 +56,17 @@ namespace Lucene.Net.Facet
         /// </summary>
         public LabelAndValue(string label, int value)
         {
-            this.label = label;
-            this.value = value;
-            this.typeOfValue = typeof(int);
+            this.Label = label;
+            this.Value = value;
+            this.TypeOfValue = typeof(int);
         }
 
         public override string ToString()
         {
-            string valueString = (typeOfValue == typeof(int))
-                ? value.ToString("0", CultureInfo.InvariantCulture)
-                : value.ToString("0.0#####", CultureInfo.InvariantCulture);
-            return label + " (" + valueString + ")";
+            string valueString = (TypeOfValue == typeof(int))
+                ? Value.ToString("0", CultureInfo.InvariantCulture)
+                : Value.ToString("0.0#####", CultureInfo.InvariantCulture);
+            return Label + " (" + valueString + ")";
         }
 
         public override bool Equals(object _other)
@@ -76,12 +76,12 @@ namespace Lucene.Net.Facet
                 return false;
             }
             LabelAndValue other = (LabelAndValue)_other;
-            return label.Equals(other.label) && value.Equals(other.value);
+            return Label.Equals(other.Label) && Value.Equals(other.Value);
         }
 
         public override int GetHashCode()
         {
-            return label.GetHashCode() + 1439 * value.GetHashCode();
+            return Label.GetHashCode() + 1439 * Value.GetHashCode();
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/RandomSamplingFacetsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/RandomSamplingFacetsCollector.cs b/src/Lucene.Net.Facet/RandomSamplingFacetsCollector.cs
index a662b6a..6c00c40 100644
--- a/src/Lucene.Net.Facet/RandomSamplingFacetsCollector.cs
+++ b/src/Lucene.Net.Facet/RandomSamplingFacetsCollector.cs
@@ -143,7 +143,7 @@ namespace Lucene.Net.Facet
                     totalHits = 0;
                     foreach (MatchingDocs md in matchingDocs)
                     {
-                        totalHits += md.totalHits;
+                        totalHits += md.TotalHits;
                     }
                 }
 
@@ -187,7 +187,7 @@ namespace Lucene.Net.Facet
         /// Create a sampled of the given hits. </summary>
         private MatchingDocs CreateSample(MatchingDocs docs)
         {
-            int maxdoc = docs.context.Reader.MaxDoc;
+            int maxdoc = docs.Context.Reader.MaxDoc;
 
             // TODO: we could try the WAH8DocIdSet here as well, as the results will be sparse
             FixedBitSet sampleDocs = new FixedBitSet(maxdoc);
@@ -210,7 +210,7 @@ namespace Lucene.Net.Facet
                     limit = binSize;
                     randomIndex = random.NextInt(binSize);
                 }
-                DocIdSetIterator it = docs.bits.GetIterator();
+                DocIdSetIterator it = docs.Bits.GetIterator();
                 for (int doc = it.NextDoc(); doc != DocIdSetIterator.NO_MORE_DOCS; doc = it.NextDoc())
                 {
                     if (counter == randomIndex)
@@ -250,7 +250,7 @@ namespace Lucene.Net.Facet
                     }
                 }
 
-                return new MatchingDocs(docs.context, sampleDocs, docs.totalHits, null);
+                return new MatchingDocs(docs.Context, sampleDocs, docs.TotalHits, null);
             }
             catch (IOException)
             {
@@ -282,12 +282,12 @@ namespace Lucene.Net.Facet
 
             for (int i = 0; i < res.LabelValues.Length; i++)
             {
-                childPath[res.Path.Length + 1] = res.LabelValues[i].label;
+                childPath[res.Path.Length + 1] = res.LabelValues[i].Label;
                 string fullPath = FacetsConfig.PathToString(childPath, childPath.Length);
                 int max = reader.DocFreq(new Term(dimConfig.IndexFieldName, fullPath));
-                int correctedCount = (int)((double)res.LabelValues[i].value / samplingRate);
+                int correctedCount = (int)((double)res.LabelValues[i].Value / samplingRate);
                 correctedCount = Math.Min(max, correctedCount);
-                fixedLabelValues[i] = new LabelAndValue(res.LabelValues[i].label, correctedCount);
+                fixedLabelValues[i] = new LabelAndValue(res.LabelValues[i].Label, correctedCount);
             }
 
             // cap the total count on the total number of non-deleted documents in the reader

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Range/DoubleRange.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Range/DoubleRange.cs b/src/Lucene.Net.Facet/Range/DoubleRange.cs
index 93f85cb..058ff52 100644
--- a/src/Lucene.Net.Facet/Range/DoubleRange.cs
+++ b/src/Lucene.Net.Facet/Range/DoubleRange.cs
@@ -40,19 +40,19 @@ namespace Lucene.Net.Facet.Range
 
         /// <summary>
         /// Minimum. </summary>
-        public readonly double Min;
+        public double Min { get; private set; }
 
         /// <summary>
         /// Maximum. </summary>
-        public readonly double Max;
+        public double Max { get; private set; }
 
         /// <summary>
         /// True if the minimum value is inclusive. </summary>
-        public readonly bool MinInclusive;
+        public bool MinInclusive { get; private set; }
 
         /// <summary>
         /// True if the maximum value is inclusive. </summary>
-        public readonly bool MaxInclusive;
+        public bool MaxInclusive { get; private set; }
 
         private const double EPSILON = 1E-14;
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Range/DoubleRangeFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Range/DoubleRangeFacetCounts.cs b/src/Lucene.Net.Facet/Range/DoubleRangeFacetCounts.cs
index 1033a42..52a3ad5 100644
--- a/src/Lucene.Net.Facet/Range/DoubleRangeFacetCounts.cs
+++ b/src/Lucene.Net.Facet/Range/DoubleRangeFacetCounts.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Facet.Range
         private void Count(ValueSource valueSource, IEnumerable<MatchingDocs> matchingDocs)
         {
 
-            DoubleRange[] ranges = (DoubleRange[])this.Ranges;
+            DoubleRange[] ranges = (DoubleRange[])this.ranges;
 
             LongRange[] longRanges = new LongRange[ranges.Length];
             for (int i = 0; i < ranges.Length; i++)
@@ -99,13 +99,13 @@ namespace Lucene.Net.Facet.Range
             int missingCount = 0;
             foreach (MatchingDocs hits in matchingDocs)
             {
-                FunctionValues fv = valueSource.GetValues(new Dictionary<string, object>(), hits.context);
+                FunctionValues fv = valueSource.GetValues(new Dictionary<string, object>(), hits.Context);
 
-                TotCount += hits.totalHits;
+                totCount += hits.TotalHits;
                 Bits bits;
-                if (FastMatchFilter != null)
+                if (fastMatchFilter != null)
                 {
-                    DocIdSet dis = FastMatchFilter.GetDocIdSet(hits.context, null);
+                    DocIdSet dis = fastMatchFilter.GetDocIdSet(hits.Context, null);
                     if (dis == null)
                     {
                         // No documents match
@@ -122,7 +122,7 @@ namespace Lucene.Net.Facet.Range
                     bits = null;
                 }
 
-                DocIdSetIterator docs = hits.bits.GetIterator();
+                DocIdSetIterator docs = hits.Bits.GetIterator();
 
                 int doc;
                 while ((doc = docs.NextDoc()) != DocIdSetIterator.NO_MORE_DOCS)
@@ -144,8 +144,8 @@ namespace Lucene.Net.Facet.Range
                 }
             }
 
-            missingCount += counter.FillCounts(Counts);
-            TotCount -= missingCount;
+            missingCount += counter.FillCounts(counts);
+            totCount -= missingCount;
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Range/LongRange.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Range/LongRange.cs b/src/Lucene.Net.Facet/Range/LongRange.cs
index c54456d..eb7671b 100644
--- a/src/Lucene.Net.Facet/Range/LongRange.cs
+++ b/src/Lucene.Net.Facet/Range/LongRange.cs
@@ -39,19 +39,19 @@ namespace Lucene.Net.Facet.Range
 
         /// <summary>
         /// Minimum. </summary>
-        public readonly long min;
+        public long Min { get; private set; }
 
         /// <summary>
         /// Maximum. </summary>
-        public readonly long max;
+        public long Max { get; private set; }
 
         /// <summary>
         /// True if the minimum value is inclusive. </summary>
-        public readonly bool minInclusive;
+        public bool MinInclusive { get; private set; }
 
         /// <summary>
         /// True if the maximum value is inclusive. </summary>
-        public readonly bool maxInclusive;
+        public bool MaxInclusive { get; private set; }
 
         // TODO: can we require fewer args? (same for
         // Double/FloatRange too)
@@ -61,10 +61,10 @@ namespace Lucene.Net.Facet.Range
         public LongRange(string label, long minIn, bool minInclusive, long maxIn, bool maxInclusive)
             : base(label)
         {
-            this.min = minIn;
-            this.max = maxIn;
-            this.minInclusive = minInclusive;
-            this.maxInclusive = maxInclusive;
+            this.Min = minIn;
+            this.Max = maxIn;
+            this.MinInclusive = minInclusive;
+            this.MaxInclusive = maxInclusive;
 
             if (!minInclusive)
             {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Range/LongRangeFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Range/LongRangeFacetCounts.cs b/src/Lucene.Net.Facet/Range/LongRangeFacetCounts.cs
index 167eb85..d906cf8 100644
--- a/src/Lucene.Net.Facet/Range/LongRangeFacetCounts.cs
+++ b/src/Lucene.Net.Facet/Range/LongRangeFacetCounts.cs
@@ -78,20 +78,20 @@ namespace Lucene.Net.Facet.Range
         private void Count(ValueSource valueSource, IList<MatchingDocs> matchingDocs)
         {
 
-            LongRange[] ranges = (LongRange[])this.Ranges;
+            LongRange[] ranges = (LongRange[])this.ranges;
 
             LongRangeCounter counter = new LongRangeCounter(ranges);
 
             int missingCount = 0;
             foreach (MatchingDocs hits in matchingDocs)
             {
-                FunctionValues fv = valueSource.GetValues(new Dictionary<string, object>(), hits.context);
+                FunctionValues fv = valueSource.GetValues(new Dictionary<string, object>(), hits.Context);
 
-                TotCount += hits.totalHits;
+                totCount += hits.TotalHits;
                 Bits bits;
-                if (FastMatchFilter != null)
+                if (fastMatchFilter != null)
                 {
-                    DocIdSet dis = FastMatchFilter.GetDocIdSet(hits.context, null);
+                    DocIdSet dis = fastMatchFilter.GetDocIdSet(hits.Context, null);
                     if (dis == null)
                     {
                         // No documents match
@@ -108,7 +108,7 @@ namespace Lucene.Net.Facet.Range
                     bits = null;
                 }
 
-                DocIdSetIterator docs = hits.bits.GetIterator();
+                DocIdSetIterator docs = hits.Bits.GetIterator();
                 int doc;
                 while ((doc = docs.NextDoc()) != DocIdSetIterator.NO_MORE_DOCS)
                 {
@@ -129,12 +129,12 @@ namespace Lucene.Net.Facet.Range
                 }
             }
 
-            int x = counter.FillCounts(Counts);
+            int x = counter.FillCounts(counts);
 
             missingCount += x;
 
             //System.out.println("totCount " + totCount + " missingCount " + counter.missingCount);
-            TotCount -= missingCount;
+            totCount -= missingCount;
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Range/Range.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Range/Range.cs b/src/Lucene.Net.Facet/Range/Range.cs
index c207031..32ea724 100644
--- a/src/Lucene.Net.Facet/Range/Range.cs
+++ b/src/Lucene.Net.Facet/Range/Range.cs
@@ -30,7 +30,7 @@
 
         /// <summary>
         /// Label that identifies this range. </summary>
-        public readonly string Label;
+        public string Label { get; private set; }
 
         /// <summary>
         /// Sole constructor. </summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Range/RangeFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Range/RangeFacetCounts.cs b/src/Lucene.Net.Facet/Range/RangeFacetCounts.cs
index 53a4d26..e051712 100644
--- a/src/Lucene.Net.Facet/Range/RangeFacetCounts.cs
+++ b/src/Lucene.Net.Facet/Range/RangeFacetCounts.cs
@@ -30,11 +30,11 @@ namespace Lucene.Net.Facet.Range
     {
         /// <summary>
         /// Ranges passed to constructor. </summary>
-        protected internal readonly Range[] Ranges;
+        protected internal readonly Range[] ranges;
 
         /// <summary>
         /// Counts, initialized in by subclass. </summary>
-        protected internal readonly int[] Counts;
+        protected internal readonly int[] counts;
 
         /// <summary>
         /// Optional: if specified, we first test this Filter to
@@ -42,42 +42,42 @@ namespace Lucene.Net.Facet.Range
         ///  matching ranges.  If this is null, all documents are
         ///  checked. 
         /// </summary>
-        protected internal readonly Filter FastMatchFilter;
+        protected internal readonly Filter fastMatchFilter;
 
         /// <summary>
         /// Our field name. </summary>
-        protected internal readonly string Field;
+        protected internal readonly string field;
 
         /// <summary>
         /// Total number of hits. </summary>
-        protected internal int TotCount;
+        protected internal int totCount;
 
         /// <summary>
         /// Create {@code RangeFacetCounts} </summary>
         protected internal RangeFacetCounts(string field, Range[] ranges, Filter fastMatchFilter)
         {
-            this.Field = field;
-            this.Ranges = ranges;
-            this.FastMatchFilter = fastMatchFilter;
-            Counts = new int[ranges.Length];
+            this.field = field;
+            this.ranges = ranges;
+            this.fastMatchFilter = fastMatchFilter;
+            counts = new int[ranges.Length];
         }
 
         public override FacetResult GetTopChildren(int topN, string dim, params string[] path)
         {
-            if (dim.Equals(Field) == false)
+            if (dim.Equals(field) == false)
             {
-                throw new System.ArgumentException("invalid dim \"" + dim + "\"; should be \"" + Field + "\"");
+                throw new System.ArgumentException("invalid dim \"" + dim + "\"; should be \"" + field + "\"");
             }
             if (path.Length != 0)
             {
                 throw new System.ArgumentException("path.length should be 0");
             }
-            LabelAndValue[] labelValues = new LabelAndValue[Counts.Length];
-            for (int i = 0; i < Counts.Length; i++)
+            LabelAndValue[] labelValues = new LabelAndValue[counts.Length];
+            for (int i = 0; i < counts.Length; i++)
             {
-                labelValues[i] = new LabelAndValue(Ranges[i].Label, Counts[i]);
+                labelValues[i] = new LabelAndValue(ranges[i].Label, counts[i]);
             }
-            return new FacetResult(dim, path, TotCount, labelValues, labelValues.Length);
+            return new FacetResult(dim, path, totCount, labelValues, labelValues.Length);
         }
 
         public override float GetSpecificValue(string dim, params string[] path)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetCounts.cs b/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetCounts.cs
index 1039fff..057d274 100644
--- a/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetCounts.cs
+++ b/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetCounts.cs
@@ -172,13 +172,13 @@ namespace Lucene.Net.Facet.SortedSet
 
             foreach (FacetsCollector.MatchingDocs hits in matchingDocs)
             {
-                var reader = hits.context.AtomicReader;
+                var reader = hits.Context.AtomicReader;
                 //System.out.println("  reader=" + reader);
                 // LUCENE-5090: make sure the provided reader context "matches"
                 // the top-level reader passed to the
                 // SortedSetDocValuesReaderState, else cryptic
                 // AIOOBE can happen:
-                if (!Equals(ReaderUtil.GetTopLevelContext(hits.context).Reader, origReader))
+                if (!Equals(ReaderUtil.GetTopLevelContext(hits.Context).Reader, origReader))
                 {
                     throw new InvalidOperationException("the SortedSetDocValuesReaderState provided to this class does not match the reader being searched; you must create a new SortedSetDocValuesReaderState every time you open a new IndexReader");
                 }
@@ -189,7 +189,7 @@ namespace Lucene.Net.Facet.SortedSet
                     continue;
                 }
 
-                DocIdSetIterator docs = hits.bits.GetIterator();
+                DocIdSetIterator docs = hits.Bits.GetIterator();
 
                 // TODO: yet another option is to count all segs
                 // first, only in seg-ord space, and then do a
@@ -202,11 +202,11 @@ namespace Lucene.Net.Facet.SortedSet
                 // segs)
                 if (ordinalMap != null)
                 {
-                    int segOrd = hits.context.Ord;
+                    int segOrd = hits.Context.Ord;
 
                     int numSegOrds = (int)segValues.ValueCount;
 
-                    if (hits.totalHits < numSegOrds / 10)
+                    if (hits.TotalHits < numSegOrds / 10)
                     {
                         //System.out.println("    remap as-we-go");
                         // Remap every ord to global ord as we iterate:

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetField.cs b/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetField.cs
index 3729583..ba1f360 100644
--- a/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetField.cs
+++ b/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesFacetField.cs
@@ -37,11 +37,11 @@
 
         /// <summary>
         /// Dimension. </summary>
-        public readonly string Dim;
+        public string Dim { get; private set; }
 
         /// <summary>
         /// Label. </summary>
-        public readonly string Label;
+        public string Label { get; private set; }
 
         /// <summary>
         /// Sole constructor. </summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesReaderState.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesReaderState.cs b/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesReaderState.cs
index 2b3c2b1..f895210 100644
--- a/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesReaderState.cs
+++ b/src/Lucene.Net.Facet/SortedSet/SortedSetDocValuesReaderState.cs
@@ -51,10 +51,10 @@ namespace Lucene.Net.Facet.SortedSet
         {
             /// <summary>
             /// Start of range, inclusive: </summary>
-            public readonly int Start;
+            public int Start { get; private set; }
             /// <summary>
             /// End of range, inclusive: </summary>
-            public readonly int End;
+            public int End { get; private set; }
 
             /// <summary>
             /// Start and end are inclusive. </summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/AssociationFacetField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/AssociationFacetField.cs b/src/Lucene.Net.Facet/Taxonomy/AssociationFacetField.cs
index 6092f9a..f2e70a7 100644
--- a/src/Lucene.Net.Facet/Taxonomy/AssociationFacetField.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/AssociationFacetField.cs
@@ -48,15 +48,15 @@ namespace Lucene.Net.Facet.Taxonomy
 
         /// <summary>
         /// Dimension for this field. </summary>
-        public readonly string dim;
+        public string Dim { get; private set; }
 
         /// <summary>
         /// Facet path for this field. </summary>
-        public readonly string[] path;
+        public string[] Path { get; private set; }
 
         /// <summary>
         /// Associated value. </summary>
-        public readonly BytesRef assoc;
+        public BytesRef Assoc { get; private set; }
 
         /// <summary>
         /// Creates this from {@code dim} and {@code path} and an
@@ -70,18 +70,18 @@ namespace Lucene.Net.Facet.Taxonomy
             {
                 FacetField.VerifyLabel(label);
             }
-            this.dim = dim;
-            this.assoc = assoc;
+            this.Dim = dim;
+            this.Assoc = assoc;
             if (path.Length == 0)
             {
                 throw new System.ArgumentException("path must have at least one element");
             }
-            this.path = path;
+            this.Path = path;
         }
 
         public override string ToString()
         {
-            return "AssociationFacetField(dim=" + dim + " path=" + Arrays.ToString(path) + " bytes=" + assoc + ")";
+            return "AssociationFacetField(dim=" + Dim + " path=" + Arrays.ToString(Path) + " bytes=" + Assoc + ")";
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/CachedOrdinalsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/CachedOrdinalsReader.cs b/src/Lucene.Net.Facet/Taxonomy/CachedOrdinalsReader.cs
index 70bbd26..62ee95f 100644
--- a/src/Lucene.Net.Facet/Taxonomy/CachedOrdinalsReader.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/CachedOrdinalsReader.cs
@@ -115,9 +115,9 @@ namespace Lucene.Net.Facet.Taxonomy
 
             public override void Get(int docID, IntsRef ordinals)
             {
-                ordinals.Ints = cachedOrds.ordinals;
-                ordinals.Offset = cachedOrds.offsets[docID];
-                ordinals.Length = cachedOrds.offsets[docID + 1] - ordinals.Offset;
+                ordinals.Ints = cachedOrds.Ordinals;
+                ordinals.Offset = cachedOrds.Offsets[docID];
+                ordinals.Length = cachedOrds.Offsets[docID + 1] - ordinals.Offset;
             }
         }
 
@@ -127,11 +127,11 @@ namespace Lucene.Net.Facet.Taxonomy
         {
             /// <summary>
             /// Index into <seealso cref="#ordinals"/> for each document. </summary>
-            public readonly int[] offsets;
+            public int[] Offsets { get; private set; }
 
             /// <summary>
             /// Holds ords for all docs. </summary>
-            public readonly int[] ordinals;
+            public int[] Ordinals { get; private set; }
 
             /// <summary>
             /// Creates a new <seealso cref="CachedOrds"/> from the <seealso cref="BinaryDocValues"/>.
@@ -139,7 +139,7 @@ namespace Lucene.Net.Facet.Taxonomy
             /// </summary>
             public CachedOrds(OrdinalsSegmentReader source, int maxDoc)
             {
-                offsets = new int[maxDoc + 1];
+                Offsets = new int[maxDoc + 1];
                 int[] ords = new int[maxDoc]; // let's assume one ordinal per-document as an initial size
 
                 // this aggregator is limited to Integer.MAX_VALUE total ordinals.
@@ -147,7 +147,7 @@ namespace Lucene.Net.Facet.Taxonomy
                 IntsRef values = new IntsRef(32);
                 for (int docID = 0; docID < maxDoc; docID++)
                 {
-                    offsets[docID] = (int)totOrds;
+                    Offsets[docID] = (int)totOrds;
                     source.Get(docID, values);
                     long nextLength = totOrds + values.Length;
                     if (nextLength > ords.Length)
@@ -161,26 +161,26 @@ namespace Lucene.Net.Facet.Taxonomy
                     Array.Copy(values.Ints, 0, ords, (int)totOrds, values.Length);
                     totOrds = nextLength;
                 }
-                offsets[maxDoc] = (int)totOrds;
+                Offsets[maxDoc] = (int)totOrds;
 
                 // if ords array is bigger by more than 10% of what we really need, shrink it
                 if ((double)totOrds / ords.Length < 0.9)
                 {
-                    this.ordinals = new int[(int)totOrds];
-                    Array.Copy(ords, 0, this.ordinals, 0, (int)totOrds);
+                    this.Ordinals = new int[(int)totOrds];
+                    Array.Copy(ords, 0, this.Ordinals, 0, (int)totOrds);
                 }
                 else
                 {
-                    this.ordinals = ords;
+                    this.Ordinals = ords;
                 }
             }
 
             public long RamBytesUsed()
             {
-                long mem = RamUsageEstimator.ShallowSizeOf(this) + RamUsageEstimator.SizeOf(offsets);
-                if (offsets != ordinals)
+                long mem = RamUsageEstimator.ShallowSizeOf(this) + RamUsageEstimator.SizeOf(Offsets);
+                if (Offsets != Ordinals)
                 {
-                    mem += RamUsageEstimator.SizeOf(ordinals);
+                    mem += RamUsageEstimator.SizeOf(Ordinals);
                 }
                 return mem;
             }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/CategoryPath.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/CategoryPath.cs b/src/Lucene.Net.Facet/Taxonomy/CategoryPath.cs
index d00c50a..f168e87 100644
--- a/src/Lucene.Net.Facet/Taxonomy/CategoryPath.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/CategoryPath.cs
@@ -40,17 +40,17 @@ namespace Lucene.Net.Facet.Taxonomy
         /// <seealso cref="#subpath(int)"/>, therefore you should traverse the array up to
         /// <seealso cref="#length"/> for this path's components.
         /// </summary>
-        public readonly string[] components;
+        public string[] Components { get; private set; }
 
         /// <summary>
         /// The number of components of this <seealso cref="CategoryPath"/>. </summary>
-        public readonly int length;
+        public int Length { get; private set; }
 
         // Used by singleton EMPTY
         private CategoryPath()
         {
-            components = null;
-            length = 0;
+            Components = null;
+            Length = 0;
         }
 
         // Used by subpath
@@ -59,9 +59,9 @@ namespace Lucene.Net.Facet.Taxonomy
             // while the code which calls this method is safe, at some point a test
             // tripped on AIOOBE in toString, but we failed to reproduce. adding the
             // assert as a safety check.
-            Debug.Assert(prefixLen > 0 && prefixLen <= copyFrom.components.Length, "prefixLen cannot be negative nor larger than the given components' length: prefixLen=" + prefixLen + " components.length=" + copyFrom.components.Length);
-            this.components = copyFrom.components;
-            length = prefixLen;
+            Debug.Assert(prefixLen > 0 && prefixLen <= copyFrom.Components.Length, "prefixLen cannot be negative nor larger than the given components' length: prefixLen=" + prefixLen + " components.length=" + copyFrom.Components.Length);
+            this.Components = copyFrom.Components;
+            Length = prefixLen;
         }
 
         /// <summary>
@@ -76,8 +76,8 @@ namespace Lucene.Net.Facet.Taxonomy
                     throw new System.ArgumentException("empty or null components not allowed: " + Arrays.ToString(components));
                 }
             }
-            this.components = components;
-            length = components.Length;
+            this.Components = components;
+            Length = components.Length;
         }
 
         /// <summary>
@@ -87,8 +87,8 @@ namespace Lucene.Net.Facet.Taxonomy
             string[] comps = pathString.Split(new[] { delimiter }, StringSplitOptions.RemoveEmptyEntries);
             if (comps.Length == 1 && comps[0].Length == 0)
             {
-                components = null;
-                length = 0;
+                Components = null;
+                Length = 0;
             }
             else
             {
@@ -99,8 +99,8 @@ namespace Lucene.Net.Facet.Taxonomy
                         throw new System.ArgumentException("empty or null components not allowed: " + Arrays.ToString(comps));
                     }
                 }
-                components = comps;
-                length = components.Length;
+                Components = comps;
+                Length = Components.Length;
             }
         }
 
@@ -111,17 +111,17 @@ namespace Lucene.Net.Facet.Taxonomy
         /// </summary>
         public virtual int FullPathLength()
         {
-            if (length == 0)
+            if (Length == 0)
             {
                 return 0;
             }
 
             int charsNeeded = 0;
-            for (int i = 0; i < length; i++)
+            for (int i = 0; i < Length; i++)
             {
-                charsNeeded += components[i].Length;
+                charsNeeded += Components[i].Length;
             }
-            charsNeeded += length - 1; // num delimter chars
+            charsNeeded += Length - 1; // num delimter chars
             return charsNeeded;
         }
 
@@ -131,10 +131,10 @@ namespace Lucene.Net.Facet.Taxonomy
         /// </summary>
         public virtual int CompareTo(CategoryPath other)
         {
-            int len = length < other.length ? length : other.length;
+            int len = Length < other.Length ? Length : other.Length;
             for (int i = 0, j = 0; i < len; i++, j++)
             {
-                int cmp = components[i].CompareTo(other.components[j]);
+                int cmp = Components[i].CompareTo(other.Components[j]);
                 if (cmp < 0) // this is 'before'
                 {
                     return -1;
@@ -146,7 +146,7 @@ namespace Lucene.Net.Facet.Taxonomy
             }
 
             // one is a prefix of the other
-            return length - other.length;
+            return Length - other.Length;
         }
 
         private void HasDelimiter(string offender, char delimiter)
@@ -179,25 +179,25 @@ namespace Lucene.Net.Facet.Taxonomy
         /// </summary>
         public virtual int CopyFullPath(char[] buf, int start, char delimiter)
         {
-            if (length == 0)
+            if (Length == 0)
             {
                 return 0;
             }
 
             int idx = start;
-            int upto = length - 1;
+            int upto = Length - 1;
             for (int i = 0; i < upto; i++)
             {
-                int len = components[i].Length;
-                components[i].CopyTo(0, buf, idx, len - 0);
+                int len = Components[i].Length;
+                Components[i].CopyTo(0, buf, idx, len - 0);
                 NoDelimiter(buf, idx, len, delimiter);
                 idx += len;
                 buf[idx++] = delimiter;
             }
-            components[upto].CopyTo(0, buf, idx, components[upto].Length - 0);
-            NoDelimiter(buf, idx, components[upto].Length, delimiter);
+            Components[upto].CopyTo(0, buf, idx, Components[upto].Length - 0);
+            NoDelimiter(buf, idx, Components[upto].Length, delimiter);
 
-            return idx + components[upto].Length - start;
+            return idx + Components[upto].Length - start;
         }
 
         public override bool Equals(object obj)
@@ -208,16 +208,16 @@ namespace Lucene.Net.Facet.Taxonomy
             }
 
             CategoryPath other = (CategoryPath)obj;
-            if (length != other.length)
+            if (Length != other.Length)
             {
                 return false; // not same length, cannot be equal
             }
 
             // CategoryPaths are more likely to differ at the last components, so start
             // from last-first
-            for (int i = length - 1; i >= 0; i--)
+            for (int i = Length - 1; i >= 0; i--)
             {
-                if (!components[i].Equals(other.components[i]))
+                if (!Components[i].Equals(other.Components[i]))
                 {
                     return false;
                 }
@@ -227,15 +227,15 @@ namespace Lucene.Net.Facet.Taxonomy
 
         public override int GetHashCode()
         {
-            if (length == 0)
+            if (Length == 0)
             {
                 return 0;
             }
 
-            int hash = length;
-            for (int i = 0; i < length; i++)
+            int hash = Length;
+            for (int i = 0; i < Length; i++)
             {
-                hash = hash * 31 + components[i].GetHashCode();
+                hash = hash * 31 + Components[i].GetHashCode();
             }
             return hash;
         }
@@ -244,15 +244,15 @@ namespace Lucene.Net.Facet.Taxonomy
         /// Calculate a 64-bit hash function for this path. </summary>
         public virtual long LongHashCode()
         {
-            if (length == 0)
+            if (Length == 0)
             {
                 return 0;
             }
 
-            long hash = length;
-            for (int i = 0; i < length; i++)
+            long hash = Length;
+            for (int i = 0; i < Length; i++)
             {
-                hash = hash * 65599 + components[i].GetHashCode();
+                hash = hash * 65599 + Components[i].GetHashCode();
             }
             return hash;
         }
@@ -261,7 +261,7 @@ namespace Lucene.Net.Facet.Taxonomy
         /// Returns a sub-path of this path up to {@code length} components. </summary>
         public virtual CategoryPath Subpath(int length)
         {
-            if (length >= this.length || length < 0)
+            if (length >= this.Length || length < 0)
             {
                 return this;
             }
@@ -291,19 +291,19 @@ namespace Lucene.Net.Facet.Taxonomy
         /// </summary>
         public virtual string ToString(char delimiter)
         {
-            if (length == 0)
+            if (Length == 0)
             {
                 return "";
             }
 
             StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < length; i++)
+            for (int i = 0; i < Length; i++)
             {
-                if (components[i].IndexOf(delimiter) != -1)
+                if (Components[i].IndexOf(delimiter) != -1)
                 {
-                    HasDelimiter(components[i], delimiter);
+                    HasDelimiter(Components[i], delimiter);
                 }
-                sb.Append(components[i]).Append(delimiter);
+                sb.Append(Components[i]).Append(delimiter);
             }
             sb.Length = sb.Length - 1; // remove last delimiter
             return sb.ToString();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/FacetLabel.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/FacetLabel.cs b/src/Lucene.Net.Facet/Taxonomy/FacetLabel.cs
index 94eb2d6..26dc493 100644
--- a/src/Lucene.Net.Facet/Taxonomy/FacetLabel.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/FacetLabel.cs
@@ -50,11 +50,11 @@ namespace Lucene.Net.Facet.Taxonomy
         /// <seealso cref="#subpath(int)"/>, therefore you should traverse the array up to
         /// <seealso cref="#length"/> for this path's components.
         /// </summary>
-        public readonly string[] Components;
+        public string[] Components { get; private set; }
 
         /// <summary>
         /// The number of components of this <seealso cref="FacetLabel"/>. </summary>
-        public readonly int Length;
+        public int Length { get; private set; }
 
         // Used by subpath
         private FacetLabel(FacetLabel copyFrom, int prefixLen)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/FastTaxonomyFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/FastTaxonomyFacetCounts.cs b/src/Lucene.Net.Facet/Taxonomy/FastTaxonomyFacetCounts.cs
index f54b70b..e303394 100644
--- a/src/Lucene.Net.Facet/Taxonomy/FastTaxonomyFacetCounts.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/FastTaxonomyFacetCounts.cs
@@ -58,13 +58,13 @@ namespace Lucene.Net.Facet.Taxonomy
         {
             foreach (FacetsCollector.MatchingDocs hits in matchingDocs)
             {
-                BinaryDocValues dv = hits.context.AtomicReader.GetBinaryDocValues(IndexFieldName);
+                BinaryDocValues dv = hits.Context.AtomicReader.GetBinaryDocValues(indexFieldName);
                 if (dv == null) // this reader does not have DocValues for the requested category list
                 {
                     continue;
                 }
 
-                DocIdSetIterator docs = hits.bits.GetIterator();
+                DocIdSetIterator docs = hits.Bits.GetIterator();
 
                 int doc;
                 BytesRef bytesRef = new BytesRef();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/FloatAssociationFacetField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/FloatAssociationFacetField.cs b/src/Lucene.Net.Facet/Taxonomy/FloatAssociationFacetField.cs
index 8b47430..1b070a6 100644
--- a/src/Lucene.Net.Facet/Taxonomy/FloatAssociationFacetField.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/FloatAssociationFacetField.cs
@@ -58,8 +58,8 @@ namespace Lucene.Net.Facet.Taxonomy
 
         public override string ToString()
         {
-            return "FloatAssociationFacetField(dim=" + dim + " path=" + Arrays.ToString(path) + 
-                " value=" + BytesRefToFloat(assoc).ToString("0.0#####", CultureInfo.InvariantCulture) + ")";
+            return "FloatAssociationFacetField(dim=" + Dim + " path=" + Arrays.ToString(Path) + 
+                " value=" + BytesRefToFloat(Assoc).ToString("0.0#####", CultureInfo.InvariantCulture) + ")";
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/FloatTaxonomyFacets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/FloatTaxonomyFacets.cs b/src/Lucene.Net.Facet/Taxonomy/FloatTaxonomyFacets.cs
index e0b3688..f2e79a5 100644
--- a/src/Lucene.Net.Facet/Taxonomy/FloatTaxonomyFacets.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/FloatTaxonomyFacets.cs
@@ -46,15 +46,15 @@ namespace Lucene.Net.Facet.Taxonomy
         protected virtual void Rollup()
         {
             // Rollup any necessary dims:
-            foreach (KeyValuePair<string, FacetsConfig.DimConfig> ent in Config.DimConfigs)
+            foreach (KeyValuePair<string, FacetsConfig.DimConfig> ent in config.DimConfigs)
             {
                 string dim = ent.Key;
                 FacetsConfig.DimConfig ft = ent.Value;
                 if (ft.Hierarchical && ft.MultiValued == false)
                 {
-                    int dimRootOrd = TaxoReader.GetOrdinal(new FacetLabel(dim));
+                    int dimRootOrd = taxoReader.GetOrdinal(new FacetLabel(dim));
                     Debug.Assert(dimRootOrd > 0);
-                    values[dimRootOrd] += Rollup(Children[dimRootOrd]);
+                    values[dimRootOrd] += Rollup(children[dimRootOrd]);
                 }
             }
         }
@@ -64,10 +64,10 @@ namespace Lucene.Net.Facet.Taxonomy
             float sum = 0;
             while (ord != TaxonomyReader.INVALID_ORDINAL)
             {
-                float childValue = values[ord] + Rollup(Children[ord]);
+                float childValue = values[ord] + Rollup(children[ord]);
                 values[ord] = childValue;
                 sum += childValue;
-                ord = Siblings[ord];
+                ord = siblings[ord];
             }
             return sum;
         }
@@ -90,7 +90,7 @@ namespace Lucene.Net.Facet.Taxonomy
                     throw new System.ArgumentException("cannot return dimension-level value alone; use getTopChildren instead");
                 }
             }
-            int ord = TaxoReader.GetOrdinal(new FacetLabel(dim, path));
+            int ord = taxoReader.GetOrdinal(new FacetLabel(dim, path));
             if (ord < 0)
             {
                 return -1;
@@ -106,16 +106,16 @@ namespace Lucene.Net.Facet.Taxonomy
             }
             FacetsConfig.DimConfig dimConfig = VerifyDim(dim);
             FacetLabel cp = new FacetLabel(dim, path);
-            int dimOrd = TaxoReader.GetOrdinal(cp);
+            int dimOrd = taxoReader.GetOrdinal(cp);
             if (dimOrd == -1)
             {
                 return null;
             }
 
-            TopOrdAndFloatQueue q = new TopOrdAndFloatQueue(Math.Min(TaxoReader.Size, topN));
+            TopOrdAndFloatQueue q = new TopOrdAndFloatQueue(Math.Min(taxoReader.Size, topN));
             float bottomValue = 0;
 
-            int ord = Children[dimOrd];
+            int ord = children[dimOrd];
             float sumValues = 0;
             int childCount = 0;
 
@@ -132,17 +132,17 @@ namespace Lucene.Net.Facet.Taxonomy
                         {
                             reuse = new TopOrdAndFloatQueue.OrdAndValue();
                         }
-                        reuse.ord = ord;
-                        reuse.value = values[ord];
+                        reuse.Ord = ord;
+                        reuse.Value = values[ord];
                         reuse = q.InsertWithOverflow(reuse);
                         if (q.Size() == topN)
                         {
-                            bottomValue = q.Top().value;
+                            bottomValue = q.Top().Value;
                         }
                     }
                 }
 
-                ord = Siblings[ord];
+                ord = siblings[ord];
             }
 
             if (sumValues == 0)
@@ -171,8 +171,8 @@ namespace Lucene.Net.Facet.Taxonomy
             for (int i = labelValues.Length - 1; i >= 0; i--)
             {
                 TopOrdAndFloatQueue.OrdAndValue ordAndValue = q.Pop();
-                FacetLabel child = TaxoReader.GetPath(ordAndValue.ord);
-                labelValues[i] = new LabelAndValue(child.Components[cp.Length], ordAndValue.value);
+                FacetLabel child = taxoReader.GetPath(ordAndValue.Ord);
+                labelValues[i] = new LabelAndValue(child.Components[cp.Length], ordAndValue.Value);
             }
 
             return new FacetResult(dim, path, sumValues, labelValues, childCount);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/IntAssociationFacetField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/IntAssociationFacetField.cs b/src/Lucene.Net.Facet/Taxonomy/IntAssociationFacetField.cs
index 1c854fd..e7b56d7 100644
--- a/src/Lucene.Net.Facet/Taxonomy/IntAssociationFacetField.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/IntAssociationFacetField.cs
@@ -67,7 +67,7 @@ namespace Lucene.Net.Facet.Taxonomy
 
         public override string ToString()
         {
-            return "IntAssociationFacetField(dim=" + dim + " path=" + Arrays.ToString(path) + " value=" + BytesRefToInt(assoc) + ")";
+            return "IntAssociationFacetField(dim=" + Dim + " path=" + Arrays.ToString(Path) + " value=" + BytesRefToInt(Assoc) + ")";
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/IntTaxonomyFacets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/IntTaxonomyFacets.cs b/src/Lucene.Net.Facet/Taxonomy/IntTaxonomyFacets.cs
index 11f76f0..c9a789b 100644
--- a/src/Lucene.Net.Facet/Taxonomy/IntTaxonomyFacets.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/IntTaxonomyFacets.cs
@@ -46,18 +46,18 @@ namespace Lucene.Net.Facet.Taxonomy
         protected virtual void Rollup()
         {
             // Rollup any necessary dims:
-            foreach (KeyValuePair<string, FacetsConfig.DimConfig> ent in Config.DimConfigs)
+            foreach (KeyValuePair<string, FacetsConfig.DimConfig> ent in config.DimConfigs)
             {
                 string dim = ent.Key;
                 FacetsConfig.DimConfig ft = ent.Value;
                 if (ft.Hierarchical && ft.MultiValued == false)
                 {
-                    int dimRootOrd = TaxoReader.GetOrdinal(new FacetLabel(dim));
+                    int dimRootOrd = taxoReader.GetOrdinal(new FacetLabel(dim));
                     // It can be -1 if this field was declared in the
                     // config but never indexed:
                     if (dimRootOrd > 0)
                     {
-                        values[dimRootOrd] += Rollup(Children[dimRootOrd]);
+                        values[dimRootOrd] += Rollup(children[dimRootOrd]);
                     }
                 }
             }
@@ -68,10 +68,10 @@ namespace Lucene.Net.Facet.Taxonomy
             int sum = 0;
             while (ord != TaxonomyReader.INVALID_ORDINAL)
             {
-                int childValue = values[ord] + Rollup(Children[ord]);
+                int childValue = values[ord] + Rollup(children[ord]);
                 values[ord] = childValue;
                 sum += childValue;
-                ord = Siblings[ord];
+                ord = siblings[ord];
             }
             return sum;
         }
@@ -94,7 +94,7 @@ namespace Lucene.Net.Facet.Taxonomy
                     throw new System.ArgumentException("cannot return dimension-level value alone; use getTopChildren instead");
                 }
             }
-            int ord = TaxoReader.GetOrdinal(new FacetLabel(dim, path));
+            int ord = taxoReader.GetOrdinal(new FacetLabel(dim, path));
             if (ord < 0)
             {
                 return -1;
@@ -110,17 +110,17 @@ namespace Lucene.Net.Facet.Taxonomy
             }
             var dimConfig = VerifyDim(dim);
             FacetLabel cp = new FacetLabel(dim, path);
-            int dimOrd = TaxoReader.GetOrdinal(cp);
+            int dimOrd = taxoReader.GetOrdinal(cp);
             if (dimOrd == -1)
             {
                 return null;
             }
 
-            TopOrdAndIntQueue q = new TopOrdAndIntQueue(Math.Min(TaxoReader.Size, topN));
+            TopOrdAndIntQueue q = new TopOrdAndIntQueue(Math.Min(taxoReader.Size, topN));
 
             int bottomValue = 0;
 
-            int ord = Children[dimOrd];
+            int ord = children[dimOrd];
             int totValue = 0;
             int childCount = 0;
 
@@ -147,7 +147,7 @@ namespace Lucene.Net.Facet.Taxonomy
                     }
                 }
 
-                ord = Siblings[ord];
+                ord = siblings[ord];
             }
 
             if (totValue == 0)
@@ -176,7 +176,7 @@ namespace Lucene.Net.Facet.Taxonomy
             for (int i = labelValues.Length - 1; i >= 0; i--)
             {
                 TopOrdAndIntQueue.OrdAndValue ordAndValue = q.Pop();
-                FacetLabel child = TaxoReader.GetPath(ordAndValue.Ord);
+                FacetLabel child = taxoReader.GetPath(ordAndValue.Ord);
                 labelValues[i] = new LabelAndValue(child.Components[cp.Length], ordAndValue.Value);
             }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/LRUHashMap.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/LRUHashMap.cs b/src/Lucene.Net.Facet/Taxonomy/LRUHashMap.cs
index 5d51036..1f7883f 100644
--- a/src/Lucene.Net.Facet/Taxonomy/LRUHashMap.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/LRUHashMap.cs
@@ -95,20 +95,20 @@ namespace Lucene.Net.Facet.Taxonomy
                 if (cache.TryGetValue(key, out cdo))
                 {
                     // Item already exists, update our last access time
-                    cdo.Timestamp = GetTimestamp();
+                    cdo.timestamp = GetTimestamp();
                 }
                 else
                 {
                     cache[key] = new CacheDataObject
                     {
-                        Value = value,
-                        Timestamp = GetTimestamp()
+                        value = value,
+                        timestamp = GetTimestamp()
                     };
                     // We have added a new item, so we may need to remove the eldest
                     if (cache.Count > MaxSize)
                     {
                         // Remove the eldest item (lowest timestamp) from the cache
-                        cache.Remove(cache.OrderBy(x => x.Value.Timestamp).First().Key);
+                        cache.Remove(cache.OrderBy(x => x.Value.timestamp).First().Key);
                     }
                 }
             }
@@ -123,9 +123,9 @@ namespace Lucene.Net.Facet.Taxonomy
                 if (cache.TryGetValue(key, out cdo))
                 {
                     // Write our last access time
-                    cdo.Timestamp = GetTimestamp();
+                    cdo.timestamp = GetTimestamp();
 
-                    return cdo.Value;
+                    return cdo.value;
                 }
             }
             return null;
@@ -139,8 +139,8 @@ namespace Lucene.Net.Facet.Taxonomy
                 if (cache.TryGetValue(key, out cdo))
                 {
                     // Write our last access time
-                    cdo.Timestamp = GetTimestamp();
-                    value = cdo.Value;
+                    cdo.timestamp = GetTimestamp();
+                    value = cdo.value;
 
                     return true;
                 }
@@ -184,12 +184,12 @@ namespace Lucene.Net.Facet.Taxonomy
         private class CacheDataObject
         {
             // Ticks representing the last access time
-            public long Timestamp;
-            public TValue Value;
+            public long timestamp;
+            public TValue value;
 
             public override string ToString()
             {
-                return "Last Access: " + Timestamp.ToString() + " - " + Value.ToString();
+                return "Last Access: " + timestamp.ToString() + " - " + value.ToString();
             }
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs b/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs
index 6686188..2c8edb3 100644
--- a/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs
@@ -44,24 +44,24 @@ namespace Lucene.Net.Facet.Taxonomy
     {
         /// <summary>
         /// Holds a matched pair of <seealso cref="IndexSearcher"/> and
-        ///  <seealso cref="TaxonomyReader"/> 
+        ///  <seealso cref="Taxonomy.TaxonomyReader"/> 
         /// </summary>
         public class SearcherAndTaxonomy
         {
             /// <summary>
             /// Point-in-time <seealso cref="IndexSearcher"/>. </summary>
-            public readonly IndexSearcher searcher;
+            public IndexSearcher Searcher { get; private set; }
 
             /// <summary>
             /// Matching point-in-time <seealso cref="DirectoryTaxonomyReader"/>. </summary>
-            public readonly DirectoryTaxonomyReader taxonomyReader;
+            public DirectoryTaxonomyReader TaxonomyReader { get; private set; }
 
             /// <summary>
             /// Create a SearcherAndTaxonomy </summary>
             public SearcherAndTaxonomy(IndexSearcher searcher, DirectoryTaxonomyReader taxonomyReader)
             {
-                this.searcher = searcher;
-                this.taxonomyReader = taxonomyReader;
+                this.Searcher = searcher;
+                this.TaxonomyReader = taxonomyReader;
             }
         }
 
@@ -113,7 +113,7 @@ namespace Lucene.Net.Facet.Taxonomy
 
         protected override void DecRef(SearcherAndTaxonomy @ref)
         {
-            @ref.searcher.IndexReader.DecRef();
+            @ref.Searcher.IndexReader.DecRef();
 
             // This decRef can fail, and then in theory we should
             // tryIncRef the searcher to put back the ref count
@@ -122,20 +122,20 @@ namespace Lucene.Net.Facet.Taxonomy
             // during close, in which case 2) very likely the
             // searcher was also just closed by the above decRef and
             // a tryIncRef would fail:
-            @ref.taxonomyReader.DecRef();
+            @ref.TaxonomyReader.DecRef();
         }
 
         protected override bool TryIncRef(SearcherAndTaxonomy @ref)
         {
-            if (@ref.searcher.IndexReader.TryIncRef())
+            if (@ref.Searcher.IndexReader.TryIncRef())
             {
-                if (@ref.taxonomyReader.TryIncRef())
+                if (@ref.TaxonomyReader.TryIncRef())
                 {
                     return true;
                 }
                 else
                 {
-                    @ref.searcher.IndexReader.DecRef();
+                    @ref.Searcher.IndexReader.DecRef();
                 }
             }
             return false;
@@ -146,7 +146,7 @@ namespace Lucene.Net.Facet.Taxonomy
             // Must re-open searcher first, otherwise we may get a
             // new reader that references ords not yet known to the
             // taxonomy reader:
-            IndexReader r = @ref.searcher.IndexReader;
+            IndexReader r = @ref.Searcher.IndexReader;
             IndexReader newReader = DirectoryReader.OpenIfChanged((DirectoryReader)r);
             if (newReader == null)
             {
@@ -154,11 +154,11 @@ namespace Lucene.Net.Facet.Taxonomy
             }
             else
             {
-                var tr = TaxonomyReader.OpenIfChanged(@ref.taxonomyReader);
+                var tr = TaxonomyReader.OpenIfChanged(@ref.TaxonomyReader);
                 if (tr == null)
                 {
-                    @ref.taxonomyReader.IncRef();
-                    tr = @ref.taxonomyReader;
+                    @ref.TaxonomyReader.IncRef();
+                    tr = @ref.TaxonomyReader;
                 }
                 else if (taxoWriter != null && taxoWriter.TaxonomyEpoch != taxoEpoch)
                 {
@@ -172,7 +172,7 @@ namespace Lucene.Net.Facet.Taxonomy
 
         protected override int GetRefCount(SearcherAndTaxonomy reference)
         {
-            return reference.searcher.IndexReader.RefCount;
+            return reference.Searcher.IndexReader.RefCount;
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetCounts.cs b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetCounts.cs
index af008c7..059822c 100644
--- a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetCounts.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetCounts.cs
@@ -53,8 +53,8 @@ namespace Lucene.Net.Facet.Taxonomy
             IntsRef scratch = new IntsRef();
             foreach (FacetsCollector.MatchingDocs hits in matchingDocs)
             {
-                OrdinalsReader.OrdinalsSegmentReader ords = ordinalsReader.GetReader(hits.context);
-                DocIdSetIterator docs = hits.bits.GetIterator();
+                OrdinalsReader.OrdinalsSegmentReader ords = ordinalsReader.GetReader(hits.Context);
+                DocIdSetIterator docs = hits.Bits.GetIterator();
 
                 int doc;
                 while ((doc = docs.NextDoc()) != DocIdSetIterator.NO_MORE_DOCS)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumFloatAssociations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumFloatAssociations.cs b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumFloatAssociations.cs
index 821c942..b943004 100644
--- a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumFloatAssociations.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumFloatAssociations.cs
@@ -58,13 +58,13 @@ namespace Lucene.Net.Facet.Taxonomy
             //System.out.println("count matchingDocs=" + matchingDocs + " facetsField=" + facetsFieldName);
             foreach (FacetsCollector.MatchingDocs hits in matchingDocs)
             {
-                BinaryDocValues dv = hits.context.AtomicReader.GetBinaryDocValues(IndexFieldName);
+                BinaryDocValues dv = hits.Context.AtomicReader.GetBinaryDocValues(indexFieldName);
                 if (dv == null) // this reader does not have DocValues for the requested category list
                 {
                     continue;
                 }
 
-                DocIdSetIterator docs = hits.bits.GetIterator();
+                DocIdSetIterator docs = hits.Bits.GetIterator();
 
                 int doc;
                 while ((doc = docs.NextDoc()) != DocIdSetIterator.NO_MORE_DOCS)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumIntAssociations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumIntAssociations.cs b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumIntAssociations.cs
index 8d835fb..d053dfe 100644
--- a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumIntAssociations.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumIntAssociations.cs
@@ -57,13 +57,13 @@ namespace Lucene.Net.Facet.Taxonomy
             //System.out.println("count matchingDocs=" + matchingDocs + " facetsField=" + facetsFieldName);
             foreach (FacetsCollector.MatchingDocs hits in matchingDocs)
             {
-                BinaryDocValues dv = hits.context.AtomicReader.GetBinaryDocValues(IndexFieldName);
+                BinaryDocValues dv = hits.Context.AtomicReader.GetBinaryDocValues(indexFieldName);
                 if (dv == null) // this reader does not have DocValues for the requested category list
                 {
                     continue;
                 }
 
-                DocIdSetIterator docs = hits.bits.GetIterator();
+                DocIdSetIterator docs = hits.Bits.GetIterator();
 
                 int doc;
                 while ((doc = docs.NextDoc()) != DocIdSetIterator.NO_MORE_DOCS)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumValueSource.cs b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumValueSource.cs
index 4981f33..2ae0f49 100644
--- a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumValueSource.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacetSumValueSource.cs
@@ -129,13 +129,13 @@ namespace Lucene.Net.Facet.Taxonomy
             IntsRef scratch = new IntsRef();
             foreach (MatchingDocs hits in matchingDocs)
             {
-                OrdinalsReader.OrdinalsSegmentReader ords = ordinalsReader.GetReader(hits.context);
+                OrdinalsReader.OrdinalsSegmentReader ords = ordinalsReader.GetReader(hits.Context);
 
                 int scoresIdx = 0;
-                float[] scores = hits.scores;
+                float[] scores = hits.Scores;
 
-                FunctionValues functionValues = valueSource.GetValues(context, hits.context);
-                DocIdSetIterator docs = hits.bits.GetIterator();
+                FunctionValues functionValues = valueSource.GetValues(context, hits.Context);
+                DocIdSetIterator docs = hits.Bits.GetIterator();
 
                 int doc;
                 while ((doc = docs.NextDoc()) != DocIdSetIterator.NO_MORE_DOCS)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs
index 03baa55..c0ae758 100644
--- a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs
@@ -54,39 +54,39 @@ namespace Lucene.Net.Facet.Taxonomy
 
         /// <summary>
         /// Index field name provided to the constructor. </summary>
-        protected readonly string IndexFieldName;
+        protected readonly string indexFieldName;
 
         /// <summary>
         /// {@code TaxonomyReader} provided to the constructor. </summary>
-        protected readonly TaxonomyReader TaxoReader;
+        protected readonly TaxonomyReader taxoReader;
 
         /// <summary>
         /// {@code FacetsConfig} provided to the constructor. </summary>
-        protected readonly FacetsConfig Config;
+        protected readonly FacetsConfig config;
 
         /// <summary>
         /// Maps parent ordinal to its child, or -1 if the parent
         ///  is childless. 
         /// </summary>
-        protected readonly int[] Children;
+        protected readonly int[] children;
 
         /// <summary>
         /// Maps an ordinal to its sibling, or -1 if there is no
         ///  sibling. 
         /// </summary>
-        protected readonly int[] Siblings;
+        protected readonly int[] siblings;
 
         /// <summary>
         /// Sole constructor. 
         /// </summary>
         protected internal TaxonomyFacets(string indexFieldName, TaxonomyReader taxoReader, FacetsConfig config)
         {
-            this.IndexFieldName = indexFieldName;
-            this.TaxoReader = taxoReader;
-            this.Config = config;
+            this.indexFieldName = indexFieldName;
+            this.taxoReader = taxoReader;
+            this.config = config;
             ParallelTaxonomyArrays pta = taxoReader.ParallelTaxonomyArrays;
-            Children = pta.Children();
-            Siblings = pta.Siblings();
+            children = pta.Children();
+            siblings = pta.Siblings();
         }
 
         /// <summary>
@@ -96,23 +96,23 @@ namespace Lucene.Net.Facet.Taxonomy
         /// </summary>
         protected internal virtual DimConfig VerifyDim(string dim)
         {
-            DimConfig dimConfig = Config.GetDimConfig(dim);
-            if (!dimConfig.IndexFieldName.Equals(IndexFieldName))
+            DimConfig dimConfig = config.GetDimConfig(dim);
+            if (!dimConfig.IndexFieldName.Equals(indexFieldName))
             {
-                throw new System.ArgumentException("dimension \"" + dim + "\" was not indexed into field \"" + IndexFieldName);
+                throw new System.ArgumentException("dimension \"" + dim + "\" was not indexed into field \"" + indexFieldName);
             }
             return dimConfig;
         }
 
         public override IList<FacetResult> GetAllDims(int topN)
         {
-            int ord = Children[TaxonomyReader.ROOT_ORDINAL];
+            int ord = children[TaxonomyReader.ROOT_ORDINAL];
             IList<FacetResult> results = new List<FacetResult>();
             while (ord != TaxonomyReader.INVALID_ORDINAL)
             {
-                string dim = TaxoReader.GetPath(ord).Components[0];
-                DimConfig dimConfig = Config.GetDimConfig(dim);
-                if (dimConfig.IndexFieldName.Equals(IndexFieldName))
+                string dim = taxoReader.GetPath(ord).Components[0];
+                DimConfig dimConfig = config.GetDimConfig(dim);
+                if (dimConfig.IndexFieldName.Equals(indexFieldName))
                 {
                     FacetResult result = GetTopChildren(topN, dim);
                     if (result != null)
@@ -120,7 +120,7 @@ namespace Lucene.Net.Facet.Taxonomy
                         results.Add(result);
                     }
                 }
-                ord = Siblings[ord];
+                ord = siblings[ord];
             }
 
             // Sort by highest value, tie break by dim:

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e0a73b45/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs b/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs
index f303abb..f94ebe4 100644
--- a/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs
@@ -133,7 +133,7 @@ namespace Lucene.Net.Facet.Taxonomy
             return newTaxoReader;
         }
 
-        private volatile bool Closed = false;
+        private volatile bool closed = false;
 
         // set refCount to 1 at start
         private readonly AtomicInteger refCount = new AtomicInteger(1);
@@ -168,10 +168,10 @@ namespace Lucene.Net.Facet.Taxonomy
             {
                 lock (this)
                 {
-                    if (!Closed)
+                    if (!closed)
                     {
                         DecRef();
-                        Closed = true;
+                        closed = true;
                     }
                 }
             }
@@ -192,7 +192,7 @@ namespace Lucene.Net.Facet.Taxonomy
                 try
                 {
                     DoClose();
-                    Closed = true;
+                    closed = true;
                     success = true;
                 }
                 finally


Mime
View raw message