spotlessApply after merge conflict

Peter Alfonsi · Peter Alfonsi · commit 7ea9533cb320 · 2024-06-05T10:01:48.000-07:00
Signed-off-by: Peter Alfonsi &lt;petealft@amazon.com&gt;
diff --git a/modules/cache-common/src/test/java/org/opensearch/cache/common/tier/TieredSpilloverCacheTests.java b/modules/cache-common/src/test/java/org/opensearch/cache/common/tier/TieredSpilloverCacheTests.java
@@ -1522,7 +1522,7 @@ public boolean equals(String object, byte[] bytes) {
             return object.equals(deserialize(bytes));
         }
     }
-  
+
     private ImmutableCacheStats getTotalStatsSnapshot(TieredSpilloverCache<?, ?> tsc) throws IOException {
         ImmutableCacheStatsHolder cacheStats = tsc.stats(new String[0]);
         return cacheStats.getStatsForDimensionValues(List.of());

Original file line number	Diff line number	Diff line change
`@@ -1522,7 +1522,7 @@ public boolean equals(String object, byte[] bytes) {`
`1522`	`1522`	`return object.equals(deserialize(bytes));`
`1523`	`1523`	`}`
`1524`	`1524`	`}`
`1525`		`-`
	`1525`	`+`
`1526`	`1526`	`private ImmutableCacheStats getTotalStatsSnapshot(TieredSpilloverCache<?, ?> tsc) throws IOException {`
`1527`	`1527`	`ImmutableCacheStatsHolder cacheStats = tsc.stats(new String[0]);`
`1528`	`1528`	`return cacheStats.getStatsForDimensionValues(List.of());`