diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java index ce5e05b2657..7296eb776de 100644 --- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java +++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java @@ -31,6 +31,7 @@ import com.github.benmanes.caffeine.cache.Interner; import com.google.common.annotations.VisibleForTesting; import io.opentelemetry.api.trace.Tracer; +import jakarta.inject.Singleton; import java.io.IOException; import java.lang.invoke.MethodHandles; import java.nio.file.Path; @@ -53,7 +54,6 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.inject.Singleton; import org.apache.http.auth.AuthSchemeProvider; import org.apache.http.client.CredentialsProvider; import org.apache.http.config.Lookup; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperReadAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperReadAPI.java index 1cc42401662..c3e2c4c6a93 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperReadAPI.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperReadAPI.java @@ -25,6 +25,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.Parameter; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; @@ -35,7 +36,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.model.SolrJerseyResponse; import org.apache.solr.client.solrj.impl.BinaryResponseParser; import org.apache.solr.client.solrj.impl.XMLResponseParser; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/AddReplicaProperty.java b/solr/core/src/java/org/apache/solr/handler/admin/api/AddReplicaProperty.java index c3f29f90b00..37f79fb9f87 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/AddReplicaProperty.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/AddReplicaProperty.java @@ -27,10 +27,10 @@ import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.AddReplicaPropertyApi; import org.apache.solr.client.api.model.AddReplicaPropertyRequestBody; import org.apache.solr.client.api.model.SolrJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/AliasProperty.java b/solr/core/src/java/org/apache/solr/handler/admin/api/AliasProperty.java index 1184751cb9a..9534bacd595 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/AliasProperty.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/AliasProperty.java @@ -23,9 +23,9 @@ import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_READ_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.AliasPropertyApis; import org.apache.solr.client.api.model.GetAliasPropertyResponse; import org.apache.solr.client.api.model.GetAllAliasPropertiesResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/BalanceReplicas.java b/solr/core/src/java/org/apache/solr/handler/admin/api/BalanceReplicas.java index 6e163857296..6063074a235 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/BalanceReplicas.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/BalanceReplicas.java @@ -23,9 +23,9 @@ import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.BalanceReplicasApi; import org.apache.solr.client.api.model.BalanceReplicasRequestBody; import org.apache.solr.client.api.model.SolrJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/BalanceShardUnique.java b/solr/core/src/java/org/apache/solr/handler/admin/api/BalanceShardUnique.java index 149fa1f4105..ae54b0ab98d 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/BalanceShardUnique.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/BalanceShardUnique.java @@ -25,10 +25,10 @@ import static org.apache.solr.common.params.CommonAdminParams.ASYNC; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.BalanceShardUniqueApi; import org.apache.solr.client.api.model.BalanceShardUniqueRequestBody; import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CoreReplicationAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CoreReplicationAPI.java index 0caf810edf1..f6bf4f4c05d 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/CoreReplicationAPI.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CoreReplicationAPI.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.Parameter; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; @@ -28,7 +29,6 @@ import jakarta.ws.rs.core.MediaType; import java.io.IOException; import java.util.List; -import javax.inject.Inject; import org.apache.solr.client.api.model.SolrJerseyResponse; import org.apache.solr.core.SolrCore; import org.apache.solr.jersey.JacksonReflectMapWriter; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CoreSnapshot.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CoreSnapshot.java index d043894d128..3760c1690b4 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/CoreSnapshot.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CoreSnapshot.java @@ -19,11 +19,11 @@ import static org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM; import static org.apache.solr.security.PermissionNameProvider.Name.CORE_READ_PERM; +import jakarta.inject.Inject; import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.Optional; -import javax.inject.Inject; import org.apache.lucene.index.IndexCommit; import org.apache.solr.client.api.endpoint.CoreSnapshotApi; import org.apache.solr.client.api.model.CreateCoreSnapshotResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateAliasAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateAliasAPI.java index 56ea737206d..8e8ecaf405f 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateAliasAPI.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateAliasAPI.java @@ -36,6 +36,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import jakarta.inject.Inject; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; @@ -46,7 +47,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.model.CreateCollectionRequestBody; import org.apache.solr.client.api.model.SolrJerseyResponse; import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollection.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollection.java index 2de8917df6a..4042d303be1 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollection.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollection.java @@ -41,6 +41,7 @@ import static org.apache.solr.handler.api.V2ApiUtils.flattenMapWithPrefix; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -52,7 +53,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.CreateCollectionApi; import org.apache.solr.client.api.model.CreateCollectionRequestBody; import org.apache.solr.client.api.model.CreateCollectionRouterProperties; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionBackup.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionBackup.java index b85e766c7f8..09729da6ea2 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionBackup.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionBackup.java @@ -35,9 +35,9 @@ import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.CreateCollectionBackupApi; import org.apache.solr.client.api.model.CreateCollectionBackupRequestBody; import org.apache.solr.client.api.model.CreateCollectionBackupResponseBody; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionSnapshot.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionSnapshot.java index 52cc1ab0427..dd4a7a4033b 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionSnapshot.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCollectionSnapshot.java @@ -23,9 +23,9 @@ import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.CreateCollectionSnapshotApi; import org.apache.solr.client.api.model.CreateCollectionSnapshotRequestBody; import org.apache.solr.client.api.model.CreateCollectionSnapshotResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCoreBackup.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCoreBackup.java index 08cfb9e3f13..cab08b61e5c 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCoreBackup.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCoreBackup.java @@ -18,10 +18,10 @@ import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.net.URI; import java.nio.file.Paths; import java.util.Optional; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.CreateCoreBackupApi; import org.apache.solr.client.api.model.CreateCoreBackupRequestBody; import org.apache.solr.client.api.model.SolrJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateReplica.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateReplica.java index 180a0a335d4..72c8eb058b1 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateReplica.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateReplica.java @@ -40,10 +40,10 @@ import static org.apache.solr.handler.admin.api.CreateCollection.copyPrefixedPropertiesWithoutPrefix; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.CreateReplicaApi; import org.apache.solr.client.api.model.CreateReplicaRequestBody; import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateShard.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateShard.java index ffa2f55ef25..2912fbd8e07 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateShard.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateShard.java @@ -36,10 +36,10 @@ import static org.apache.solr.handler.admin.api.CreateCollection.copyPrefixedPropertiesWithoutPrefix; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.CreateShardApi; import org.apache.solr.client.api.model.CreateShardRequestBody; import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteAlias.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteAlias.java index 1242375f5ba..de625ef830f 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteAlias.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteAlias.java @@ -23,9 +23,9 @@ import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.DeleteAliasApi; import org.apache.solr.client.api.model.AsyncJerseyResponse; import org.apache.solr.client.api.model.SolrJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollection.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollection.java index 812f7255ad2..04b16435aeb 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollection.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollection.java @@ -23,9 +23,9 @@ import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.DeleteCollectionApi; import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse; import org.apache.solr.client.solrj.SolrResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionBackup.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionBackup.java index 88afdc1eb50..bb88c09853c 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionBackup.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionBackup.java @@ -30,12 +30,12 @@ import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.DeleteCollectionBackupApi; import org.apache.solr.client.api.model.BackupDeletionData; import org.apache.solr.client.api.model.BackupDeletionResponseBody; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionSnapshot.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionSnapshot.java index 1ebf7944a08..5ead94e0432 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionSnapshot.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteCollectionSnapshot.java @@ -23,9 +23,9 @@ import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.DeleteCollectionSnapshotApi; import org.apache.solr.client.api.model.DeleteCollectionSnapshotResponse; import org.apache.solr.client.solrj.SolrResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteNode.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteNode.java index 76ace8384aa..a2459a7b68f 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteNode.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteNode.java @@ -22,9 +22,9 @@ import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.DeleteNodeApi; import org.apache.solr.client.api.model.DeleteNodeRequestBody; import org.apache.solr.client.api.model.SolrJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplica.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplica.java index 3f3f9d44b27..857624b4852 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplica.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplica.java @@ -31,9 +31,9 @@ import static org.apache.solr.common.params.CoreAdminParams.REPLICA; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.DeleteReplicaApi; import org.apache.solr.client.api.model.ScaleCollectionRequestBody; import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaProperty.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaProperty.java index 30651f83b6c..1630bf575e6 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaProperty.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaProperty.java @@ -25,8 +25,8 @@ import static org.apache.solr.common.params.CollectionAdminParams.PROPERTY_PREFIX; import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT; +import jakarta.inject.Inject; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.DeleteReplicaPropertyApi; import org.apache.solr.client.api.model.SolrJerseyResponse; import org.apache.solr.client.solrj.SolrResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteShard.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteShard.java index 2d627162e7d..5b9b5407274 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteShard.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteShard.java @@ -27,9 +27,9 @@ import static org.apache.solr.common.params.CoreAdminParams.DELETE_INSTANCE_DIR; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.DeleteShardApi; import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse; import org.apache.solr.common.cloud.ZkNodeProps; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ForceLeader.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ForceLeader.java index c3080e3ef16..d7b2ab42eb1 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/ForceLeader.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ForceLeader.java @@ -21,11 +21,11 @@ import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.lang.invoke.MethodHandles; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.ForceLeaderApi; import org.apache.solr.client.api.model.SolrJerseyResponse; import org.apache.solr.cloud.ZkController; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/GetSchema.java b/solr/core/src/java/org/apache/solr/handler/admin/api/GetSchema.java index 3e12805e3cc..909d0cfe997 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/GetSchema.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/GetSchema.java @@ -17,8 +17,8 @@ package org.apache.solr.handler.admin.api; +import jakarta.inject.Inject; import java.lang.invoke.MethodHandles; -import javax.inject.Inject; import org.apache.solr.api.JerseyResource; import org.apache.solr.client.api.endpoint.GetSchemaApi; import org.apache.solr.client.api.model.SchemaInfoResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/GetSchemaFieldAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/GetSchemaFieldAPI.java index 1e161446dd4..5050787429c 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/GetSchemaFieldAPI.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/GetSchemaFieldAPI.java @@ -20,6 +20,7 @@ import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; @@ -27,7 +28,6 @@ import jakarta.ws.rs.core.MediaType; import java.util.List; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.api.JerseyResource; import org.apache.solr.client.api.model.SolrJerseyResponse; import org.apache.solr.common.MapWriter; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardData.java b/solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardData.java index 33844b28608..f1f88f78e54 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardData.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardData.java @@ -20,8 +20,8 @@ import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.InstallShardDataApi; import org.apache.solr.client.api.model.InstallShardDataRequestBody; import org.apache.solr.client.api.model.SolrJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ListAliases.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ListAliases.java index d8995ce16ae..69be9a59567 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/ListAliases.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ListAliases.java @@ -18,10 +18,10 @@ import static org.apache.solr.security.PermissionNameProvider.Name.COLL_READ_PERM; +import jakarta.inject.Inject; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.ListAliasesApi; import org.apache.solr.client.api.model.GetAliasByNameResponse; import org.apache.solr.client.api.model.ListAliasesResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionBackups.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionBackups.java index 859e0e38941..c81e7c44246 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionBackups.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionBackups.java @@ -24,12 +24,12 @@ import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.inject.Inject; import java.io.IOException; import java.net.URI; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.ListCollectionBackupsApi; import org.apache.solr.client.api.model.CollectionBackupDetails; import org.apache.solr.client.api.model.ListCollectionBackupsResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionSnapshotsAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionSnapshotsAPI.java index 397e113b982..dec0f5998f6 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionSnapshotsAPI.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionSnapshotsAPI.java @@ -22,13 +22,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import java.util.Collection; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.model.AsyncJerseyResponse; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.util.CollectionUtil; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollections.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollections.java index 2f08a7323ac..4b54b86ae81 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollections.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ListCollections.java @@ -19,11 +19,11 @@ import static org.apache.solr.security.PermissionNameProvider.Name.COLL_READ_PERM; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.ListCollectionsApi; import org.apache.solr.client.api.model.ListCollectionsResponse; import org.apache.solr.common.cloud.DocCollection; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/MigrateReplicas.java b/solr/core/src/java/org/apache/solr/handler/admin/api/MigrateReplicas.java index 4a1e3b657b8..7b4e0a934b4 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/MigrateReplicas.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/MigrateReplicas.java @@ -24,9 +24,9 @@ import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.MigrateReplicasApi; import org.apache.solr.client.api.model.MigrateReplicasRequestBody; import org.apache.solr.client.api.model.SolrJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/NodeLoggingAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/NodeLoggingAPI.java index fb923020e1f..bbcd4cc8de4 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/NodeLoggingAPI.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/NodeLoggingAPI.java @@ -23,6 +23,7 @@ import static org.apache.solr.security.PermissionNameProvider.Name.CONFIG_READ_PERM; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.PUT; import jakarta.ws.rs.Path; @@ -33,7 +34,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import javax.inject.Inject; import org.apache.solr.api.JerseyResource; import org.apache.solr.client.api.model.SolrJerseyResponse; import org.apache.solr.common.SolrDocumentList; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCollectionAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCollectionAPI.java index be80062d87a..b620dd430a7 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCollectionAPI.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCollectionAPI.java @@ -22,10 +22,10 @@ import static org.apache.solr.common.params.CommonParams.NAME; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.ReloadCollectionApi; import org.apache.solr.client.api.model.ReloadCollectionRequestBody; import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCore.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCore.java index 2210d43add1..88d8ecaf7ab 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCore.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ReloadCore.java @@ -19,7 +19,7 @@ import static org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.solr.client.api.endpoint.ReloadCoreApi; import org.apache.solr.client.api.model.ReloadCoreRequestBody; import org.apache.solr.client.api.model.SolrJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/RenameCollection.java b/solr/core/src/java/org/apache/solr/handler/admin/api/RenameCollection.java index 8cec8535a7f..1a6ed3a3946 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/RenameCollection.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/RenameCollection.java @@ -24,9 +24,9 @@ import static org.apache.solr.common.params.CommonParams.NAME; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.RenameCollectionApi; import org.apache.solr.client.api.model.RenameCollectionRequestBody; import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/RenameCore.java b/solr/core/src/java/org/apache/solr/handler/admin/api/RenameCore.java index 03b96b57659..e94e02890e4 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/RenameCore.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/RenameCore.java @@ -18,7 +18,7 @@ import static org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.solr.client.api.endpoint.RenameCoreApi; import org.apache.solr.client.api.model.RenameCoreRequestBody; import org.apache.solr.client.api.model.SolrJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ReplaceNode.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ReplaceNode.java index ab597b54038..0e4b98138e7 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/ReplaceNode.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ReplaceNode.java @@ -24,9 +24,9 @@ import static org.apache.solr.handler.admin.CollectionsHandler.DEFAULT_COLLECTION_OP_TIMEOUT; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.ReplaceNodeApi; import org.apache.solr.client.api.model.ReplaceNodeRequestBody; import org.apache.solr.client.api.model.SolrJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollectionAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollectionAPI.java index 0dc9b4ae631..e1e071e6418 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollectionAPI.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollectionAPI.java @@ -35,6 +35,7 @@ import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.inject.Inject; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; @@ -44,7 +45,6 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; import org.apache.solr.client.api.model.CreateCollectionRequestBody; import org.apache.solr.client.api.model.SolrJerseyResponse; import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCore.java b/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCore.java index 858e42da9f6..3997b1971b4 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCore.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCore.java @@ -18,8 +18,8 @@ import static org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM; +import jakarta.inject.Inject; import java.net.URI; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.RestoreCoreApi; import org.apache.solr.client.api.model.RestoreCoreRequestBody; import org.apache.solr.client.api.model.SolrJerseyResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/SnapshotBackupAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/SnapshotBackupAPI.java index 24ff37b5a11..e4024b119c5 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/SnapshotBackupAPI.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/SnapshotBackupAPI.java @@ -23,6 +23,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.parameters.RequestBody; +import jakarta.inject.Inject; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; @@ -30,7 +31,6 @@ import java.io.IOException; import java.lang.invoke.MethodHandles; import java.util.function.Consumer; -import javax.inject.Inject; import org.apache.solr.api.JerseyResource; import org.apache.solr.client.api.model.SolrJerseyResponse; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/SwapCores.java b/solr/core/src/java/org/apache/solr/handler/admin/api/SwapCores.java index eff87bc3f86..e5a6ea9826e 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/SwapCores.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/SwapCores.java @@ -18,7 +18,7 @@ import static org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.solr.client.api.endpoint.SwapCoresApi; import org.apache.solr.client.api.model.SolrJerseyResponse; import org.apache.solr.client.api.model.SwapCoresRequestBody; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/SyncShard.java b/solr/core/src/java/org/apache/solr/handler/admin/api/SyncShard.java index b506f585673..17f63fa739e 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/SyncShard.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/SyncShard.java @@ -21,9 +21,9 @@ import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP; import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; +import jakarta.inject.Inject; import java.io.IOException; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; import org.apache.solr.client.api.endpoint.SyncShardApi; import org.apache.solr.client.api.model.SolrJerseyResponse; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/UnloadCore.java b/solr/core/src/java/org/apache/solr/handler/admin/api/UnloadCore.java index 63fd49a21d3..e9a9db8d05e 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/UnloadCore.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/UnloadCore.java @@ -19,7 +19,7 @@ import static org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.solr.client.api.endpoint.UnloadCoreApi; import org.apache.solr.client.api.model.SolrJerseyResponse; import org.apache.solr.client.api.model.UnloadCoreRequestBody; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/V2NodeLoggingAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/V2NodeLoggingAPI.java index 6ea531e65a3..a2b97609d0a 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/V2NodeLoggingAPI.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/V2NodeLoggingAPI.java @@ -19,12 +19,12 @@ import static org.apache.solr.security.PermissionNameProvider.Name.CONFIG_EDIT_PERM; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import java.util.List; -import javax.inject.Inject; import org.apache.solr.jersey.PermissionName; import org.apache.solr.logging.LogWatcher; diff --git a/solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSets.java b/solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSets.java index 732b547d4f9..5f5d28adcfc 100644 --- a/solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSets.java +++ b/solr/core/src/java/org/apache/solr/handler/configsets/ListConfigSets.java @@ -18,9 +18,9 @@ import static org.apache.solr.security.PermissionNameProvider.Name.CONFIG_READ_PERM; +import jakarta.inject.Inject; import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.HttpHeaders; -import javax.inject.Inject; import org.apache.solr.api.JerseyResource; import org.apache.solr.client.api.endpoint.ListConfigsetsApi; import org.apache.solr.client.api.model.ListConfigsetsResponse; diff --git a/solr/core/src/java/org/apache/solr/jersey/APIConfigProviderBinder.java b/solr/core/src/java/org/apache/solr/jersey/APIConfigProviderBinder.java index d17ea7ded13..be77a56cf4a 100644 --- a/solr/core/src/java/org/apache/solr/jersey/APIConfigProviderBinder.java +++ b/solr/core/src/java/org/apache/solr/jersey/APIConfigProviderBinder.java @@ -16,7 +16,7 @@ */ package org.apache.solr.jersey; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.glassfish.hk2.utilities.binding.AbstractBinder; /** Jersey binder for APIConfigProvider */ diff --git a/solr/core/src/java/org/apache/solr/security/GetPublicKey.java b/solr/core/src/java/org/apache/solr/security/GetPublicKey.java index 1f7e991667d..91557b63f1b 100644 --- a/solr/core/src/java/org/apache/solr/security/GetPublicKey.java +++ b/solr/core/src/java/org/apache/solr/security/GetPublicKey.java @@ -17,7 +17,7 @@ package org.apache.solr.security; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.solr.api.JerseyResource; import org.apache.solr.client.api.endpoint.GetPublicKeyApi; import org.apache.solr.client.api.model.PublicKeyResponse; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/NodeLoggingAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/NodeLoggingAPITest.java index 45eef6bd51a..de376917297 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/api/NodeLoggingAPITest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/api/NodeLoggingAPITest.java @@ -31,11 +31,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import jakarta.inject.Singleton; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.Application; import jakarta.ws.rs.core.Response; import java.util.List; -import javax.inject.Singleton; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; import org.apache.solr.core.CoreContainer; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/SnapshotBackupAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/SnapshotBackupAPITest.java index 6250a180588..765655dabb9 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/api/SnapshotBackupAPITest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/api/SnapshotBackupAPITest.java @@ -21,6 +21,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import jakarta.inject.Inject; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.Application; import jakarta.ws.rs.core.Response; @@ -28,7 +29,6 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; -import javax.inject.Inject; import org.apache.solr.common.SolrException; import org.apache.solr.common.util.NamedList; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java b/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java index 1ff3e70729c..fcce17e55da 100644 --- a/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java +++ b/solr/core/src/test/org/apache/solr/handler/configsets/ListConfigSetsAPITest.java @@ -25,10 +25,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import jakarta.inject.Singleton; import jakarta.ws.rs.core.Application; import jakarta.ws.rs.core.Response; import java.util.List; -import javax.inject.Singleton; import org.apache.solr.client.api.model.ListConfigsetsResponse; import org.apache.solr.client.solrj.response.ConfigSetAdminResponse; import org.apache.solr.common.util.NamedList;