/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.apache.cassandra.locator;

import java.lang.management.ManagementFactory;
import java.net.InetAddress;
import java.net.UnknownHostException;

import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;

import com.scylladb.jmx.api.APIClient;

public class EndpointSnitchInfo implements EndpointSnitchInfoMBean {
    private static final java.util.logging.Logger logger = java.util.logging.Logger
            .getLogger(EndpointSnitchInfo.class.getName());

    private APIClient c = new APIClient();

    public void log(String str) {
        logger.finest(str);
    }

    private static final EndpointSnitchInfo instance = new EndpointSnitchInfo();

    public static EndpointSnitchInfo getInstance() {
        return instance;
    }

    private EndpointSnitchInfo() {
        MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
        try {
            mbs.registerMBean(this, new ObjectName(
                    "org.apache.cassandra.db:type=EndpointSnitchInfo"));
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }

    /**
     * Provides the Rack name depending on the respective snitch used, given the
     * host name/ip
     *
     * @param host
     * @throws UnknownHostException
     */
    @Override
    public String getRack(String host) throws UnknownHostException {
        log("getRack(String host) throws UnknownHostException");
        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<String, String>();
        if (host == null) {
            host = InetAddress.getLoopbackAddress().getHostAddress();
        }
        queryParams.add("host", host);
        return c.getStringValue("/snitch/rack", queryParams, 10000);
    }

    /**
     * Provides the Datacenter name depending on the respective snitch used,
     * given the hostname/ip
     *
     * @param host
     * @throws UnknownHostException
     */
    @Override
    public String getDatacenter(String host) throws UnknownHostException {
        log(" getDatacenter(String host) throws UnknownHostException");
        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<String, String>();
        if (host == null) {
            host = InetAddress.getLoopbackAddress().getHostAddress();
        }
        queryParams.add("host", host);
        return c.getStringValue("/snitch/datacenter", queryParams, 10000);
    }

    /**
     * Provides the snitch name of the cluster
     *
     * @return Snitch name
     */
    @Override
    public String getSnitchName() {
        log(" getSnitchName()");
        return c.getStringValue("/snitch/name");
    }

    @Override
    public String getRack() {
        return c.getStringValue("/snitch/rack", null, 10000);
    }

    @Override
    public String getDatacenter() {
        return c.getStringValue("/snitch/datacenter", null, 10000);
    }
}

@@ -842,55 +842,8 @@
 r;%0A%0A
-import java.lang.management.ManagementFactory;%0A
 impo
@@ -905,17 +905,16 @@
 eption;%0A
-%0A
 import j
@@ -920,69 +920,30 @@
 java
-x.management.MBeanServer;%0Aimport javax.management.ObjectName;
+.util.logging.Logger;%0A
 %0Aimp
@@ -1062,16 +1062,58 @@
 IClient;
+%0Aimport com.scylladb.jmx.metrics.APIMBean;
 %0A%0Apublic
@@ -1138,16 +1138,33 @@
 tchInfo 
+extends APIMBean 
 implemen
@@ -1193,30 +1193,29 @@
 Bean %7B%0A    p
-rivate
+ublic
  static fina
@@ -1220,319 +1220,171 @@
 nal 
-java.util.logging.Logger logger = java.util.logging.Logger%0A            .getLogger(EndpointSnitchInfo.class.getName());%0A%0A    private APIClient c = new APIClient();%0A%0A    public void log(String str) %7B%0A        logger.finest(str);%0A    %7D%0A%0A    private static final EndpointSnitchInfo instance = new EndpointSnitchInfo(
+String MBEAN_NAME = %22org.apache.cassandra.db:type=EndpointSnitchInfo%22;%0A    private static final Logger logger = Logger.getLogger(EndpointSnitchInfo.class.getName()
 );%0A%0A
@@ -1394,23 +1394,16 @@
  public 
-static 
 Endpoint
@@ -1416,385 +1416,110 @@
 Info
- getInstance() %7B%0A        return instance;%0A    %7D%0A%0A    private EndpointSnitchInfo() %7B%0A        MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();%0A        try %7B%0A            mbs.registerMBean(this, new ObjectName(%0A                    %22org.apache.cassandra.db:type=EndpointSnitchInfo%22));%0A        %7D catch (Exception e) %7B%0A            throw new RuntimeException(e);%0A        %7D
+(APIClient c) %7B%0A        super(c);%0A    %7D%0A%0A    public void log(String str) %7B%0A        logger.finest(str);
 %0A   
@@ -2099,32 +2099,37 @@
         return c
+lient
 .getStringValue(
@@ -2767,32 +2767,37 @@
         return c
+lient
 .getStringValue(
@@ -3034,32 +3034,37 @@
         return c
+lient
 .getStringValue(
@@ -3139,32 +3139,37 @@
         return c
+lient
 .getStringValue(
@@ -3271,16 +3271,21 @@
 return c
+lient
 .getStri

Rework EnpointSnitchInfo