(solr) branch branch_9x updated: GH-2086: errorprone build fix #2086 (#2090) (#2091)

[mk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mkhl pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 1c9a6f0ec39 GH-2086: errorprone build fix #2086 (#2090) (#2091)
1c9a6f0ec39 is described below

commit 1c9a6f0ec39903ccc0e7a1c23c81d3c8f5537a42
Author: Mikhail Khludnev <mk...@users.noreply.github.com>
AuthorDate: Fri Nov 24 00:19:43 2023 +0300

    GH-2086: errorprone build fix #2086 (#2090) (#2091)
    
    * GH-2086: errorprone fix
    
    * GH-2086: tidy
    
    (cherry picked from commit f9c17ebd90180910a7d3d1a695c23c6686bf1191)
---
 .../org/apache/solr/core/BlobRepositoryMockingTest.java | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java b/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java
index 49f9d3699f7..cf37174bbc3 100644
--- a/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java
+++ b/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java
@@ -46,8 +46,7 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 {
   private CoreContainer mockContainer = mock(CoreContainer.class);
 
   @SuppressWarnings({"unchecked", "rawtypes"})
-  private ConcurrentHashMap<String, BlobRepository.BlobContent> mapMock =
-      mock(ConcurrentHashMap.class);
+  private ConcurrentHashMap<String, BlobRepository.BlobContent> blobStorage;
 
   BlobRepository repository;
   ByteBuffer blobData = ByteBuffer.wrap(BLOBSTR.getBytes(UTF8));
@@ -68,7 +67,7 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 {
     blobFetched = false;
     blobKey = "";
     reset(mockContainer);
-    mapMock = new ConcurrentHashMap<>();
+    blobStorage = new ConcurrentHashMap<>();
     repository =
         new BlobRepository(mockContainer) {
           @Override
@@ -89,7 +88,7 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 {
           @Override
           @SuppressWarnings({"rawtypes"})
           ConcurrentHashMap<String, BlobContent> createMap() {
-            return mapMock;
+            return blobStorage;
           }
         };
   }
@@ -114,7 +113,7 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 {
     assertNotNull(ref.blob);
     assertEquals(blobData, ref.blob.get());
     verify(mockContainer).isZooKeeperAware();
-    assertTrue(mapMock.get("foo!") instanceof BlobRepository.BlobContent);
+    assertNotNull(blobStorage.get("foo!"));
   }
 
   @Test
@@ -147,16 +146,14 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 {
   @Test
   public void testCachedAlready() {
     when(mockContainer.isZooKeeperAware()).thenReturn(true);
-    mapMock.put("foo!", new BlobRepository.BlobContent<BlobRepository>("foo!", blobData));
+    blobStorage.put("foo!", new BlobRepository.BlobContent<BlobRepository>("foo!", blobData));
     BlobRepository.BlobContentRef<ByteBuffer> ref = repository.getBlobIncRef("foo!");
     assertEquals("", blobKey);
     assertFalse(blobFetched);
     assertNotNull(ref.blob);
     assertEquals(blobData, ref.blob.get());
     verify(mockContainer).isZooKeeperAware();
-    assertTrue(
-        "Key was not mapped to a BlobContent instance.",
-        mapMock.get("foo!") instanceof BlobRepository.BlobContent);
+    assertNotNull("Key was not mapped to a BlobContent instance.", blobStorage.get("foo!"));
   }
 
   @Test
@@ -189,6 +186,6 @@ public class BlobRepositoryMockingTest extends SolrTestCaseJ4 {
     assertNotNull(ref.blob);
     assertEquals(PARSED, ref.blob.get());
     verify(mockContainer).isZooKeeperAware();
-    assertTrue(mapMock.get("foo!mocked") instanceof BlobRepository.BlobContent);
+    assertNotNull(blobStorage.get("foo!mocked"));
   }
 }