Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-1629: Upgrade to Guice 7.0.0 

This also changes from javax to jakarta annotations.
This commit is contained in:
Andrew Gaul 2024-02-24 09:33:14 +09:00
parent b5e4e1d0fd
commit 107741f786
1429 changed files with 2124 additions and 2114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java
View File

@ -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;

4
apis/atmos/src/main/java/org/jclouds/atmos/binders/BindMetadataToHeaders.java
View File

@ -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 javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import com.google.common.io.BaseEncoding;

2
apis/atmos/src/main/java/org/jclouds/atmos/binders/BindUserMetadataToHeaders.java
View File

@ -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;

4
apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java
View File

@ -23,8 +23,8 @@ import static org.jclouds.reflect.Reflection2.method;
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;

6
apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java
View File

@ -23,9 +23,9 @@ import java.io.InputStream;
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;

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

@ -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;

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

@ -18,8 +18,8 @@ package org.jclouds.atmos.blobstore.functions;
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;

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

@ -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;

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

@ -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;

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

@ -18,8 +18,8 @@ package org.jclouds.atmos.blobstore.functions;
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;

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

@ -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;

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

@ -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;

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

@ -18,8 +18,8 @@ package org.jclouds.atmos.blobstore.functions;
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;

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

@ -20,8 +20,8 @@ import java.util.Map;
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;

2
apis/atmos/src/main/java/org/jclouds/atmos/config/AtmosHttpApiModule.java
View File

@ -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;

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

@ -18,9 +18,9 @@ package org.jclouds.atmos.domain.internal;
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;

10
apis/atmos/src/main/java/org/jclouds/atmos/filters/ShareUrl.java
View File

@ -29,9 +29,9 @@ import java.net.URI;
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;

8
apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java
View File

@ -26,10 +26,10 @@ import static org.jclouds.util.Strings2.toInputStream;
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;

2
apis/atmos/src/main/java/org/jclouds/atmos/functions/AtmosObjectName.java
View File

@ -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;

6
apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseDirectoryListFromContentAndHeaders.java
View File

@ -18,9 +18,9 @@ package org.jclouds.atmos.functions;
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;

2
apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseObjectFromHeadersAndHttpContent.java
View File

@ -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;

4
apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseSystemMetadataFromHeaders.java
View File

@ -21,8 +21,8 @@ import static com.google.common.io.BaseEncoding.base16;
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;

2
apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseUserMetadataFromHeaders.java
View File

@ -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;

2
apis/atmos/src/main/java/org/jclouds/atmos/functions/ReturnTrueIfGroupACLIsOtherRead.java
View File

@ -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;

2
apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosClientErrorRetryHandler.java
View File

@ -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;

2
apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosServerErrorRetryHandler.java
View File

@ -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;

4
apis/atmos/src/main/java/org/jclouds/atmos/handlers/ParseAtmosErrorFromXmlContent.java
View File

@ -24,8 +24,8 @@ import java.util.regex.Matcher;
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;

4
apis/atmos/src/main/java/org/jclouds/atmos/util/AtmosUtils.java
View File

@ -22,8 +22,8 @@ import java.io.ByteArrayInputStream;
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;

2
apis/atmos/src/main/java/org/jclouds/atmos/xml/ListDirectoryResponseHandler.java
View File

@ -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;

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

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

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

@ -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;

4
apis/byon/src/main/java/org/jclouds/byon/config/YamlNodeStoreModule.java
View File

@ -19,8 +19,8 @@ package org.jclouds.byon.config;
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;

6
apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java
View File

@ -26,9 +26,9 @@ import java.util.NoSuchElementException;
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;

2
apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java
View File

@ -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;

4
apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java
View File

@ -25,8 +25,8 @@ import static com.google.common.collect.Maps.filterKeys;
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;

4
apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java
View File

@ -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 javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.byon.Node;
import org.jclouds.location.Provider;

2
apis/chef/src/main/java/org/jclouds/chef/ChefApi.java
View File

@ -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;

2
apis/chef/src/main/java/org/jclouds/chef/binders/BindChecksumsToJsonPayload.java
View File

@ -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;

2
apis/chef/src/main/java/org/jclouds/chef/binders/BindCreateClientOptionsToJsonPayload.java
View File

@ -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;

2
apis/chef/src/main/java/org/jclouds/chef/binders/BindGenerateKeyForClientToJsonPayload.java
View File

@ -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;

4
apis/chef/src/main/java/org/jclouds/chef/binders/BindGroupToUpdateRequestJsonPayload.java
View File

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

2
apis/chef/src/main/java/org/jclouds/chef/binders/DatabagItemId.java
View File

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

2
apis/chef/src/main/java/org/jclouds/chef/binders/EnvironmentName.java
View File

@ -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> {

2
apis/chef/src/main/java/org/jclouds/chef/binders/GroupName.java
View File

@ -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;

2
apis/chef/src/main/java/org/jclouds/chef/binders/NodeName.java
View File

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

2
apis/chef/src/main/java/org/jclouds/chef/binders/RoleName.java
View File

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

4
apis/chef/src/main/java/org/jclouds/chef/config/ChefBootstrapModule.java
View File

@ -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 javax.inject.Singleton;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
import org.jclouds.scriptbuilder.domain.Statement;
import org.jclouds.scriptbuilder.domain.StatementList;

6
apis/chef/src/main/java/org/jclouds/chef/config/ChefHttpApiModule.java
View File

@ -29,9 +29,9 @@ import java.security.PrivateKey;
import java.security.spec.InvalidKeySpecException;
import java.util.concurrent.TimeUnit;
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.chef.ChefApi;
import org.jclouds.chef.domain.BootstrapConfig;

4
apis/chef/src/main/java/org/jclouds/chef/config/ChefParserModule.java
View File

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

2
apis/chef/src/main/java/org/jclouds/chef/config/InstallChef.java
View File

@ -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.

2
apis/chef/src/main/java/org/jclouds/chef/config/Validator.java
View File

@ -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.

2
apis/chef/src/main/java/org/jclouds/chef/features/OrganizationApi.java
View File

@ -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;

8
apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java
View File

@ -27,10 +27,10 @@ import java.security.PrivateKey;
import java.util.NoSuchElementException;
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.Constants;
import org.jclouds.crypto.Crypto;

6
apis/chef/src/main/java/org/jclouds/chef/functions/BootstrapConfigForGroup.java
View File

@ -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 javax.inject.Named;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
import org.jclouds.chef.ChefApi;
import org.jclouds.chef.domain.BootstrapConfig;

4
apis/chef/src/main/java/org/jclouds/chef/functions/ClientForGroup.java
View File

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

4
apis/chef/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java
View File

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

4
apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJson.java
View File

@ -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 javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import java.util.Map;
/**

4
apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionListFromJson.java
View File

@ -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 javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import java.util.Map;
import java.util.Set;

4
apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookNamesFromJson.java
View File

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

4
apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsFromJson.java
View File

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

4
apis/chef/src/main/java/org/jclouds/chef/functions/ParseErrorFromJsonOrReturnBody.java
View File

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

4
apis/chef/src/main/java/org/jclouds/chef/functions/ParseKeySetFromJson.java
View File

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

4
apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchClientsFromJson.java
View File

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

4
apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchDatabagFromJson.java
View File

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

4
apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchEnvironmentsFromJson.java
View File

@ -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 javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
@Singleton
public class ParseSearchEnvironmentsFromJson extends ParseSearchResultFromJson<Environment> {

4
apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchNodesFromJson.java
View File

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

4
apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchResultFromJson.java
View File

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

4
apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchRolesFromJson.java
View File

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

2
apis/chef/src/main/java/org/jclouds/chef/functions/UriForResource.java
View File

@ -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;

2
apis/chef/src/main/java/org/jclouds/chef/handlers/ChefApiErrorRetryHandler.java
View File

@ -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;

4
apis/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java
View File

@ -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 javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.chef.functions.ParseErrorFromJsonOrReturnBody;
import org.jclouds.http.HttpCommand;

6
apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java
View File

@ -25,9 +25,9 @@ import java.security.PrivateKey;
import java.util.concurrent.ExecutorService;
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.chef.ChefApi;
import org.jclouds.chef.ChefService;

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

@ -27,9 +27,9 @@ import java.util.Calendar;
import java.util.Date;
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.chef.config.ChefProperties;
import org.jclouds.chef.domain.Node;

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

@ -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 javax.inject.Named;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
import org.jclouds.chef.ChefApi;
import org.jclouds.chef.config.ChefProperties;

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

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

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

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

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

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

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

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

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

@ -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 javax.inject.Singleton;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
import com.google.common.base.Function;
import com.google.common.util.concurrent.ListeningExecutorService;

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

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

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

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

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

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

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

@ -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 javax.inject.Named;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
import org.jclouds.chef.ChefApi;
import org.jclouds.chef.config.ChefProperties;

6
apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java
View File

@ -23,9 +23,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
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.chef.config.ChefProperties;
import org.jclouds.logging.Logger;

2
apis/chef/src/main/java/org/jclouds/ohai/Automatic.java
View File

@ -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 })

4
apis/chef/src/main/java/org/jclouds/ohai/AutomaticSupplier.java
View File

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

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

@ -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;

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

@ -23,10 +23,10 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
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.date.TimeStamp;
import org.jclouds.domain.JsonBall;

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

@ -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;

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

@ -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;

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

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

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

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

2
apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java
View File

@ -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;

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

@ -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;

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

@ -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;

2
apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java
View File

@ -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;

2
apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java
View File

@ -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;

2
apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java
View File

@ -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;

2
apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java
View File

@ -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;

8
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java
View File

@ -27,10 +27,10 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
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.Constants;
import org.jclouds.cloudstack.CloudStackApi;

Some files were not shown because too many files have changed in this diff Show More