From 3a78325a65507ca055cd44ea582e5c318e55dffa Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Sat, 17 Feb 2018 08:36:47 -0800
Subject: [PATCH] Move HandlerRegistryBenchmark to core/

It blended in with Netty benchmarks, so was missed in our earlier
reorganization.
---
 core/build.gradle                                              | 2 ++
 .../src/jmh/java/io/grpc/util}/HandlerRegistryBenchmark.java   | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename {benchmarks/src/jmh/java/io/grpc/benchmarks/netty => core/src/jmh/java/io/grpc/util}/HandlerRegistryBenchmark.java (97%)

diff --git a/core/build.gradle b/core/build.gradle
index 1707b3f19d..4202f88116 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -29,6 +29,8 @@ dependencies {
             libraries.guava_testlib,
             libraries.opencensus_impl
 
+    jmh project(':grpc-testing')
+
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
     signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
 }
diff --git a/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/HandlerRegistryBenchmark.java b/core/src/jmh/java/io/grpc/util/HandlerRegistryBenchmark.java
similarity index 97%
rename from benchmarks/src/jmh/java/io/grpc/benchmarks/netty/HandlerRegistryBenchmark.java
rename to core/src/jmh/java/io/grpc/util/HandlerRegistryBenchmark.java
index ff8497968a..3186e002dc 100644
--- a/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/HandlerRegistryBenchmark.java
+++ b/core/src/jmh/java/io/grpc/util/HandlerRegistryBenchmark.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.benchmarks.netty;
+package io.grpc.util;
 
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
@@ -23,7 +23,6 @@ import io.grpc.ServerCall.Listener;
 import io.grpc.ServerCallHandler;
 import io.grpc.ServerServiceDefinition;
 import io.grpc.testing.TestMethodDescriptors;
-import io.grpc.util.MutableHandlerRegistry;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;