[CI] Auto commit changes from spotless

Author: elasticsearchmachine

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

@@ -39,7 +39,7 @@ final class ConfigDatabases implements Closeable {
     private final GeoIpCache cache;
     private final Path geoipConfigDir;
 
-//    private final ConcurrentMap<ProjectId, ConcurrentMap<String, DatabaseReaderLazyLoader>> configDatabasesByProject;
+    // private final ConcurrentMap<ProjectId, ConcurrentMap<String, DatabaseReaderLazyLoader>> configDatabasesByProject;
     private final ConcurrentMap<String, DatabaseReaderLazyLoader> configDatabases;
 
     ConfigDatabases(Environment environment, GeoIpCache cache) {

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

@@ -146,8 +146,12 @@ public final class DatabaseNodeService implements IpDatabaseProvider {
         this.clusterService = clusterService;
     }
 
-    public void initialize(String nodeId, ResourceWatcherService resourceWatcher, IngestService ingestServiceArg,
-                           ProjectResolver projectResolver) throws IOException {
+    public void initialize(
+        String nodeId,
+        ResourceWatcherService resourceWatcher,
+        IngestService ingestServiceArg,
+        ProjectResolver projectResolver
+    ) throws IOException {
         configDatabases.initialize(resourceWatcher);
         geoipTmpDirectory = geoipTmpBaseDirectory.resolve(nodeId);
         // delete all stale files in the geoip tmp directory
@@ -191,7 +195,7 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
     }
 
     @Override
-    public Boolean isValid(ProjectId projectId,String databaseFile) {
+    public Boolean isValid(ProjectId projectId, String databaseFile) {
         ProjectState projectState = clusterService.state().projectState(projectId);
         assert projectState != null;
 
@@ -253,9 +257,11 @@ DatabaseReaderLazyLoader get(ProjectId projectId, String key) {
     public void shutdown() throws IOException {
         // this is a little 'fun' looking, but it's just adapting IOUtils.close() into something
         // that can call a bunch of shutdown methods (rather than close methods)
-        final var loadersToShutdown = databases.values().stream()
+        final var loadersToShutdown = databases.values()
+            .stream()
             .flatMap(map -> map.values().stream())
-            .map(ShutdownCloseable::new).toList();
+            .map(ShutdownCloseable::new)
+            .toList();
         databases.clear();
         IOUtils.close(loadersToShutdown);
     }
@@ -285,7 +291,8 @@ void checkDatabases(ClusterState state) {
         for (ProjectMetadata projectMetadata : state.getMetadata().projects().values()) {
             ProjectId projectId = projectMetadata.id();
 
-            PersistentTasksCustomMetadata persistentTasks = state.metadata().getProject(projectId)
+            PersistentTasksCustomMetadata persistentTasks = state.metadata()
+                .getProject(projectId)
                 .custom(PersistentTasksCustomMetadata.TYPE);
             if (persistentTasks == null) {
                 logger.trace("Not checking databases for project [{}] because persistent tasks are null", projectId);
@@ -301,8 +308,11 @@ void checkDatabases(ClusterState state) {
                 Index databasesIndex = databasesAbstraction.getWriteIndex();
                 IndexRoutingTable databasesIndexRT = state.routingTable(projectId).index(databasesIndex);
                 if (databasesIndexRT == null || databasesIndexRT.allPrimaryShardsActive() == false) {
-                    logger.trace("Not checking databases because geoip databases index does not have all active primary shards for" +
-                        " project [{}]", projectId);
+                    logger.trace(
+                        "Not checking databases because geoip databases index does not have all active primary shards for"
+                            + " project [{}]",
+                        projectId
+                    );
                     return;
                 }
             }
@@ -312,8 +322,10 @@ void checkDatabases(ClusterState state) {
 
             // process the geoip task state for the (ordinary) geoip downloader
             {
-                GeoIpTaskState taskState = getGeoIpTaskState(projectMetadata, getTaskId(projectId,
-                    projectResolver.supportsMultipleProjects()));
+                GeoIpTaskState taskState = getGeoIpTaskState(
+                    projectMetadata,
+                    getTaskId(projectId, projectResolver.supportsMultipleProjects())
+                );
                 if (taskState == null) {
                     // Note: an empty state will purge stale entries in databases map
                     taskState = GeoIpTaskState.EMPTY;
@@ -439,8 +451,11 @@ void retrieveAndUpdateDatabase(ProjectId projectId, String databaseName, GeoIpTa
                             if (name.startsWith(databaseName)) {
                                 Files.copy(is, databaseTmpFile, StandardCopyOption.REPLACE_EXISTING);
                             } else {
-                                Files.copy(is, databaseTmpDirectory.resolve(databaseName + "_" + name),
-                                    StandardCopyOption.REPLACE_EXISTING);
+                                Files.copy(
+                                    is,
+                                    databaseTmpDirectory.resolve(databaseName + "_" + name),
+                                    StandardCopyOption.REPLACE_EXISTING
+                                );
                             }
                         }
                     }
@@ -466,7 +481,8 @@ void retrieveAndUpdateDatabase(ProjectId projectId, String databaseName, GeoIpTa
                     ioe.addSuppressed(failure);
                     logger.error("unable to delete tmp database file after failure", ioe);
                 }
-            });
+            }
+        );
     }
 
     void updateDatabase(ProjectId projectId, String databaseFileName, String recordedMd5, Path file) {
@@ -522,7 +538,7 @@ void removeStaleEntries(ProjectId projectId, Collection<String> staleEntries) {
                 assert existing != null;
                 existing.shutdown(true);
             } catch (Exception e) {
-                logger.error(() -> "failed to clean database [" + staleEntry + "] for project [" + projectId + "]" , e);
+                logger.error(() -> "failed to clean database [" + staleEntry + "] for project [" + projectId + "]", e);
             }
         }
     }
@@ -558,7 +574,7 @@ void retrieveDatabase(
                         // so it is ok if this happens in a blocking manner on a thread from generic thread pool.
                         // This makes the code easier to understand and maintain.
                         // TODO: we should revisit if blocking the generic thread pool for search is still acceptable,
-                        //  since in multi-project mode each project will have its own geoip databases index search
+                        // since in multi-project mode each project will have its own geoip databases index search
                         SearchResponse searchResponse = client.search(searchRequest).actionGet();
                         try {
                             SearchHit[] hits = searchResponse.getHits().getHits();

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

@@ -182,8 +182,12 @@ public static final class DatabaseVerifyingSupplier implements CheckedSupplier<I
         private final String databaseType;
         private final ProjectId projectId;
 
-        public DatabaseVerifyingSupplier(IpDatabaseProvider ipDatabaseProvider, String databaseFile, String databaseType,
-                                         ProjectId projectId) {
+        public DatabaseVerifyingSupplier(
+            IpDatabaseProvider ipDatabaseProvider,
+            String databaseFile,
+            String databaseType,
+            ProjectId projectId
+        ) {
             this.ipDatabaseProvider = ipDatabaseProvider;
             this.databaseFile = databaseFile;
             this.databaseType = databaseType;

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

@@ -11,7 +11,6 @@
 
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
-import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -253,19 +252,19 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         }
     }
 
-//    /**
-//     * Retrieves the geoip downloader's task state from the cluster state. This may return null in some circumstances,
-//     * for example if the geoip downloader task hasn't been created yet (which it wouldn't be if it's disabled).
-//     *
-//     * @param state the cluster state to read the task state from
-//     * @return the geoip downloader's task state or null if there is not a state to read
-//     */
-//    @Nullable
-//    @Deprecated(forRemoval = true)
-//    static GeoIpTaskState getGeoIpTaskState(ClusterState state) {
-//        PersistentTasksCustomMetadata.PersistentTask<?> task = getTaskWithId(state, GeoIpDownloader.GEOIP_DOWNLOADER);
-//        return (task == null) ? null : (GeoIpTaskState) task.getState();
-//    }
+    // /**
+    // * Retrieves the geoip downloader's task state from the cluster state. This may return null in some circumstances,
+    // * for example if the geoip downloader task hasn't been created yet (which it wouldn't be if it's disabled).
+    // *
+    // * @param state the cluster state to read the task state from
+    // * @return the geoip downloader's task state or null if there is not a state to read
+    // */
+    // @Nullable
+    // @Deprecated(forRemoval = true)
+    // static GeoIpTaskState getGeoIpTaskState(ClusterState state) {
+    // PersistentTasksCustomMetadata.PersistentTask<?> task = getTaskWithId(state, GeoIpDownloader.GEOIP_DOWNLOADER);
+    // return (task == null) ? null : (GeoIpTaskState) task.getState();
+    // }
 
     /**
      * Retrieves the geoip downloader's task state from the project metadata. This may return null in some circumstances,

modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/DatabaseNodeServiceTests.java

@@ -136,8 +136,12 @@ public void setup() throws IOException {
         clusterService = mock(ClusterService.class);
         geoIpTmpDir = createTempDir();
         databaseNodeService = new DatabaseNodeService(geoIpTmpDir, client, cache, configDatabases, Runnable::run, clusterService);
-        databaseNodeService.initialize("nodeId", resourceWatcherService, ingestService,
-            TestProjectResolvers.singleProject(randomProjectIdOrDefault()));
+        databaseNodeService.initialize(
+            "nodeId",
+            resourceWatcherService,
+            ingestService,
+            TestProjectResolvers.singleProject(randomProjectIdOrDefault())
+        );
     }
 
     @After
@@ -203,7 +207,6 @@ public void testCheckDatabases_dontCheckDatabaseOnNonIngestNode() throws Excepti
         task = new PersistentTask<>(task, new GeoIpTaskState(Map.of("GeoIP2-City.mmdb", new GeoIpTaskState.Metadata(0L, 0, 9, md5, 10))));
         PersistentTasksCustomMetadata tasksCustomMetadata = new PersistentTasksCustomMetadata(1L, Map.of(taskId, task));
 
-
         ClusterState state = ClusterState.builder(createClusterState(projectId, tasksCustomMetadata))
             .nodes(
                 new DiscoveryNodes.Builder().add(
@@ -306,7 +309,7 @@ public void testUpdateDatabase() throws Exception {
         List<String> pipelineIds = IntStream.range(0, numPipelinesToBeReloaded).mapToObj(String::valueOf).toList();
         when(ingestService.getPipelineWithProcessorType(any(), any(), any())).thenReturn(pipelineIds);
 
-        databaseNodeService.updateDatabase(projectId,"_name", "_md5", geoIpTmpDir.resolve("some-file"));
+        databaseNodeService.updateDatabase(projectId, "_name", "_md5", geoIpTmpDir.resolve("some-file"));
 
         // Updating the first time may trigger a reload.
         verify(clusterService, times(1)).addListener(any());

modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java

@@ -81,8 +81,12 @@ public void loadDatabaseReaders() throws IOException {
         clusterService = mock(ClusterService.class);
         when(clusterService.state()).thenReturn(ClusterState.EMPTY_STATE);
         databaseNodeService = new DatabaseNodeService(geoipTmpDir, client, cache, configDatabases, Runnable::run, clusterService);
-        databaseNodeService.initialize("nodeId", mock(ResourceWatcherService.class), mock(IngestService.class),
-            TestProjectResolvers.singleProject(randomProjectIdOrDefault()));
+        databaseNodeService.initialize(
+            "nodeId",
+            mock(ResourceWatcherService.class),
+            mock(IngestService.class),
+            TestProjectResolvers.singleProject(randomProjectIdOrDefault())
+        );
     }
 
     @After
@@ -224,7 +228,7 @@ public void testBuildWithAsnDbAndCityFields() {
     public void testBuildNonExistingDbFile() throws Exception {
         ProjectId projectId = randomProjectIdOrDefault();
         copyDatabase("GeoLite2-City-Test.mmdb", geoipTmpDir.resolve("GeoLite2-City.mmdb"));
-        databaseNodeService.updateDatabase(projectId,"GeoLite2-City.mmdb", "md5", geoipTmpDir.resolve("GeoLite2-City.mmdb"));
+        databaseNodeService.updateDatabase(projectId, "GeoLite2-City.mmdb", "md5", geoipTmpDir.resolve("GeoLite2-City.mmdb"));
         GeoIpProcessor.Factory factory = new GeoIpProcessor.Factory(GEOIP_TYPE, databaseNodeService);
 
         Map<String, Object> config = new HashMap<>();