From 715e3a2f93a531e9a2db18f2d29fb030b926adf2 Mon Sep 17 00:00:00 2001 From: Dave Brosius Date: Fri, 3 Jun 2016 01:48:51 -0400 Subject: [PATCH] make inner classes static where possible, and remove outer class reference --- .../contrib/metrics/eventstream/HystrixMetricsPoller.java | 2 +- .../java/com/netflix/hystrix/util/HystrixRollingNumber.java | 2 +- .../java/com/netflix/hystrix/util/HystrixRollingPercentile.java | 2 +- .../src/main/java/com/netflix/hystrix/util/HystrixTimer.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hystrix-contrib/hystrix-metrics-event-stream/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsPoller.java b/hystrix-contrib/hystrix-metrics-event-stream/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsPoller.java index 9d74b9672..e920c109e 100644 --- a/hystrix-contrib/hystrix-metrics-event-stream/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsPoller.java +++ b/hystrix-contrib/hystrix-metrics-event-stream/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsPoller.java @@ -509,7 +509,7 @@ public Long call() { } } - private class MetricsPollerThreadFactory implements ThreadFactory { + private static class MetricsPollerThreadFactory implements ThreadFactory { private static final String MetricsThreadName = "HystrixMetricPoller"; private final ThreadFactory defaultFactory = Executors.defaultThreadFactory(); diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixRollingNumber.java b/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixRollingNumber.java index 05ec54069..fbdc35b98 100644 --- a/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixRollingNumber.java +++ b/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixRollingNumber.java @@ -504,7 +504,7 @@ LongMaxUpdater getMaxUpdater(HystrixRollingNumberEvent type) { *

* benjchristensen => This implementation was chosen based on performance testing I did and documented at: http://benjchristensen.com/2011/10/08/atomiccirculararray/ */ - /* package */class BucketCircularArray implements Iterable { + /* package */static class BucketCircularArray implements Iterable { private final AtomicReference state; private final int dataLength; // we don't resize, we always stay the same, so remember this private final int numBuckets; diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixRollingPercentile.java b/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixRollingPercentile.java index 260f7922f..faf17a844 100644 --- a/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixRollingPercentile.java +++ b/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixRollingPercentile.java @@ -453,7 +453,7 @@ private int computePercentile(double percent) { *

* benjchristensen => This implementation was chosen based on performance testing I did and documented at: http://benjchristensen.com/2011/10/08/atomiccirculararray/ */ - /* package for testing */ class BucketCircularArray implements Iterable { + /* package for testing */ static class BucketCircularArray implements Iterable { private final AtomicReference state; private final int dataLength; // we don't resize, we always stay the same, so remember this private final int numBuckets; diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixTimer.java b/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixTimer.java index 722b1dff1..2ee7bf97a 100644 --- a/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixTimer.java +++ b/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixTimer.java @@ -107,7 +107,7 @@ public void run() { return new TimerReference(listener, f); } - private class TimerReference extends SoftReference { + private static class TimerReference extends SoftReference { private final ScheduledFuture f;