Repository: cassandra Updated Branches: refs/heads/trunk d06fd788e -> be13d35b2
make inner classes static, where possible Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be13d35b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be13d35b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be13d35b Branch: refs/heads/trunk Commit: be13d35b2a2ea1626800aa6653f26f9d25edc605 Parents: d06fd78 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Mar 11 01:50:15 2015 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Mar 11 01:50:15 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 4 ++-- .../apache/cassandra/metrics/EstimatedHistogramReservoir.java | 2 +- src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java | 2 +- src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be13d35b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java index 7b1be74..383b2b6 100644 --- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java +++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java @@ -715,7 +715,7 @@ public class ColumnFamilyMetrics return ret; } - public class ColumnFamilyHistogram + public static class ColumnFamilyHistogram { public final Histogram[] all; public final Histogram cf; @@ -734,7 +734,7 @@ public class ColumnFamilyMetrics } } - class ColumnFamilyMetricNameFactory implements MetricNameFactory + static class ColumnFamilyMetricNameFactory implements MetricNameFactory { private final String keyspaceName; private final String columnFamilyName; http://git-wip-us.apache.org/repos/asf/cassandra/blob/be13d35b/src/java/org/apache/cassandra/metrics/EstimatedHistogramReservoir.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/EstimatedHistogramReservoir.java b/src/java/org/apache/cassandra/metrics/EstimatedHistogramReservoir.java index 221f2e1..b7266e4 100644 --- a/src/java/org/apache/cassandra/metrics/EstimatedHistogramReservoir.java +++ b/src/java/org/apache/cassandra/metrics/EstimatedHistogramReservoir.java @@ -67,7 +67,7 @@ public class EstimatedHistogramReservoir implements Reservoir histogram.getBuckets(true); } - class HistogramSnapshot extends UniformSnapshot + static class HistogramSnapshot extends UniformSnapshot { EstimatedHistogram histogram; http://git-wip-us.apache.org/repos/asf/cassandra/blob/be13d35b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java index fef8c1f..d3d8388 100644 --- a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java +++ b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java @@ -82,7 +82,7 @@ public class HintedHandoffMetrics } } - public class DifferencingCounter + public static class DifferencingCounter { private final Counter meter; private long reported = 0; http://git-wip-us.apache.org/repos/asf/cassandra/blob/be13d35b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java index 0bac421..e9ce49c 100644 --- a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java +++ b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java @@ -284,7 +284,7 @@ public class KeyspaceMetrics }); } - class KeyspaceMetricNameFactory implements MetricNameFactory + static class KeyspaceMetricNameFactory implements MetricNameFactory { private final String keyspaceName;