Move cli classes out of the server package (#725)

Move cli classes out of the server package

build.gradle

@@ -133,7 +133,7 @@ task luceneServer(type: CreateStartScripts) {
 }
 
 task luceneServerClient(type: CreateStartScripts) {
-    mainClass = 'com.yelp.nrtsearch.server.cli.LuceneClientCommand'
+    mainClass = 'com.yelp.nrtsearch.tools.cli.LuceneClientCommand'
     applicationName = 'lucene-client'
     outputDir = new File(project.buildDir, 'tmp-app')
     classpath = startScripts.classpath

src/main/java/com/yelp/nrtsearch/server/grpc/LuceneServer.java

@@ -59,6 +59,7 @@
 import com.yelp.nrtsearch.server.plugins.PluginsService;
 import com.yelp.nrtsearch.server.remote.RemoteBackend;
 import com.yelp.nrtsearch.server.utils.ThreadPoolExecutorFactory;
+import com.yelp.nrtsearch.tools.cli.VersionProvider;
 import io.grpc.Context;
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
@@ -244,7 +245,7 @@ public static void main(String[] args) {
   @CommandLine.Command(
       name = "lucene-server",
       mixinStandardHelpOptions = true,
-      versionProvider = com.yelp.nrtsearch.server.cli.VersionProvider.class,
+      versionProvider = VersionProvider.class,
       description = "Start NRT search server")
   public static class LuceneServerCommand implements Callable<Integer> {
     @CommandLine.Parameters(

src/main/java/com/yelp/nrtsearch/server/cli/AddDocumentsCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/AddDocumentsCommand.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
-import static com.yelp.nrtsearch.server.cli.AddDocumentsCommand.ADD_DOCUMENTS;
+import static com.yelp.nrtsearch.tools.cli.AddDocumentsCommand.ADD_DOCUMENTS;
 
 import com.google.gson.Gson;
 import com.yelp.nrtsearch.server.grpc.AddDocumentRequest;

src/main/java/com/yelp/nrtsearch/server/cli/BackupWarmingQueriesCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/BackupWarmingQueriesCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.util.concurrent.Callable;

src/main/java/com/yelp/nrtsearch/server/cli/CliUtils.java → src/main/java/com/yelp/nrtsearch/tools/cli/CliUtils.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.google.protobuf.Message;
 import com.google.protobuf.util.JsonFormat;

src/main/java/com/yelp/nrtsearch/server/cli/CommitCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/CommitCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.util.concurrent.Callable;

src/main/java/com/yelp/nrtsearch/server/cli/CreateIndexCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/CreateIndexCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.FieldDefRequest;
 import com.yelp.nrtsearch.server.grpc.IndexLiveSettings;

src/main/java/com/yelp/nrtsearch/server/cli/DeleteAllDocumentsCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/DeleteAllDocumentsCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.util.concurrent.Callable;

src/main/java/com/yelp/nrtsearch/server/cli/DeleteDocumentsCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/DeleteDocumentsCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.nio.file.Path;

src/main/java/com/yelp/nrtsearch/server/cli/DeleteIndexCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/DeleteIndexCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.util.concurrent.Callable;

src/main/java/com/yelp/nrtsearch/server/cli/ForceMergeCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/ForceMergeCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.ForceMergeRequest;
 import com.yelp.nrtsearch.server.grpc.ForceMergeResponse;

src/main/java/com/yelp/nrtsearch/server/cli/ForceMergeDeletesCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/ForceMergeDeletesCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.ForceMergeDeletesRequest;
 import com.yelp.nrtsearch.server.grpc.ForceMergeDeletesResponse;

src/main/java/com/yelp/nrtsearch/server/cli/GetCurrentSearcherVersion.java → src/main/java/com/yelp/nrtsearch/tools/cli/GetCurrentSearcherVersion.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
-import static com.yelp.nrtsearch.server.cli.LuceneClientCommand.logger;
+import static com.yelp.nrtsearch.tools.cli.LuceneClientCommand.logger;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import com.yelp.nrtsearch.server.grpc.ReplicationServerClient;

src/main/java/com/yelp/nrtsearch/server/cli/IndicesCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/IndicesCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.util.List;

src/main/java/com/yelp/nrtsearch/server/cli/LiveSettingsV2Command.java → src/main/java/com/yelp/nrtsearch/tools/cli/LiveSettingsV2Command.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.google.protobuf.BoolValue;
 import com.google.protobuf.DoubleValue;

src/main/java/com/yelp/nrtsearch/server/cli/LuceneClientCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/LuceneClientCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.Version;
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;

src/main/java/com/yelp/nrtsearch/server/cli/ReadyCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/ReadyCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.util.concurrent.Callable;

src/main/java/com/yelp/nrtsearch/server/cli/RefreshCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/RefreshCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.util.concurrent.Callable;

src/main/java/com/yelp/nrtsearch/server/cli/RegisterFieldsCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/RegisterFieldsCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.nio.file.Files;

src/main/java/com/yelp/nrtsearch/server/cli/ReloadStateCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/ReloadStateCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.util.concurrent.Callable;

src/main/java/com/yelp/nrtsearch/server/cli/SearchCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/SearchCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.nio.file.Path;

src/main/java/com/yelp/nrtsearch/server/cli/SettingsV2Command.java → src/main/java/com/yelp/nrtsearch/tools/cli/SettingsV2Command.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.nio.file.Path;

src/main/java/com/yelp/nrtsearch/server/cli/StartIndexCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/StartIndexCommand.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
-import static com.yelp.nrtsearch.server.cli.StartIndexCommand.START_INDEX;
+import static com.yelp.nrtsearch.tools.cli.StartIndexCommand.START_INDEX;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.nio.file.Path;

src/main/java/com/yelp/nrtsearch/server/cli/StartIndexV2Command.java → src/main/java/com/yelp/nrtsearch/tools/cli/StartIndexV2Command.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.util.concurrent.Callable;

src/main/java/com/yelp/nrtsearch/server/cli/StatsCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/StatsCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.util.concurrent.Callable;

src/main/java/com/yelp/nrtsearch/server/cli/StatusCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/StatusCommand.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
-import static com.yelp.nrtsearch.server.cli.StatusCommand.STATUS;
+import static com.yelp.nrtsearch.tools.cli.StatusCommand.STATUS;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.util.concurrent.Callable;

src/main/java/com/yelp/nrtsearch/server/cli/StopIndexCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/StopIndexCommand.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import java.util.concurrent.Callable;

src/main/java/com/yelp/nrtsearch/server/cli/VersionProvider.java → src/main/java/com/yelp/nrtsearch/tools/cli/VersionProvider.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.Version;
 import picocli.CommandLine;

src/main/java/com/yelp/nrtsearch/server/cli/WriteNRTPointCommand.java → src/main/java/com/yelp/nrtsearch/tools/cli/WriteNRTPointCommand.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
-import static com.yelp.nrtsearch.server.cli.LuceneClientCommand.logger;
+import static com.yelp.nrtsearch.tools.cli.LuceneClientCommand.logger;
 
 import com.yelp.nrtsearch.server.grpc.LuceneServerClient;
 import com.yelp.nrtsearch.server.grpc.ReplicationServerClient;

src/test/java/com/yelp/nrtsearch/server/cli/CliUtilsTest.java → src/test/java/com/yelp/nrtsearch/tools/cli/CliUtilsTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;

src/test/java/com/yelp/nrtsearch/server/cli/CreateIndexCommandTest.java → src/test/java/com/yelp/nrtsearch/tools/cli/CreateIndexCommandTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

src/test/java/com/yelp/nrtsearch/server/cli/IndicesCommandTest.java → src/test/java/com/yelp/nrtsearch/tools/cli/IndicesCommandTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import static org.junit.Assert.*;
 

src/test/java/com/yelp/nrtsearch/server/cli/LiveSettingsV2CommandTest.java → src/test/java/com/yelp/nrtsearch/tools/cli/LiveSettingsV2CommandTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

src/test/java/com/yelp/nrtsearch/server/cli/ReadyCommandTest.java → src/test/java/com/yelp/nrtsearch/tools/cli/ReadyCommandTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import static org.junit.Assert.assertEquals;
 

src/test/java/com/yelp/nrtsearch/server/cli/StartIndexV2CommandTest.java → src/test/java/com/yelp/nrtsearch/tools/cli/StartIndexV2CommandTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.cli;
+package com.yelp.nrtsearch.tools.cli;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;