Eliminate MetricKeys class.

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheContainerMetric.java

@@ -35,33 +35,33 @@
  */
 public enum CacheContainerMetric implements Metric<EmbeddedCacheManager> {
 
-    CACHE_MANAGER_STATUS(MetricKeys.CACHE_MANAGER_STATUS, ModelType.STRING) {
+    CACHE_MANAGER_STATUS("cache-manager-status", ModelType.STRING) {
         @Override
         public ModelNode execute(EmbeddedCacheManager manager) {
             return new ModelNode(manager.getStatus().toString());
         }
     },
-    CLUSTER_NAME(MetricKeys.CLUSTER_NAME, ModelType.STRING) {
+    CLUSTER_NAME("cluster-name", ModelType.STRING) {
         @Override
         public ModelNode execute(EmbeddedCacheManager manager) {
             String clusterName = manager.getClusterName();
             return (clusterName != null) ? new ModelNode(clusterName) : null;
         }
     },
-    COORDINATOR_ADDRESS(MetricKeys.COORDINATOR_ADDRESS, ModelType.STRING) {
+    COORDINATOR_ADDRESS("coordinator-address", ModelType.STRING) {
         @Override
         public ModelNode execute(EmbeddedCacheManager manager) {
             Address address = manager.getCoordinator();
             return (address != null) ? new ModelNode(address.toString()) : null;
         }
     },
-    IS_COORDINATOR(MetricKeys.IS_COORDINATOR, ModelType.BOOLEAN) {
+    IS_COORDINATOR("is-coordinator", ModelType.BOOLEAN) {
         @Override
         public ModelNode execute(EmbeddedCacheManager manager) {
             return new ModelNode(manager.isCoordinator());
         }
     },
-    LOCAL_ADDRESS(MetricKeys.LOCAL_ADDRESS, ModelType.STRING) {
+    LOCAL_ADDRESS("local-address", ModelType.STRING) {
         @Override
         public ModelNode execute(EmbeddedCacheManager manager) {
             Address address = manager.getAddress();

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheMetric.java

@@ -39,111 +39,111 @@
  */
 public enum CacheMetric implements Metric<Cache<?, ?>> {
 
-    ACTIVATIONS(MetricKeys.ACTIVATIONS, ModelType.LONG) {
+    ACTIVATIONS("activations", ModelType.LONG) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             ActivationManager manager = cache.getAdvancedCache().getComponentRegistry().getComponent(ActivationManager.class);
             return new ModelNode((manager != null) ? manager.getActivationCount() : 0);
         }
     },
-    AVERAGE_READ_TIME(MetricKeys.AVERAGE_READ_TIME, ModelType.LONG) {
+    AVERAGE_READ_TIME("average-read-time", ModelType.LONG) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             CacheMgmtInterceptor interceptor = findInterceptor(cache, CacheMgmtInterceptor.class);
             return new ModelNode((interceptor != null) ? interceptor.getAverageReadTime() : 0);
         }
     },
-    AVERAGE_WRITE_TIME(MetricKeys.AVERAGE_WRITE_TIME, ModelType.LONG) {
+    AVERAGE_WRITE_TIME("average-write-time", ModelType.LONG) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             CacheMgmtInterceptor interceptor = findInterceptor(cache, CacheMgmtInterceptor.class);
             return new ModelNode((interceptor != null) ? interceptor.getAverageWriteTime() : 0);
         }
     },
-    CACHE_STATUS(MetricKeys.CACHE_STATUS, ModelType.STRING) {
+    CACHE_STATUS("cache-status", ModelType.STRING) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             return new ModelNode(cache.getStatus().toString());
         }
     },
-    ELAPSED_TIME(MetricKeys.ELAPSED_TIME, ModelType.LONG) {
+    ELAPSED_TIME("elapsed-time", ModelType.LONG) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             CacheMgmtInterceptor interceptor = findInterceptor(cache, CacheMgmtInterceptor.class);
             return new ModelNode((interceptor != null) ? interceptor.getTimeSinceStart() : 0);
         }
     },
-    HIT_RATIO(MetricKeys.HIT_RATIO, ModelType.DOUBLE) {
+    HIT_RATIO("hit-ratio", ModelType.DOUBLE) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             CacheMgmtInterceptor interceptor = findInterceptor(cache, CacheMgmtInterceptor.class);
             return new ModelNode((interceptor != null) ? interceptor.getHitRatio() : 0);
         }
     },
-    HITS(MetricKeys.HITS, ModelType.LONG) {
+    HITS("hits", ModelType.LONG) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             CacheMgmtInterceptor interceptor = findInterceptor(cache, CacheMgmtInterceptor.class);
             return new ModelNode((interceptor != null) ? interceptor.getHits() : 0);
         }
     },
-    INVALIDATIONS(MetricKeys.INVALIDATIONS, ModelType.LONG) {
+    INVALIDATIONS("invalidations", ModelType.LONG) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             InvalidationInterceptor interceptor = findInterceptor(cache, InvalidationInterceptor.class);
             return new ModelNode((interceptor != null) ? interceptor.getInvalidations() : 0);
         }
     },
-    MISSES(MetricKeys.MISSES, ModelType.LONG) {
+    MISSES("misses", ModelType.LONG) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             CacheMgmtInterceptor interceptor = findInterceptor(cache, CacheMgmtInterceptor.class);
             return new ModelNode((interceptor != null) ? interceptor.getMisses() : 0);
         }
     },
-    NUMBER_OF_ENTRIES(MetricKeys.NUMBER_OF_ENTRIES, ModelType.INT) {
+    NUMBER_OF_ENTRIES("number-of-entries", ModelType.INT) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             CacheMgmtInterceptor interceptor = findInterceptor(cache, CacheMgmtInterceptor.class);
             return new ModelNode((interceptor != null) ? interceptor.getNumberOfEntries() : 0);
         }
     },
-    PASSIVATIONS(MetricKeys.PASSIVATIONS, ModelType.LONG) {
+    PASSIVATIONS("passivations", ModelType.LONG) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             PassivationManager manager = cache.getAdvancedCache().getComponentRegistry().getComponent(PassivationManager.class);
             return new ModelNode((manager != null) ? manager.getPassivations() : 0);
         }
     },
-    READ_WRITE_RATIO(MetricKeys.READ_WRITE_RATIO, ModelType.DOUBLE) {
+    READ_WRITE_RATIO("read-write-ratio", ModelType.DOUBLE) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             CacheMgmtInterceptor interceptor = findInterceptor(cache, CacheMgmtInterceptor.class);
             return new ModelNode((interceptor != null) ? interceptor.getReadWriteRatio() : 0);
         }
     },
-    REMOVE_HITS(MetricKeys.REMOVE_HITS, ModelType.LONG) {
+    REMOVE_HITS("remove-hits", ModelType.LONG) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             CacheMgmtInterceptor interceptor = findInterceptor(cache, CacheMgmtInterceptor.class);
             return new ModelNode((interceptor != null) ? interceptor.getRemoveHits() : 0);
         }
     },
-    REMOVE_MISSES(MetricKeys.REMOVE_MISSES, ModelType.LONG) {
+    REMOVE_MISSES("remove-misses", ModelType.LONG) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             CacheMgmtInterceptor interceptor = findInterceptor(cache, CacheMgmtInterceptor.class);
             return new ModelNode((interceptor != null) ? interceptor.getRemoveMisses() : 0);
         }
     },
-    STORES(MetricKeys.STORES, ModelType.LONG) {
+    STORES("stores", ModelType.LONG) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             CacheMgmtInterceptor interceptor = findInterceptor(cache, CacheMgmtInterceptor.class);
             return new ModelNode((interceptor != null) ? interceptor.getStores() : 0);
         }
     },
-    TIME_SINCE_RESET(MetricKeys.TIME_SINCE_RESET, ModelType.LONG) {
+    TIME_SINCE_RESET("time-since-reset", ModelType.LONG) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             CacheMgmtInterceptor interceptor = findInterceptor(cache, CacheMgmtInterceptor.class);

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ClusteredCacheMetric.java

@@ -34,25 +34,25 @@
  */
 public enum ClusteredCacheMetric implements Metric<RpcManagerImpl> {
 
-    AVERAGE_REPLICATION_TIME(MetricKeys.AVERAGE_REPLICATION_TIME, ModelType.LONG) {
+    AVERAGE_REPLICATION_TIME("average-replication-time", ModelType.LONG) {
         @Override
         public ModelNode execute(RpcManagerImpl manager) {
             return new ModelNode(manager.getAverageReplicationTime());
         }
     },
-    REPLICATION_COUNT(MetricKeys.REPLICATION_COUNT, ModelType.LONG) {
+    REPLICATION_COUNT("replication-count", ModelType.LONG) {
         @Override
         public ModelNode execute(RpcManagerImpl manager) {
             return new ModelNode(manager.getReplicationCount());
         }
     },
-    REPLICATION_FAILURES(MetricKeys.REPLICATION_FAILURES, ModelType.LONG) {
+    REPLICATION_FAILURES("replication-failures", ModelType.LONG) {
         @Override
         public ModelNode execute(RpcManagerImpl manager) {
             return new ModelNode(manager.getReplicationFailures());
         }
     },
-    SUCCESS_RATIO(MetricKeys.SUCCESS_RATIO, ModelType.DOUBLE) {
+    SUCCESS_RATIO("success-ratio", ModelType.DOUBLE) {
         @Override
         public ModelNode execute(RpcManagerImpl manager) {
             return new ModelNode(manager.getSuccessRatio());

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/EvictionMetric.java

@@ -32,7 +32,7 @@
  */
 public enum EvictionMetric implements Metric<Cache<?, ?>> {
 
-    EVICTIONS(MetricKeys.EVICTIONS, ModelType.LONG) {
+    EVICTIONS("evictions", ModelType.LONG) {
         @Override
         public ModelNode execute(Cache<?, ?> cache) {
             CacheMgmtInterceptor interceptor = CacheMetric.findInterceptor(cache, CacheMgmtInterceptor.class);

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/LockingMetric.java

@@ -35,19 +35,19 @@
  */
 public enum LockingMetric implements Metric<DefaultLockManager> {
 
-    CURRENT_CONCURRENCY_LEVEL(MetricKeys.CURRENT_CONCURRENCY_LEVEL, ModelType.INT) {
+    CURRENT_CONCURRENCY_LEVEL("current-concurrency-level", ModelType.INT) {
         @Override
         public ModelNode execute(DefaultLockManager manager) {
             return new ModelNode(manager.getConcurrencyLevel());
         }
     },
-    NUMBER_OF_LOCKS_AVAILABLE(MetricKeys.NUMBER_OF_LOCKS_AVAILABLE, ModelType.INT) {
+    NUMBER_OF_LOCKS_AVAILABLE("number-of-locks-available", ModelType.INT) {
         @Override
         public ModelNode execute(DefaultLockManager manager) {
             return new ModelNode(manager.getNumberOfLocksAvailable());
         }
     },
-    NUMBER_OF_LOCKS_HELD(MetricKeys.NUMBER_OF_LOCKS_HELD, ModelType.INT) {
+    NUMBER_OF_LOCKS_HELD("number-of-locks-held", ModelType.INT) {
         @Override
         public ModelNode execute(DefaultLockManager manager) {
             return new ModelNode(manager.getNumberOfLocksHeld());

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/StoreMetric.java

@@ -35,13 +35,13 @@
  */
 public enum StoreMetric implements Metric<CacheLoaderInterceptor<?, ?>> {
 
-    CACHE_LOADER_LOADS(MetricKeys.CACHE_LOADER_LOADS, ModelType.LONG) {
+    CACHE_LOADER_LOADS("cache-loader-loads", ModelType.LONG) {
         @Override
         public ModelNode execute(CacheLoaderInterceptor<?, ?> interceptor) {
             return new ModelNode(interceptor.getCacheLoaderLoads());
         }
     },
-    CACHE_LOADER_MISSES(MetricKeys.CACHE_LOADER_MISSES, ModelType.LONG) {
+    CACHE_LOADER_MISSES("cache-loader-misses", ModelType.LONG) {
         @Override
         public ModelNode execute(CacheLoaderInterceptor<?, ?> interceptor) {
             return new ModelNode(interceptor.getCacheLoaderMisses());

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/TransactionMetric.java

@@ -35,19 +35,19 @@
  */
 public enum TransactionMetric implements Metric<TxInterceptor<?, ?>> {
 
-    COMMITS(MetricKeys.COMMITS, ModelType.LONG) {
+    COMMITS("commits", ModelType.LONG) {
         @Override
         public ModelNode execute(TxInterceptor<?, ?> interceptor) {
             return new ModelNode(interceptor.getCommits());
         }
     },
-    PREPARES(MetricKeys.PREPARES, ModelType.LONG) {
+    PREPARES("prepares", ModelType.LONG) {
         @Override
         public ModelNode execute(TxInterceptor<?, ?> interceptor) {
             return new ModelNode(interceptor.getPrepares());
         }
     },
-    ROLLBACKS(MetricKeys.ROLLBACKS, ModelType.LONG) {
+    ROLLBACKS("rollbacks", ModelType.LONG) {
         @Override
         public ModelNode execute(TxInterceptor<?, ?> interceptor) {
             return new ModelNode(interceptor.getRollbacks());