reverting changes to Refactor CacheStats to Stats across all relevant classes and tests as it's pulled out into elastic#131784

Author: mjmbischoff

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpCache.java

@@ -120,7 +120,7 @@ public int count() {
      * @return Current stats about this cache
      */
     public CacheStats getCacheStats() {
-        Cache.Stats stats = cache.stats();
+        Cache.CacheStats stats = cache.stats();
         return new CacheStats(
             cache.count(),
             stats.getHits(),

server/src/main/java/org/elasticsearch/common/cache/Cache.java

@@ -141,7 +141,7 @@ default void refresh() {}
      *
      * @return the current cache statistics
      */
-    Stats stats();
+    CacheStats stats();
 
     /**
      * Performs an action for each cache entry in the cache. While iterating over the cache entries this method might use locks. As such,
@@ -157,7 +157,7 @@ default void refresh() {}
      * @param misses number of times no cached value could be found
      * @param evictions number of entries that have been evicted
      */
-    record Stats(long hits, long misses, long evictions) {
+    record CacheStats(long hits, long misses, long evictions) {
 
         public long getHits() {
             return hits;

server/src/main/java/org/elasticsearch/common/cache/LRUCache.java

@@ -746,8 +746,8 @@ public void remove() {
      *
      * @return the current cache statistics
      */
-    public Stats stats() {
-        return new Stats(hits.sum(), misses.sum(), evictions.sum());
+    public CacheStats stats() {
+        return new CacheStats(hits.sum(), misses.sum(), evictions.sum());
     }
 
     private void promote(Entry<K, V> entry, long now) {

server/src/test/java/org/elasticsearch/common/cache/CacheTests.java

@@ -184,7 +184,7 @@ public void testStats() {
                 cache.invalidate(entry);
             }
 
-            Cache.Stats stats = cache.stats();
+            Cache.CacheStats stats = cache.stats();
             assertEquals(expectedHits, stats.getHits());
             assertEquals(expectedMisses, stats.getMisses());
             assertEquals(invalidations, stats.getEvictions());

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/FieldPermissionsCache.java

@@ -49,7 +49,7 @@ public FieldPermissionsCache(Settings settings) {
             .build();
     }
 
-    public Cache.Stats getCacheStats() {
+    public Cache.CacheStats getCacheStats() {
         return cache.stats();
     }
 

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/RoleDescriptorTests.java

@@ -578,7 +578,7 @@ public void testParsingFieldPermissionsUsesCache() throws IOException {
         FieldPermissionsCache fieldPermissionsCache = new FieldPermissionsCache(Settings.EMPTY);
         RoleDescriptor.setFieldPermissionsCache(fieldPermissionsCache);
 
-        final Cache.Stats beforeStats = fieldPermissionsCache.getCacheStats();
+        final Cache.CacheStats beforeStats = fieldPermissionsCache.getCacheStats();
 
         final String json = """
             {
@@ -604,7 +604,7 @@ public void testParsingFieldPermissionsUsesCache() throws IOException {
         RoleDescriptor.parserBuilder().build().parse("test", new BytesArray(json), XContentType.JSON);
 
         final int numberOfFieldSecurityBlocks = 2;
-        final Cache.Stats betweenStats = fieldPermissionsCache.getCacheStats();
+        final Cache.CacheStats betweenStats = fieldPermissionsCache.getCacheStats();
         assertThat(betweenStats.getMisses(), equalTo(beforeStats.getMisses() + numberOfFieldSecurityBlocks));
         assertThat(betweenStats.getHits(), equalTo(beforeStats.getHits()));
 
@@ -613,7 +613,7 @@ public void testParsingFieldPermissionsUsesCache() throws IOException {
             RoleDescriptor.parserBuilder().build().parse("test", new BytesArray(json), XContentType.JSON);
         }
 
-        final Cache.Stats afterStats = fieldPermissionsCache.getCacheStats();
+        final Cache.CacheStats afterStats = fieldPermissionsCache.getCacheStats();
         assertThat(afterStats.getMisses(), equalTo(betweenStats.getMisses()));
         assertThat(afterStats.getHits(), equalTo(beforeStats.getHits() + numberOfFieldSecurityBlocks * iterations));
     }

x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichCache.java

@@ -137,7 +137,7 @@ void put(CacheKey cacheKey, CacheValue cacheValue) {
     }
 
     public EnrichStatsAction.Response.CacheStats getStats(String localNodeId) {
-        Cache.Stats stats = cache.stats();
+        Cache.CacheStats stats = cache.stats();
         return new EnrichStatsAction.Response.CacheStats(
             localNodeId,
             cache.count(),