Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JCLOUDS-1629: Upgrade to Guice 7.0.0 #197

Merged
merged 1 commit into from
Feb 26, 2024
Merged

JCLOUDS-1629: Upgrade to Guice 7.0.0 #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apis/atmos/src/main/java/org/jclouds/atmos/binders/BindMetadataToHeaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion apis/atmos/src/main/java/org/jclouds/atmos/binders/BindUserMetadataToHeaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion apis/atmos/src/main/java/org/jclouds/atmos/blobstore/config/AtmosBlobStoreContextModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobMetadataToObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/jclouds/atmos/blobstore/functions/BlobStoreListOptionsToListOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToContentMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToSystemMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions .../java/org/jclouds/atmos/blobstore/functions/DirectoryEntryListToResourceMetadataList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion apis/atmos/src/main/java/org/jclouds/atmos/config/AtmosHttpApiModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/AtmosObjectImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions apis/atmos/src/main/java/org/jclouds/atmos/filters/ShareUrl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion apis/atmos/src/main/java/org/jclouds/atmos/functions/AtmosObjectName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...os/src/main/java/org/jclouds/atmos/functions/ParseDirectoryListFromContentAndHeaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...atmos/src/main/java/org/jclouds/atmos/functions/ParseObjectFromHeadersAndHttpContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseSystemMetadataFromHeaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseUserMetadataFromHeaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion apis/atmos/src/main/java/org/jclouds/atmos/functions/ReturnTrueIfGroupACLIsOtherRead.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosClientErrorRetryHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosServerErrorRetryHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apis/atmos/src/main/java/org/jclouds/atmos/handlers/ParseAtmosErrorFromXmlContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apis/atmos/src/main/java/org/jclouds/atmos/util/AtmosUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion apis/atmos/src/main/java/org/jclouds/atmos/xml/ListDirectoryResponseHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/org/jclouds/atmos/blobstore/functions/ListOptionsToBlobStoreListOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package org.jclouds.atmos.blobstore.functions;

import javax.inject.Singleton;
import jakarta.inject.Singleton;

import org.jclouds.blobstore.options.ListContainerOptions;

Expand Down
2 changes: 1 addition & 1 deletion .../java/org/jclouds/atmos/blobstore/functions/ResourceMetadataListToDirectoryEntryList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apis/byon/src/main/java/org/jclouds/byon/config/YamlNodeStoreModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading