honeymoose/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2026-09-01 00:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-1629: Upgrade to Guice 7.0.0

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextString.java
+2 -2
View File
@@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkArgument;
import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import jakarta.ws.rs.core.MediaType;
import org.jclouds.elasticstack.domain.DriveData;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextString.java
+2 -2
View File
@@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkArgument;
import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import jakarta.ws.rs.core.MediaType;
import org.jclouds.elasticstack.domain.Drive;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindServerToPlainTextString.java
+2 -2
View File
@@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkArgument;
import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import jakarta.ws.rs.core.MediaType;
import org.jclouds.elasticstack.domain.Server;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java
+3 -3
View File
@@ -27,9 +27,9 @@ import static org.jclouds.elasticstack.util.Servers.small;
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.Constants;
import org.jclouds.collect.Memoized;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/config/ElasticStackComputeServiceContextModule.java
+3 -3
View File
@@ -27,9 +27,9 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
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.collect.Memoized;
import org.jclouds.compute.ComputeServiceAdapter;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/ServerInfoToNodeMetadata.java
+2 -2
View File
@@ -24,8 +24,8 @@ import java.util.Map;
import java.util.Set;
import jakarta.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.collect.Memoized;
import org.jclouds.compute.domain.HardwareBuilder;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/StandardDriveToWellKnownImage.java
+2 -2
View File
@@ -23,8 +23,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import jakarta.annotation.Resource;
import javax.inject.Named;
import javax.inject.Singleton;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.reference.ComputeServiceConstants;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/WellKnownImageToImage.java
+2 -2
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.collect.Memoized;
import org.jclouds.compute.domain.Image;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java
+1 -1
View File
@@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
import java.util.Map.Entry;
import javax.inject.Singleton;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.ClaimType;
import org.jclouds.elasticstack.domain.Drive;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMap.java
+2 -2
View File
@@ -18,8 +18,8 @@ package org.jclouds.elasticstack.functions;
import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.CreateDriveRequest;
import org.jclouds.elasticstack.domain.Drive;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/DriveDataToMap.java
+2 -2
View File
@@ -18,8 +18,8 @@ package org.jclouds.elasticstack.functions;
import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.DriveData;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java
+2 -2
View File
@@ -18,8 +18,8 @@ package org.jclouds.elasticstack.functions;
import java.util.Set;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.DriveInfo;
import org.jclouds.http.HttpResponse;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java
+2 -2
View File
@@ -18,8 +18,8 @@ package org.jclouds.elasticstack.functions;
import java.util.Set;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.ServerInfo;
import org.jclouds.http.HttpResponse;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSet.java
+2 -2
View File
@@ -18,8 +18,8 @@ package org.jclouds.elasticstack.functions;
import java.util.Set;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.DriveInfo;
import org.jclouds.http.HttpResponse;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jclouds.elasticstack.functions;
import java.util.List;
import java.util.Map;
import javax.inject.Singleton;
import jakarta.inject.Singleton;
import com.google.common.base.Function;
import com.google.common.base.Splitter;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToServerInfoSet.java
+2 -2
View File
@@ -18,8 +18,8 @@ package org.jclouds.elasticstack.functions;
import java.util.Set;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.ServerInfo;
import org.jclouds.http.HttpResponse;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToStandardDriveSet.java
+2 -2
View File
@@ -21,8 +21,8 @@ import static com.google.common.base.Strings.nullToEmpty;
import java.util.Set;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.StandardDrive;
import org.jclouds.http.HttpResponse;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfMapsToListOfKeyValuesDelimitedByBlankLines.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jclouds.elasticstack.functions;
import java.util.Map;
import javax.inject.Singleton;
import jakarta.inject.Singleton;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDevices.java
+2 -2
View File
@@ -18,8 +18,8 @@ package org.jclouds.elasticstack.functions;
import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.BlockDevice;
import org.jclouds.elasticstack.domain.Device;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java
+1 -1
View File
@@ -20,7 +20,7 @@ import java.util.Map;
import java.util.Map.Entry;
import jakarta.annotation.Resource;
import javax.inject.Singleton;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.ClaimType;
import org.jclouds.elasticstack.domain.DriveInfo;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveMetrics.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jclouds.elasticstack.functions;
import java.util.Map;
import javax.inject.Singleton;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.DriveMetrics;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToNICs.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jclouds.elasticstack.functions;
import java.util.List;
import java.util.Map;
import javax.inject.Singleton;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.Model;
import org.jclouds.elasticstack.domain.NIC;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java
+2 -2
View File
@@ -21,8 +21,8 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.Device;
import org.jclouds.elasticstack.domain.NIC;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerMetrics.java
+2 -2
View File
@@ -18,8 +18,8 @@ package org.jclouds.elasticstack.functions;
import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.DriveMetrics;
import org.jclouds.elasticstack.domain.ServerMetrics;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToStandardDrive.java
+1 -1
View File
@@ -20,7 +20,7 @@ import java.util.Map;
import java.util.Map.Entry;
import jakarta.annotation.Resource;
import javax.inject.Singleton;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.ClaimType;
import org.jclouds.elasticstack.domain.ImageConversionType;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ReturnPayload.java
+1 -1
View File
@@ -16,7 +16,7 @@
*/
package org.jclouds.elasticstack.functions;
import javax.inject.Singleton;
import jakarta.inject.Singleton;
import org.jclouds.http.HttpResponse;
import org.jclouds.io.Payload;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java
+2 -2
View File
@@ -22,8 +22,8 @@ import java.util.Map;
import java.util.Map.Entry;
import jakarta.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.Device;
import org.jclouds.elasticstack.domain.NIC;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/SplitNewlines.java
+2 -2
View File
@@ -18,8 +18,8 @@ package org.jclouds.elasticstack.functions;
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.ReturnStringIf2xx;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandler.java
+1 -1
View File
@@ -23,7 +23,7 @@ import static org.jclouds.util.Strings2.toStringAndClose;
import java.io.IOException;
import jakarta.annotation.Resource;
import javax.inject.Singleton;
import jakarta.inject.Singleton;
import org.jclouds.http.HttpCommand;
import org.jclouds.http.HttpErrorHandler;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.jclouds.elasticstack.predicates;
import static com.google.common.base.Preconditions.checkNotNull;
import jakarta.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.ElasticStackApi;
import org.jclouds.elasticstack.domain.DriveInfo;
apis/elasticstack/src/main/java/org/jclouds/elasticstack/suppliers/StandardDiskImageSupplier.java
+2 -2
View File
@@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.ElasticStackApi;
import org.jclouds.elasticstack.domain.MediaType;
apis/elasticstack/src/test/java/org/jclouds/elasticstack/suppliers/MockStandardDiskImageSupplier.java
+2 -2
View File
@@ -23,8 +23,8 @@ import static org.jclouds.util.Strings2.toStringAndClose;
import java.io.IOException;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.jclouds.elasticstack.domain.StandardDrive;
import org.jclouds.elasticstack.domain.WellKnownImage;