use REST for nodetool info

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "scylla-jmx"]
+	branch = master
+	url = [email protected]:scylladb/scylla-jmx.git
+	path = scylla-jmx

build.xml

@@ -40,6 +40,8 @@
     <property name="build.src.gen-java" value="${basedir}/src/gen-java"/>
     <property name="build.lib" value="${basedir}/lib"/>
     <property name="build.dir" value="${basedir}/build"/>
+    <property name="build.scylla-jmx-parent" value="${basedir}/scylla-jmx/scylla-jmx-parent/"/>
+    <property name="build.scylla-apiclient" value="${basedir}/scylla-jmx/scylla-apiclient/target"/>
     <property name="build.dir.lib" value="${basedir}/build/lib"/>
     <property name="build.test.dir" value="${build.dir}/test"/>
     <property name="build.classes" value="${build.dir}/classes"/>
@@ -166,6 +168,11 @@
             <exclude name="**/*-sources.jar"/>
             <exclude name="**/ant-*.jar"/>
         </fileset>
+        <fileset dir="${build.scylla-apiclient}">
+            <include name="**/scylla-apiclient*.jar" />
+            <exclude name="**/*-sources.jar"/>
+            <exclude name="**/ant-*.jar"/>
+        </fileset>
     </path>
 
   <macrodef name="create-javadoc">
@@ -453,6 +460,19 @@
           <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.2.6" />
           <dependency groupId="org.jctools" artifactId="jctools-core" version="1.2.1"/>
           <dependency groupId="org.ow2.asm" artifactId="asm" version="5.0.4" />
+
+          <dependency groupId="org.glassfish.jersey.core" artifactId="jersey-common" version="2.22.1" />
+          <dependency groupId="javax.ws.rs" artifactId="javax.ws.rs-api" version="2.0.1" />
+          <dependency groupId="javax.ws.rs" artifactId="jsr311-api" version="1.1.1" />
+          <dependency groupId="org.glassfish.jersey.core" artifactId="jersey-client" version="2.22.1" />
+          <dependency groupId="org.glassfish" artifactId="javax.json" version="1.0.4" />
+          <dependency groupId="javax.activation" artifactId="activation" version="1.1" />
+          <dependency groupId="com.google.guava" artifactId="guava" version="18.0" />
+          <dependency groupId="com.google.collections" artifactId="google-collections" version="1.0" />
+          <dependency groupId="javax.activation" artifactId="activation" version="1.1" />
+          <dependency groupId="javax.annotation" artifactId="javax.annotation-api" version="1.2" />
+          <dependency groupId="org.glassfish.jersey.bundles.repackaged" artifactId="jersey-guava" version="2.22.1" />
+
         </dependencyManagement>
         <developer id="adelapena" name="Andres de la Peña"/>
         <developer id="alakshman" name="Avinash Lakshman"/>
@@ -816,7 +836,7 @@
         depends="maven-ant-tasks-retrieve-build,build-project" description="Compile Cassandra classes"/>
     <target name="codecoverage" depends="jacoco-run,jacoco-report" description="Create code coverage report"/>
 
-    <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java"
+    <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,mvn-scylla-apiclient-jar"
             name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
         <!-- Order matters! -->
@@ -1054,6 +1074,17 @@
       </jar>
     </target>
 
+    <target name="mvn-scylla-apiclient-jar">
+        <artifact:mvn mavenVersion="${maven.version}" pom="${build.scylla-jmx-parent}/pom.xml">
+            <arg value="-pl"/>
+            <arg value=":scylla-apiclient"/>
+            <arg value="package"/>
+        </artifact:mvn>
+        <copy todir="${build.lib}">
+            <fileset dir="${build.scylla-apiclient}" includes="*.jar"/>
+        </copy>
+    </target>
+
     <!-- creates release tarballs -->
     <target name="artifacts" depends="jar,javadoc,gen-doc"
             description="Create Cassandra release artifacts">
@@ -1069,6 +1100,7 @@
           <include name="${final.scylla-tools.name}.jar" />
           <include name="${ant.project.name}-thrift-${version}.jar" />
         </fileset>
+        <fileset dir="${build.scylla-apiclient}" includes="*.jar"/>
       </copy>
       <copy todir="${dist.dir}/javadoc">
         <fileset dir="${javadoc.dir}"/>
@@ -1216,6 +1248,7 @@
               <include name="commons*.jar"/>
           </zipgroupfileset>
           <zipgroupfileset dir="${build.lib}" includes="*.jar"/>
+          <zipgroupfileset dir="${build.scylla-apiclient}" includes="*.jar"/>
       </jar>
       <jar jarfile="${build.test.dir}/benchmarks.jar">
           <manifest>

src/java/org/apache/cassandra/tools/NodeTool.java

@@ -49,9 +49,19 @@ public class NodeTool
 
     public static void main(String... args)
     {
-        List<Class<? extends Runnable>> commands = asList(
+        boolean REST=true;
+        for (String arg:args) {
+            if (arg.startsWith("-r") || arg.startsWith("--protocol")) {
+                String[] param=arg.split("=");
+                if (param.length>1) {
+                    if (!"rest".equals(param[1].toLowerCase())) {
+                System.out.println("Other than REST detected, falling back to jmx");
+                        REST = false; }
+                }
+            }
+        }
+        List<Class<? extends Runnable>> commands = new ArrayList<>(asList(
                 Help.class,
-                Info.class,
                 Ring.class,
                 NetStats.class,
                 CfStats.class,
@@ -147,7 +157,9 @@ public static void main(String... args)
                 // Remove until proven otherwise: RefreshSizeEstimates.class
                 // Remove until proven otherwise: RelocateSSTables.class,
                 ViewBuildStatus.class
-        );
+        ));
+
+        if (REST) { commands.add(RESTInfo.class); } else { commands.add(Info.class); }
 
         Cli.CliBuilder<Runnable> builder = Cli.builder("nodetool");
 
@@ -230,12 +242,18 @@ public static class CommandFailedButNeedNoMoreOutput extends Error {};
     public static abstract class NodeToolCmd implements Runnable
     {
 
+        private final String REST = "rest";
+        private final String JMX = "jmx";
+
         @Option(type = OptionType.GLOBAL, name = {"-h", "--host"}, description = "Node hostname or ip address")
         private String host = "127.0.0.1";
 
         @Option(type = OptionType.GLOBAL, name = {"-p", "--port"}, description = "Remote jmx agent port number")
         private String port = "7199";
 
+        @Option(type = OptionType.GLOBAL, name = {"-o", "--restport"}, description = "Remote Scylla REST port number")
+        private String rport = "10000";
+
         @Option(type = OptionType.GLOBAL, name = {"-u", "--username"}, description = "Remote jmx agent username")
         private String username = EMPTY;
 
@@ -245,6 +263,9 @@ public static abstract class NodeToolCmd implements Runnable
         @Option(type = OptionType.GLOBAL, name = {"-pwf", "--password-file"}, description = "Path to the JMX password file")
         private String passwordFilePath = EMPTY;
 
+        @Option(type = OptionType.GLOBAL, name = {"-r", "--protocol"}, description = "Use rest(default, only for what is ported) or jmx(legacy) protocol")
+        private String protocol = REST;
+
         @Override
         public void run()
         {
@@ -316,9 +337,17 @@ private NodeProbe connect()
             try
             {
                 if (username.isEmpty())
-                    nodeClient = new NodeProbe(host, parseInt(port));
+                    if (REST.equals(protocol)) {
+                        nodeClient = new RESTNodeProbe(host, parseInt(port), parseInt(rport));
+                    } else {
+                        nodeClient = new NodeProbe(host, parseInt(port));
+                    }
                 else
+                if (REST.equals(protocol)) {
+                    nodeClient = new RESTNodeProbe(host, parseInt(port), parseInt(rport), username, password);
+                } else {
                     nodeClient = new NodeProbe(host, parseInt(port), username, password);
+                }
             } catch (IOException | SecurityException e)
             {
                 Throwable rootCause = Throwables.getRootCause(e);