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 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 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+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 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 java.net.URI;
 import java.util.Date;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+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.util.List;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+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 @@
 
 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 @@
 
 import java.util.Map.Entry;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+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 @@
 
 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 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+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 javax.inject.Singleton;
+import jakarta.inject.Inject;
+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 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+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.Set;
 import java.util.Map.Entry;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+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 @@
 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 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+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.security.InvalidKeyException;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+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 java.util.Set;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+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 @@
 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 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+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 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 java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+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 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 @@
 
 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.Pattern;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+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.InputStream;
 import java.net.URI;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+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 @@
 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 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+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.Set;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+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.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 java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+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.checkState;
 
 import jakarta.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.jclouds.byon.Node;
 import org.jclouds.location.Provider;