From c08442b158c31d7621d4be9b48f76aa9214ed763 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@scylladb.com>
Date: Wed, 9 Nov 2016 11:03:07 +0200
Subject: [PATCH] Revert "Adding missing method implementation"

This reverts commit 8e5d6490481596dc02d2316e74909dc2747c6d39 in
preparation for Cassandra 3.x compatibility changes.
---
 .../db/compaction/CompactionManager.java      | 26 ++++---------------
 .../cassandra/net/MessagingService.java       |  6 +----
 .../cassandra/service/StorageService.java     |  3 ++-
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 8733fb5..55c3a60 100644
--- a/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -137,7 +137,7 @@ public class CompactionManager implements CompactionManagerMBean {
     @Deprecated
     public long getTotalBytesCompacted() {
         log(" getTotalBytesCompacted()");
-        return metrics.bytesCompacted.count();
+        return c.getLongValue("");
     }
 
     /**
@@ -187,11 +187,7 @@ public class CompactionManager implements CompactionManagerMBean {
      */
     public int getCoreCompactorThreads() {
         log(" getCoreCompactorThreads()");
-        /**
-         * Core size pool is meaningless, we still wants to return a valid reponse,
-         * just in case someone will try to call this method.
-         */
-        return 1;
+        return c.getIntValue("");
     }
 
     /**
@@ -209,11 +205,7 @@ public class CompactionManager implements CompactionManagerMBean {
      */
     public int getMaximumCompactorThreads() {
         log(" getMaximumCompactorThreads()");
-        /**
-         * Core size pool is meaningless, we still wants to return a valid reponse,
-         * just in case someone will try to call this method.
-         */
-        return 1;
+        return c.getIntValue("");
     }
 
     /**
@@ -231,11 +223,7 @@ public class CompactionManager implements CompactionManagerMBean {
      */
     public int getCoreValidationThreads() {
         log(" getCoreValidationThreads()");
-        /**
-         * Core validation size pool is meaningless, we still wants to return a valid reponse,
-         * just in case someone will try to call this method.
-         */
-        return 1;
+        return c.getIntValue("");
     }
 
     /**
@@ -253,11 +241,7 @@ public class CompactionManager implements CompactionManagerMBean {
      */
     public int getMaximumValidatorThreads() {
         log(" getMaximumValidatorThreads()");
-        /**
-         * Core validation size pool is meaningless, we still wants to return a valid reponse,
-         * just in case someone will try to call this method.
-         */
-        return 1;
+        return c.getIntValue("");
     }
 
     /**
diff --git a/src/main/java/org/apache/cassandra/net/MessagingService.java b/src/main/java/org/apache/cassandra/net/MessagingService.java
index 565819a..d8d4b1f 100644
--- a/src/main/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/main/java/org/apache/cassandra/net/MessagingService.java
@@ -31,8 +31,6 @@ import javax.json.JsonArray;
 import javax.json.JsonObject;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
 
 import org.apache.cassandra.metrics.DroppedMessageMetrics;
 
@@ -242,9 +240,7 @@ public final class MessagingService implements MessagingServiceMBean {
 
     public int getVersion(String address) throws UnknownHostException {
         log(" getVersion(String address) throws UnknownHostException");
-        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<String, String>();
-        queryParams.add("addr", address);
-        return c.getIntValue("/messaging_service/version", queryParams);
+        return c.getIntValue("");
     }
 
 }
diff --git a/src/main/java/org/apache/cassandra/service/StorageService.java b/src/main/java/org/apache/cassandra/service/StorageService.java
index 9b5b822..effff96 100644
--- a/src/main/java/org/apache/cassandra/service/StorageService.java
+++ b/src/main/java/org/apache/cassandra/service/StorageService.java
@@ -1446,7 +1446,8 @@ public class StorageService extends NotificationBroadcasterSupport
 
     @Override
     public double getTracingProbability() {
+        // TODO Auto-generated method stub
         log(" getTracingProbability()");
-        return c.getDoubleValue("/storage_service/trace_probability");
+        return c.getDoubleValue("");
     }
 }