Move the remaining handlers into the handler package (#748)

Move the remaining handlers into the handler package
Yelp · Oct 4, 2024 · d1ef31c · d1ef31c
1 parent 64786de
commit d1ef31c
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 22 deletions.
diff --git a/src/main/java/com/yelp/nrtsearch/server/grpc/LuceneServer.java b/src/main/java/com/yelp/nrtsearch/server/grpc/LuceneServer.java
@@ -27,20 +27,15 @@
 import com.google.protobuf.util.JsonFormat;
 import com.yelp.nrtsearch.server.config.LuceneServerConfiguration;
 import com.yelp.nrtsearch.server.config.QueryCacheConfig;
-import com.yelp.nrtsearch.server.luceneserver.AddReplicaHandler;
-import com.yelp.nrtsearch.server.luceneserver.CopyFilesHandler;
-import com.yelp.nrtsearch.server.luceneserver.GetNodesInfoHandler;
-import com.yelp.nrtsearch.server.luceneserver.NewNRTPointHandler;
-import com.yelp.nrtsearch.server.luceneserver.RecvCopyStateHandler;
-import com.yelp.nrtsearch.server.luceneserver.ReplicaCurrentSearchingVersionHandler;
-import com.yelp.nrtsearch.server.luceneserver.WriteNRTPointHandler;
 import com.yelp.nrtsearch.server.luceneserver.analysis.AnalyzerCreator;
 import com.yelp.nrtsearch.server.luceneserver.concurrent.ThreadPoolExecutorFactory;
 import com.yelp.nrtsearch.server.luceneserver.custom.request.CustomRequestProcessor;
 import com.yelp.nrtsearch.server.luceneserver.field.FieldDefCreator;
 import com.yelp.nrtsearch.server.luceneserver.handler.AddDocumentHandler;
+import com.yelp.nrtsearch.server.luceneserver.handler.AddReplicaHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.BackupWarmingQueriesHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.CommitHandler;
+import com.yelp.nrtsearch.server.luceneserver.handler.CopyFilesHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.CreateIndexHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.CreateSnapshotHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.CustomHandler;
@@ -51,18 +46,22 @@
 import com.yelp.nrtsearch.server.luceneserver.handler.ForceMergeDeletesHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.ForceMergeHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.GetAllSnapshotIndexGenHandler;
+import com.yelp.nrtsearch.server.luceneserver.handler.GetNodesInfoHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.GetStateHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.GlobalStateHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.IndicesHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.LiveSettingsHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.MetricsHandler;
+import com.yelp.nrtsearch.server.luceneserver.handler.NewNRTPointHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.ReadyHandler;
+import com.yelp.nrtsearch.server.luceneserver.handler.RecvCopyStateHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.RecvRawFileHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.RecvRawFileV2Handler;
 import com.yelp.nrtsearch.server.luceneserver.handler.RefreshHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.RegisterFieldsHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.ReleaseSnapshotHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.ReloadStateHandler;
+import com.yelp.nrtsearch.server.luceneserver.handler.ReplicaCurrentSearchingVersionHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.SearchHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.SearchV2Handler;
 import com.yelp.nrtsearch.server.luceneserver.handler.SendRawFileHandler;
@@ -73,6 +72,7 @@
 import com.yelp.nrtsearch.server.luceneserver.handler.StatusHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.StopIndexHandler;
 import com.yelp.nrtsearch.server.luceneserver.handler.UpdateFieldsHandler;
+import com.yelp.nrtsearch.server.luceneserver.handler.WriteNRTPointHandler;
 import com.yelp.nrtsearch.server.luceneserver.highlights.HighlighterService;
 import com.yelp.nrtsearch.server.luceneserver.index.handlers.LiveSettingsV2Handler;
 import com.yelp.nrtsearch.server.luceneserver.index.handlers.SettingsV2Handler;

diff --git a/...erver/luceneserver/AddReplicaHandler.java → ...ceneserver/handler/AddReplicaHandler.java b/...erver/luceneserver/AddReplicaHandler.java → ...ceneserver/handler/AddReplicaHandler.java
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver;
+package com.yelp.nrtsearch.server.luceneserver.handler;
 
 import com.yelp.nrtsearch.server.grpc.AddReplicaRequest;
 import com.yelp.nrtsearch.server.grpc.AddReplicaResponse;
 import com.yelp.nrtsearch.server.grpc.ReplicationServerClient;
-import com.yelp.nrtsearch.server.luceneserver.handler.Handler;
 import com.yelp.nrtsearch.server.luceneserver.index.IndexState;
 import com.yelp.nrtsearch.server.luceneserver.index.IndexStateManager;
 import com.yelp.nrtsearch.server.luceneserver.index.ShardState;

diff --git a/...server/luceneserver/CopyFilesHandler.java → ...uceneserver/handler/CopyFilesHandler.java b/...server/luceneserver/CopyFilesHandler.java → ...uceneserver/handler/CopyFilesHandler.java
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver;
+package com.yelp.nrtsearch.server.luceneserver.handler;
 
 import com.yelp.nrtsearch.server.grpc.CopyFiles;
 import com.yelp.nrtsearch.server.grpc.TransferStatus;
 import com.yelp.nrtsearch.server.grpc.TransferStatusCode;
-import com.yelp.nrtsearch.server.luceneserver.handler.Handler;
 import com.yelp.nrtsearch.server.luceneserver.index.IndexState;
 import com.yelp.nrtsearch.server.luceneserver.index.IndexStateManager;
 import com.yelp.nrtsearch.server.luceneserver.index.ShardState;

diff --git a/...ver/luceneserver/GetNodesInfoHandler.java → ...neserver/handler/GetNodesInfoHandler.java b/...ver/luceneserver/GetNodesInfoHandler.java → ...neserver/handler/GetNodesInfoHandler.java
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver;
+package com.yelp.nrtsearch.server.luceneserver.handler;
 
 import com.yelp.nrtsearch.server.grpc.GetNodesRequest;
 import com.yelp.nrtsearch.server.grpc.GetNodesResponse;
 import com.yelp.nrtsearch.server.grpc.NodeInfo;
-import com.yelp.nrtsearch.server.luceneserver.handler.Handler;
 import com.yelp.nrtsearch.server.luceneserver.index.IndexState;
 import com.yelp.nrtsearch.server.luceneserver.index.ShardState;
 import com.yelp.nrtsearch.server.luceneserver.nrt.NRTPrimaryNode;

diff --git a/...rver/luceneserver/NewNRTPointHandler.java → ...eneserver/handler/NewNRTPointHandler.java b/...rver/luceneserver/NewNRTPointHandler.java → ...eneserver/handler/NewNRTPointHandler.java
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver;
+package com.yelp.nrtsearch.server.luceneserver.handler;
 
 import com.yelp.nrtsearch.server.grpc.NewNRTPoint;
 import com.yelp.nrtsearch.server.grpc.TransferStatus;
 import com.yelp.nrtsearch.server.grpc.TransferStatusCode;
-import com.yelp.nrtsearch.server.luceneserver.handler.Handler;
 import com.yelp.nrtsearch.server.luceneserver.index.IndexState;
 import com.yelp.nrtsearch.server.luceneserver.index.IndexStateManager;
 import com.yelp.nrtsearch.server.luceneserver.index.ShardState;

diff --git a/...er/luceneserver/RecvCopyStateHandler.java → ...eserver/handler/RecvCopyStateHandler.java b/...er/luceneserver/RecvCopyStateHandler.java → ...eserver/handler/RecvCopyStateHandler.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver;
+package com.yelp.nrtsearch.server.luceneserver.handler;
 
 import com.google.protobuf.ByteString;
 import com.yelp.nrtsearch.server.grpc.CopyState;
 import com.yelp.nrtsearch.server.grpc.CopyStateRequest;
 import com.yelp.nrtsearch.server.grpc.FileMetadata;
 import com.yelp.nrtsearch.server.grpc.FilesMetadata;
-import com.yelp.nrtsearch.server.luceneserver.handler.Handler;
 import com.yelp.nrtsearch.server.luceneserver.index.IndexState;
 import com.yelp.nrtsearch.server.luceneserver.index.IndexStateManager;
 import com.yelp.nrtsearch.server.luceneserver.index.ShardState;

diff --git a/...eplicaCurrentSearchingVersionHandler.java → ...eplicaCurrentSearchingVersionHandler.java b/...eplicaCurrentSearchingVersionHandler.java → ...eplicaCurrentSearchingVersionHandler.java
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver;
+package com.yelp.nrtsearch.server.luceneserver.handler;
 
 import com.yelp.nrtsearch.server.grpc.IndexName;
 import com.yelp.nrtsearch.server.grpc.SearcherVersion;
-import com.yelp.nrtsearch.server.luceneserver.handler.Handler;
 import com.yelp.nrtsearch.server.luceneserver.index.IndexState;
 import com.yelp.nrtsearch.server.luceneserver.index.ShardState;
 import com.yelp.nrtsearch.server.luceneserver.state.GlobalState;

diff --git a/...er/luceneserver/WriteNRTPointHandler.java → ...eserver/handler/WriteNRTPointHandler.java b/...er/luceneserver/WriteNRTPointHandler.java → ...eserver/handler/WriteNRTPointHandler.java
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver;
+package com.yelp.nrtsearch.server.luceneserver.handler;
 
 import com.yelp.nrtsearch.server.grpc.IndexName;
 import com.yelp.nrtsearch.server.grpc.ReplicationServerClient;
 import com.yelp.nrtsearch.server.grpc.SearcherVersion;
-import com.yelp.nrtsearch.server.luceneserver.handler.Handler;
 import com.yelp.nrtsearch.server.luceneserver.index.IndexState;
 import com.yelp.nrtsearch.server.luceneserver.index.IndexStateManager;
 import com.yelp.nrtsearch.server.luceneserver.index.ShardState;

diff --git a/src/main/java/com/yelp/nrtsearch/server/luceneserver/nrt/NRTPrimaryNode.java b/src/main/java/com/yelp/nrtsearch/server/luceneserver/nrt/NRTPrimaryNode.java
@@ -18,7 +18,7 @@
 import com.yelp.nrtsearch.server.grpc.FilesMetadata;
 import com.yelp.nrtsearch.server.grpc.ReplicationServerClient;
 import com.yelp.nrtsearch.server.grpc.TransferStatus;
-import com.yelp.nrtsearch.server.luceneserver.RecvCopyStateHandler;
+import com.yelp.nrtsearch.server.luceneserver.handler.RecvCopyStateHandler;
 import com.yelp.nrtsearch.server.luceneserver.index.IndexStateManager;
 import com.yelp.nrtsearch.server.monitoring.NrtMetrics;
 import com.yelp.nrtsearch.server.utils.HostPort;