JCLOUDS-1629: Upgrade to Guice 7.0.0

This also changes from javax to jakarta annotations.

apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java

@@ -21,7 +21,7 @@ import static com.google.common.net.HttpHeaders.EXPECT;
 import java.io.Closeable;
 import java.net.URI;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.GET;

apis/atmos/src/main/java/org/jclouds/atmos/binders/BindMetadataToHeaders.java

@@ -19,8 +19,8 @@ package org.jclouds.atmos.binders;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import com.google.common.io.BaseEncoding;
 

apis/atmos/src/main/java/org/jclouds/atmos/binders/BindUserMetadataToHeaders.java

@@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Map;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.UserMetadata;
 import org.jclouds.http.HttpRequest;

apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java

@@ -23,8 +23,8 @@ import static org.jclouds.reflect.Reflection2.method;
 import java.net.URI;
 import java.util.Date;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.AtmosClient;
 import org.jclouds.atmos.blobstore.functions.BlobToObject;

apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java

@@ -23,9 +23,9 @@ import java.io.InputStream;
 import java.util.List;
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.AtmosClient;
 import org.jclouds.atmos.blobstore.functions.BlobStoreListOptionsToListOptions;

apis/atmos/src/main/java/org/jclouds/atmos/blobstore/config/AtmosBlobStoreContextModule.java

@@ -18,7 +18,7 @@ package org.jclouds.atmos.blobstore.config;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.AtmosClient;
 import org.jclouds.atmos.blobstore.AtmosBlobRequestSigner;

apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobMetadataToObject.java

@@ -18,8 +18,8 @@ package org.jclouds.atmos.blobstore.functions;
 
 import java.util.Map.Entry;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.AtmosObject;
 import org.jclouds.atmos.domain.UserMetadata;

apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobStoreListOptionsToListOptions.java

@@ -18,7 +18,7 @@ package org.jclouds.atmos.blobstore.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.blobstore.options.ListContainerOptions;
 

apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToContentMetadata.java

@@ -16,7 +16,7 @@
  */
 package org.jclouds.atmos.blobstore.functions;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.MutableContentMetadata;
 import org.jclouds.atmos.domain.internal.DelegatingMutableContentMetadata;

apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToObject.java

@@ -18,8 +18,8 @@ package org.jclouds.atmos.blobstore.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.AtmosObject;
 import org.jclouds.blobstore.domain.Blob;

apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToSystemMetadata.java

@@ -16,7 +16,7 @@
  */
 package org.jclouds.atmos.blobstore.functions;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.FileType;
 import org.jclouds.atmos.domain.SystemMetadata;

apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/DirectoryEntryListToResourceMetadataList.java

@@ -16,8 +16,8 @@
  */
 package org.jclouds.atmos.blobstore.functions;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.BoundedSet;
 import org.jclouds.atmos.domain.DirectoryEntry;

apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlob.java

@@ -18,8 +18,8 @@ package org.jclouds.atmos.blobstore.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.AtmosObject;
 import org.jclouds.blobstore.domain.Blob;

apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java

@@ -20,8 +20,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.AtmosObject;
 import org.jclouds.atmos.domain.FileType;

apis/atmos/src/main/java/org/jclouds/atmos/config/AtmosHttpApiModule.java

@@ -19,7 +19,7 @@ package org.jclouds.atmos.config;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.jclouds.Constants;
 import org.jclouds.atmos.AtmosClient;

apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/AtmosObjectImpl.java

@@ -18,9 +18,9 @@ package org.jclouds.atmos.domain.internal;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.AtmosObject;
 import org.jclouds.atmos.domain.MutableContentMetadata;

apis/atmos/src/main/java/org/jclouds/atmos/filters/ShareUrl.java

@@ -29,9 +29,9 @@ import java.net.URI;
 import java.security.InvalidKeyException;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.crypto.Crypto;
 import org.jclouds.date.TimeStamp;
@@ -55,7 +55,7 @@ public class ShareUrl implements Function<String, URI> {
 
    private final Supplier<Credentials> creds;
    private final Supplier<URI> provider;
-   private final javax.inject.Provider<Long> timeStampProvider;
+   private final jakarta.inject.Provider<Long> timeStampProvider;
    private final Crypto crypto;
 
    @Resource
@@ -67,7 +67,7 @@ public class ShareUrl implements Function<String, URI> {
 
    @Inject
    public ShareUrl(@Provider Supplier<Credentials> creds, @Provider Supplier<URI> provider,
-         @TimeStamp javax.inject.Provider<Long> timeStampProvider, Crypto crypto) {
+         @TimeStamp jakarta.inject.Provider<Long> timeStampProvider, Crypto crypto) {
       this.creds = creds;
       this.provider = provider;
       this.timeStampProvider = timeStampProvider;

apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java

@@ -26,10 +26,10 @@ import static org.jclouds.util.Strings2.toInputStream;
 import java.util.Set;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.reference.AtmosHeaders;
 import org.jclouds.crypto.Crypto;

apis/atmos/src/main/java/org/jclouds/atmos/functions/AtmosObjectName.java

@@ -19,7 +19,7 @@ package org.jclouds.atmos.functions;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.AtmosObject;
 

apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseDirectoryListFromContentAndHeaders.java

@@ -18,9 +18,9 @@ package org.jclouds.atmos.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.BoundedSet;
 import org.jclouds.atmos.domain.DirectoryEntry;

apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseObjectFromHeadersAndHttpContent.java

@@ -21,7 +21,7 @@ import static org.jclouds.http.HttpUtils.attemptToParseSizeAndRangeFromHeaders;
 
 import java.net.URI;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.jclouds.atmos.domain.AtmosObject;
 import org.jclouds.http.HttpRequest;

apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseSystemMetadataFromHeaders.java

@@ -21,8 +21,8 @@ import static com.google.common.io.BaseEncoding.base16;
 
 import java.util.Map;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.FileType;
 import org.jclouds.atmos.domain.SystemMetadata;

apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseUserMetadataFromHeaders.java

@@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.UserMetadata;
 import org.jclouds.atmos.reference.AtmosHeaders;

apis/atmos/src/main/java/org/jclouds/atmos/functions/ReturnTrueIfGroupACLIsOtherRead.java

@@ -18,7 +18,7 @@ package org.jclouds.atmos.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.http.HttpResponse;
 

apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosClientErrorRetryHandler.java

@@ -17,7 +17,7 @@
 package org.jclouds.atmos.handlers;
 
 import jakarta.annotation.Resource;
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.jclouds.Constants;
 import org.jclouds.atmos.domain.AtmosError;

apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosServerErrorRetryHandler.java

@@ -17,7 +17,7 @@
 package org.jclouds.atmos.handlers;
 
 import jakarta.annotation.Resource;
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.jclouds.Constants;
 import org.jclouds.atmos.domain.AtmosError;

apis/atmos/src/main/java/org/jclouds/atmos/handlers/ParseAtmosErrorFromXmlContent.java

@@ -24,8 +24,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.AtmosResponseException;
 import org.jclouds.atmos.domain.AtmosError;

apis/atmos/src/main/java/org/jclouds/atmos/util/AtmosUtils.java

@@ -22,8 +22,8 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.net.URI;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import org.jclouds.atmos.AtmosClient;
 import org.jclouds.atmos.blobstore.functions.BlobToObject;

apis/atmos/src/main/java/org/jclouds/atmos/xml/ListDirectoryResponseHandler.java

@@ -19,7 +19,7 @@ package org.jclouds.atmos.xml;
 import java.util.Date;
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.jclouds.atmos.domain.DirectoryEntry;
 import org.jclouds.atmos.domain.FileType;

apis/atmos/src/test/java/org/jclouds/atmos/blobstore/functions/ListOptionsToBlobStoreListOptions.java

@@ -16,7 +16,7 @@
  */
 package org.jclouds.atmos.blobstore.functions;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.blobstore.options.ListContainerOptions;
 

apis/atmos/src/test/java/org/jclouds/atmos/blobstore/functions/ResourceMetadataListToDirectoryEntryList.java

@@ -16,7 +16,7 @@
  */
 package org.jclouds.atmos.blobstore.functions;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.atmos.domain.BoundedSet;
 import org.jclouds.atmos.domain.DirectoryEntry;

apis/byon/src/main/java/org/jclouds/byon/config/YamlNodeStoreModule.java

@@ -19,8 +19,8 @@ package org.jclouds.byon.config;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.byon.Node;
 import org.jclouds.byon.domain.YamlNode;

apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java

@@ -26,9 +26,9 @@ import java.util.NoSuchElementException;
 import java.util.Set;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.byon.Node;
 import org.jclouds.collect.Memoized;

apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java

@@ -25,7 +25,7 @@ import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.byon.Node;
 import org.jclouds.byon.domain.YamlNode;

apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java

@@ -25,8 +25,8 @@ import static com.google.common.collect.Maps.filterKeys;
 
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.byon.Node;
 import org.jclouds.byon.functions.NodeToNodeMetadata;

apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java

@@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.byon.Node;
 import org.jclouds.location.Provider;

apis/chef/src/main/java/org/jclouds/chef/ChefApi.java

@@ -22,7 +22,7 @@ import java.net.URI;
 import java.util.List;
 import java.util.Set;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.GET;

apis/chef/src/main/java/org/jclouds/chef/binders/BindChecksumsToJsonPayload.java

@@ -24,7 +24,7 @@ import static com.google.common.primitives.Bytes.toArray;
 import java.util.List;
 import java.util.Set;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import jakarta.ws.rs.core.MediaType;
 
 import org.jclouds.http.HttpRequest;

apis/chef/src/main/java/org/jclouds/chef/binders/BindCreateClientOptionsToJsonPayload.java

@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkState;
 
 import java.util.Map;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.jclouds.chef.options.CreateClientOptions;
 import org.jclouds.http.HttpRequest;

apis/chef/src/main/java/org/jclouds/chef/binders/BindGenerateKeyForClientToJsonPayload.java

@@ -16,7 +16,7 @@
  */
 package org.jclouds.chef.binders;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import jakarta.ws.rs.core.MediaType;
 
 import org.jclouds.http.HttpRequest;

apis/chef/src/main/java/org/jclouds/chef/binders/BindGroupToUpdateRequestJsonPayload.java

@@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.Group;
 import org.jclouds.http.HttpRequest;

apis/chef/src/main/java/org/jclouds/chef/binders/DatabagItemId.java

@@ -16,7 +16,7 @@
  */
 package org.jclouds.chef.binders;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.DatabagItem;
 

apis/chef/src/main/java/org/jclouds/chef/binders/EnvironmentName.java

@@ -19,7 +19,7 @@ package org.jclouds.chef.binders;
 import com.google.common.base.Function;
 import org.jclouds.chef.domain.Environment;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class EnvironmentName implements Function<Object, String> {

apis/chef/src/main/java/org/jclouds/chef/binders/GroupName.java

@@ -18,7 +18,7 @@ package org.jclouds.chef.binders;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.Group;
 

apis/chef/src/main/java/org/jclouds/chef/binders/NodeName.java

@@ -16,7 +16,7 @@
  */
 package org.jclouds.chef.binders;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.Node;
 

apis/chef/src/main/java/org/jclouds/chef/binders/RoleName.java

@@ -16,7 +16,7 @@
  */
 package org.jclouds.chef.binders;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.Role;
 

apis/chef/src/main/java/org/jclouds/chef/config/ChefBootstrapModule.java

@@ -22,8 +22,8 @@ import static org.jclouds.chef.config.ChefProperties.CHEF_UPDATE_GEM_SYSTEM;
 import static org.jclouds.chef.config.ChefProperties.CHEF_USE_OMNIBUS;
 import static org.jclouds.chef.config.ChefProperties.CHEF_VERSION;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.scriptbuilder.domain.Statement;
 import org.jclouds.scriptbuilder.domain.StatementList;

apis/chef/src/main/java/org/jclouds/chef/config/ChefHttpApiModule.java

@@ -29,9 +29,9 @@ import java.security.PrivateKey;
 import java.security.spec.InvalidKeySpecException;
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.ChefApi;
 import org.jclouds.chef.domain.BootstrapConfig;

apis/chef/src/main/java/org/jclouds/chef/config/ChefParserModule.java

@@ -29,8 +29,8 @@ import java.security.cert.X509Certificate;
 import java.security.spec.InvalidKeySpecException;
 import java.util.Map;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.DatabagItem;
 import org.jclouds.crypto.Crypto;

apis/chef/src/main/java/org/jclouds/chef/config/InstallChef.java

@@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 /**
  * Used to configure the Chef install script.

apis/chef/src/main/java/org/jclouds/chef/config/Validator.java

@@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 /**
  * Used to configure the validator client information.

apis/chef/src/main/java/org/jclouds/chef/features/OrganizationApi.java

@@ -18,7 +18,7 @@ package org.jclouds.chef.features;
 
 import java.util.Set;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.GET;

apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java

@@ -27,10 +27,10 @@ import java.security.PrivateKey;
 import java.util.NoSuchElementException;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.Constants;
 import org.jclouds.crypto.Crypto;

apis/chef/src/main/java/org/jclouds/chef/functions/BootstrapConfigForGroup.java

@@ -19,9 +19,9 @@ package org.jclouds.chef.functions;
 import static com.google.common.base.Preconditions.checkState;
 import static org.jclouds.chef.config.ChefProperties.CHEF_BOOTSTRAP_DATABAG;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.ChefApi;
 import org.jclouds.chef.domain.BootstrapConfig;

apis/chef/src/main/java/org/jclouds/chef/functions/ClientForGroup.java

@@ -21,8 +21,8 @@ import static com.google.common.collect.Sets.newHashSet;
 
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.ChefApi;
 import org.jclouds.chef.domain.Client;

apis/chef/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java

@@ -26,8 +26,8 @@ import java.security.PrivateKey;
 import java.util.Collections;
 import java.util.regex.Pattern;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.config.InstallChef;
 import org.jclouds.chef.config.Validator;

apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJson.java

@@ -21,8 +21,8 @@ import org.jclouds.chef.domain.CookbookDefinition;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseJson;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.Map;
 
 /**

apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionListFromJson.java

@@ -21,8 +21,8 @@ import org.jclouds.chef.domain.CookbookDefinition;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseJson;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.Map;
 import java.util.Set;
 

apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookNamesFromJson.java

@@ -19,8 +19,8 @@ package org.jclouds.chef.functions;
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.CookbookDefinition;
 import org.jclouds.http.HttpResponse;

apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsFromJson.java

@@ -19,8 +19,8 @@ package org.jclouds.chef.functions;
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.CookbookDefinition;
 import org.jclouds.chef.domain.CookbookDefinition.Version;

apis/chef/src/main/java/org/jclouds/chef/functions/ParseErrorFromJsonOrReturnBody.java

@@ -19,8 +19,8 @@ package org.jclouds.chef.functions;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ReturnStringIf2xx;

apis/chef/src/main/java/org/jclouds/chef/functions/ParseKeySetFromJson.java

@@ -19,8 +19,8 @@ package org.jclouds.chef.functions;
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseJson;

apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchClientsFromJson.java

@@ -16,8 +16,8 @@
  */
 package org.jclouds.chef.functions;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.Client;
 import org.jclouds.http.functions.ParseJson;

apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchDatabagFromJson.java

@@ -18,8 +18,8 @@ package org.jclouds.chef.functions;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.DatabagItem;
 import org.jclouds.chef.domain.SearchResult;

apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchEnvironmentsFromJson.java

@@ -19,8 +19,8 @@ package org.jclouds.chef.functions;
 import org.jclouds.chef.domain.Environment;
 import org.jclouds.http.functions.ParseJson;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class ParseSearchEnvironmentsFromJson extends ParseSearchResultFromJson<Environment> {

apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchNodesFromJson.java

@@ -16,8 +16,8 @@
  */
 package org.jclouds.chef.functions;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.Node;
 import org.jclouds.http.functions.ParseJson;

apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchResultFromJson.java

@@ -18,8 +18,8 @@ package org.jclouds.chef.functions;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.SearchResult;
 import org.jclouds.http.HttpResponse;

apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchRolesFromJson.java

@@ -16,8 +16,8 @@
  */
 package org.jclouds.chef.functions;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.Role;
 import org.jclouds.http.functions.ParseJson;

apis/chef/src/main/java/org/jclouds/chef/functions/UriForResource.java

@@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.net.URI;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.domain.Resource;
 

apis/chef/src/main/java/org/jclouds/chef/handlers/ChefApiErrorRetryHandler.java

@@ -19,7 +19,7 @@ package org.jclouds.chef.handlers;
 import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream;
 
 import jakarta.annotation.Resource;
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.jclouds.Constants;
 import org.jclouds.http.HttpCommand;

apis/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java

@@ -19,8 +19,8 @@ package org.jclouds.chef.handlers;
 import static org.jclouds.util.Closeables2.closeQuietly;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.functions.ParseErrorFromJsonOrReturnBody;
 import org.jclouds.http.HttpCommand;

apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java

@@ -25,9 +25,9 @@ import java.security.PrivateKey;
 import java.util.concurrent.ExecutorService;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.ChefApi;
 import org.jclouds.chef.ChefService;

apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java

@@ -27,9 +27,9 @@ import java.util.Calendar;
 import java.util.Date;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.config.ChefProperties;
 import org.jclouds.chef.domain.Node;

apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImpl.java

@@ -21,9 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.Map;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.ChefApi;
 import org.jclouds.chef.config.ChefProperties;

apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllClientsInListImpl.java

@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.concurrent.Callable;
 
 import jakarta.annotation.Resource;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.Constants;
 import org.jclouds.chef.ChefApi;

apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllNodesInListImpl.java

@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.concurrent.Callable;
 
 import jakarta.annotation.Resource;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.Constants;
 import org.jclouds.chef.ChefApi;

apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java

@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.concurrent.Callable;
 
 import jakarta.annotation.Resource;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;

apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java

@@ -26,8 +26,8 @@ import org.jclouds.chef.strategy.ListCookbookVersions;
 import org.jclouds.logging.Logger;
 
 import jakarta.annotation.Resource;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.concurrent.ExecutorService;
 
 @Singleton

apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsInEnvironmentImpl.java

@@ -19,8 +19,8 @@ package org.jclouds.chef.strategy.internal;
 import static com.google.common.collect.Iterables.transform;
 
 import jakarta.annotation.Resource;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import com.google.common.base.Function;
 import com.google.common.util.concurrent.ListeningExecutorService;

apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java

@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.concurrent.Callable;
 
 import jakarta.annotation.Resource;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.Constants;
 import org.jclouds.chef.ChefApi;

apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java

@@ -17,8 +17,8 @@
 package org.jclouds.chef.strategy.internal;
 
 import jakarta.annotation.Resource;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;

apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java

@@ -17,8 +17,8 @@
 package org.jclouds.chef.strategy.internal;
 
 import jakarta.annotation.Resource;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;

apis/chef/src/main/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImpl.java

@@ -21,9 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.Map;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.ChefApi;
 import org.jclouds.chef.config.ChefProperties;

apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java

@@ -23,9 +23,9 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.chef.config.ChefProperties;
 import org.jclouds.logging.Logger;

apis/chef/src/main/java/org/jclouds/ohai/Automatic.java

@@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 @Retention(RUNTIME)
 @Target({ TYPE, METHOD, PARAMETER })

apis/chef/src/main/java/org/jclouds/ohai/AutomaticSupplier.java

@@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Map;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.domain.JsonBall;
 import org.jclouds.ohai.functions.NestSlashKeys;

apis/chef/src/main/java/org/jclouds/ohai/config/JMXOhaiModule.java

@@ -19,7 +19,7 @@ package org.jclouds.ohai.config;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.domain.JsonBall;
 import org.jclouds.ohai.suppliers.UptimeSecondsSupplier;

apis/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java

@@ -23,10 +23,10 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.date.TimeStamp;
 import org.jclouds.domain.JsonBall;

apis/chef/src/main/java/org/jclouds/ohai/functions/ByteArrayToMacAddress.java

@@ -24,7 +24,7 @@ import static com.google.common.primitives.Bytes.toArray;
 
 import java.util.List;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;

apis/chef/src/main/java/org/jclouds/ohai/functions/MapSetToMultimap.java

@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import com.google.common.base.Function;
 import com.google.common.collect.LinkedHashMultimap;

apis/chef/src/main/java/org/jclouds/ohai/functions/NestSlashKeys.java

@@ -25,8 +25,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.domain.JsonBall;
 import org.jclouds.json.Json;

apis/chef/src/main/java/org/jclouds/ohai/suppliers/UptimeSecondsSupplier.java

@@ -18,8 +18,8 @@ package org.jclouds.ohai.suppliers;
 
 import java.lang.management.RuntimeMXBean;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.domain.JsonBall;
 

apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java

@@ -23,7 +23,7 @@ import static org.testng.Assert.assertTrue;
 import java.io.IOException;
 import java.security.PrivateKey;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import jakarta.ws.rs.HttpMethod;
 
 import org.jclouds.ContextBuilder;

apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java

@@ -24,7 +24,7 @@ import static org.testng.Assert.assertEquals;
 import java.lang.management.RuntimeMXBean;
 import java.util.Map;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.jclouds.chef.ChefApiMetadata;
 import org.jclouds.chef.config.ChefParserModule;

apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java

@@ -23,7 +23,7 @@ import java.net.SocketException;
 import java.util.Map;
 import java.util.Properties;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.jclouds.chef.ChefApiMetadata;
 import org.jclouds.chef.config.ChefParserModule;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java

@@ -24,7 +24,7 @@ import static org.jclouds.http.utils.Queries.queryParser;
 import java.net.URI;
 import java.util.Map.Entry;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java

@@ -19,7 +19,7 @@ package org.jclouds.cloudstack.binders;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java

@@ -19,7 +19,7 @@ package org.jclouds.cloudstack.binders;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java

@@ -18,7 +18,7 @@ package org.jclouds.cloudstack.binders;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.cloudstack.domain.SnapshotPolicySchedule;
 import org.jclouds.http.HttpRequest;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java

@@ -27,10 +27,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.jclouds.Constants;
 import org.jclouds.cloudstack.CloudStackApi;