SOLR-17949: Fix CI failures for Azure Blob Storage backup repository

- Replace fully-qualified class names with imports in test files
  (Error Prone UnnecessarilyFullyQualified under -Werror)
- Remove invalid 'description' key from changelog entry
- Regenerate dependency lockfiles after merging upstream/main

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: prateeksinghalgit

changelog/unreleased/SOLR-17949-azure-blob-repository.yml

@@ -3,9 +3,6 @@ title: Add Azure Blob Storage backup repository module
 type: added
 authors:
   - name: Prateek Singhal
-description: |
-  Added AzureBlobBackupRepository module for backing up and restoring Solr collections to Azure Blob Storage.
-  Supports multiple authentication methods: connection string, account name + key, SAS token, and Azure Identity (service principal, managed identity).
 links:
   - name: SOLR-17949
     url: https://issues.apache.org/jira/browse/SOLR-17949

gradle/libs.versions.toml

@@ -512,10 +512,10 @@ ow2-asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "ow2-asm"
 ow2-asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "ow2-asm" }
 # @keep transitive dependency for version alignment
 perfmark-api = { module = "io.perfmark:perfmark-api", version.ref = "perfmark" }
-prometheus-metrics-expositionformats = { module = "io.prometheus:prometheus-metrics-exposition-formats", version.ref = "prometheus-metrics" }
-prometheus-metrics-model = { module = "io.prometheus:prometheus-metrics-model", version.ref = "prometheus-metrics" }
 # Version managed by azure-sdk-bom
 projectreactor-core = { module = "io.projectreactor:reactor-core" }
+prometheus-metrics-expositionformats = { module = "io.prometheus:prometheus-metrics-exposition-formats", version.ref = "prometheus-metrics" }
+prometheus-metrics-model = { module = "io.prometheus:prometheus-metrics-model", version.ref = "prometheus-metrics" }
 quicktheories-quicktheories = { module = "org.quicktheories:quicktheories", version.ref = "quicktheories" }
 semver4j-semver4j = { module = "org.semver4j:semver4j", version.ref = "semver4j" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }

solr/modules/azure-blob-repository/gradle.lockfile

@@ -53,10 +53,7 @@ com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,s
 commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 commons-codec:commons-codec:1.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath
 io.dropwizard.metrics:metrics-core:4.2.33=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath
 io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
 io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath

solr/modules/azure-blob-repository/src/test/org/apache/solr/azureblob/AbstractAzureBlobClientTest.java

@@ -24,19 +24,23 @@
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import okhttp3.OkHttpClient;
 import org.apache.lucene.tests.util.QuickPatchThreadsFilter;
 import org.apache.solr.SolrIgnoredThreadsFilter;
 import org.apache.solr.SolrTestCase;
+import org.apache.solr.util.SocketProxy;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
+import reactor.core.scheduler.Schedulers;
 
 /** Abstract class for tests with Azure Blob Storage emulator. */
 @ThreadLeakFilters(
@@ -56,7 +60,7 @@ public class AbstractAzureBlobClientTest extends SolrTestCase {
   private static String connectionString;
 
   protected String containerName;
-  protected org.apache.solr.util.SocketProxy proxy;
+  protected SocketProxy proxy;
 
   protected AzureBlobStorageClient client;
 
@@ -85,8 +89,8 @@ public void setUpClient() throws Exception {
             + blobServiceUrl
             + "/devstoreaccount1;";
 
-    proxy = new org.apache.solr.util.SocketProxy();
-    proxy.open(new java.net.URI(blobServiceUrl));
+    proxy = new SocketProxy();
+    proxy.open(new URI(blobServiceUrl));
 
     HttpClient httpClient = new OkHttpAsyncHttpClientBuilder(sharedOkHttpClient).build();
 
@@ -100,7 +104,7 @@ public void setUpClient() throws Exception {
             .httpClient(httpClient)
             .buildClient();
 
-    containerName = "test-" + java.util.UUID.randomUUID();
+    containerName = "test-" + UUID.randomUUID();
     client = new AzureBlobStorageClient(blobServiceClient, containerName);
   }
 
@@ -161,7 +165,7 @@ public static void afterAll() {
     }
 
     try {
-      reactor.core.scheduler.Schedulers.shutdownNow();
+      Schedulers.shutdownNow();
       Thread.sleep(100);
     } catch (Throwable ignored) {
     }

solr/modules/azure-blob-repository/src/test/org/apache/solr/azureblob/AzureBlobBackupRepositoryTest.java

@@ -31,6 +31,7 @@
 import org.apache.lucene.store.IOContext;
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.IndexOutput;
+import org.apache.lucene.store.MMapDirectory;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.backup.repository.BackupRepository;
 import org.junit.Before;
@@ -215,7 +216,7 @@ public void testCopyFileFromDirectory() throws IOException {
     Files.write(tempFile, content.getBytes(StandardCharsets.UTF_8));
 
     try {
-      Directory sourceDir = new org.apache.lucene.store.MMapDirectory(tempDir);
+      Directory sourceDir = new MMapDirectory(tempDir);
       URI destDirUri = getBaseUri().resolve("copy-from-dir");
 
       repository.copyFileFrom(sourceDir, "source-file.txt", destDirUri);
@@ -250,7 +251,7 @@ public void testCopyFileToDirectory() throws IOException {
     Path tempDir = Files.createTempDirectory("blob-test");
 
     try {
-      Directory destDir = new org.apache.lucene.store.MMapDirectory(tempDir);
+      Directory destDir = new MMapDirectory(tempDir);
 
       repository.copyFileTo(sourceUri, "source-file.txt", destDir);
 
@@ -290,7 +291,7 @@ public void testRetrieveChecksumViaRepository() throws IOException {
     String fileName = "checksum-test.bin";
     long expectedChecksum;
     long expectedLength;
-    try (Directory localDir = new org.apache.lucene.store.MMapDirectory(tempDir)) {
+    try (Directory localDir = new MMapDirectory(tempDir)) {
       try (IndexOutput out = localDir.createOutput(fileName, IOContext.DEFAULT)) {
         CodecUtil.writeIndexHeader(out, "azure-blob-test", 1, new byte[16], "suffix");
         for (int i = 0; i < 10000; i++) {

solr/modules/azure-blob-repository/src/test/org/apache/solr/azureblob/AzureBlobIndexInputTest.java

@@ -20,6 +20,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import org.apache.lucene.store.AlreadyClosedException;
+import org.apache.lucene.store.BufferedIndexInput;
 import org.apache.lucene.store.IndexInput;
 import org.junit.Test;
 
@@ -333,9 +334,8 @@ public void testIndexInputSlice() throws Exception {
   }
 
   /**
-   * A clone has an independent file pointer (per {@link
-   * org.apache.lucene.store.BufferedIndexInput#clone()}): seeks and reads on the clone do not move
-   * the parent's position, and vice versa.
+   * A clone has an independent file pointer (per {@link BufferedIndexInput#clone()}): seeks and
+   * reads on the clone do not move the parent's position, and vice versa.
    */
   @Test
   public void testIndexInputCloneIndependent() throws Exception {

solr/modules/azure-blob-repository/src/test/org/apache/solr/azureblob/AzureBlobPathsTest.java

@@ -16,14 +16,17 @@
  */
 package org.apache.solr.azureblob;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
 import org.junit.Test;
 
 public class AzureBlobPathsTest extends AbstractAzureBlobClientTest {
 
   /** {@code pathExists()} returns false before push, true after. */
   @Test
   public void testPathExists() throws Exception {
-    String path = "path-exists-test-" + java.util.UUID.randomUUID() + ".txt";
+    String path = "path-exists-test-" + UUID.randomUUID() + ".txt";
 
     assertFalse("Path should not exist initially", client.pathExists(path));
 
@@ -35,7 +38,7 @@ public void testPathExists() throws Exception {
   /** {@code pathExists()} reports a freshly-created directory marker as present. */
   @Test
   public void testDirectoryExists() throws Exception {
-    String dirPath = "test-directory-" + java.util.UUID.randomUUID() + "/";
+    String dirPath = "test-directory-" + UUID.randomUUID() + "/";
 
     assertFalse("Directory should not exist initially", client.pathExists(dirPath));
 
@@ -127,7 +130,7 @@ public void testListAll() throws Exception {
     pushContent(dirPath + "subdir1/file3.txt", "Content 3");
     pushContent(dirPath + "subdir2/file4.txt", "Content 4");
 
-    java.util.Set<String> allFiles = new java.util.HashSet<>();
+    Set<String> allFiles = new HashSet<>();
     listAllRecursive(dirPath, allFiles);
 
     assertTrue("Should find file1.txt", allFiles.contains(dirPath + "file1.txt"));
@@ -136,8 +139,7 @@ public void testListAll() throws Exception {
     assertTrue("Should find subdir2/file4.txt", allFiles.contains(dirPath + "subdir2/file4.txt"));
   }
 
-  private void listAllRecursive(String dirPath, java.util.Set<String> allFiles)
-      throws AzureBlobException {
+  private void listAllRecursive(String dirPath, Set<String> allFiles) throws AzureBlobException {
     String[] files = client.listDir(dirPath);
     for (String file : files) {
       String fullPath = dirPath + file;
@@ -160,7 +162,7 @@ public void testDeleteFile() throws Exception {
     pushContent(path, "test content");
     assertTrue("File should exist", client.pathExists(path));
 
-    client.delete(java.util.Set.of(path));
+    client.delete(Set.of(path));
 
     assertFalse("File should not exist after deletion", client.pathExists(path));
   }
@@ -191,7 +193,7 @@ public void testDeleteNonExistentFile() throws Exception {
     assertFalse("File should not exist", client.pathExists(path));
 
     AzureBlobNotFoundException thrown =
-        expectThrows(AzureBlobNotFoundException.class, () -> client.delete(java.util.Set.of(path)));
+        expectThrows(AzureBlobNotFoundException.class, () -> client.delete(Set.of(path)));
     assertTrue(
         "Exception message should reference the missing path: " + thrown.getMessage(),
         thrown.getMessage().contains(path));