From 107741f786a6aabfd68617b4e2e4ff59efac675d Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sat, 24 Feb 2024 09:33:14 +0900 Subject: [PATCH] JCLOUDS-1629: Upgrade to Guice 7.0.0 This also changes from javax to jakarta annotations. --- .../src/main/java/org/jclouds/atmos/AtmosClient.java | 2 +- .../jclouds/atmos/binders/BindMetadataToHeaders.java | 4 ++-- .../atmos/binders/BindUserMetadataToHeaders.java | 2 +- .../atmos/blobstore/AtmosBlobRequestSigner.java | 4 ++-- .../org/jclouds/atmos/blobstore/AtmosBlobStore.java | 6 +++--- .../blobstore/config/AtmosBlobStoreContextModule.java | 2 +- .../blobstore/functions/BlobMetadataToObject.java | 4 ++-- .../functions/BlobStoreListOptionsToListOptions.java | 2 +- .../blobstore/functions/BlobToContentMetadata.java | 2 +- .../atmos/blobstore/functions/BlobToObject.java | 4 ++-- .../blobstore/functions/BlobToSystemMetadata.java | 2 +- .../DirectoryEntryListToResourceMetadataList.java | 4 ++-- .../atmos/blobstore/functions/ObjectToBlob.java | 4 ++-- .../blobstore/functions/ObjectToBlobMetadata.java | 4 ++-- .../org/jclouds/atmos/config/AtmosHttpApiModule.java | 2 +- .../jclouds/atmos/domain/internal/AtmosObjectImpl.java | 6 +++--- .../main/java/org/jclouds/atmos/filters/ShareUrl.java | 10 +++++----- .../java/org/jclouds/atmos/filters/SignRequest.java | 8 ++++---- .../org/jclouds/atmos/functions/AtmosObjectName.java | 2 +- .../ParseDirectoryListFromContentAndHeaders.java | 6 +++--- .../ParseObjectFromHeadersAndHttpContent.java | 2 +- .../functions/ParseSystemMetadataFromHeaders.java | 4 ++-- .../atmos/functions/ParseUserMetadataFromHeaders.java | 2 +- .../functions/ReturnTrueIfGroupACLIsOtherRead.java | 2 +- .../atmos/handlers/AtmosClientErrorRetryHandler.java | 2 +- .../atmos/handlers/AtmosServerErrorRetryHandler.java | 2 +- .../atmos/handlers/ParseAtmosErrorFromXmlContent.java | 4 ++-- .../main/java/org/jclouds/atmos/util/AtmosUtils.java | 4 ++-- .../atmos/xml/ListDirectoryResponseHandler.java | 2 +- .../functions/ListOptionsToBlobStoreListOptions.java | 2 +- .../ResourceMetadataListToDirectoryEntryList.java | 2 +- .../org/jclouds/byon/config/YamlNodeStoreModule.java | 4 ++-- .../org/jclouds/byon/functions/NodeToNodeMetadata.java | 6 +++--- .../jclouds/byon/functions/NodesFromYamlStream.java | 2 +- .../byon/internal/BYONComputeServiceAdapter.java | 4 ++-- .../byon/suppliers/NodesParsedFromSupplier.java | 4 ++-- apis/chef/src/main/java/org/jclouds/chef/ChefApi.java | 2 +- .../chef/binders/BindChecksumsToJsonPayload.java | 2 +- .../binders/BindCreateClientOptionsToJsonPayload.java | 2 +- .../binders/BindGenerateKeyForClientToJsonPayload.java | 2 +- .../binders/BindGroupToUpdateRequestJsonPayload.java | 4 ++-- .../java/org/jclouds/chef/binders/DatabagItemId.java | 2 +- .../java/org/jclouds/chef/binders/EnvironmentName.java | 2 +- .../main/java/org/jclouds/chef/binders/GroupName.java | 2 +- .../main/java/org/jclouds/chef/binders/NodeName.java | 2 +- .../main/java/org/jclouds/chef/binders/RoleName.java | 2 +- .../org/jclouds/chef/config/ChefBootstrapModule.java | 4 ++-- .../org/jclouds/chef/config/ChefHttpApiModule.java | 6 +++--- .../java/org/jclouds/chef/config/ChefParserModule.java | 4 ++-- .../main/java/org/jclouds/chef/config/InstallChef.java | 2 +- .../main/java/org/jclouds/chef/config/Validator.java | 2 +- .../org/jclouds/chef/features/OrganizationApi.java | 2 +- .../org/jclouds/chef/filters/SignedHeaderAuth.java | 8 ++++---- .../chef/functions/BootstrapConfigForGroup.java | 6 +++--- .../org/jclouds/chef/functions/ClientForGroup.java | 4 ++-- .../org/jclouds/chef/functions/GroupToBootScript.java | 4 ++-- .../functions/ParseCookbookDefinitionFromJson.java | 4 ++-- .../functions/ParseCookbookDefinitionListFromJson.java | 4 ++-- .../chef/functions/ParseCookbookNamesFromJson.java | 4 ++-- .../chef/functions/ParseCookbookVersionsFromJson.java | 4 ++-- .../chef/functions/ParseErrorFromJsonOrReturnBody.java | 4 ++-- .../jclouds/chef/functions/ParseKeySetFromJson.java | 4 ++-- .../chef/functions/ParseSearchClientsFromJson.java | 4 ++-- .../chef/functions/ParseSearchDatabagFromJson.java | 4 ++-- .../functions/ParseSearchEnvironmentsFromJson.java | 4 ++-- .../chef/functions/ParseSearchNodesFromJson.java | 4 ++-- .../chef/functions/ParseSearchResultFromJson.java | 4 ++-- .../chef/functions/ParseSearchRolesFromJson.java | 4 ++-- .../org/jclouds/chef/functions/UriForResource.java | 2 +- .../chef/handlers/ChefApiErrorRetryHandler.java | 2 +- .../org/jclouds/chef/handlers/ChefErrorHandler.java | 4 ++-- .../org/jclouds/chef/internal/BaseChefService.java | 6 +++--- .../internal/CleanupStaleNodesAndClientsImpl.java | 6 +++--- .../CreateNodeAndPopulateAutomaticAttributesImpl.java | 6 +++--- .../strategy/internal/DeleteAllClientsInListImpl.java | 4 ++-- .../strategy/internal/DeleteAllNodesInListImpl.java | 4 ++-- .../chef/strategy/internal/ListClientsImpl.java | 4 ++-- .../strategy/internal/ListCookbookVersionsImpl.java | 4 ++-- .../ListCookbookVersionsInEnvironmentImpl.java | 4 ++-- .../chef/strategy/internal/ListEnvironmentsImpl.java | 4 ++-- .../jclouds/chef/strategy/internal/ListNodesImpl.java | 4 ++-- .../strategy/internal/ListNodesInEnvironmentImpl.java | 4 ++-- .../internal/UpdateAutomaticAttributesOnNodeImpl.java | 6 +++--- .../jclouds/chef/suppliers/ChefVersionSupplier.java | 6 +++--- .../chef/src/main/java/org/jclouds/ohai/Automatic.java | 2 +- .../main/java/org/jclouds/ohai/AutomaticSupplier.java | 4 ++-- .../java/org/jclouds/ohai/config/JMXOhaiModule.java | 2 +- .../main/java/org/jclouds/ohai/config/OhaiModule.java | 8 ++++---- .../jclouds/ohai/functions/ByteArrayToMacAddress.java | 2 +- .../org/jclouds/ohai/functions/MapSetToMultimap.java | 2 +- .../java/org/jclouds/ohai/functions/NestSlashKeys.java | 4 ++-- .../jclouds/ohai/suppliers/UptimeSecondsSupplier.java | 4 ++-- .../org/jclouds/chef/filters/SignedHeaderAuthTest.java | 2 +- .../src/test/java/org/jclouds/ohai/config/JMXTest.java | 2 +- .../java/org/jclouds/ohai/config/OhaiModuleTest.java | 2 +- ...dAccountSecurityGroupPairsToIndexedQueryParams.java | 2 +- .../binders/BindCIDRsToCommaDelimitedQueryParam.java | 2 +- .../binders/BindIdListToCommaDelimitedQueryParam.java | 2 +- .../BindSnapshotPolicyScheduleToQueryParam.java | 2 +- .../cloudstack/compute/CloudStackComputeService.java | 8 ++++---- .../config/CloudStackComputeServiceContextModule.java | 4 ++-- .../compute/extensions/CloudStackImageExtension.java | 6 +++--- .../extensions/CloudStackSecurityGroupExtension.java | 2 +- .../CloudStackSecurityGroupToSecurityGroup.java | 4 ++-- .../compute/functions/IngressRuleToIpPermission.java | 2 +- .../compute/functions/OrphanedGroupsByZoneId.java | 2 +- .../compute/functions/ServiceOfferingToHardware.java | 2 +- .../cloudstack/compute/functions/TemplateToImage.java | 4 ++-- .../compute/functions/TemplateToOperatingSystem.java | 6 +++--- .../functions/VirtualMachineToNodeMetadata.java | 4 ++-- .../cloudstack/compute/functions/ZoneToLocation.java | 2 +- .../compute/loaders/CreateUniqueKeyPair.java | 4 ++-- .../compute/loaders/FindSecurityGroupOrCreate.java | 4 ++-- .../compute/predicates/AllNodesInGroupTerminated.java | 2 +- .../strategy/CloudStackComputeServiceAdapter.java | 6 +++--- .../cloudstack/config/CloudStackHttpApiModule.java | 2 +- .../cloudstack/config/CloudStackParserModule.java | 2 +- .../org/jclouds/cloudstack/features/AccountApi.java | 2 +- .../org/jclouds/cloudstack/features/AddressApi.java | 2 +- .../org/jclouds/cloudstack/features/AsyncJobApi.java | 2 +- .../jclouds/cloudstack/features/ConfigurationApi.java | 2 +- .../jclouds/cloudstack/features/DomainAccountApi.java | 2 +- .../jclouds/cloudstack/features/DomainDomainApi.java | 2 +- .../jclouds/cloudstack/features/DomainLimitApi.java | 2 +- .../org/jclouds/cloudstack/features/DomainUserApi.java | 2 +- .../java/org/jclouds/cloudstack/features/EventApi.java | 2 +- .../org/jclouds/cloudstack/features/FirewallApi.java | 2 +- .../jclouds/cloudstack/features/GlobalAccountApi.java | 2 +- .../jclouds/cloudstack/features/GlobalAlertApi.java | 2 +- .../jclouds/cloudstack/features/GlobalCapacityApi.java | 2 +- .../cloudstack/features/GlobalConfigurationApi.java | 2 +- .../jclouds/cloudstack/features/GlobalDomainApi.java | 2 +- .../org/jclouds/cloudstack/features/GlobalHostApi.java | 2 +- .../jclouds/cloudstack/features/GlobalOfferingApi.java | 2 +- .../org/jclouds/cloudstack/features/GlobalPodApi.java | 2 +- .../cloudstack/features/GlobalStoragePoolApi.java | 2 +- .../jclouds/cloudstack/features/GlobalUsageApi.java | 2 +- .../org/jclouds/cloudstack/features/GlobalUserApi.java | 2 +- .../org/jclouds/cloudstack/features/GlobalVlanApi.java | 2 +- .../org/jclouds/cloudstack/features/GlobalZoneApi.java | 2 +- .../org/jclouds/cloudstack/features/GuestOSApi.java | 2 +- .../org/jclouds/cloudstack/features/HypervisorApi.java | 2 +- .../java/org/jclouds/cloudstack/features/ISOApi.java | 2 +- .../java/org/jclouds/cloudstack/features/LimitApi.java | 2 +- .../jclouds/cloudstack/features/LoadBalancerApi.java | 2 +- .../java/org/jclouds/cloudstack/features/NATApi.java | 2 +- .../org/jclouds/cloudstack/features/NetworkApi.java | 2 +- .../org/jclouds/cloudstack/features/OfferingApi.java | 2 +- .../org/jclouds/cloudstack/features/ProjectApi.java | 2 +- .../org/jclouds/cloudstack/features/SSHKeyPairApi.java | 2 +- .../jclouds/cloudstack/features/SecurityGroupApi.java | 2 +- .../org/jclouds/cloudstack/features/SessionApi.java | 2 +- .../org/jclouds/cloudstack/features/SnapshotApi.java | 2 +- .../java/org/jclouds/cloudstack/features/TagApi.java | 2 +- .../org/jclouds/cloudstack/features/TemplateApi.java | 2 +- .../org/jclouds/cloudstack/features/VMGroupApi.java | 2 +- .../jclouds/cloudstack/features/VirtualMachineApi.java | 2 +- .../org/jclouds/cloudstack/features/VolumeApi.java | 2 +- .../java/org/jclouds/cloudstack/features/ZoneApi.java | 2 +- .../filters/AddSessionKeyAndJSessionIdToRequest.java | 4 ++-- .../org/jclouds/cloudstack/filters/QuerySigner.java | 6 +++--- .../cloudstack/functions/CreateFirewallRulesForIP.java | 6 +++--- .../functions/CreatePortForwardingRulesForIP.java | 6 +++--- .../functions/CreateSecurityGroupIfNeeded.java | 6 +++--- .../functions/GetFirewallRulesByVirtualMachine.java | 4 ++-- .../GetIPForwardingRulesByVirtualMachine.java | 4 ++-- .../functions/ParseAsyncJobFromHttpResponse.java | 2 +- .../functions/ParseAsyncJobsFromHttpResponse.java | 2 +- .../functions/ParseEventTypesFromHttpResponse.java | 2 +- .../functions/ParseIdToNameEntryFromHttpResponse.java | 2 +- .../functions/ParseIdToNameFromHttpResponse.java | 2 +- .../functions/ParseNamesFromHttpResponse.java | 2 +- .../cloudstack/functions/ParseTypedAsyncJob.java | 4 ++-- .../functions/ReuseOrAssociateNewPublicIPAddress.java | 6 +++--- .../functions/StaticNATVirtualMachineInNetwork.java | 4 ++-- .../cloudstack/handlers/CloudStackErrorHandler.java | 2 +- .../cloudstack/internal/CloudStackContextImpl.java | 4 ++-- .../loaders/LoginWithPasswordCredentials.java | 4 ++-- .../predicates/CorrectHypervisorForZone.java | 4 ++-- .../org/jclouds/cloudstack/predicates/JobComplete.java | 2 +- .../cloudstack/predicates/LoadBalancerRuleActive.java | 4 ++-- .../jclouds/cloudstack/predicates/OSCategoryIn.java | 4 ++-- .../cloudstack/predicates/TemplatePredicates.java | 2 +- .../cloudstack/predicates/VirtualMachineDestroyed.java | 2 +- .../cloudstack/predicates/VirtualMachineExpunged.java | 2 +- .../cloudstack/predicates/VirtualMachineRunning.java | 2 +- .../BlockUntilJobCompletesAndReturnResult.java | 6 +++--- .../jclouds/cloudstack/suppliers/GetCurrentUser.java | 2 +- .../cloudstack/suppliers/NetworksForCurrentUser.java | 2 +- .../cloudstack/suppliers/ProjectsForCurrentUser.java | 2 +- .../cloudstack/suppliers/ZoneIdToZoneSupplier.java | 2 +- .../compute/loaders/FindSecurityGroupOrCreateTest.java | 2 +- .../functions/CreateSecurityGroupIfNeededTest.java | 2 +- .../cloudwatch/binders/GetMetricStatisticsBinder.java | 2 +- .../java/org/jclouds/cloudwatch/features/AlarmApi.java | 2 +- .../org/jclouds/cloudwatch/features/MetricApi.java | 2 +- .../jclouds/cloudwatch/functions/ISO8601Format.java | 4 ++-- .../cloudwatch/functions/MetricsToPagedIterable.java | 2 +- .../cloudwatch/handlers/CloudWatchErrorHandler.java | 6 +++--- .../cloudwatch/xml/AlarmHistoryItemHandler.java | 2 +- .../org/jclouds/cloudwatch/xml/DatapointHandler.java | 2 +- .../xml/GetMetricStatisticsResponseHandler.java | 2 +- .../xml/GetMetricStatisticsResponseHandlerV2.java | 2 +- .../compute/functions/ContainerToNodeMetadata.java | 2 +- .../compute/functions/CustomLoginPortFromImage.java | 2 +- .../jclouds/docker/compute/functions/ImageToImage.java | 2 +- .../compute/functions/LoginPortForContainer.java | 2 +- .../docker/compute/functions/StateToStatus.java | 2 +- .../compute/strategy/DockerComputeServiceAdapter.java | 6 +++--- .../docker/config/DockerOkHttpClientSupplier.java | 4 ++-- .../java/org/jclouds/docker/features/ContainerApi.java | 2 +- .../java/org/jclouds/docker/features/ImageApi.java | 2 +- .../main/java/org/jclouds/docker/features/MiscApi.java | 2 +- .../java/org/jclouds/docker/features/NetworkApi.java | 2 +- .../docker/suppliers/DockerSSLContextSupplier.java | 6 +++--- .../suppliers/DockerUntrustedSSLContextSupplier.java | 4 ++-- .../ec2/binders/BindBundleIdsToIndexedFormParams.java | 2 +- .../ec2/binders/BindFiltersToIndexedFormParams.java | 2 +- .../ec2/binders/BindGroupIdsToIndexedFormParams.java | 2 +- .../ec2/binders/BindGroupNamesToIndexedFormParams.java | 2 +- .../binders/BindInstanceIdsToIndexedFormParams.java | 2 +- .../ec2/binders/BindKeyNamesToIndexedFormParams.java | 2 +- .../binders/BindProductCodesToIndexedFormParams.java | 2 +- .../ec2/binders/BindPublicIpsToIndexedFormParams.java | 2 +- .../binders/BindResourceIdsToIndexedFormParams.java | 2 +- .../ec2/binders/BindS3UploadPolicyAndSignature.java | 2 +- .../ec2/binders/BindSubnetIdsToIndexedFormParams.java | 2 +- .../ec2/binders/BindTagKeysToIndexedFormParams.java | 2 +- .../ec2/binders/BindUserGroupsToIndexedFormParams.java | 2 +- ...UserIdGroupPairToSourceSecurityGroupFormParams.java | 2 +- .../ec2/binders/BindUserIdsToIndexedFormParams.java | 2 +- .../ec2/binders/BindVolumeIdsToIndexedFormParams.java | 2 +- .../IfNotNullBindAvailabilityZoneToFormParam.java | 4 ++-- .../org/jclouds/ec2/compute/EC2ComputeService.java | 6 +++--- .../compute/config/EC2ComputeServiceContextModule.java | 4 ++-- .../config/EC2ComputeServiceDependenciesModule.java | 4 ++-- .../ec2/compute/extensions/EC2ImageExtension.java | 4 ++-- .../compute/extensions/EC2SecurityGroupExtension.java | 4 ++-- .../compute/functions/AddElasticIpsToNodemetadata.java | 6 +++--- .../ec2/compute/functions/CreateUniqueKeyPair.java | 4 ++-- .../ec2/compute/functions/CredentialsForInstance.java | 4 ++-- .../jclouds/ec2/compute/functions/EC2ImageParser.java | 6 +++--- .../compute/functions/EC2SecurityGroupIdFromName.java | 4 ++-- .../functions/EC2SecurityGroupToSecurityGroup.java | 4 ++-- .../ec2/compute/functions/ImagesToRegionAndIdMap.java | 2 +- .../PasswordCredentialsFromWindowsInstance.java | 6 +++--- .../ec2/compute/functions/PresentInstances.java | 2 +- .../functions/RunningInstanceToNodeMetadata.java | 2 +- .../WindowsLoginCredentialsFromEncryptedData.java | 2 +- .../compute/internal/EC2ComputeServiceContextImpl.java | 4 ++-- .../ec2/compute/internal/EC2TemplateBuilderImpl.java | 6 +++--- .../compute/loaders/CreateSecurityGroupIfNeeded.java | 6 +++--- .../compute/loaders/LoadPublicIpForInstanceOrNull.java | 4 ++-- .../ec2/compute/loaders/RegionAndIdToImage.java | 4 ++-- .../ec2/compute/predicates/SecurityGroupPresent.java | 2 +- ...irAndSecurityGroupsAsNeededAndReturnRunOptions.java | 8 ++++---- .../ec2/compute/strategy/DescribeImagesParallel.java | 6 +++--- .../strategy/EC2CreateNodesInGroupThenAddToSet.java | 6 +++--- .../ec2/compute/strategy/EC2DestroyNodeStrategy.java | 6 +++--- .../ec2/compute/strategy/EC2GetImageStrategy.java | 4 ++-- .../compute/strategy/EC2GetNodeMetadataStrategy.java | 4 ++-- .../ec2/compute/strategy/EC2ListNodesStrategy.java | 4 ++-- ...opulateDefaultLoginCredentialsForImageStrategy.java | 6 +++--- .../ec2/compute/strategy/EC2RebootNodeStrategy.java | 4 ++-- .../ec2/compute/strategy/EC2ResumeNodeStrategy.java | 4 ++-- .../ec2/compute/strategy/EC2SuspendNodeStrategy.java | 4 ++-- .../ec2/compute/strategy/ReviseParsedImage.java | 2 +- .../ec2/compute/suppliers/EC2HardwareSupplier.java | 2 +- .../ec2/compute/suppliers/EC2ImageSupplier.java | 6 +++--- .../suppliers/RegionAndNameToImageSupplier.java | 6 +++--- .../org/jclouds/ec2/compute/util/EC2ComputeUtils.java | 2 +- .../src/main/java/org/jclouds/ec2/features/AMIApi.java | 2 +- .../ec2/features/AvailabilityZoneAndRegionApi.java | 2 +- .../org/jclouds/ec2/features/ElasticBlockStoreApi.java | 2 +- .../org/jclouds/ec2/features/ElasticIPAddressApi.java | 2 +- .../java/org/jclouds/ec2/features/InstanceApi.java | 2 +- .../main/java/org/jclouds/ec2/features/KeyPairApi.java | 2 +- .../org/jclouds/ec2/features/SecurityGroupApi.java | 2 +- .../main/java/org/jclouds/ec2/features/SubnetApi.java | 2 +- .../src/main/java/org/jclouds/ec2/features/TagApi.java | 2 +- .../main/java/org/jclouds/ec2/features/WindowsApi.java | 2 +- .../ConvertUnencodedBytesToBase64EncodedString.java | 2 +- .../ec2/functions/EncodedRSAPublicKeyToBase64.java | 2 +- .../jclouds/ec2/predicates/InstanceHasIpAddress.java | 2 +- .../jclouds/ec2/predicates/InstanceStateRunning.java | 2 +- .../jclouds/ec2/predicates/InstanceStateStopped.java | 2 +- .../ec2/predicates/InstanceStateTerminated.java | 2 +- .../org/jclouds/ec2/predicates/SnapshotCompleted.java | 2 +- .../org/jclouds/ec2/predicates/VolumeAttached.java | 2 +- .../org/jclouds/ec2/predicates/VolumeAvailable.java | 2 +- .../suppliers/DescribeAvailabilityZonesInRegion.java | 2 +- .../ec2/suppliers/DescribeRegionsForRegionURIs.java | 2 +- .../java/org/jclouds/ec2/xml/AttachmentHandler.java | 2 +- .../java/org/jclouds/ec2/xml/BundleTaskHandler.java | 2 +- .../jclouds/ec2/xml/CreateVolumeResponseHandler.java | 2 +- .../ec2/xml/DescribeAddressesResponseHandler.java | 2 +- .../xml/DescribeAvailabilityZonesResponseHandler.java | 2 +- .../ec2/xml/DescribeBundleTasksResponseHandler.java | 2 +- .../jclouds/ec2/xml/DescribeImagesResponseHandler.java | 2 +- .../ec2/xml/DescribeInstancesResponseHandler.java | 2 +- .../ec2/xml/DescribeKeyPairsResponseHandler.java | 2 +- .../ec2/xml/DescribeSecurityGroupsResponseHandler.java | 2 +- .../ec2/xml/DescribeSnapshotsResponseHandler.java | 2 +- .../ec2/xml/DescribeVolumesResponseHandler.java | 2 +- .../ec2/xml/GetPasswordDataResponseHandler.java | 2 +- .../jclouds/ec2/xml/InstanceStateChangeHandler.java | 2 +- .../org/jclouds/ec2/xml/KeyPairResponseHandler.java | 2 +- .../jclouds/ec2/xml/RunInstancesResponseHandler.java | 2 +- .../main/java/org/jclouds/ec2/xml/SnapshotHandler.java | 2 +- .../main/java/org/jclouds/ec2/xml/SubnetHandler.java | 2 +- .../jclouds/ec2/compute/EC2TemplateBuilderTest.java | 2 +- .../compute/internal/EC2TemplateBuilderImplTest.java | 2 +- ...dSecurityGroupsAsNeededAndReturnRunOptionsTest.java | 4 ++-- .../java/org/jclouds/ec2/features/BaseEC2ApiTest.java | 4 ++-- .../java/org/jclouds/ec2/xml/BaseEC2HandlerTest.java | 2 +- .../DescribeAvailabilityZonesResponseHandlerTest.java | 2 +- .../binders/BindDriveDataToPlainTextString.java | 4 ++-- .../binders/BindDriveToPlainTextString.java | 4 ++-- .../binders/BindServerToPlainTextString.java | 4 ++-- .../compute/ElasticStackComputeServiceAdapter.java | 6 +++--- .../ElasticStackComputeServiceContextModule.java | 6 +++--- .../compute/functions/ServerInfoToNodeMetadata.java | 4 ++-- .../functions/StandardDriveToWellKnownImage.java | 4 ++-- .../compute/functions/WellKnownImageToImage.java | 4 ++-- .../jclouds/elasticstack/functions/BaseDriveToMap.java | 2 +- .../functions/CreateDriveRequestToMap.java | 4 ++-- .../jclouds/elasticstack/functions/DriveDataToMap.java | 4 ++-- .../KeyValuesDelimitedByBlankLinesToDriveInfo.java | 4 ++-- .../KeyValuesDelimitedByBlankLinesToServerInfo.java | 4 ++-- ...OfKeyValuesDelimitedByBlankLinesToDriveInfoSet.java | 4 ++-- ...stOfKeyValuesDelimitedByBlankLinesToListOfMaps.java | 2 +- ...fKeyValuesDelimitedByBlankLinesToServerInfoSet.java | 4 ++-- ...yValuesDelimitedByBlankLinesToStandardDriveSet.java | 4 ++-- ...stOfMapsToListOfKeyValuesDelimitedByBlankLines.java | 2 +- .../jclouds/elasticstack/functions/MapToDevices.java | 4 ++-- .../jclouds/elasticstack/functions/MapToDriveInfo.java | 2 +- .../elasticstack/functions/MapToDriveMetrics.java | 2 +- .../org/jclouds/elasticstack/functions/MapToNICs.java | 2 +- .../elasticstack/functions/MapToServerInfo.java | 4 ++-- .../elasticstack/functions/MapToServerMetrics.java | 4 ++-- .../elasticstack/functions/MapToStandardDrive.java | 2 +- .../jclouds/elasticstack/functions/ReturnPayload.java | 2 +- .../jclouds/elasticstack/functions/ServerToMap.java | 4 ++-- .../jclouds/elasticstack/functions/SplitNewlines.java | 4 ++-- .../handlers/ElasticStackErrorHandler.java | 2 +- .../jclouds/elasticstack/predicates/DriveClaimed.java | 4 ++-- .../suppliers/StandardDiskImageSupplier.java | 4 ++-- .../suppliers/MockStandardDiskImageSupplier.java | 4 ++-- .../internal/FilesystemStorageStrategyImpl.java | 6 +++--- .../util/internal/FileSystemBlobUtilsImpl.java | 2 +- .../internal/FilesystemStorageStrategyImplTest.java | 2 +- .../main/java/org/jclouds/glacier/GlacierClient.java | 2 +- .../strategy/internal/BaseSlicingStrategy.java | 2 +- .../jclouds/glacier/config/GlacierHttpApiModule.java | 2 +- .../glacier/filters/RequestAuthorizeSignature.java | 8 ++++---- .../java/org/jclouds/oauth/v2/AuthorizationApi.java | 2 +- .../org/jclouds/oauth/v2/config/Authorization.java | 2 +- .../v2/config/CertificateFingerprintSupplier.java | 2 +- .../jclouds/oauth/v2/config/OAuthConfigFactory.java | 2 +- .../java/org/jclouds/oauth/v2/config/OAuthModule.java | 6 +++--- .../jclouds/oauth/v2/config/PrivateKeySupplier.java | 4 ++-- .../oauth/v2/filters/BearerTokenFromCredentials.java | 2 +- .../filters/ClientCredentialsJWTBearerTokenFlow.java | 4 ++-- .../oauth/v2/filters/ClientCredentialsSecretFlow.java | 2 +- .../jclouds/oauth/v2/filters/JWTBearerTokenFlow.java | 4 ++-- .../jclouds/oauth/v2/functions/ClaimsToAssertion.java | 4 ++-- .../functions/ClientCredentialsClaimsToAssertion.java | 4 ++-- .../oauth/v2/filters/TestJWTBearerTokenFlow.java | 4 ++-- .../cinder/v1/config/CinderHttpApiModule.java | 2 +- .../openstack/cinder/v1/config/CinderParserModule.java | 2 +- .../jclouds/openstack/cinder/v1/domain/Snapshot.java | 2 +- .../cinder/v1/domain/SnapshotExtendedAttributes.java | 2 +- .../org/jclouds/openstack/cinder/v1/domain/Volume.java | 2 +- .../openstack/cinder/v1/domain/VolumeAttachment.java | 2 +- .../jclouds/openstack/cinder/v1/domain/VolumeType.java | 2 +- .../jclouds/openstack/cinder/v1/features/QuotaApi.java | 2 +- .../openstack/cinder/v1/features/SnapshotApi.java | 2 +- .../openstack/cinder/v1/features/VolumeApi.java | 2 +- .../openstack/cinder/v1/features/VolumeTypeApi.java | 2 +- .../cinder/v1/handlers/CinderErrorHandler.java | 2 +- .../cinder/v1/options/CreateSnapshotOptions.java | 2 +- .../cinder/v1/options/CreateVolumeOptions.java | 2 +- .../openstack/keystone/auth/config/Authentication.java | 2 +- .../keystone/auth/config/AuthenticationModule.java | 4 ++-- .../openstack/keystone/auth/config/CredentialType.java | 2 +- .../keystone/auth/filters/AuthenticateRequest.java | 4 ++-- .../functions/AuthenticateApiAccessKeyCredentials.java | 4 ++-- .../functions/AuthenticatePasswordCredentials.java | 4 ++-- .../auth/functions/AuthenticateTokenCredentials.java | 4 ++-- .../openstack/keystone/auth/handlers/RetryOnRenew.java | 2 +- .../catalog/config/KeystoneAdminURLModule.java | 4 ++-- .../keystone/catalog/config/ServiceCatalogModule.java | 6 +++--- .../openstack/keystone/catalog/functions/AdminURL.java | 2 +- .../keystone/catalog/functions/InternalURL.java | 2 +- .../catalog/functions/PublicURLOrInternal.java | 2 +- .../catalog/functions/ReturnRegionOrProvider.java | 4 ++-- ...oAdminURIFromServiceEndpointsForTypeAndVersion.java | 2 +- ...onIdToURIFromServiceEndpointsForTypeAndVersion.java | 2 +- .../jclouds/openstack/keystone/v2_0/KeystoneApi.java | 2 +- .../keystone/v2_0/binders/BindAuthToJsonPayload.java | 4 ++-- .../keystone/v2_0/catalog/V2ServiceCatalog.java | 4 ++-- .../keystone/v2_0/config/KeystoneHttpApiModule.java | 4 ++-- .../keystone/v2_0/config/NamespaceAliases.java | 2 +- .../openstack/keystone/v2_0/domain/ApiMetadata.java | 2 +- .../keystone/v2_0/extensions/RoleAdminApi.java | 2 +- .../keystone/v2_0/extensions/ServiceAdminApi.java | 2 +- .../keystone/v2_0/extensions/TenantAdminApi.java | 2 +- .../keystone/v2_0/extensions/UserAdminApi.java | 2 +- .../openstack/keystone/v2_0/features/ServiceApi.java | 2 +- .../openstack/keystone/v2_0/features/TokenApi.java | 2 +- .../openstack/keystone/v2_0/features/UserApi.java | 2 +- .../v2_0/functions/internal/ParseServices.java | 4 ++-- .../keystone/v2_0/functions/internal/ParseTenants.java | 4 ++-- .../keystone/v2_0/functions/internal/ParseUsers.java | 4 ++-- .../keystone/v2_0/handlers/KeystoneErrorHandler.java | 4 ++-- .../keystone/v2_0/options/CreateTenantOptions.java | 2 +- .../keystone/v2_0/options/CreateUserOptions.java | 2 +- .../keystone/v2_0/options/UpdateTenantOptions.java | 2 +- .../keystone/v2_0/options/UpdateUserOptions.java | 2 +- .../v3/binders/BindAccessKeyAuthToJsonPayload.java | 4 ++-- .../v3/binders/BindPasswordAuthToJsonPayload.java | 4 ++-- .../v3/binders/BindTokenAuthToJsonPayload.java | 4 ++-- .../keystone/v3/catalog/V3ServiceCatalog.java | 4 ++-- .../openstack/keystone/v3/features/AuthApi.java | 2 +- .../openstack/keystone/v3/features/CatalogApi.java | 2 +- .../openstack/keystone/v3/features/ProjectApi.java | 2 +- .../openstack/keystone/v3/features/RegionApi.java | 2 +- .../openstack/keystone/v3/features/UserApi.java | 2 +- .../v3/parsers/ParseTokenFromHttpResponse.java | 2 +- .../java/org/jclouds/openstack/v2_0/domain/Limit.java | 2 +- .../java/org/jclouds/openstack/v2_0/domain/Limits.java | 2 +- .../java/org/jclouds/openstack/v2_0/domain/Link.java | 2 +- .../org/jclouds/openstack/v2_0/domain/RateLimit.java | 2 +- .../jclouds/openstack/v2_0/features/ExtensionApi.java | 2 +- ...sentWhenExtensionAnnotationMatchesExtensionSet.java | 2 +- .../org/jclouds/openstack/v2_0/services/Compute.java | 2 +- .../org/jclouds/openstack/v2_0/services/Extension.java | 2 +- .../org/jclouds/openstack/v2_0/services/Identity.java | 2 +- .../org/jclouds/openstack/v2_0/services/Image.java | 2 +- .../jclouds/openstack/v2_0/services/ObjectStore.java | 2 +- .../keystone/auth/config/ProviderModuleExpectTest.java | 4 ++-- ...LocationIdToURIFromAccessForTypeAndVersionTest.java | 2 +- ...ionIdToAdminURIFromAccessForTypeAndVersionTest.java | 2 +- .../RegionIdToURIFromAccessForTypeAndVersionTest.java | 2 +- .../neutron/v2/config/NeutronHttpApiModule.java | 4 ++-- .../openstack/neutron/v2/domain/AddressPair.java | 2 +- .../neutron/v2/domain/ExternalGatewayInfo.java | 2 +- .../openstack/neutron/v2/domain/ExtraDhcpOption.java | 2 +- .../openstack/neutron/v2/domain/FloatingIP.java | 2 +- .../jclouds/openstack/neutron/v2/domain/HostRoute.java | 2 +- .../org/jclouds/openstack/neutron/v2/domain/IP.java | 2 +- .../jclouds/openstack/neutron/v2/domain/Network.java | 2 +- .../openstack/neutron/v2/domain/NetworkSegment.java | 2 +- .../org/jclouds/openstack/neutron/v2/domain/Port.java | 2 +- .../jclouds/openstack/neutron/v2/domain/Router.java | 2 +- .../openstack/neutron/v2/domain/RouterInterface.java | 2 +- .../org/jclouds/openstack/neutron/v2/domain/Rule.java | 2 +- .../openstack/neutron/v2/domain/SecurityGroup.java | 2 +- .../jclouds/openstack/neutron/v2/domain/Subnet.java | 2 +- .../neutron/v2/domain/lbaas/v1/HealthMonitor.java | 2 +- .../v2/domain/lbaas/v1/HealthMonitorStatus.java | 2 +- .../openstack/neutron/v2/domain/lbaas/v1/Member.java | 2 +- .../openstack/neutron/v2/domain/lbaas/v1/Pool.java | 2 +- .../neutron/v2/domain/lbaas/v1/PoolStatus.java | 2 +- .../neutron/v2/domain/lbaas/v1/SessionPersistence.java | 2 +- .../openstack/neutron/v2/domain/lbaas/v1/VIP.java | 2 +- .../openstack/neutron/v2/extensions/FWaaSApi.java | 2 +- .../openstack/neutron/v2/extensions/RouterApi.java | 2 +- .../neutron/v2/extensions/lbaas/v1/LBaaSApi.java | 2 +- .../openstack/neutron/v2/features/FloatingIPApi.java | 2 +- .../openstack/neutron/v2/features/NetworkApi.java | 2 +- .../jclouds/openstack/neutron/v2/features/PortApi.java | 2 +- .../neutron/v2/features/SecurityGroupApi.java | 2 +- .../openstack/neutron/v2/features/SubnetApi.java | 2 +- .../v2/functions/FirewallPolicyToPagedIterable.java | 2 +- .../v2/functions/FirewallRuleToPagedIterable.java | 2 +- .../neutron/v2/functions/FirewallToPagedIterable.java | 2 +- .../v2/functions/FloatingIPsToPagedIterable.java | 2 +- .../neutron/v2/functions/NetworksToPagedIterable.java | 2 +- .../neutron/v2/functions/ParseFirewallPolicies.java | 4 ++-- .../neutron/v2/functions/ParseFirewallRules.java | 4 ++-- .../openstack/neutron/v2/functions/ParseFirewalls.java | 4 ++-- .../neutron/v2/functions/ParseFloatingIPs.java | 4 ++-- .../openstack/neutron/v2/functions/ParseNetworks.java | 4 ++-- .../openstack/neutron/v2/functions/ParsePorts.java | 4 ++-- .../openstack/neutron/v2/functions/ParseRouters.java | 4 ++-- .../openstack/neutron/v2/functions/ParseRules.java | 4 ++-- .../neutron/v2/functions/ParseSecurityGroups.java | 4 ++-- .../openstack/neutron/v2/functions/ParseSubnets.java | 4 ++-- .../neutron/v2/functions/PortsToPagedIterable.java | 2 +- .../neutron/v2/functions/RouterToPagedIterable.java | 2 +- .../neutron/v2/functions/RulesToPagedIterable.java | 2 +- .../v2/functions/SecurityGroupsToPagedIterable.java | 2 +- .../neutron/v2/functions/SubnetsToPagedIterable.java | 2 +- .../v2/functions/VersionAwareRegionToEndpoint.java | 2 +- .../lbaas/v1/HealthMonitorsToPagedIterable.java | 2 +- .../v2/functions/lbaas/v1/MembersToPagedIterable.java | 2 +- .../v2/functions/lbaas/v1/ParseHealthMonitors.java | 4 ++-- .../neutron/v2/functions/lbaas/v1/ParseMembers.java | 4 ++-- .../neutron/v2/functions/lbaas/v1/ParsePools.java | 4 ++-- .../neutron/v2/functions/lbaas/v1/ParseVIPs.java | 4 ++-- .../v2/functions/lbaas/v1/PoolsToPagedIterable.java | 2 +- .../v2/functions/lbaas/v1/VIPsToPagedIterable.java | 2 +- .../neutron/v2/handlers/NeutronErrorHandler.java | 2 +- .../openstack/nova/ec2/features/NovaEC2KeyPairApi.java | 2 +- .../nova/ec2/internal/HyphenToNullIso8601Codec.java | 2 +- .../ec2/loaders/NovaCreateSecurityGroupIfNeeded.java | 6 +++--- .../nova/ec2/strategy/NovaReviseParsedImage.java | 4 ++-- .../nova/ec2/xml/NovaCreateVolumeResponseHandler.java | 2 +- .../ec2/xml/NovaDescribeImagesResponseHandler.java | 2 +- .../nova/v2_0/binders/BindConsoleToJsonPayload.java | 4 ++-- .../nova/v2_0/binders/BindKeyPairToJsonPayload.java | 4 ++-- .../nova/v2_0/binders/BindMetadataToJsonPayload.java | 4 ++-- .../binders/BindSecurityGroupRuleToJsonPayload.java | 4 ++-- .../nova/v2_0/compute/NovaComputeService.java | 8 ++++---- .../nova/v2_0/compute/NovaComputeServiceAdapter.java | 4 ++-- .../config/NovaComputeServiceContextModule.java | 4 ++-- .../extensions/NeutronSecurityGroupExtension.java | 2 +- .../v2_0/compute/extensions/NovaImageExtension.java | 6 +++--- .../compute/extensions/NovaSecurityGroupExtension.java | 2 +- .../functions/AllocateAndAddFloatingIpToNode.java | 2 +- .../nova/v2_0/compute/functions/CleanupResources.java | 6 +++--- .../compute/functions/CreateSecurityGroupIfNeeded.java | 4 ++-- .../compute/functions/FlavorInRegionToHardware.java | 2 +- .../v2_0/compute/functions/ImageInRegionToImage.java | 2 +- .../v2_0/compute/functions/ImageToOperatingSystem.java | 4 ++-- .../functions/NeutronSecurityGroupToSecurityGroup.java | 2 +- .../NovaSecurityGroupInRegionToSecurityGroup.java | 4 ++-- .../functions/NovaSecurityGroupToSecurityGroup.java | 4 ++-- .../compute/functions/OrphanedGroupsByRegionId.java | 2 +- .../RemoveFloatingIpFromNodeAndDeallocate.java | 2 +- .../functions/ServerInRegionToNodeMetadata.java | 4 ++-- .../compute/loaders/FindSecurityGroupOrCreate.java | 2 +- .../compute/loaders/LoadFloatingIpsForInstance.java | 4 ++-- .../compute/predicates/AllNodesInGroupTerminated.java | 2 +- ...reateNodesWithGroupEncodedIntoNameThenAddToSet.java | 6 +++--- .../openstack/nova/v2_0/config/NovaHttpApiModule.java | 4 ++-- .../openstack/nova/v2_0/config/NovaParserModule.java | 2 +- .../jclouds/openstack/nova/v2_0/domain/Address.java | 2 +- .../openstack/nova/v2_0/domain/BlockDeviceMapping.java | 2 +- .../jclouds/openstack/nova/v2_0/domain/FixedIP.java | 2 +- .../org/jclouds/openstack/nova/v2_0/domain/Flavor.java | 2 +- .../jclouds/openstack/nova/v2_0/domain/FloatingIP.java | 2 +- .../org/jclouds/openstack/nova/v2_0/domain/Host.java | 2 +- .../openstack/nova/v2_0/domain/HostAggregate.java | 2 +- .../openstack/nova/v2_0/domain/HostResourceUsage.java | 2 +- .../org/jclouds/openstack/nova/v2_0/domain/Image.java | 2 +- .../jclouds/openstack/nova/v2_0/domain/Ingress.java | 2 +- .../nova/v2_0/domain/InterfaceAttachment.java | 2 +- .../jclouds/openstack/nova/v2_0/domain/KeyPair.java | 2 +- .../org/jclouds/openstack/nova/v2_0/domain/Quota.java | 2 +- .../openstack/nova/v2_0/domain/SecurityGroup.java | 2 +- .../openstack/nova/v2_0/domain/SecurityGroupRule.java | 2 +- .../org/jclouds/openstack/nova/v2_0/domain/Server.java | 2 +- .../nova/v2_0/domain/ServerExtendedAttributes.java | 2 +- .../nova/v2_0/domain/ServerExtendedStatus.java | 2 +- .../nova/v2_0/domain/ServerWithSecurityGroups.java | 2 +- .../openstack/nova/v2_0/domain/SimpleServerUsage.java | 2 +- .../openstack/nova/v2_0/domain/SimpleTenantUsage.java | 2 +- .../openstack/nova/v2_0/domain/TenantIdAndName.java | 2 +- .../openstack/nova/v2_0/domain/VirtualInterface.java | 2 +- .../org/jclouds/openstack/nova/v2_0/domain/Volume.java | 2 +- .../openstack/nova/v2_0/domain/VolumeSnapshot.java | 2 +- .../jclouds/openstack/nova/v2_0/domain/VolumeType.java | 2 +- .../nova/v2_0/extensions/AttachInterfaceApi.java | 2 +- .../nova/v2_0/extensions/AvailabilityZoneApi.java | 2 +- .../openstack/nova/v2_0/extensions/ConsolesApi.java | 2 +- .../nova/v2_0/extensions/FlavorExtraSpecsApi.java | 2 +- .../openstack/nova/v2_0/extensions/FloatingIPApi.java | 2 +- .../nova/v2_0/extensions/HostAdministrationApi.java | 2 +- .../nova/v2_0/extensions/HostAggregateApi.java | 2 +- .../openstack/nova/v2_0/extensions/HypervisorApi.java | 2 +- .../openstack/nova/v2_0/extensions/KeyPairApi.java | 2 +- .../openstack/nova/v2_0/extensions/QuotaApi.java | 2 +- .../nova/v2_0/extensions/SecurityGroupApi.java | 2 +- .../openstack/nova/v2_0/extensions/ServerAdminApi.java | 2 +- .../v2_0/extensions/ServerWithSecurityGroupsApi.java | 2 +- .../nova/v2_0/extensions/SimpleTenantUsageApi.java | 2 +- .../nova/v2_0/extensions/VirtualInterfaceApi.java | 2 +- .../openstack/nova/v2_0/extensions/VolumeApi.java | 2 +- .../nova/v2_0/extensions/VolumeAttachmentApi.java | 2 +- .../openstack/nova/v2_0/extensions/VolumeTypeApi.java | 2 +- .../openstack/nova/v2_0/features/FlavorApi.java | 2 +- .../jclouds/openstack/nova/v2_0/features/ImageApi.java | 2 +- .../openstack/nova/v2_0/features/ServerApi.java | 2 +- .../openstack/nova/v2_0/functions/OverLimitParser.java | 2 +- .../v2_0/functions/ParseImageIdFromLocationHeader.java | 2 +- .../functions/internal/OnlyMetadataValueOrNull.java | 2 +- .../v2_0/functions/internal/ParseFlavorDetails.java | 4 ++-- .../nova/v2_0/functions/internal/ParseFlavors.java | 4 ++-- .../v2_0/functions/internal/ParseImageDetails.java | 4 ++-- .../nova/v2_0/functions/internal/ParseImages.java | 4 ++-- .../nova/v2_0/functions/internal/ParseKeyPairs.java | 2 +- .../v2_0/functions/internal/ParseServerDetails.java | 4 ++-- .../nova/v2_0/functions/internal/ParseServers.java | 4 ++-- .../openstack/nova/v2_0/handlers/NovaErrorHandler.java | 6 +++--- .../nova/v2_0/options/CreateBackupOfServerOptions.java | 2 +- .../nova/v2_0/options/CreateServerOptions.java | 4 ++-- .../nova/v2_0/options/CreateVolumeOptions.java | 2 +- .../nova/v2_0/options/CreateVolumeSnapshotOptions.java | 2 +- .../nova/v2_0/options/CreateVolumeTypeOptions.java | 2 +- .../nova/v2_0/options/RebuildServerOptions.java | 2 +- .../FindSecurityGroupWithNameAndReturnTrue.java | 2 +- .../NeutronSecurityGroupExtensionLiveTest.java | 2 +- .../extensions/NovaSecurityGroupExtensionLiveTest.java | 2 +- .../v1/blobstore/RegionScopedBlobStoreContext.java | 2 +- .../swift/v1/blobstore/RegionScopedSwiftBlobStore.java | 4 ++-- .../blobstore/RegionScopedTemporaryUrlBlobSigner.java | 2 +- .../v1/blobstore/config/SignUsingTemporaryUrls.java | 2 +- .../blobstore/config/SwiftBlobStoreContextModule.java | 2 +- .../swift/v1/config/SwiftAuthenticationModule.java | 2 +- .../org/jclouds/openstack/swift/v1/domain/Segment.java | 2 +- .../openstack/swift/v1/features/AccountApi.java | 2 +- .../jclouds/openstack/swift/v1/features/BulkApi.java | 2 +- .../openstack/swift/v1/features/ContainerApi.java | 2 +- .../swift/v1/features/DynamicLargeObjectApi.java | 2 +- .../jclouds/openstack/swift/v1/features/ObjectApi.java | 2 +- .../swift/v1/features/StaticLargeObjectApi.java | 2 +- .../swift/v1/functions/ParseObjectFromResponse.java | 2 +- .../v1/functions/ParseObjectListFromResponse.java | 2 +- .../openstack/trove/v1/config/TroveHttpApiModule.java | 2 +- .../openstack/trove/v1/features/DatabaseApi.java | 2 +- .../jclouds/openstack/trove/v1/features/FlavorApi.java | 2 +- .../openstack/trove/v1/features/InstanceApi.java | 2 +- .../jclouds/openstack/trove/v1/features/UserApi.java | 2 +- .../trove/v1/filters/EncodeDotsForUserGet.java | 2 +- .../openstack/trove/v1/handlers/TroveErrorHandler.java | 2 +- .../org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java | 2 +- .../clouddns/v1/binders/CreateReverseDNSToJSON.java | 2 +- .../clouddns/v1/binders/UpdateRecordsToJSON.java | 4 ++-- .../clouddns/v1/binders/UpdateReverseDNSToJSON.java | 2 +- .../jclouds/rackspace/clouddns/v1/config/CloudDNS.java | 2 +- .../rackspace/clouddns/v1/features/DomainApi.java | 2 +- .../rackspace/clouddns/v1/features/LimitApi.java | 2 +- .../rackspace/clouddns/v1/features/RecordApi.java | 2 +- .../rackspace/clouddns/v1/features/ReverseDNSApi.java | 2 +- .../clouddns/v1/functions/DomainsToPagedIterable.java | 2 +- .../rackspace/clouddns/v1/functions/ParseDomain.java | 4 ++-- .../rackspace/clouddns/v1/functions/ParseDomains.java | 2 +- .../rackspace/clouddns/v1/functions/ParseJob.java | 2 +- .../clouddns/v1/functions/ParseOnlyRecord.java | 2 +- .../rackspace/clouddns/v1/functions/ParseRecord.java | 2 +- .../rackspace/clouddns/v1/functions/ParseRecords.java | 2 +- .../clouddns/v1/functions/ParseSubdomains.java | 2 +- .../clouddns/v1/functions/RecordsToPagedIterable.java | 2 +- .../v1/functions/SubdomainsToPagedIterable.java | 2 +- .../binders/BindCDNPurgeEmailAddressesToHeaders.java | 2 +- .../rackspace/cloudfiles/v1/domain/CDNContainer.java | 2 +- .../rackspace/cloudfiles/v1/features/CDNApi.java | 2 +- .../cloudfiles/v1/functions/RegionToCDNEndpoint.java | 4 ++-- .../v2_0/CloudIdentityAuthenticationApi.java | 2 +- .../v2_0/functions/AuthenticateApiKeyCredentials.java | 4 ++-- .../cloudidentity/v2_0/functions/DateParser.java | 4 ++-- .../v1/binders/BindMetadataToJsonPayload.java | 4 ++-- .../cloudloadbalancers/v1/domain/SSLTermination.java | 2 +- .../cloudloadbalancers/v1/features/AccessRuleApi.java | 2 +- .../cloudloadbalancers/v1/features/ConnectionApi.java | 2 +- .../v1/features/ContentCachingApi.java | 2 +- .../cloudloadbalancers/v1/features/ErrorPageApi.java | 2 +- .../v1/features/HealthMonitorApi.java | 2 +- .../v1/features/LoadBalancerApi.java | 2 +- .../cloudloadbalancers/v1/features/NodeApi.java | 2 +- .../cloudloadbalancers/v1/features/ReportApi.java | 2 +- .../v1/features/SSLTerminationApi.java | 2 +- .../v1/features/SessionPersistenceApi.java | 2 +- .../cloudloadbalancers/v1/features/VirtualIPApi.java | 2 +- .../cloudloadbalancers/v1/functions/ConvertLB.java | 2 +- .../cloudloadbalancers/v1/functions/DateParser.java | 2 +- .../v1/functions/ParseAlgorithms.java | 2 +- .../v1/functions/ParseLoadBalancer.java | 2 +- .../v1/functions/ParseLoadBalancerUsages.java | 4 ++-- .../v1/functions/ParseLoadBalancers.java | 2 +- .../cloudloadbalancers/v1/functions/ParseMetadata.java | 2 +- .../v1/functions/ParseNestedBoolean.java | 2 +- .../v1/functions/ParseNestedString.java | 2 +- .../cloudloadbalancers/v1/functions/ParseNode.java | 2 +- .../cloudloadbalancers/v1/functions/ParseNodes.java | 4 ++-- .../v1/functions/ParseSessionPersistence.java | 2 +- .../ParseCloudLoadBalancersErrorFromHttpResponse.java | 2 +- .../functions/LoadBalancerToLoadBalancerMetadata.java | 4 ++-- .../CloudLoadBalancersDestroyLoadBalancerStrategy.java | 6 +++--- ...udLoadBalancersGetLoadBalancerMetadataStrategy.java | 4 ++-- .../CloudLoadBalancersListLoadBalancersStrategy.java | 4 ++-- .../CloudLoadBalancersLoadBalanceNodesStrategy.java | 6 +++--- .../src/main/java/org/jclouds/route53/Route53Api.java | 2 +- .../org/jclouds/route53/binders/BindChangeBatch.java | 2 +- .../org/jclouds/route53/binders/BindNextRecord.java | 2 +- .../jclouds/route53/config/Route53HttpApiModule.java | 2 +- .../org/jclouds/route53/features/HostedZoneApi.java | 2 +- .../jclouds/route53/features/ResourceRecordSetApi.java | 2 +- .../jclouds/route53/filters/RestAuthentication.java | 6 +++--- .../route53/functions/HostedZonesToPagedIterable.java | 2 +- .../ResourceRecordSetIterableToPagedIterable.java | 2 +- .../jclouds/route53/handlers/Route53ErrorHandler.java | 6 +++--- .../java/org/jclouds/route53/xml/ChangeHandler.java | 2 +- apis/s3/src/main/java/org/jclouds/s3/Bucket.java | 2 +- apis/s3/src/main/java/org/jclouds/s3/S3Client.java | 2 +- .../org/jclouds/s3/binders/BindACLToXMLPayload.java | 2 +- .../s3/binders/BindAsHostPrefixIfConfigured.java | 6 +++--- .../s3/binders/BindBucketLoggingToXmlPayload.java | 2 +- .../s3/binders/BindNoBucketLoggingToXmlPayload.java | 4 ++-- .../s3/binders/BindObjectMetadataToRequest.java | 4 ++-- .../s3/binders/BindPartIdsAndETagsToRequest.java | 2 +- .../org/jclouds/s3/binders/BindPayerToXmlPayload.java | 2 +- .../s3/binders/BindS3ObjectMetadataToRequest.java | 4 ++-- .../org/jclouds/s3/blobstore/S3BlobRequestSigner.java | 4 ++-- .../java/org/jclouds/s3/blobstore/S3BlobStore.java | 6 +++--- .../s3/blobstore/config/S3BlobStoreContextModule.java | 2 +- .../jclouds/s3/blobstore/functions/BlobToObject.java | 4 ++-- .../s3/blobstore/functions/BucketToResourceList.java | 4 ++-- .../blobstore/functions/BucketToResourceMetadata.java | 4 ++-- .../blobstore/functions/BucketsToStorageMetadata.java | 6 +++--- .../functions/CommonPrefixesToResourceMetadata.java | 2 +- .../functions/ContainerToBucketListOptions.java | 2 +- .../s3/blobstore/functions/LocationFromBucketName.java | 4 ++-- .../jclouds/s3/blobstore/functions/ObjectToBlob.java | 4 ++-- .../s3/blobstore/functions/ObjectToBlobMetadata.java | 4 ++-- .../internal/BackoffOnNotFoundWhenGetBucketACL.java | 2 +- .../s3/blobstore/internal/S3BlobStoreContextImpl.java | 4 ++-- .../java/org/jclouds/s3/config/S3HttpApiModule.java | 4 ++-- .../java/org/jclouds/s3/config/S3ObjectModule.java | 4 ++-- .../org/jclouds/s3/domain/internal/S3ObjectImpl.java | 2 +- ...dyOwnedByYouOrOperationAbortedWhenBucketExists.java | 2 +- .../java/org/jclouds/s3/filters/Aws4SignerBase.java | 2 +- .../s3/filters/Aws4SignerForAuthorizationHeader.java | 2 +- .../jclouds/s3/filters/Aws4SignerForChunkedUpload.java | 2 +- .../jclouds/s3/filters/Aws4SignerForQueryString.java | 2 +- .../s3/filters/RequestAuthorizeSignatureV2.java | 8 ++++---- .../s3/filters/RequestAuthorizeSignatureV4.java | 2 +- .../s3/functions/AssignCorrectHostnameForBucket.java | 2 +- .../jclouds/s3/functions/BindRegionToXmlPayload.java | 4 ++-- .../functions/DefaultEndpointThenInvalidateRegion.java | 2 +- .../s3/functions/ETagFromHttpResponseViaRegex.java | 4 ++-- .../org/jclouds/s3/functions/GetRegionForBucket.java | 4 ++-- .../main/java/org/jclouds/s3/functions/ObjectKey.java | 2 +- .../org/jclouds/s3/functions/ObjectMetadataKey.java | 2 +- .../ParseObjectFromHeadersAndHttpContent.java | 2 +- .../s3/functions/ParseObjectMetadataFromHeaders.java | 4 ++-- .../s3/functions/UploadIdFromHttpResponseViaRegex.java | 4 ++-- .../s3/handlers/ParseS3ErrorFromXmlContent.java | 6 +++--- .../jclouds/s3/handlers/S3RedirectionRetryHandler.java | 4 ++-- .../java/org/jclouds/s3/options/CopyObjectOptions.java | 4 ++-- .../java/org/jclouds/s3/options/PutBucketOptions.java | 4 ++-- .../java/org/jclouds/s3/options/PutObjectOptions.java | 4 ++-- .../s3/predicates/validators/BucketNameValidator.java | 2 +- .../java/org/jclouds/s3/xml/CopyObjectHandler.java | 2 +- .../org/jclouds/s3/xml/ListAllMyBucketsHandler.java | 2 +- .../java/org/jclouds/s3/xml/ListBucketHandler.java | 2 +- .../jclouds/s3/xml/ListMultipartUploadsHandler.java | 2 +- .../org/jclouds/s3/xml/LocationConstraintHandler.java | 2 +- .../org/jclouds/s3/xml/PartIdsFromHttpResponse.java | 2 +- .../jclouds/s3/xml/PartIdsFromHttpResponseFull.java | 2 +- .../functions/BucketToContainerListOptions.java | 2 +- .../s3/blobstore/functions/ResourceToBucketList.java | 4 ++-- .../RequestAuthorizeSignatureV4ChunkedUploadTest.java | 2 +- .../s3/filters/RequestAuthorizeSignatureV4Test.java | 2 +- .../binders/BindAttributeNamesToIndexedFormParams.java | 2 +- .../main/java/org/jclouds/sqs/features/MessageApi.java | 2 +- .../java/org/jclouds/sqs/features/PermissionApi.java | 2 +- .../main/java/org/jclouds/sqs/features/QueueApi.java | 2 +- .../sqs/handlers/ParseSQSErrorFromXmlContent.java | 4 ++-- .../org/jclouds/sqs/handlers/SQSErrorRetryHandler.java | 2 +- .../ChangeMessageVisibilityBatchResponseHandler.java | 2 +- .../sqs/xml/DeleteMessageBatchResponseHandler.java | 2 +- .../src/main/java/org/jclouds/sqs/xml/IdHandler.java | 2 +- .../sqs/xml/RegexListQueuesResponseHandler.java | 4 ++-- .../jclouds/sqs/xml/RegexMessageIdAndMD5Handler.java | 2 +- .../java/org/jclouds/sqs/xml/RegexQueueHandler.java | 4 ++-- .../sqs/xml/SendMessageBatchResponseHandler.java | 2 +- .../main/java/org/jclouds/sqs/xml/ValueHandler.java | 2 +- .../sqs/xml/internal/BaseRegexQueueHandler.java | 2 +- .../java/org/jclouds/aws/config/AWSHttpApiModule.java | 2 +- .../jclouds/aws/config/FormSigningHttpApiModule.java | 2 +- .../main/java/org/jclouds/aws/filters/FormSigner.java | 6 +++--- .../java/org/jclouds/aws/filters/FormSignerV4.java | 6 +++--- .../aws/handlers/ParseAWSErrorFromXmlContent.java | 4 ++-- .../src/main/java/org/jclouds/aws/util/AWSUtils.java | 8 ++++---- .../org/jclouds/aws/xml/SessionCredentialsHandler.java | 2 +- apis/sts/src/main/java/org/jclouds/sts/STSApi.java | 2 +- .../org/jclouds/aws/filters/FormSignerV4LiveTest.java | 2 +- .../java/org/jclouds/aws/filters/FormSignerV4Test.java | 2 +- .../test/java/org/jclouds/aws/util/AWSUtilsTest.java | 2 +- .../org/jclouds/blobstore/LocalBlobRequestSigner.java | 4 ++-- .../jclouds/blobstore/TransientStorageStrategy.java | 2 +- .../blobstore/binders/BindBlobToMultipartForm.java | 2 +- .../blobstore/binders/BindMapToHeadersWithPrefix.java | 6 +++--- .../binders/BindUserMetadataToHeadersWithPrefix.java | 4 ++-- .../blobstore/config/BlobStoreObjectModule.java | 4 ++-- .../org/jclouds/blobstore/config/LocalBlobStore.java | 4 ++-- .../jclouds/blobstore/domain/internal/BlobImpl.java | 2 +- .../java/org/jclouds/blobstore/functions/BlobName.java | 2 +- .../blobstore/functions/BlobToHttpGetOptions.java | 2 +- .../functions/HttpGetOptionsListToGetOptions.java | 4 ++-- .../functions/ParseBlobFromHeadersAndHttpContent.java | 2 +- .../ParseSystemAndUserMetadataFromHeaders.java | 6 +++--- .../blobstore/functions/PrefixToResourceMetadata.java | 2 +- ...ResourceMetadataToRelativePathResourceMetadata.java | 2 +- .../org/jclouds/blobstore/internal/BaseBlobStore.java | 2 +- .../blobstore/internal/BlobStoreContextImpl.java | 4 ++-- .../blobstore/internal/RequestSigningUnsupported.java | 2 +- .../strategy/internal/ConcatenateContainerLists.java | 2 +- .../strategy/internal/CountBlobTypeInList.java | 4 ++-- .../strategy/internal/DeleteAllKeysInList.java | 4 ++-- .../blobstore/strategy/internal/FetchBlobMetadata.java | 2 +- .../internal/GetAllBlobsInListAndRetryOnFailure.java | 4 ++-- .../ListContainerAndRecurseThroughFolders.java | 2 +- .../strategy/internal/MarkerFileMkdirStrategy.java | 4 ++-- .../internal/MarkersDeleteDirectoryStrategy.java | 4 ++-- .../strategy/internal/MarkersGetDirectoryStrategy.java | 2 +- .../internal/MultipartUploadSlicingAlgorithm.java | 2 +- .../strategy/internal/PutBlobsStrategyImpl.java | 4 ++-- .../jclouds/blobstore/util/internal/BlobUtilsImpl.java | 6 +++--- .../blobstore/TransientBlobRequestSignerTest.java | 2 +- .../ParseBlobFromHeadersAndHttpContentTest.java | 2 +- .../ParseSystemAndUserMetadataFromHeadersTest.java | 2 +- ...urceMetadataToRelativePathResourceMetadataTest.java | 2 +- .../org/jclouds/googlecloud/config/CurrentProject.java | 2 +- .../config/OpenStackAuthenticationModule.java | 4 ++-- .../main/java/org/jclouds/openstack/domain/Link.java | 2 +- .../jclouds/openstack/filters/AddTimestampQuery.java | 4 ++-- .../jclouds/openstack/filters/AuthenticateRequest.java | 4 ++-- .../URIFromAuthenticationResponseForService.java | 2 +- .../org/jclouds/openstack/handlers/RetryOnRenew.java | 2 +- .../org/jclouds/openstack/internal/Authentication.java | 2 +- .../v1_1/binders/BindCredentialsToJsonPayload.java | 4 ++-- .../v1_1/config/AuthenticationServiceModule.java | 4 ++-- .../v1_1/functions/PublicURLOrInternalIfNull.java | 2 +- .../functions/RegionFirstPartOfDNSNameOrProvider.java | 4 ++-- .../openstack/keystone/v1_1/handlers/RetryOnRenew.java | 2 +- .../RegionIdToURIFromAuthForServiceSupplier.java | 2 +- .../v1_1/suppliers/V1DefaultRegionIdSupplier.java | 2 +- .../java/org/jclouds/openstack/services/Compute.java | 2 +- .../java/org/jclouds/openstack/services/Extension.java | 2 +- .../java/org/jclouds/openstack/services/Image.java | 2 +- .../org/jclouds/openstack/services/ObjectStore.java | 2 +- .../internal/TestOpenStackAuthenticationModule.java | 4 ++-- .../RegionIdToURIFromAuthForServiceSupplierTest.java | 2 +- .../v1_1/suppliers/V1DefaultRegionIdSupplierTest.java | 2 +- .../HardwareBuilderFromResourceAllocations.java | 2 +- .../callables/InitScriptConfigurationForTasks.java | 4 ++-- ...nNodeAsInitScriptUsingSshAndBlockUntilComplete.java | 2 +- .../compute/callables/RunScriptOnNodeUsingSsh.java | 2 +- .../compute/callables/SudoAwareInitManager.java | 2 +- .../compute/config/AdminAccessConfiguration.java | 2 +- .../config/BaseComputeServiceContextModule.java | 4 ++-- .../config/ComputeServiceAdapterContextModule.java | 4 ++-- .../compute/config/ComputeServiceTimeoutsModule.java | 4 ++-- ...rFromPropertiesAndStoreCredentialsOrReturnNull.java | 4 ++-- .../internal/ArbitraryCpuRamTemplateBuilderImpl.java | 6 +++--- .../compute/domain/internal/TemplateBuilderImpl.java | 6 +++--- .../extensions/internal/DelegatingImageExtension.java | 4 ++-- .../CreateSshClientOncePortIsListeningOnNode.java | 4 ++-- ...ultCredentialsFromImageOrOverridingCredentials.java | 2 +- .../compute/functions/InstallKeysAndRunScript.java | 2 +- ...eAndTemplateOptionsToStatementWithoutPublicKey.java | 2 +- .../org/jclouds/compute/functions/PollNodeRunning.java | 4 ++-- .../jclouds/compute/internal/BaseComputeService.java | 8 ++++---- .../compute/internal/ComputeServiceContextImpl.java | 4 ++-- ...edNamesAndAppendUniqueStringToThoseWhichRepeat.java | 4 ++-- .../compute/internal/PersistNodeCredentials.java | 2 +- .../java/org/jclouds/compute/internal/UtilsImpl.java | 2 +- .../compute/predicates/AtomicImageAvailable.java | 4 ++-- .../jclouds/compute/predicates/AtomicNodeRunning.java | 4 ++-- .../compute/predicates/AtomicNodeSuspended.java | 4 ++-- .../compute/predicates/ScriptStatusReturnsZero.java | 2 +- ...shImageAndDoubleCheckOnFailUnlessStatusInvalid.java | 2 +- ...eshNodeAndDoubleCheckOnFailUnlessStatusInvalid.java | 2 +- .../compute/reference/ComputeServiceConstants.java | 4 ++-- ...izeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java | 2 +- .../InitializeRunScriptOnNodeOrPlaceInBadMap.java | 2 +- .../strategy/PrioritizeCredentialsFromTemplate.java | 4 ++-- ...tOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java | 2 +- .../impl/AdaptingComputeServiceStrategies.java | 6 +++--- ...reateNodesWithGroupEncodedIntoNameThenAddToSet.java | 6 +++--- .../strategy/impl/ReturnCredentialsBoundToImage.java | 6 +++--- .../compute/stub/config/StubComputeServiceAdapter.java | 8 ++++---- .../config/StubComputeServiceDependenciesModule.java | 6 +++--- .../stub/extensions/StubSecurityGroupExtension.java | 6 +++--- .../jclouds/compute/suppliers/ImageCacheSupplier.java | 2 +- .../java/org/jclouds/compute/util/ComputeUtils.java | 6 +++--- .../compute/util/ConcurrentOpenSocketFinder.java | 2 +- .../ovf/xml/DeploymentOptionSectionHandler.java | 4 ++-- .../java/org/jclouds/ovf/xml/DiskSectionHandler.java | 4 ++-- .../main/java/org/jclouds/ovf/xml/EnvelopeHandler.java | 4 ++-- .../org/jclouds/ovf/xml/NetworkSectionHandler.java | 4 ++-- .../jclouds/ovf/xml/OperatingSystemSectionHandler.java | 4 ++-- .../org/jclouds/ovf/xml/ProductSectionHandler.java | 4 ++-- .../main/java/org/jclouds/ovf/xml/SectionHandler.java | 2 +- .../jclouds/ovf/xml/VirtualHardwareSectionHandler.java | 4 ++-- .../java/org/jclouds/ovf/xml/VirtualSystemHandler.java | 4 ++-- .../jclouds/ovf/xml/internal/BaseEnvelopeHandler.java | 4 ++-- .../ovf/xml/internal/BaseVirtualSystemHandler.java | 4 ++-- .../jclouds/ssh/internal/RsaSshKeyPairGenerator.java | 2 +- .../compute/domain/TemplateBuilderSpecTest.java | 2 +- .../domain/internal/TemplateBuilderImplTest.java | 2 +- .../internal/BaseImageExtensionLiveTest.java | 2 +- .../internal/BaseSecurityGroupExtensionLiveTest.java | 2 +- core/pom.xml | 4 ++++ core/src/main/java/org/jclouds/annotations/Name.java | 2 +- core/src/main/java/org/jclouds/collect/Memoized.java | 2 +- .../java/org/jclouds/concurrent/FutureIterables.java | 2 +- .../concurrent/config/ExecutorServiceModule.java | 4 ++-- .../config/ScheduledExecutorServiceModule.java | 4 ++-- .../jclouds/config/ValueOfConfigurationKeyOrNull.java | 2 +- core/src/main/java/org/jclouds/date/TimeStamp.java | 2 +- .../date/internal/DateServiceDateCodecFactory.java | 2 +- .../org/jclouds/encryption/internal/JCECrypto.java | 4 ++-- .../java/org/jclouds/events/config/EventBusModule.java | 4 ++-- .../jclouds/events/config/annotations/AsyncBus.java | 2 +- .../events/handlers/DeadEventLoggingHandler.java | 2 +- .../jclouds/fallbacks/HeaderToRetryAfterException.java | 2 +- .../jclouds/fallbacks/MapHttp4xxCodesToExceptions.java | 4 ++-- .../java/org/jclouds/functions/IdentityFunction.java | 2 +- .../main/java/org/jclouds/functions/JoinOnComma.java | 2 +- .../java/org/jclouds/functions/OnlyElementOrNull.java | 2 +- .../main/java/org/jclouds/functions/ToLowerCase.java | 2 +- core/src/main/java/org/jclouds/http/HttpUtils.java | 4 ++-- .../java/org/jclouds/http/annotation/ClientError.java | 2 +- .../java/org/jclouds/http/annotation/Redirection.java | 2 +- .../java/org/jclouds/http/annotation/ServerError.java | 2 +- .../main/java/org/jclouds/http/config/SSLModule.java | 4 ++-- .../org/jclouds/http/filters/BasicAuthentication.java | 4 ++-- .../org/jclouds/http/functions/ParseETagHeader.java | 2 +- .../java/org/jclouds/http/functions/ParseJson.java | 4 ++-- .../org/jclouds/http/functions/ParseXMLWithJAXB.java | 4 ++-- .../http/functions/ReleasePayloadAndReturn.java | 2 +- .../org/jclouds/http/functions/ReturnInputStream.java | 2 +- .../org/jclouds/http/functions/ReturnStringIf2xx.java | 2 +- .../org/jclouds/http/functions/ReturnTrueIf201.java | 2 +- .../org/jclouds/http/functions/ReturnTrueIf2xx.java | 2 +- .../jclouds/http/functions/UnwrapOnlyJsonValue.java | 4 ++-- .../http/functions/UnwrapOnlyJsonValueInSet.java | 4 ++-- .../jclouds/http/functions/config/SaxParserModule.java | 4 ++-- .../http/handlers/BackoffLimitedRetryHandler.java | 4 ++-- .../CloseContentAndSetExceptionErrorHandler.java | 2 +- .../jclouds/http/handlers/DelegatingErrorHandler.java | 2 +- .../jclouds/http/handlers/DelegatingRetryHandler.java | 2 +- .../jclouds/http/handlers/RateLimitRetryHandler.java | 2 +- .../jclouds/http/handlers/RedirectionRetryHandler.java | 4 ++-- .../http/internal/BaseHttpCommandExecutorService.java | 2 +- .../main/java/org/jclouds/http/internal/HttpWire.java | 2 +- .../internal/JavaUrlHttpCommandExecutorService.java | 4 ++-- .../java/org/jclouds/http/internal/SignatureWire.java | 2 +- .../main/java/org/jclouds/internal/ContextImpl.java | 2 +- .../internal/FilterStringsBoundToInjectorByName.java | 8 ++++---- .../org/jclouds/io/internal/BasePayloadSlicer.java | 2 +- .../main/java/org/jclouds/json/config/GsonModule.java | 4 ++-- ...tionConstructorAndReflectiveTypeAdapterFactory.java | 2 +- .../java/org/jclouds/json/internal/GsonWrapper.java | 4 ++-- .../org/jclouds/json/internal/NamingStrategies.java | 2 +- core/src/main/java/org/jclouds/lifecycle/Closer.java | 2 +- .../org/jclouds/lifecycle/config/LifeCycleModule.java | 2 +- core/src/main/java/org/jclouds/location/Iso3166.java | 2 +- core/src/main/java/org/jclouds/location/Provider.java | 2 +- core/src/main/java/org/jclouds/location/Region.java | 2 +- core/src/main/java/org/jclouds/location/Zone.java | 2 +- .../org/jclouds/location/config/LocationModule.java | 4 ++-- .../jclouds/location/functions/RegionToEndpoint.java | 2 +- .../functions/RegionToEndpointOrProviderIfNull.java | 2 +- .../org/jclouds/location/functions/ZoneToEndpoint.java | 2 +- .../location/predicates/LocationPredicates.java | 2 +- .../predicates/fromconfig/AnyOrConfiguredRegionId.java | 4 ++-- .../predicates/fromconfig/AnyOrConfiguredZoneId.java | 4 ++-- .../jclouds/location/suppliers/all/JustProvider.java | 4 ++-- .../location/suppliers/all/RegionToProvider.java | 4 ++-- .../suppliers/all/RegionToProviderOrJustProvider.java | 4 ++-- .../jclouds/location/suppliers/all/ZoneToProvider.java | 4 ++-- .../all/ZoneToRegionToProviderOrJustProvider.java | 4 ++-- .../derived/ZoneIdToURIFromJoinOnRegionIdToURI.java | 2 +- .../derived/ZoneIdsFromRegionIdToZoneIdsValues.java | 2 +- .../LocationIdToIso3166CodesFromConfiguration.java | 4 ++-- ...ionIdToURIFromConfigurationOrDefaultToProvider.java | 2 +- .../fromconfig/ProviderURIFromProviderMetadata.java | 4 ++-- ...ionIdToURIFromConfigurationOrDefaultToProvider.java | 4 ++-- .../fromconfig/RegionIdToZoneIdsFromConfiguration.java | 4 ++-- .../fromconfig/RegionIdsFromConfiguration.java | 4 ++-- .../suppliers/fromconfig/SplitConfigurationKey.java | 2 +- ...oneIdToURIFromConfigurationOrDefaultToProvider.java | 4 ++-- .../suppliers/fromconfig/ZoneIdsFromConfiguration.java | 4 ++-- .../location/suppliers/implicit/FirstNetwork.java | 4 ++-- .../location/suppliers/implicit/FirstRegion.java | 4 ++-- .../jclouds/location/suppliers/implicit/FirstZone.java | 4 ++-- .../implicit/GetRegionIdMatchingProviderURIOrNull.java | 4 ++-- ...ocationOrFirstRegionOptionallyMatchingRegionId.java | 4 ++-- .../suppliers/implicit/OnlyLocationOrFirstZone.java | 4 ++-- .../config/BindLoggersAnnotatedWithResource.java | 4 ++-- .../java/org/jclouds/logging/config/LoggingModule.java | 2 +- .../jclouds/predicates/InetSocketAddressConnect.java | 4 ++-- .../org/jclouds/predicates/SocketOpenUnsupported.java | 2 +- .../predicates/validators/DnsNameValidator.java | 4 ++-- .../BindProviderMetadataContextAndCredentials.java | 2 +- core/src/main/java/org/jclouds/proxy/ProxyForURI.java | 4 ++-- .../org/jclouds/proxy/internal/GuiceProxyConfig.java | 4 ++-- .../java/org/jclouds/rest/InputParamValidator.java | 2 +- .../main/java/org/jclouds/rest/annotations/Api.java | 2 +- .../java/org/jclouds/rest/annotations/ApiVersion.java | 2 +- .../jclouds/rest/annotations/ApiVersionOverride.java | 2 +- .../org/jclouds/rest/annotations/BuildVersion.java | 2 +- .../org/jclouds/rest/annotations/EndpointParam.java | 2 +- .../java/org/jclouds/rest/annotations/OnlyElement.java | 2 +- .../org/jclouds/rest/annotations/SinceApiVersion.java | 2 +- .../org/jclouds/rest/binders/BindAsHostPrefix.java | 2 +- .../jclouds/rest/binders/BindMapToStringPayload.java | 2 +- .../org/jclouds/rest/binders/BindToJsonPayload.java | 2 +- .../rest/binders/BindToJsonPayloadWrappedWith.java | 2 +- .../org/jclouds/rest/binders/BindToStringPayload.java | 2 +- .../org/jclouds/rest/binders/BindToXMLPayload.java | 4 ++-- .../jclouds/rest/config/AnnotatedHttpApiProvider.java | 4 ++-- .../org/jclouds/rest/config/CredentialStoreModule.java | 4 ++-- .../rest/config/ReadAnnotationsAndProperties.java | 6 +++--- ...rsionLexicographicallyAtOrAfterSinceApiVersion.java | 4 ++-- .../java/org/jclouds/rest/internal/ApiContextImpl.java | 2 +- .../rest/internal/DelegatesToInvocationFunction.java | 4 ++-- .../org/jclouds/rest/internal/InvokeHttpMethod.java | 2 +- .../jclouds/rest/internal/RestAnnotationProcessor.java | 2 +- .../jclouds/rest/internal/TransformerForRequest.java | 2 +- .../main/java/org/jclouds/rest/internal/UtilsImpl.java | 2 +- .../jclouds/rest/suppliers/URIFromStringSupplier.java | 2 +- .../src/main/java/org/jclouds/util/InetAddresses2.java | 2 +- .../main/java/org/jclouds/xml/internal/JAXBParser.java | 4 ++-- .../java/org/jclouds/http/IntegrationTestClient.java | 2 +- .../internal/BaseHttpCommandExecutorServiceTest.java | 4 ++-- .../TrackingJavaUrlHttpCommandExecutorService.java | 6 +++--- .../FilterStringsBoundToInjectorByNameTest.java | 2 +- .../src/test/java/org/jclouds/json/BaseParserTest.java | 2 +- ...ConstructorAndReflectiveTypeAdapterFactoryTest.java | 6 +++--- .../jclouds/json/internal/NamingStrategiesTest.java | 4 ++-- .../config/BindLoggersAnnotatedWithResourceTest.java | 4 ++-- .../BindProviderMetadataContextAndCredentialsTest.java | 6 +++--- .../ProvidesAnnotationExpectTest.java | 2 +- .../rest/config/ReadAnnotationsAndPropertiesTest.java | 2 +- .../jclouds/rest/internal/BaseRestApiExpectTest.java | 6 +++--- .../org/jclouds/rest/internal/BaseRestApiTest.java | 4 ++-- .../jclouds/rest/internal/InvokeHttpMethodTest.java | 2 +- .../rest/internal/RestAnnotationProcessorTest.java | 6 +++--- .../apachehc/ApacheHCHttpCommandExecutorService.java | 4 ++-- .../java/org/jclouds/http/apachehc/ApacheHCUtils.java | 2 +- .../ApacheHCHttpCommandExecutorServiceModule.java | 4 ++-- .../encryption/bouncycastle/BouncyCastleCrypto.java | 2 +- .../java/org/jclouds/date/joda/JodaDateService.java | 2 +- .../main/java/org/jclouds/ssh/jsch/JschSshClient.java | 2 +- .../jclouds/ssh/jsch/config/JschSshClientModule.java | 2 +- .../java/org/jclouds/netty/io/NettyPayloadSlicer.java | 2 +- .../http/okhttp/OkHttpCommandExecutorService.java | 2 +- .../config/OkHttpCommandExecutorServiceModule.java | 2 +- .../java/org/jclouds/sshj/SSHClientConnection.java | 2 +- .../src/main/java/org/jclouds/sshj/SshjSshClient.java | 2 +- .../org/jclouds/sshj/config/SshjSshClientModule.java | 2 +- .../loadbalancer/internal/BaseLoadBalancerService.java | 4 ++-- .../internal/LoadBalancerServiceContextImpl.java | 4 ++-- project/pom.xml | 8 +++++++- .../binders/BindLaunchSpecificationToFormParams.java | 2 +- .../BindSpotInstanceRequestIdsToIndexedFormParams.java | 2 +- .../aws/ec2/binders/BindVpcIdsToIndexedFormParams.java | 2 +- .../jclouds/aws/ec2/compute/AWSEC2ComputeService.java | 8 ++++---- .../aws/ec2/compute/AWSEC2TemplateBuilderImpl.java | 6 +++--- .../config/AWSEC2ComputeServiceContextModule.java | 2 +- .../config/AWSEC2ComputeServiceDependenciesModule.java | 4 ++-- .../jclouds/aws/ec2/compute/config/ClusterCompute.java | 2 +- .../org/jclouds/aws/ec2/compute/config/ImageQuery.java | 2 +- .../extensions/AWSEC2SecurityGroupExtension.java | 4 ++-- .../functions/AWSEC2SecurityGroupToSecurityGroup.java | 2 +- .../functions/AWSRunningInstanceToNodeMetadata.java | 4 ++-- .../functions/PresentSpotRequestsAndInstances.java | 2 +- .../internal/AWSEC2ComputeServiceContextImpl.java | 4 ++-- .../loaders/AWSEC2CreateSecurityGroupIfNeeded.java | 6 +++--- .../strategy/AWSEC2CreateNodesInGroupThenAddToSet.java | 6 +++--- .../compute/strategy/AWSEC2DestroyNodeStrategy.java | 6 +++--- .../strategy/AWSEC2GetNodeMetadataStrategy.java | 4 ++-- .../ec2/compute/strategy/AWSEC2ListNodesStrategy.java | 4 ++-- .../ec2/compute/strategy/AWSEC2ReviseParsedImage.java | 4 ++-- ...ntAndSecurityGroupsAsNeededAndReturnRunOptions.java | 8 ++++---- .../ec2/compute/suppliers/AWSEC2HardwareSupplier.java | 4 ++-- .../aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java | 4 ++-- .../aws/ec2/compute/suppliers/CallForImages.java | 4 ++-- .../jclouds/aws/ec2/config/AWSEC2HttpApiModule.java | 2 +- .../java/org/jclouds/aws/ec2/features/AWSAMIApi.java | 2 +- .../org/jclouds/aws/ec2/features/AWSInstanceApi.java | 2 +- .../org/jclouds/aws/ec2/features/AWSKeyPairApi.java | 2 +- .../jclouds/aws/ec2/features/AWSSecurityGroupApi.java | 2 +- .../org/jclouds/aws/ec2/features/AWSSubnetApi.java | 2 +- .../jclouds/aws/ec2/features/InternetGatewayApi.java | 2 +- .../org/jclouds/aws/ec2/features/MonitoringApi.java | 2 +- .../jclouds/aws/ec2/features/PlacementGroupApi.java | 2 +- .../org/jclouds/aws/ec2/features/RouteTableApi.java | 2 +- .../org/jclouds/aws/ec2/features/SpotInstanceApi.java | 2 +- .../main/java/org/jclouds/aws/ec2/features/VPCApi.java | 2 +- .../ec2/functions/CreatePlacementGroupIfNeeded.java | 6 +++--- .../ec2/functions/ImportOrReturnExistingKeypair.java | 6 +++--- .../aws/ec2/predicates/PlacementGroupAvailable.java | 2 +- .../aws/ec2/predicates/PlacementGroupDeleted.java | 2 +- .../aws/ec2/predicates/SpotInstanceRequestActive.java | 2 +- .../ec2/xml/AWSDescribeInstancesResponseHandler.java | 2 +- .../AWSEC2DescribeSecurityGroupsResponseHandler.java | 2 +- .../aws/ec2/xml/AWSRunInstancesResponseHandler.java | 2 +- .../aws/ec2/xml/CreateRouteTableResponseHandler.java | 2 +- .../xml/DescribePlacementGroupsResponseHandler.java | 2 +- ...scribeReservedInstancesOfferingResponseHandler.java | 2 +- .../ec2/xml/DescribeRouteTablesResponseHandler.java | 2 +- .../xml/DescribeSpotPriceHistoryResponseHandler.java | 2 +- .../jclouds/aws/ec2/xml/InternetGatewayHandler.java | 2 +- .../aws/ec2/xml/LaunchSpecificationHandler.java | 2 +- .../org/jclouds/aws/ec2/xml/PlacementGroupHandler.java | 2 +- .../aws/ec2/xml/ReservedInstancesOfferingHandler.java | 2 +- .../org/jclouds/aws/ec2/xml/RouteTableHandler.java | 2 +- .../main/java/org/jclouds/aws/ec2/xml/SpotHandler.java | 2 +- .../org/jclouds/aws/ec2/xml/SpotInstanceHandler.java | 2 +- .../org/jclouds/aws/ec2/xml/SpotInstancesHandler.java | 2 +- .../main/java/org/jclouds/aws/ec2/xml/VPCHandler.java | 2 +- ...dSecurityGroupsAsNeededAndReturnRunOptionsTest.java | 4 ++-- .../jclouds/aws/ec2/features/BaseAWSEC2ApiTest.java | 2 +- .../org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java | 4 ++-- .../blobstore/internal/AWSS3BlobStoreContextImpl.java | 4 ++-- .../org/jclouds/aws/s3/config/AWSS3HttpApiModule.java | 2 +- .../aws/s3/filters/AWSRequestAuthorizeSignature.java | 8 ++++---- .../aws/s3/filters/AWSRequestAuthorizeSignatureV4.java | 4 ++-- .../validators/AWSS3BucketNameValidator.java | 2 +- .../aws/s3/blobstore/AWSS3BlobSignerExpectTest.java | 2 +- .../aws/s3/blobstore/AWSS3BlobSignerV4ExpectTest.java | 2 +- .../storage/filters/SharedKeyLiteAuthentication.java | 8 ++++---- .../handlers/AzureStorageClientErrorRetryHandler.java | 2 +- .../handlers/ParseAzureStorageErrorFromXmlContent.java | 2 +- .../jclouds/azure/storage/util/AzureStorageUtils.java | 4 ++-- .../util/storageurl/AppendAccountToEndpoint.java | 4 ++-- .../storage/util/storageurl/StorageAccountInVhost.java | 6 +++--- .../java/org/jclouds/azureblob/AzureBlobClient.java | 2 +- .../BindAzureBlobMetadataToMultipartRequest.java | 2 +- .../binders/BindAzureBlobMetadataToRequest.java | 4 ++-- .../binders/BindAzureContentMetadataToRequest.java | 2 +- .../azureblob/binders/BindPublicAccessToRequest.java | 4 ++-- .../azureblob/blobstore/AzureBlobRequestSigner.java | 6 +++--- .../jclouds/azureblob/blobstore/AzureBlobStore.java | 4 ++-- .../blobstore/config/AzureBlobStoreContextModule.java | 4 ++-- .../azureblob/blobstore/functions/AzureBlobToBlob.java | 4 ++-- .../functions/BlobMetadataToBlobProperties.java | 2 +- .../functions/BlobPropertiesToBlobMetadata.java | 4 ++-- .../azureblob/blobstore/functions/BlobToAzureBlob.java | 4 ++-- .../functions/ContainerToResourceMetadata.java | 4 ++-- .../functions/ListBlobsResponseToResourceList.java | 4 ++-- .../functions/ListOptionsToListBlobsOptions.java | 2 +- .../azureblob/config/AzureBlobHttpApiModule.java | 2 +- .../org/jclouds/azureblob/config/AzureBlobModule.java | 6 +++--- .../azureblob/domain/internal/AzureBlobImpl.java | 2 +- .../functions/ParseBlobFromHeadersAndHttpContent.java | 4 ++-- .../functions/ParseBlobPropertiesFromHeaders.java | 2 +- .../functions/ParseContainerPropertiesFromHeaders.java | 4 ++-- .../azureblob/functions/ParsePublicAccessHeader.java | 2 +- .../handlers/ParseAzureBlobErrorFromXmlContent.java | 4 ++-- .../predicates/validators/ContainerNameValidator.java | 2 +- .../xml/AccountNameEnumerationResultsHandler.java | 2 +- .../xml/ContainerNameEnumerationResultsHandler.java | 2 +- .../functions/ListBlobsOptionsToListOptions.java | 2 +- .../functions/ResourceToListBlobsResponse.java | 4 ++-- .../azurecompute/arm/compute/AzureComputeService.java | 8 ++++---- .../arm/compute/AzureComputeServiceAdapter.java | 6 +++--- .../config/AzureComputeServiceContextModule.java | 2 +- .../extensions/AzureComputeSecurityGroupExtension.java | 4 ++-- .../arm/compute/functions/LocationToLocation.java | 4 ++-- .../compute/functions/LocationToResourceGroupName.java | 4 ++-- .../functions/NetworkSecurityGroupToSecurityGroup.java | 2 +- .../functions/NetworkSecurityRuleToIpPermission.java | 4 ++-- .../compute/functions/TemplateToAvailabilitySet.java | 6 +++--- .../functions/VirtualMachineToNodeMetadata.java | 4 ++-- .../arm/compute/functions/VirtualMachineToStatus.java | 4 ++-- .../compute/loaders/CreateSecurityGroupIfNeeded.java | 6 +++--- .../arm/compute/loaders/DefaultResourceGroup.java | 6 +++--- .../arm/compute/strategy/CleanupResources.java | 6 +++--- .../strategy/CreateResourcesThenCreateNodes.java | 6 +++--- .../arm/config/AzureComputeHttpApiModule.java | 2 +- .../org/jclouds/azurecompute/arm/config/GraphRBAC.java | 6 +++--- .../jclouds/azurecompute/arm/config/OAuthResource.java | 2 +- .../org/jclouds/azurecompute/arm/config/Tenant.java | 2 +- .../azurecompute/arm/features/ActivityLogAlertApi.java | 2 +- .../jclouds/azurecompute/arm/features/AlertApi.java | 2 +- .../azurecompute/arm/features/AvailabilitySetApi.java | 2 +- .../azurecompute/arm/features/DeploymentApi.java | 2 +- .../org/jclouds/azurecompute/arm/features/DiskApi.java | 2 +- .../jclouds/azurecompute/arm/features/ImageApi.java | 2 +- .../azurecompute/arm/features/LoadBalancerApi.java | 2 +- .../arm/features/LocalNetworkGatewayApi.java | 2 +- .../jclouds/azurecompute/arm/features/LocationApi.java | 2 +- .../azurecompute/arm/features/MetricAlertApi.java | 2 +- .../arm/features/MetricDefinitionsApi.java | 2 +- .../jclouds/azurecompute/arm/features/MetricsApi.java | 2 +- .../arm/features/NetworkInterfaceCardApi.java | 2 +- .../arm/features/NetworkSecurityGroupApi.java | 2 +- .../arm/features/NetworkSecurityRuleApi.java | 2 +- .../jclouds/azurecompute/arm/features/OSImageApi.java | 2 +- .../azurecompute/arm/features/PublicIPAddressApi.java | 2 +- .../azurecompute/arm/features/ResourceGroupApi.java | 2 +- .../azurecompute/arm/features/ResourceProviderApi.java | 2 +- .../azurecompute/arm/features/StorageAccountApi.java | 2 +- .../jclouds/azurecompute/arm/features/SubnetApi.java | 2 +- .../jclouds/azurecompute/arm/features/VMSizeApi.java | 2 +- .../jclouds/azurecompute/arm/features/VaultApi.java | 2 +- .../azurecompute/arm/features/VirtualMachineApi.java | 2 +- .../arm/features/VirtualMachineScaleSetApi.java | 2 +- .../azurecompute/arm/features/VirtualNetworkApi.java | 2 +- .../arm/features/VirtualNetworkGatewayApi.java | 2 +- .../features/VirtualNetworkGatewayConnectionApi.java | 2 +- .../azurecompute/arm/filters/ApiVersionFilter.java | 2 +- .../jclouds/azurecompute/arm/functions/FalseOn204.java | 2 +- .../azurecompute/arm/functions/ParseJobStatus.java | 2 +- .../azurecompute/arm/functions/StatusCodeParser.java | 2 +- .../jclouds/azurecompute/arm/functions/URIParser.java | 2 +- .../arm/handlers/AzureComputeErrorHandler.java | 2 +- .../arm/handlers/AzureRateLimitRetryHandler.java | 4 ++-- .../arm/handlers/AzureRetryableErrorHandler.java | 4 ++-- .../azurecompute/arm/filters/ApiVersionFilterTest.java | 2 +- .../java/org/jclouds/b2/blobstore/B2BlobStore.java | 2 +- .../java/org/jclouds/b2/config/B2HttpApiModule.java | 4 ++-- .../java/org/jclouds/b2/features/AuthorizationApi.java | 2 +- .../main/java/org/jclouds/b2/features/BucketApi.java | 2 +- .../java/org/jclouds/b2/features/MultipartApi.java | 2 +- .../main/java/org/jclouds/b2/features/ObjectApi.java | 2 +- .../java/org/jclouds/b2/filters/B2RetryHandler.java | 2 +- .../org/jclouds/b2/filters/RequestAuthorization.java | 4 ++-- .../b2/filters/RequestAuthorizationDownload.java | 4 ++-- .../compute/DigitalOcean2ComputeServiceAdapter.java | 4 ++-- .../DigitalOcean2ComputeServiceContextModule.java | 2 +- .../extensions/DigitalOcean2ImageExtension.java | 6 +++--- .../compute/functions/DropletStatusToStatus.java | 2 +- .../compute/functions/DropletToNodeMetadata.java | 6 +++--- .../compute/functions/ImageInRegionToImage.java | 4 ++-- .../compute/functions/RegionToLocation.java | 4 ++-- .../compute/functions/SizeToHardware.java | 2 +- .../strategy/CreateKeyPairsThenCreateNodes.java | 6 +++--- .../digitalocean2/config/DigitalOceanParserModule.java | 4 ++-- .../domain/options/CreateDropletOptions.java | 2 +- .../org/jclouds/digitalocean2/features/ActionApi.java | 4 ++-- .../org/jclouds/digitalocean2/features/DropletApi.java | 4 ++-- .../org/jclouds/digitalocean2/features/ImageApi.java | 4 ++-- .../org/jclouds/digitalocean2/features/KeyApi.java | 4 ++-- .../org/jclouds/digitalocean2/features/RegionApi.java | 4 ++-- .../org/jclouds/digitalocean2/features/SizeApi.java | 4 ++-- .../handlers/DigitalOcean2ErrorHandler.java | 2 +- .../handlers/DigitalOcean2RateLimitRetryHandler.java | 2 +- .../src/main/java/org/jclouds/dynect/v3/DynECTApi.java | 2 +- .../jclouds/dynect/v3/binders/CreateRecordBinder.java | 2 +- .../jclouds/dynect/v3/config/DynECTHttpApiModule.java | 6 +++--- .../jclouds/dynect/v3/config/DynECTParserModule.java | 2 +- .../jclouds/dynect/v3/domain/CreatePrimaryZone.java | 2 +- .../main/java/org/jclouds/dynect/v3/domain/Job.java | 2 +- .../main/java/org/jclouds/dynect/v3/domain/Record.java | 2 +- .../java/org/jclouds/dynect/v3/domain/SOARecord.java | 2 +- .../jclouds/dynect/v3/domain/SessionCredentials.java | 2 +- .../main/java/org/jclouds/dynect/v3/domain/Zone.java | 2 +- .../jclouds/dynect/v3/features/GeoRegionGroupApi.java | 2 +- .../org/jclouds/dynect/v3/features/GeoServiceApi.java | 2 +- .../java/org/jclouds/dynect/v3/features/RecordApi.java | 2 +- .../org/jclouds/dynect/v3/features/SessionApi.java | 2 +- .../java/org/jclouds/dynect/v3/features/ZoneApi.java | 2 +- .../v3/handlers/GetJobRedirectionRetryHandler.java | 4 ++-- .../dynect/v3/loaders/LoginUserInOrgWithPassword.java | 4 ++-- .../glesys/compute/GleSYSComputeServiceAdapter.java | 6 +++--- .../glesys/compute/functions/DatacenterToLocation.java | 2 +- .../glesys/compute/functions/OSTemplateToImage.java | 4 ++-- .../ParseOsFamilyVersion64BitFromImageName.java | 4 ++-- .../compute/functions/ServerDetailsToNodeMetadata.java | 6 +++--- .../glesys/compute/functions/ServerSpecToHardware.java | 4 ++-- .../org/jclouds/glesys/config/GleSYSParserModule.java | 2 +- .../java/org/jclouds/glesys/features/ArchiveApi.java | 2 +- .../java/org/jclouds/glesys/features/DomainApi.java | 2 +- .../org/jclouds/glesys/features/EmailAccountApi.java | 2 +- .../main/java/org/jclouds/glesys/features/IpApi.java | 2 +- .../java/org/jclouds/glesys/features/ServerApi.java | 2 +- .../functions/ParseTemplatesFromHttpResponse.java | 2 +- .../jclouds/glesys/handlers/GleSYSErrorHandler.java | 2 +- .../jclouds/gogrid/binders/BindIdsToQueryParams.java | 2 +- .../jclouds/gogrid/compute/GoGridComputeService.java | 8 ++++---- .../config/GoGridComputeServiceContextModule.java | 2 +- .../gogrid/compute/functions/OptionToLocation.java | 4 ++-- .../gogrid/compute/functions/ServerImageToImage.java | 6 +++--- .../gogrid/compute/functions/ServerToNodeMetadata.java | 4 ++-- .../compute/strategy/GoGridComputeServiceAdapter.java | 4 ++-- .../compute/suppliers/GoGridHardwareSupplier.java | 2 +- .../org/jclouds/gogrid/config/GoGridHttpApiModule.java | 2 +- .../org/jclouds/gogrid/config/GoGridParserModule.java | 2 +- .../gogrid/filters/SharedKeyLiteAuthentication.java | 4 ++-- .../functions/ParseCredentialsFromJsonResponse.java | 4 ++-- .../gogrid/functions/ParseImageFromJsonResponse.java | 2 +- .../functions/ParseImageListFromJsonResponse.java | 2 +- .../gogrid/functions/ParseIpListFromJsonResponse.java | 2 +- .../gogrid/functions/ParseJobListFromJsonResponse.java | 2 +- .../functions/ParseLoadBalancerFromJsonResponse.java | 2 +- .../ParseLoadBalancerListFromJsonResponse.java | 2 +- .../gogrid/functions/ParseOptionsFromJsonResponse.java | 2 +- ...arseServerNameToCredentialsMapFromJsonResponse.java | 6 +++--- .../gogrid/location/GoGridDefaultLocationSupplier.java | 6 +++--- .../predicates/LoadBalancerLatestJobCompleted.java | 2 +- .../gogrid/predicates/ServerLatestJobCompleted.java | 2 +- .../ParseCredentialsFromJsonResponseTest.java | 2 +- .../functions/ParseJobsFromJsonResponseTest.java | 2 +- .../ParseLoadBalancersFromJsonResponseTest.java | 2 +- ...ServerNameToCredentialsMapFromJsonResponseTest.java | 2 +- .../blobstore/GoogleCloudStorageBlobRequestSigner.java | 2 +- .../blobstore/GoogleCloudStorageBlobStore.java | 2 +- .../blobstore/functions/BucketToStorageMetadata.java | 2 +- .../functions/ObjectListToStorageMetadata.java | 2 +- .../config/GoogleCloudStorageHttpApiModule.java | 2 +- .../config/GoogleCloudStorageParserModule.java | 2 +- .../features/BucketAccessControlsApi.java | 2 +- .../jclouds/googlecloudstorage/features/BucketApi.java | 2 +- .../features/DefaultObjectAccessControlsApi.java | 2 +- .../features/ObjectAccessControlsApi.java | 2 +- .../jclouds/googlecloudstorage/features/ObjectApi.java | 2 +- .../features/ResumableUploadApi.java | 2 +- .../GoogleCloudStorageClientErrorRetryHandler.java | 2 +- .../handlers/GoogleCloudStorageErrorHandler.java | 2 +- .../GoogleCloudStorageRedirectRetryHandler.java | 2 +- .../googlecomputeengine/binders/FirewallBinder.java | 2 +- .../binders/ForwardingRuleCreationBinder.java | 2 +- .../binders/HttpHealthCheckCreationBinder.java | 2 +- .../googlecomputeengine/binders/RouteBinder.java | 2 +- .../binders/TargetPoolChangeHealthChecksBinder.java | 2 +- .../binders/TargetPoolChangeInstancesBinder.java | 2 +- .../compute/GoogleComputeEngineService.java | 6 +++--- .../compute/GoogleComputeEngineServiceAdapter.java | 4 ++-- .../GoogleComputeEngineServiceContextModule.java | 4 ++-- ...omputeEngineArbitraryCpuRamTemplateBuilderImpl.java | 6 +++--- .../compute/functions/FirewallTagNamingConvention.java | 2 +- .../functions/GoogleComputeEngineImageToImage.java | 2 +- .../compute/functions/InstanceToNodeMetadata.java | 2 +- .../compute/functions/MachineTypeToHardware.java | 2 +- .../compute/functions/OrphanedGroupsFromDeadNodes.java | 2 +- .../compute/functions/ResetWindowsPassword.java | 4 ++-- .../compute/functions/Resources.java | 2 +- .../compute/loaders/DiskURIToImage.java | 4 ++-- .../compute/loaders/SubnetworkLoader.java | 4 ++-- .../compute/predicates/AtomicInstanceVisible.java | 2 +- .../compute/predicates/AtomicOperationDone.java | 2 +- .../compute/predicates/GroupIsEmpty.java | 2 +- ...reateNodesWithGroupEncodedIntoNameThenAddToSet.java | 4 ++-- .../config/GoogleComputeEngineHttpApiModule.java | 6 +++--- .../config/GoogleComputeEngineParserModule.java | 2 +- .../googlecomputeengine/features/AddressApi.java | 4 ++-- .../features/AggregatedListApi.java | 4 ++-- .../features/BackendServiceApi.java | 4 ++-- .../jclouds/googlecomputeengine/features/DiskApi.java | 4 ++-- .../googlecomputeengine/features/DiskTypeApi.java | 4 ++-- .../googlecomputeengine/features/FirewallApi.java | 4 ++-- .../features/ForwardingRuleApi.java | 4 ++-- .../features/HttpHealthCheckApi.java | 4 ++-- .../jclouds/googlecomputeengine/features/ImageApi.java | 4 ++-- .../googlecomputeengine/features/InstanceApi.java | 4 ++-- .../googlecomputeengine/features/LicenseApi.java | 2 +- .../googlecomputeengine/features/MachineTypeApi.java | 4 ++-- .../googlecomputeengine/features/NetworkApi.java | 4 ++-- .../googlecomputeengine/features/OperationApi.java | 4 ++-- .../googlecomputeengine/features/ProjectApi.java | 2 +- .../googlecomputeengine/features/RegionApi.java | 4 ++-- .../jclouds/googlecomputeengine/features/RouteApi.java | 4 ++-- .../googlecomputeengine/features/SnapshotApi.java | 4 ++-- .../googlecomputeengine/features/SubnetworkApi.java | 4 ++-- .../features/TargetHttpProxyApi.java | 4 ++-- .../features/TargetInstanceApi.java | 4 ++-- .../googlecomputeengine/features/TargetPoolApi.java | 4 ++-- .../googlecomputeengine/features/UrlMapApi.java | 4 ++-- .../jclouds/googlecomputeengine/features/ZoneApi.java | 4 ++-- .../packet/compute/PacketComputeServiceAdapter.java | 6 +++--- .../packet/compute/functions/DeviceStateToStatus.java | 2 +- .../packet/compute/functions/DeviceToNodeMetadata.java | 6 +++--- .../packet/compute/functions/FacilityToLocation.java | 4 ++-- .../compute/functions/OperatingSystemToImage.java | 2 +- .../packet/compute/functions/PlanToHardware.java | 2 +- .../compute/strategy/CreateSshKeysThenCreateNodes.java | 6 +++--- .../java/org/jclouds/packet/features/DeviceApi.java | 4 ++-- .../java/org/jclouds/packet/features/FacilityApi.java | 4 ++-- .../jclouds/packet/features/OperatingSystemApi.java | 4 ++-- .../main/java/org/jclouds/packet/features/PlanApi.java | 4 ++-- .../java/org/jclouds/packet/features/ProjectApi.java | 4 ++-- .../java/org/jclouds/packet/features/SshKeyApi.java | 4 ++-- .../jclouds/packet/filters/AddApiVersionToRequest.java | 4 ++-- .../jclouds/packet/filters/AddXAuthTokenToRequest.java | 4 ++-- .../jclouds/packet/handlers/PacketErrorHandler.java | 2 +- .../compute/ProfitBricksComputeServiceAdapter.java | 4 ++-- .../compute/concurrent/ProvisioningJob.java | 2 +- .../ProfitBricksComputeServiceContextModule.java | 4 ++-- .../compute/strategy/AssignDataCenterToTemplate.java | 6 +++--- .../jclouds/profitbricks/features/DataCenterApi.java | 2 +- .../org/jclouds/profitbricks/features/DrivesApi.java | 2 +- .../org/jclouds/profitbricks/features/FirewallApi.java | 2 +- .../org/jclouds/profitbricks/features/ImageApi.java | 2 +- .../org/jclouds/profitbricks/features/IpBlockApi.java | 2 +- .../jclouds/profitbricks/features/LoadBalancerApi.java | 2 +- .../java/org/jclouds/profitbricks/features/NicApi.java | 2 +- .../org/jclouds/profitbricks/features/ServerApi.java | 2 +- .../org/jclouds/profitbricks/features/SnapshotApi.java | 2 +- .../org/jclouds/profitbricks/features/StorageApi.java | 2 +- .../handlers/ProfitBricksHttpErrorHandler.java | 2 +- ...nseStatusFromPayloadHttpCommandExecutorService.java | 4 ++-- .../suppliers/FixedWellKnownImageSupplier.java | 4 ++-- .../java/org/jclouds/softlayer/binders/TagToJson.java | 4 ++-- .../jclouds/softlayer/binders/VirtualGuestToJson.java | 2 +- .../config/SoftLayerComputeServiceContextModule.java | 4 ++-- .../compute/functions/DatacenterToLocation.java | 4 ++-- .../compute/functions/OperatingSystemToImage.java | 4 ++-- .../compute/functions/VirtualGuestToHardware.java | 2 +- .../compute/functions/VirtualGuestToImage.java | 4 ++-- .../compute/functions/VirtualGuestToNodeMetadata.java | 4 ++-- .../strategy/SoftLayerComputeServiceAdapter.java | 6 +++--- .../org/jclouds/softlayer/features/AccountApi.java | 2 +- .../org/jclouds/softlayer/features/NetworkApi.java | 2 +- .../jclouds/softlayer/features/VirtualGuestApi.java | 2 +- .../VirtualGuestBlockDeviceTemplateGroupApi.java | 2 +- .../softlayer/handlers/SoftLayerErrorHandler.java | 2 +- .../SoftLayerComputeServiceContextLiveTest.java | 2 +- .../java/org/jclouds/ultradns/ws/UltraDNSWSApi.java | 2 +- .../ultradns/ws/features/DirectionalGroupApi.java | 2 +- .../ultradns/ws/features/DirectionalPoolApi.java | 2 +- .../ultradns/ws/features/ResourceRecordApi.java | 2 +- .../ultradns/ws/features/RoundRobinPoolApi.java | 2 +- .../java/org/jclouds/ultradns/ws/features/TaskApi.java | 2 +- .../ultradns/ws/features/TrafficControllerPoolApi.java | 2 +- .../java/org/jclouds/ultradns/ws/features/ZoneApi.java | 2 +- .../ultradns/ws/filters/SOAPWrapWithPasswordAuth.java | 2 +- .../ultradns/ws/handlers/UltraDNSWSErrorHandler.java | 6 +++--- .../ws/internal/DirectionalPoolRecordTypeToString.java | 2 +- .../ws/internal/RoundRobinPoolRecordTypeToString.java | 2 +- .../TrafficControllerPoolRecordTypeToString.java | 2 +- .../jclouds/ultradns/ws/xml/ZonePropertiesHandler.java | 2 +- .../scriptbuilder/functions/InitAdminAccess.java | 2 +- .../statements/login/AdminAccessBuilderSpecTest.java | 2 +- .../java/org/jclouds/servermanager/ServerManager.java | 2 +- .../compute/functions/DatacenterToLocation.java | 6 +++--- .../functions/ServerManagerHardwareToHardware.java | 2 +- .../compute/functions/ServerManagerImageToImage.java | 4 ++-- .../compute/functions/ServerToNodeMetadata.java | 4 ++-- .../strategy/ServerManagerComputeServiceAdapter.java | 4 ++-- 1429 files changed, 2124 insertions(+), 2114 deletions(-) diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java index 84a783801d..4e1ac74dad 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindMetadataToHeaders.java b/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindMetadataToHeaders.java index 63f68de8fb..0e73535584 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindMetadataToHeaders.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import com.google.common.io.BaseEncoding; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindUserMetadataToHeaders.java b/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindUserMetadataToHeaders.java index 8ccf2c31fd..6ce2a04cfb 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindUserMetadataToHeaders.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java index 0c58d4c995..85ab7ab279 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.atmos.AtmosClient; import org.jclouds.atmos.blobstore.functions.BlobToObject; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java index 83079b3fee..b3a55444c4 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java +++ b/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 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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/config/AtmosBlobStoreContextModule.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/config/AtmosBlobStoreContextModule.java index a68f26afd7..169f37fa8d 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/config/AtmosBlobStoreContextModule.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobMetadataToObject.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobMetadataToObject.java index 6d3c2b86a8..14a7dfef9b 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobMetadataToObject.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.atmos.domain.AtmosObject; import org.jclouds.atmos.domain.UserMetadata; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobStoreListOptionsToListOptions.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobStoreListOptionsToListOptions.java index 13882f998d..f241044e2d 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobStoreListOptionsToListOptions.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToContentMetadata.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToContentMetadata.java index e6a79affff..80cd69e79a 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToContentMetadata.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToObject.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToObject.java index 6284530e87..31e50239ef 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToObject.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.atmos.domain.AtmosObject; import org.jclouds.blobstore.domain.Blob; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToSystemMetadata.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToSystemMetadata.java index f5284eba43..c474873c3d 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobToSystemMetadata.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/DirectoryEntryListToResourceMetadataList.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/DirectoryEntryListToResourceMetadataList.java index e7fe4edca1..a748d70e68 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/DirectoryEntryListToResourceMetadataList.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlob.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlob.java index 1ad2cd5a59..afb7aa907c 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlob.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.atmos.domain.AtmosObject; import org.jclouds.blobstore.domain.Blob; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java index 1fac649187..5c22727224 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.atmos.domain.AtmosObject; import org.jclouds.atmos.domain.FileType; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/config/AtmosHttpApiModule.java b/apis/atmos/src/main/java/org/jclouds/atmos/config/AtmosHttpApiModule.java index 2d00acdb1a..8e2f386802 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/config/AtmosHttpApiModule.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/AtmosObjectImpl.java b/apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/AtmosObjectImpl.java index a9641b68ce..0386ffd546 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/AtmosObjectImpl.java +++ b/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 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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/filters/ShareUrl.java b/apis/atmos/src/main/java/org/jclouds/atmos/filters/ShareUrl.java index 3f4909b522..8a23a1d0f9 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/filters/ShareUrl.java +++ b/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 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 { private final Supplier creds; private final Supplier provider; - private final javax.inject.Provider timeStampProvider; + private final jakarta.inject.Provider timeStampProvider; private final Crypto crypto; @Resource @@ -67,7 +67,7 @@ public class ShareUrl implements Function { @Inject public ShareUrl(@Provider Supplier creds, @Provider Supplier provider, - @TimeStamp javax.inject.Provider timeStampProvider, Crypto crypto) { + @TimeStamp jakarta.inject.Provider timeStampProvider, Crypto crypto) { this.creds = creds; this.provider = provider; this.timeStampProvider = timeStampProvider; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java b/apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java index 28d8f62009..d724c65a69 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java +++ b/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 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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/functions/AtmosObjectName.java b/apis/atmos/src/main/java/org/jclouds/atmos/functions/AtmosObjectName.java index f3699f6191..7ec2d5a5df 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/functions/AtmosObjectName.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseDirectoryListFromContentAndHeaders.java b/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseDirectoryListFromContentAndHeaders.java index a0559fdbaa..7b09677975 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseDirectoryListFromContentAndHeaders.java +++ b/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 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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseObjectFromHeadersAndHttpContent.java b/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseObjectFromHeadersAndHttpContent.java index c96ee8ac4c..c61420f38e 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseObjectFromHeadersAndHttpContent.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseSystemMetadataFromHeaders.java b/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseSystemMetadataFromHeaders.java index 6fb809d222..a266703281 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseSystemMetadataFromHeaders.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.atmos.domain.FileType; import org.jclouds.atmos.domain.SystemMetadata; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseUserMetadataFromHeaders.java b/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseUserMetadataFromHeaders.java index 3615e56da7..ad33c5f094 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseUserMetadataFromHeaders.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ReturnTrueIfGroupACLIsOtherRead.java b/apis/atmos/src/main/java/org/jclouds/atmos/functions/ReturnTrueIfGroupACLIsOtherRead.java index 0b01082f40..d849477510 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ReturnTrueIfGroupACLIsOtherRead.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosClientErrorRetryHandler.java b/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosClientErrorRetryHandler.java index 9726f78537..b426159ab1 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosClientErrorRetryHandler.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosServerErrorRetryHandler.java b/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosServerErrorRetryHandler.java index f972a07bed..ec204473b3 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/handlers/AtmosServerErrorRetryHandler.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/handlers/ParseAtmosErrorFromXmlContent.java b/apis/atmos/src/main/java/org/jclouds/atmos/handlers/ParseAtmosErrorFromXmlContent.java index 48af3db534..731ff5f1bc 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/handlers/ParseAtmosErrorFromXmlContent.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.atmos.AtmosResponseException; import org.jclouds.atmos.domain.AtmosError; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/util/AtmosUtils.java b/apis/atmos/src/main/java/org/jclouds/atmos/util/AtmosUtils.java index a2b33cf762..540dd74605 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/util/AtmosUtils.java +++ b/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 javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jclouds.atmos.AtmosClient; import org.jclouds.atmos.blobstore.functions.BlobToObject; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/xml/ListDirectoryResponseHandler.java b/apis/atmos/src/main/java/org/jclouds/atmos/xml/ListDirectoryResponseHandler.java index 3109708cf9..c5819a11c0 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/xml/ListDirectoryResponseHandler.java +++ b/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; diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/functions/ListOptionsToBlobStoreListOptions.java b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/functions/ListOptionsToBlobStoreListOptions.java index 0944d4cf32..a5bce2c120 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/functions/ListOptionsToBlobStoreListOptions.java +++ b/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; diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/functions/ResourceMetadataListToDirectoryEntryList.java b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/functions/ResourceMetadataListToDirectoryEntryList.java index 9dc0d01861..7b59cdec42 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/functions/ResourceMetadataListToDirectoryEntryList.java +++ b/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; diff --git a/apis/byon/src/main/java/org/jclouds/byon/config/YamlNodeStoreModule.java b/apis/byon/src/main/java/org/jclouds/byon/config/YamlNodeStoreModule.java index 1e523df045..035385221e 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/config/YamlNodeStoreModule.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.byon.Node; import org.jclouds.byon.domain.YamlNode; diff --git a/apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java b/apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java index 4f7c1be70e..68aab8bb89 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java +++ b/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 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; diff --git a/apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java b/apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java index 4176b87a3a..7c2bb5ec3f 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java +++ b/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; diff --git a/apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java b/apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java index 680eee9120..d0913c767c 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.byon.Node; import org.jclouds.byon.functions.NodeToNodeMetadata; diff --git a/apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java b/apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java index 1aa6784824..77548f7259 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.byon.Node; import org.jclouds.location.Provider; diff --git a/apis/chef/src/main/java/org/jclouds/chef/ChefApi.java b/apis/chef/src/main/java/org/jclouds/chef/ChefApi.java index 0ba98dba2e..c33a20e05d 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/ChefApi.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/binders/BindChecksumsToJsonPayload.java b/apis/chef/src/main/java/org/jclouds/chef/binders/BindChecksumsToJsonPayload.java index 2490d3cc6e..5748341441 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/binders/BindChecksumsToJsonPayload.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/binders/BindCreateClientOptionsToJsonPayload.java b/apis/chef/src/main/java/org/jclouds/chef/binders/BindCreateClientOptionsToJsonPayload.java index b719c6616d..87e90045e0 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/binders/BindCreateClientOptionsToJsonPayload.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/binders/BindGenerateKeyForClientToJsonPayload.java b/apis/chef/src/main/java/org/jclouds/chef/binders/BindGenerateKeyForClientToJsonPayload.java index 7cbea20cc0..363a80414e 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/binders/BindGenerateKeyForClientToJsonPayload.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/binders/BindGroupToUpdateRequestJsonPayload.java b/apis/chef/src/main/java/org/jclouds/chef/binders/BindGroupToUpdateRequestJsonPayload.java index 469423de89..8c02928c64 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/binders/BindGroupToUpdateRequestJsonPayload.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.chef.domain.Group; import org.jclouds.http.HttpRequest; diff --git a/apis/chef/src/main/java/org/jclouds/chef/binders/DatabagItemId.java b/apis/chef/src/main/java/org/jclouds/chef/binders/DatabagItemId.java index 5dd5a62539..70258834ba 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/binders/DatabagItemId.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/binders/EnvironmentName.java b/apis/chef/src/main/java/org/jclouds/chef/binders/EnvironmentName.java index 165052144d..3334152f83 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/binders/EnvironmentName.java +++ b/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 { diff --git a/apis/chef/src/main/java/org/jclouds/chef/binders/GroupName.java b/apis/chef/src/main/java/org/jclouds/chef/binders/GroupName.java index 18f1b5ba04..7842a55cd8 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/binders/GroupName.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/binders/NodeName.java b/apis/chef/src/main/java/org/jclouds/chef/binders/NodeName.java index 5277895795..3c821434fd 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/binders/NodeName.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/binders/RoleName.java b/apis/chef/src/main/java/org/jclouds/chef/binders/RoleName.java index aa78a06283..41355249ef 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/binders/RoleName.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/config/ChefBootstrapModule.java b/apis/chef/src/main/java/org/jclouds/chef/config/ChefBootstrapModule.java index 93e219b04f..d70a790164 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/config/ChefBootstrapModule.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.scriptbuilder.domain.Statement; import org.jclouds.scriptbuilder.domain.StatementList; diff --git a/apis/chef/src/main/java/org/jclouds/chef/config/ChefHttpApiModule.java b/apis/chef/src/main/java/org/jclouds/chef/config/ChefHttpApiModule.java index f00bdd4c91..13c097b7ce 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/config/ChefHttpApiModule.java +++ b/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 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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/config/ChefParserModule.java b/apis/chef/src/main/java/org/jclouds/chef/config/ChefParserModule.java index 5d1fa135ec..2605932b3c 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/config/ChefParserModule.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.chef.domain.DatabagItem; import org.jclouds.crypto.Crypto; diff --git a/apis/chef/src/main/java/org/jclouds/chef/config/InstallChef.java b/apis/chef/src/main/java/org/jclouds/chef/config/InstallChef.java index d40ae914cd..bc3f016498 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/config/InstallChef.java +++ b/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. diff --git a/apis/chef/src/main/java/org/jclouds/chef/config/Validator.java b/apis/chef/src/main/java/org/jclouds/chef/config/Validator.java index 99825d835e..aa3a9f17f2 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/config/Validator.java +++ b/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. diff --git a/apis/chef/src/main/java/org/jclouds/chef/features/OrganizationApi.java b/apis/chef/src/main/java/org/jclouds/chef/features/OrganizationApi.java index 84b4eaa98a..9f4518f5b8 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/features/OrganizationApi.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java b/apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java index edc4260735..d7787d7e09 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java +++ b/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 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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/BootstrapConfigForGroup.java b/apis/chef/src/main/java/org/jclouds/chef/functions/BootstrapConfigForGroup.java index 32f7c4b3a6..7f6adc398f 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/BootstrapConfigForGroup.java +++ b/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 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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/ClientForGroup.java b/apis/chef/src/main/java/org/jclouds/chef/functions/ClientForGroup.java index d1a9250fb2..22bf6a661e 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/ClientForGroup.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.chef.ChefApi; import org.jclouds.chef.domain.Client; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java b/apis/chef/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java index 9920de5e6e..e669b2212b 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.chef.config.InstallChef; import org.jclouds.chef.config.Validator; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJson.java b/apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJson.java index 6848bc0b6d..af07a83af9 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJson.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.util.Map; /** diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionListFromJson.java b/apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionListFromJson.java index 1d9103969d..6e48de1094 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookDefinitionListFromJson.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.util.Map; import java.util.Set; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookNamesFromJson.java b/apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookNamesFromJson.java index ae25036175..90caef5d99 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookNamesFromJson.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.chef.domain.CookbookDefinition; import org.jclouds.http.HttpResponse; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsFromJson.java b/apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsFromJson.java index ac77dfa02d..4a642305cb 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsFromJson.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.chef.domain.CookbookDefinition; import org.jclouds.chef.domain.CookbookDefinition.Version; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseErrorFromJsonOrReturnBody.java b/apis/chef/src/main/java/org/jclouds/chef/functions/ParseErrorFromJsonOrReturnBody.java index 644040935c..0fb9f62cbf 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseErrorFromJsonOrReturnBody.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ReturnStringIf2xx; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseKeySetFromJson.java b/apis/chef/src/main/java/org/jclouds/chef/functions/ParseKeySetFromJson.java index 963c19bfc3..fbaf560725 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseKeySetFromJson.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchClientsFromJson.java b/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchClientsFromJson.java index 18ecbfa428..979eff1a31 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchClientsFromJson.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.chef.domain.Client; import org.jclouds.http.functions.ParseJson; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchDatabagFromJson.java b/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchDatabagFromJson.java index c2c58efc5e..540fba4cb7 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchDatabagFromJson.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.chef.domain.DatabagItem; import org.jclouds.chef.domain.SearchResult; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchEnvironmentsFromJson.java b/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchEnvironmentsFromJson.java index 852e0f32ed..813fde35b8 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchEnvironmentsFromJson.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton public class ParseSearchEnvironmentsFromJson extends ParseSearchResultFromJson { diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchNodesFromJson.java b/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchNodesFromJson.java index 6d34575a8f..326764a468 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchNodesFromJson.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.chef.domain.Node; import org.jclouds.http.functions.ParseJson; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchResultFromJson.java b/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchResultFromJson.java index 6c9bd84f98..a0ecb346ed 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchResultFromJson.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.chef.domain.SearchResult; import org.jclouds.http.HttpResponse; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchRolesFromJson.java b/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchRolesFromJson.java index 42ba797104..a9d5ee8ec2 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/ParseSearchRolesFromJson.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.chef.domain.Role; import org.jclouds.http.functions.ParseJson; diff --git a/apis/chef/src/main/java/org/jclouds/chef/functions/UriForResource.java b/apis/chef/src/main/java/org/jclouds/chef/functions/UriForResource.java index d5d0810ff1..9a813b40a7 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/functions/UriForResource.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefApiErrorRetryHandler.java b/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefApiErrorRetryHandler.java index 33c2555a5b..9c2629a46e 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefApiErrorRetryHandler.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java b/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java index e88b02f9bd..22bc858f13 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/handlers/ChefErrorHandler.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.chef.functions.ParseErrorFromJsonOrReturnBody; import org.jclouds.http.HttpCommand; diff --git a/apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java b/apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java index 5ca2030916..19bb4f5e72 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java +++ b/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 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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java index 500fcacaad..60839d3f1c 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java +++ b/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 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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImpl.java index 35ea5b1441..2db25958c7 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImpl.java +++ b/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 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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllClientsInListImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllClientsInListImpl.java index 237b9e573b..1a6dde25c6 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllClientsInListImpl.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.Constants; import org.jclouds.chef.ChefApi; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllNodesInListImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllNodesInListImpl.java index 74e7bf09a1..4435249ce8 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllNodesInListImpl.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.Constants; import org.jclouds.chef.ChefApi; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java index 9fbc9e85f2..5c95ba5551 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import com.google.common.base.Function; import com.google.common.base.Joiner; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java index 34534703b7..528739fdd6 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import java.util.concurrent.ExecutorService; @Singleton diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsInEnvironmentImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsInEnvironmentImpl.java index 74d800e50d..9ab4ab588b 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsInEnvironmentImpl.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import com.google.common.base.Function; import com.google.common.util.concurrent.ListeningExecutorService; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java index c8eef342cb..1848ef76ac 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.Constants; import org.jclouds.chef.ChefApi; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java index 82013d8bee..639808563f 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java +++ b/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 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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java index 4217f03695..bb1749642d 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java +++ b/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 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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImpl.java index e59cefc139..1d6a6662eb 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImpl.java +++ b/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 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; diff --git a/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java b/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java index 2299c46919..daf36e1771 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java +++ b/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 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; diff --git a/apis/chef/src/main/java/org/jclouds/ohai/Automatic.java b/apis/chef/src/main/java/org/jclouds/ohai/Automatic.java index 9b3d1346bd..449863b4d5 100644 --- a/apis/chef/src/main/java/org/jclouds/ohai/Automatic.java +++ b/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 }) diff --git a/apis/chef/src/main/java/org/jclouds/ohai/AutomaticSupplier.java b/apis/chef/src/main/java/org/jclouds/ohai/AutomaticSupplier.java index 681558e29a..7bd1972ddf 100644 --- a/apis/chef/src/main/java/org/jclouds/ohai/AutomaticSupplier.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.domain.JsonBall; import org.jclouds.ohai.functions.NestSlashKeys; diff --git a/apis/chef/src/main/java/org/jclouds/ohai/config/JMXOhaiModule.java b/apis/chef/src/main/java/org/jclouds/ohai/config/JMXOhaiModule.java index 8316f2d225..ffd4b7ec6e 100644 --- a/apis/chef/src/main/java/org/jclouds/ohai/config/JMXOhaiModule.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java b/apis/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java index fcce310632..0b75962dc0 100644 --- a/apis/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java +++ b/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 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; diff --git a/apis/chef/src/main/java/org/jclouds/ohai/functions/ByteArrayToMacAddress.java b/apis/chef/src/main/java/org/jclouds/ohai/functions/ByteArrayToMacAddress.java index be7e46aaab..fa40ef244e 100644 --- a/apis/chef/src/main/java/org/jclouds/ohai/functions/ByteArrayToMacAddress.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/ohai/functions/MapSetToMultimap.java b/apis/chef/src/main/java/org/jclouds/ohai/functions/MapSetToMultimap.java index 4ef3c87245..16237f63a8 100644 --- a/apis/chef/src/main/java/org/jclouds/ohai/functions/MapSetToMultimap.java +++ b/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; diff --git a/apis/chef/src/main/java/org/jclouds/ohai/functions/NestSlashKeys.java b/apis/chef/src/main/java/org/jclouds/ohai/functions/NestSlashKeys.java index d68ed14d21..1cb0d84c2e 100644 --- a/apis/chef/src/main/java/org/jclouds/ohai/functions/NestSlashKeys.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.domain.JsonBall; import org.jclouds.json.Json; diff --git a/apis/chef/src/main/java/org/jclouds/ohai/suppliers/UptimeSecondsSupplier.java b/apis/chef/src/main/java/org/jclouds/ohai/suppliers/UptimeSecondsSupplier.java index 9713902d82..3716ed8060 100644 --- a/apis/chef/src/main/java/org/jclouds/ohai/suppliers/UptimeSecondsSupplier.java +++ b/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 javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.domain.JsonBall; diff --git a/apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java b/apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java index f734c324cc..ebe7e4e0a1 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java +++ b/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; diff --git a/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java b/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java index 1ff36a1680..8d23c6d17f 100644 --- a/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java +++ b/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; diff --git a/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java b/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java index 093f76bed4..1c2c7bf7db 100644 --- a/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java index b99e64456a..58dccb51df 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java index 28adf91e2a..9c493e8ec7 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java index f4b381373b..14fc3d1824 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java index d80f4ba81d..dbf11bd94a 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java index 70227bd468..3f05cbef96 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java +++ b/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 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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java index 11f00c8dff..9264885139 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java @@ -26,8 +26,8 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.compute.extensions.CloudStackImageExtension; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtension.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtension.java index 489bf342ea..3ab1d29de2 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtension.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtension.java @@ -28,9 +28,9 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; 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.cloudstack.CloudStackApi; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java index 2d56b5ca2a..47c6cfe830 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java @@ -26,7 +26,7 @@ import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.ruleGrou import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.IngressRule; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java index b2a5e088de..67f2c929e2 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java @@ -20,8 +20,8 @@ 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 org.jclouds.compute.domain.SecurityGroup; import org.jclouds.compute.domain.SecurityGroupBuilder; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java index 1881c1ca1a..490cdf8646 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java @@ -17,7 +17,7 @@ package org.jclouds.cloudstack.compute.functions; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.cloudstack.domain.IngressRule; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/OrphanedGroupsByZoneId.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/OrphanedGroupsByZoneId.java index d7a187da93..f4b5234a7b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/OrphanedGroupsByZoneId.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/OrphanedGroupsByZoneId.java @@ -23,7 +23,7 @@ import static com.google.common.collect.Sets.filter; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.compute.ComputeService; import org.jclouds.compute.domain.NodeMetadata; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardware.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardware.java index ab85c3a152..270b243045 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardware.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardware.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudstack.compute.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.domain.ServiceOffering; import org.jclouds.compute.domain.Hardware; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToImage.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToImage.java index 86ab66e6e9..527b390112 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToImage.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToImage.java @@ -21,8 +21,8 @@ import static org.jclouds.location.predicates.LocationPredicates.idEquals; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.domain.Template; import org.jclouds.collect.Memoized; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java index 4c2faa954b..fd8f9d13db 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java @@ -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.cloudstack.domain.OSType; import org.jclouds.cloudstack.domain.Template; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java index c234f9c818..010d89c5e3 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java @@ -26,8 +26,8 @@ import static com.google.common.collect.Sets.newHashSet; import static org.jclouds.location.predicates.LocationPredicates.idEquals; import static org.jclouds.util.InetAddresses2.isPrivateIPAddress; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.util.Map; import java.util.Set; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ZoneToLocation.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ZoneToLocation.java index ae46a675cb..e6c4bacc7f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ZoneToLocation.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ZoneToLocation.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.cloudstack.domain.Zone; import org.jclouds.domain.Location; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java index b9b6f84059..186de1c28d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java @@ -19,8 +19,8 @@ package org.jclouds.cloudstack.compute.loaders; import static com.google.common.base.Preconditions.checkNotNull; import jakarta.annotation.Resource; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.logging.Logger; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java index 6daf2dcb22..ad8686da9e 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkState; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.logging.Logger; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/predicates/AllNodesInGroupTerminated.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/predicates/AllNodesInGroupTerminated.java index 02cc846ddd..acf239570b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/predicates/AllNodesInGroupTerminated.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/predicates/AllNodesInGroupTerminated.java @@ -23,7 +23,7 @@ import static org.jclouds.compute.predicates.NodePredicates.inGroup; import static org.jclouds.compute.predicates.NodePredicates.locationId; import static org.jclouds.compute.predicates.NodePredicates.parentLocationId; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.compute.ComputeService; import org.jclouds.compute.domain.ComputeMetadata; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java index 48f5c0d662..f18fe8c7b7 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java @@ -29,9 +29,9 @@ import static org.jclouds.cloudstack.predicates.ZonePredicates.supportsSecurityG import static org.jclouds.ssh.SshKeys.fingerprintPrivateKey; 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 java.util.List; import java.util.Map; import java.util.Set; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackHttpApiModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackHttpApiModule.java index 5a8962e00c..e6833580b4 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackHttpApiModule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackHttpApiModule.java @@ -94,7 +94,7 @@ public class CloudStackHttpApiModule extends HttpApiModule { } @Singleton - static class CredentialTypeFromPropertyOrDefault implements javax.inject.Provider { + static class CredentialTypeFromPropertyOrDefault implements jakarta.inject.Provider { /** * use optional injection to supply a default value for credential type. so that we don't have * to set a default property. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackParserModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackParserModule.java index ab1fac0fff..f4ba4ee00c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackParserModule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackParserModule.java @@ -19,7 +19,7 @@ package org.jclouds.cloudstack.config; import java.io.IOException; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.json.config.GsonModule.DateAdapter; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountApi.java index 0818a104b8..2b6d8da552 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressApi.java index 45492db0ad..fdd159ee2b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobApi.java index b22485b328..12e2055d50 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationApi.java index 630516ad26..79a6b1ddf1 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudstack.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.core.MediaType; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainAccountApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainAccountApi.java index 79379e3a81..0c6d4d7ead 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainAccountApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainAccountApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudstack.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java index b2f6ccd928..94fec28c64 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java index 85952a5cca..5fc52924a8 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudstack.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.core.MediaType; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java index 06f831bbce..e1b29821f8 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventApi.java index 39cf0943e2..594fa1f9ba 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.core.MediaType; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java index 5b490bb276..17c0f3d8b3 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java index 0e7838333b..79ffd3816e 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudstack.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java index a4adcaadc2..e524c6f137 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.core.MediaType; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java index dfe84be6a6..cc9d0fb066 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.core.MediaType; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java index 56f2f8b054..293a9cff45 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java index dae4af19cd..bdc44889de 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudstack.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java index 65b2bfb7d4..1d293652d6 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java index c86cdf8f67..ba6f12a685 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudstack.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java index 05dc1c3a98..6ae9a99503 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java index a3c24bbdbb..72a4869b44 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.core.MediaType; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java index 9214c0ad74..db3be546bc 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java @@ -19,7 +19,7 @@ package org.jclouds.cloudstack.features; import java.util.Date; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java index c06cc5f051..682e19ee4b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudstack.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java index e17b2c1c2f..7d2b15b3e5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java index 44561769cb..16f470899b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudstack.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java index f657fcb895..0df17f3c55 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java @@ -19,7 +19,7 @@ package org.jclouds.cloudstack.features; import java.util.Map; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java index b6464acda3..ca2f92b210 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOApi.java index ab508a86b8..a0cd5e463d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitApi.java index 0c32fa34ba..232e9ad17a 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.core.MediaType; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java index cc04c04d3f..fc2041d4f4 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATApi.java index 153c0aeb2d..23d4c19309 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java index dbba9e5c92..f4875901fd 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java index 3408950c58..2c469422a7 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ProjectApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ProjectApi.java index f327348f2b..c3e6ed0bfe 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ProjectApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ProjectApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java index 2daf7fde27..72505b62c4 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java index 4660097e69..b0b41eac66 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionApi.java index 7f1e2952f9..1ecd5f191e 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudstack.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java index a0facd8b6f..912a7c098c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TagApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TagApi.java index f9aef7129f..3affe7413b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TagApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TagApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudstack.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.core.MediaType; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java index bf62cc057e..81e63bf563 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java index 23a1b7e64d..a5cddb8034 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java index 5140c2827b..7a4e779ce3 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java index fca5567f5a..877f888fac 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java index 12f8231e78..817d99e6ac 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java @@ -18,7 +18,7 @@ package org.jclouds.cloudstack.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/AddSessionKeyAndJSessionIdToRequest.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/AddSessionKeyAndJSessionIdToRequest.java index f08c0e8c96..31298b03c5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/AddSessionKeyAndJSessionIdToRequest.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/AddSessionKeyAndJSessionIdToRequest.java @@ -16,8 +16,8 @@ */ package org.jclouds.cloudstack.filters; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.domain.LoginResponse; import org.jclouds.http.HttpException; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java index 6e38aeb1ac..a68ebe9d2c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java @@ -31,9 +31,9 @@ import java.security.InvalidKeyException; 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 com.google.common.base.Joiner; import org.jclouds.crypto.Crypto; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateFirewallRulesForIP.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateFirewallRulesForIP.java index faaff05a1f..2babd30800 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateFirewallRulesForIP.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateFirewallRulesForIP.java @@ -22,9 +22,9 @@ import static com.google.common.base.Preconditions.checkState; 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.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.AsyncCreateResponse; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java index ed1ba0ff68..391ce5072f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java @@ -22,9 +22,9 @@ import static com.google.common.base.Preconditions.checkState; 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.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.AsyncCreateResponse; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java index 49211da8fd..0f2ce56792 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java @@ -24,9 +24,9 @@ import static org.jclouds.cloudstack.predicates.ZonePredicates.supportsSecurityG 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.compute.reference.ComputeServiceConstants; import org.jclouds.logging.Logger; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetFirewallRulesByVirtualMachine.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetFirewallRulesByVirtualMachine.java index 3fc73ab484..d76223d868 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetFirewallRulesByVirtualMachine.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetFirewallRulesByVirtualMachine.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.cache.CacheLoader; import com.google.common.collect.ImmutableSet; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.FirewallRule; import org.jclouds.cloudstack.options.ListFirewallRulesOptions; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetIPForwardingRulesByVirtualMachine.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetIPForwardingRulesByVirtualMachine.java index 02e6fa1348..2b771a5265 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetIPForwardingRulesByVirtualMachine.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetIPForwardingRulesByVirtualMachine.java @@ -20,8 +20,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.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.IPForwardingRule; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponse.java index 3095729fab..9ab7786eb0 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponse.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponse.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.domain.AsyncJob; import org.jclouds.domain.JsonBall; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponse.java index 59f479f019..87e28db163 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponse.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponse.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.cloudstack.domain.AsyncJob; import org.jclouds.domain.JsonBall; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java index 552a6e8a8f..3791dfd741 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseFirstJsonValueNamed; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java index 936e5aa73e..c569648ae8 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java index d2ba0a7421..24845d6d1f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.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.http.HttpResponse; import org.jclouds.http.functions.ParseFirstJsonValueNamed; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java index f30c6a45a9..a2a38cd8a5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseFirstJsonValueNamed; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java index 7a1f1fdd3f..cb288228af 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Map.Entry; import jakarta.annotation.Resource; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.domain.Account; import org.jclouds.cloudstack.domain.AsyncJob; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java index 322d2102e3..299825e2df 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java @@ -28,9 +28,9 @@ import static org.jclouds.compute.reference.ComputeServiceConstants.COMPUTE_LOGG import java.util.NoSuchElementException; 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.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.AsyncCreateResponse; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java index 21c166535a..b20dd9c6e1 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java @@ -19,8 +19,8 @@ package org.jclouds.cloudstack.functions; import static com.google.common.base.Preconditions.checkNotNull; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.Network; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java index 913fe13e94..ba835d791c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java @@ -19,7 +19,7 @@ package org.jclouds.cloudstack.handlers; 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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/internal/CloudStackContextImpl.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/internal/CloudStackContextImpl.java index 962b751866..7b285c91d5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/internal/CloudStackContextImpl.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/internal/CloudStackContextImpl.java @@ -16,8 +16,8 @@ */ package org.jclouds.cloudstack.internal; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.Context; import org.jclouds.cloudstack.CloudStackApi; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentials.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentials.java index 9d6ca1b1e9..8bc2fd6ed0 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentials.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentials.java @@ -20,8 +20,8 @@ import static com.google.common.base.Charsets.UTF_8; import static com.google.common.hash.Hashing.md5; import static com.google.common.io.BaseEncoding.base16; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.domain.LoginResponse; import org.jclouds.cloudstack.features.SessionApi; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java index e518763b46..59a61fd839 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java @@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; 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.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.Template; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java index 240332e8f2..409be7cbdb 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java @@ -19,7 +19,7 @@ package org.jclouds.cloudstack.predicates; import static com.google.common.base.Preconditions.checkNotNull; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.AsyncJobException; import org.jclouds.cloudstack.CloudStackApi; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java index 87ac0d35c1..1003ff2fe4 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java @@ -19,8 +19,8 @@ package org.jclouds.cloudstack.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.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.LoadBalancerRule; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/OSCategoryIn.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/OSCategoryIn.java index 48397d85e0..895d26e6e0 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/OSCategoryIn.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/OSCategoryIn.java @@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; 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.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.OSType; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/TemplatePredicates.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/TemplatePredicates.java index 341356cc9d..76e0399e3e 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/TemplatePredicates.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/TemplatePredicates.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudstack.predicates; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.domain.Template; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java index 335183cd73..37536c6c38 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java @@ -19,7 +19,7 @@ package org.jclouds.cloudstack.predicates; import static com.google.common.base.Preconditions.checkNotNull; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.VirtualMachine; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java index f44e77d9d0..8f5fb41b8e 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java @@ -19,7 +19,7 @@ package org.jclouds.cloudstack.predicates; import static com.google.common.base.Preconditions.checkNotNull; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.VirtualMachine; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java index 4bdf9f97ff..3a59ef1ee4 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java @@ -19,7 +19,7 @@ package org.jclouds.cloudstack.predicates; import static com.google.common.base.Preconditions.checkNotNull; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.VirtualMachine; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java index 3b885b86a8..c658d3f166 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java @@ -20,9 +20,9 @@ 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.Named; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.AsyncCreateResponse; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java index e4836069f1..659ad92295 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.NoSuchElementException; import jakarta.annotation.Resource; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.User; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java index 8ed3d50734..9d88331e36 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java @@ -21,7 +21,7 @@ import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.account import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.Network; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/ProjectsForCurrentUser.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/ProjectsForCurrentUser.java index ecfebf3d06..d82b335c75 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/ProjectsForCurrentUser.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/ProjectsForCurrentUser.java @@ -21,7 +21,7 @@ import static org.jclouds.cloudstack.options.ListProjectsOptions.Builder.account import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.Project; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/ZoneIdToZoneSupplier.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/ZoneIdToZoneSupplier.java index 4485d012c9..1d5c4d70de 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/ZoneIdToZoneSupplier.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/ZoneIdToZoneSupplier.java @@ -20,7 +20,7 @@ import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; import java.util.concurrent.TimeUnit; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.cloudstack.domain.Zone; diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreateTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreateTest.java index 87fabd8aa7..fd1c687df1 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreateTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreateTest.java @@ -27,7 +27,7 @@ import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.net.UnknownHostException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.IngressRule; diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeededTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeededTest.java index 7d840dcd66..2743fbc995 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeededTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeededTest.java @@ -27,7 +27,7 @@ import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.net.UnknownHostException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.IngressRule; diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/binders/GetMetricStatisticsBinder.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/binders/GetMetricStatisticsBinder.java index 53523cfd3e..94c598c81b 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/binders/GetMetricStatisticsBinder.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/binders/GetMetricStatisticsBinder.java @@ -18,7 +18,7 @@ package org.jclouds.cloudwatch.binders; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.cloudwatch.domain.Dimension; import org.jclouds.cloudwatch.domain.GetMetricStatistics; diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/AlarmApi.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/AlarmApi.java index c00fd0d105..aa24a3beed 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/AlarmApi.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/AlarmApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudwatch.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/MetricApi.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/MetricApi.java index f44db98ff5..2aecda29e0 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/MetricApi.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/MetricApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudwatch.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java index 9a400bf723..f0fbefd1ca 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkArgument; import java.util.Date; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.date.DateService; diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/MetricsToPagedIterable.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/MetricsToPagedIterable.java index 7e1318b894..be1f109e80 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/MetricsToPagedIterable.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/MetricsToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.cloudwatch.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.cloudwatch.CloudWatchApi; import org.jclouds.cloudwatch.domain.Metric; diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/handlers/CloudWatchErrorHandler.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/handlers/CloudWatchErrorHandler.java index 91851121eb..30d18a586d 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/handlers/CloudWatchErrorHandler.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/handlers/CloudWatchErrorHandler.java @@ -19,9 +19,9 @@ package org.jclouds.cloudwatch.handlers; import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; import static org.jclouds.http.HttpUtils.releasePayload; -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 com.google.common.annotations.Beta; import org.jclouds.aws.AWSResponseException; diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/AlarmHistoryItemHandler.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/AlarmHistoryItemHandler.java index 0e8cb6cd9c..d64c811f4c 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/AlarmHistoryItemHandler.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/AlarmHistoryItemHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudwatch.xml; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Date; import com.google.common.annotations.Beta; diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java index 9f8bc9061a..d2b7048af1 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java @@ -21,7 +21,7 @@ import org.jclouds.cloudwatch.domain.Unit; import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Date; public class DatapointHandler extends ParseSax.HandlerForGeneratedRequestWithResult { diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java index bf35f00b5a..77f121b9f0 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java @@ -18,7 +18,7 @@ package org.jclouds.cloudwatch.xml; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.cloudwatch.domain.Datapoint; import org.jclouds.http.functions.ParseSax; diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerV2.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerV2.java index 7cdb143620..33eacc88b7 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerV2.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerV2.java @@ -24,7 +24,7 @@ import org.jclouds.util.SaxUtils; import org.xml.sax.Attributes; import org.xml.sax.SAXException; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Set; /** diff --git a/apis/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java b/apis/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java index c3b58312ac..48c2cacb33 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java +++ b/apis/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.Memoized; import org.jclouds.compute.domain.HardwareBuilder; diff --git a/apis/docker/src/main/java/org/jclouds/docker/compute/functions/CustomLoginPortFromImage.java b/apis/docker/src/main/java/org/jclouds/docker/compute/functions/CustomLoginPortFromImage.java index 811cdd4eb1..f5ef4496b5 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/compute/functions/CustomLoginPortFromImage.java +++ b/apis/docker/src/main/java/org/jclouds/docker/compute/functions/CustomLoginPortFromImage.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.docker.domain.Container; diff --git a/apis/docker/src/main/java/org/jclouds/docker/compute/functions/ImageToImage.java b/apis/docker/src/main/java/org/jclouds/docker/compute/functions/ImageToImage.java index 1c1d5cce4a..845c3d9352 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/compute/functions/ImageToImage.java +++ b/apis/docker/src/main/java/org/jclouds/docker/compute/functions/ImageToImage.java @@ -19,7 +19,7 @@ package org.jclouds.docker.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.ImageBuilder; diff --git a/apis/docker/src/main/java/org/jclouds/docker/compute/functions/LoginPortForContainer.java b/apis/docker/src/main/java/org/jclouds/docker/compute/functions/LoginPortForContainer.java index 723f9c0cf3..e4817e538e 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/compute/functions/LoginPortForContainer.java +++ b/apis/docker/src/main/java/org/jclouds/docker/compute/functions/LoginPortForContainer.java @@ -16,7 +16,7 @@ */ package org.jclouds.docker.compute.functions; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.docker.compute.functions.LoginPortForContainer.LoginPortLookupChain; import org.jclouds.docker.domain.Container; diff --git a/apis/docker/src/main/java/org/jclouds/docker/compute/functions/StateToStatus.java b/apis/docker/src/main/java/org/jclouds/docker/compute/functions/StateToStatus.java index ef9f61641c..611ea0e432 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/compute/functions/StateToStatus.java +++ b/apis/docker/src/main/java/org/jclouds/docker/compute/functions/StateToStatus.java @@ -16,7 +16,7 @@ */ package org.jclouds.docker.compute.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.NodeMetadata.Status; import org.jclouds.docker.domain.State; diff --git a/apis/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java b/apis/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java index 7147c3ec0a..3d9b6b32dc 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java +++ b/apis/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java @@ -25,9 +25,9 @@ import java.util.Set; 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 com.google.common.base.Charsets; import com.google.common.base.Predicate; diff --git a/apis/docker/src/main/java/org/jclouds/docker/config/DockerOkHttpClientSupplier.java b/apis/docker/src/main/java/org/jclouds/docker/config/DockerOkHttpClientSupplier.java index a77ffe9b1e..28a60985d2 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/config/DockerOkHttpClientSupplier.java +++ b/apis/docker/src/main/java/org/jclouds/docker/config/DockerOkHttpClientSupplier.java @@ -18,8 +18,8 @@ package org.jclouds.docker.config; import java.io.File; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import okhttp3.ConnectionSpec; import okhttp3.OkHttpClient; diff --git a/apis/docker/src/main/java/org/jclouds/docker/features/ContainerApi.java b/apis/docker/src/main/java/org/jclouds/docker/features/ContainerApi.java index b11663b7dd..9c47956223 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/features/ContainerApi.java +++ b/apis/docker/src/main/java/org/jclouds/docker/features/ContainerApi.java @@ -19,7 +19,7 @@ package org.jclouds.docker.features; import java.io.InputStream; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/docker/src/main/java/org/jclouds/docker/features/ImageApi.java b/apis/docker/src/main/java/org/jclouds/docker/features/ImageApi.java index f58280491c..9dc7db81b1 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/features/ImageApi.java +++ b/apis/docker/src/main/java/org/jclouds/docker/features/ImageApi.java @@ -19,7 +19,7 @@ package org.jclouds.docker.features; import java.io.InputStream; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/docker/src/main/java/org/jclouds/docker/features/MiscApi.java b/apis/docker/src/main/java/org/jclouds/docker/features/MiscApi.java index 5992b88fcd..9a97f4c1fa 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/features/MiscApi.java +++ b/apis/docker/src/main/java/org/jclouds/docker/features/MiscApi.java @@ -18,7 +18,7 @@ package org.jclouds.docker.features; import java.io.InputStream; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; diff --git a/apis/docker/src/main/java/org/jclouds/docker/features/NetworkApi.java b/apis/docker/src/main/java/org/jclouds/docker/features/NetworkApi.java index 3283f3b1e6..b23ce524f8 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/features/NetworkApi.java +++ b/apis/docker/src/main/java/org/jclouds/docker/features/NetworkApi.java @@ -18,7 +18,7 @@ package org.jclouds.docker.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/docker/src/main/java/org/jclouds/docker/suppliers/DockerSSLContextSupplier.java b/apis/docker/src/main/java/org/jclouds/docker/suppliers/DockerSSLContextSupplier.java index 326528a61f..87f9c8465d 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/suppliers/DockerSSLContextSupplier.java +++ b/apis/docker/src/main/java/org/jclouds/docker/suppliers/DockerSSLContextSupplier.java @@ -23,9 +23,9 @@ import org.jclouds.docker.DockerApiMetadata; import org.jclouds.domain.Credentials; import org.jclouds.location.Provider; -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 javax.net.ssl.SSLContext; import java.io.IOException; diff --git a/apis/docker/src/main/java/org/jclouds/docker/suppliers/DockerUntrustedSSLContextSupplier.java b/apis/docker/src/main/java/org/jclouds/docker/suppliers/DockerUntrustedSSLContextSupplier.java index f20cceff9f..3f6521945b 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/suppliers/DockerUntrustedSSLContextSupplier.java +++ b/apis/docker/src/main/java/org/jclouds/docker/suppliers/DockerUntrustedSSLContextSupplier.java @@ -24,8 +24,8 @@ import org.jclouds.domain.Credentials; import org.jclouds.http.config.SSLModule; import org.jclouds.location.Provider; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import javax.net.ssl.SSLContext; import java.io.File; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindBundleIdsToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindBundleIdsToIndexedFormParams.java index 0f936ef01e..704d5a7924 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindBundleIdsToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindBundleIdsToIndexedFormParams.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.binders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindFiltersToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindFiltersToIndexedFormParams.java index 5478d64542..4a9ee79297 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindFiltersToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindFiltersToIndexedFormParams.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.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.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindGroupIdsToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindGroupIdsToIndexedFormParams.java index bec6dd7297..9f06ba9d22 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindGroupIdsToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindGroupIdsToIndexedFormParams.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.binders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindGroupNamesToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindGroupNamesToIndexedFormParams.java index 71a01142eb..6081f77a56 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindGroupNamesToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindGroupNamesToIndexedFormParams.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.binders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindInstanceIdsToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindInstanceIdsToIndexedFormParams.java index ca0ab58b1a..7d7d4517be 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindInstanceIdsToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindInstanceIdsToIndexedFormParams.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.binders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindKeyNamesToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindKeyNamesToIndexedFormParams.java index c1b72f1201..7ca8d6097d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindKeyNamesToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindKeyNamesToIndexedFormParams.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.binders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindProductCodesToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindProductCodesToIndexedFormParams.java index 4651807a9d..a874a5980a 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindProductCodesToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindProductCodesToIndexedFormParams.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.binders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindPublicIpsToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindPublicIpsToIndexedFormParams.java index 12dc23f5e4..bae366e2a6 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindPublicIpsToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindPublicIpsToIndexedFormParams.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.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.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParams.java index f9d2b9646d..26c6142107 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParams.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.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.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindS3UploadPolicyAndSignature.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindS3UploadPolicyAndSignature.java index b49c9c4b9a..8260cc4fb2 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindS3UploadPolicyAndSignature.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindS3UploadPolicyAndSignature.java @@ -20,7 +20,7 @@ import static com.google.common.base.Charsets.UTF_8; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.io.BaseEncoding.base64; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.filters.FormSigner.FormSignerV2; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindSubnetIdsToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindSubnetIdsToIndexedFormParams.java index f71d8d0053..ce2ec61d68 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindSubnetIdsToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindSubnetIdsToIndexedFormParams.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.binders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindTagKeysToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindTagKeysToIndexedFormParams.java index 7b19cc7c01..169833f0af 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindTagKeysToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindTagKeysToIndexedFormParams.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.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.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserGroupsToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserGroupsToIndexedFormParams.java index 8faf0f49d9..e9452aead7 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserGroupsToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserGroupsToIndexedFormParams.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.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.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdGroupPairToSourceSecurityGroupFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdGroupPairToSourceSecurityGroupFormParams.java index e1b6995175..a257fb1c3e 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdGroupPairToSourceSecurityGroupFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdGroupPairToSourceSecurityGroupFormParams.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.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.ec2.domain.UserIdGroupPair; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdsToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdsToIndexedFormParams.java index d57022a641..c39f298694 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdsToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdsToIndexedFormParams.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.binders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindVolumeIdsToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindVolumeIdsToIndexedFormParams.java index cf9d8b388c..4fc7b8d37a 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindVolumeIdsToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindVolumeIdsToIndexedFormParams.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.binders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/IfNotNullBindAvailabilityZoneToFormParam.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/IfNotNullBindAvailabilityZoneToFormParam.java index 8013c1bcf2..ef6e2511b6 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/IfNotNullBindAvailabilityZoneToFormParam.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/IfNotNullBindAvailabilityZoneToFormParam.java @@ -18,8 +18,8 @@ package org.jclouds.ec2.binders; import static com.google.common.base.Preconditions.checkArgument; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.rest.Binder; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java index fea023c109..8e4d52d8cf 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java @@ -39,9 +39,9 @@ import java.util.Set; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import org.jclouds.Constants; import org.jclouds.aws.util.AWSUtils; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModule.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModule.java index ce889a3a2a..dcf6a7eccc 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModule.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModule.java @@ -23,8 +23,8 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.config.BaseComputeServiceContextModule; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceDependenciesModule.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceDependenciesModule.java index 62b72dd194..bf4947547d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceDependenciesModule.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceDependenciesModule.java @@ -23,8 +23,8 @@ import static org.jclouds.util.Predicates2.retry; import java.util.Map; import java.util.concurrent.ConcurrentMap; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.compute.ComputeService; import org.jclouds.compute.domain.Image; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2ImageExtension.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2ImageExtension.java index ab33270f1e..022a4fd6c4 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2ImageExtension.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2ImageExtension.java @@ -29,8 +29,8 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.aws.util.AWSUtils; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtension.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtension.java index faed4037cd..54e66c74a7 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtension.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtension.java @@ -26,8 +26,8 @@ import static com.google.common.collect.Iterables.transform; import java.util.NoSuchElementException; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.aws.util.AWSUtils; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/AddElasticIpsToNodemetadata.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/AddElasticIpsToNodemetadata.java index 72528a11ae..a5b65cf6f7 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/AddElasticIpsToNodemetadata.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/AddElasticIpsToNodemetadata.java @@ -20,9 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.concurrent.ExecutionException; -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.aws.util.AWSUtils; import org.jclouds.compute.domain.NodeMetadata; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPair.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPair.java index f602a621af..491a2331c9 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPair.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPair.java @@ -19,8 +19,8 @@ package org.jclouds.ec2.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; import jakarta.annotation.Resource; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.compute.functions.GroupNamingConvention; import org.jclouds.compute.reference.ComputeServiceConstants; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CredentialsForInstance.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CredentialsForInstance.java index f9ee0a7d89..6bf6a1e6f3 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CredentialsForInstance.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CredentialsForInstance.java @@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Image; import org.jclouds.domain.LoginCredentials; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2ImageParser.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2ImageParser.java index 9370ccfbdd..3178771353 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2ImageParser.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2ImageParser.java @@ -24,9 +24,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.collect.Memoized; import org.jclouds.compute.domain.Image; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupIdFromName.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupIdFromName.java index 56a7f80964..f7db8acd23 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupIdFromName.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupIdFromName.java @@ -19,8 +19,8 @@ package org.jclouds.ec2.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.ImmutableMultimap.of; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.ec2.EC2Api; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupToSecurityGroup.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupToSecurityGroup.java index 8c5881c79d..0058a93fc9 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupToSecurityGroup.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/EC2SecurityGroupToSecurityGroup.java @@ -22,8 +22,8 @@ import java.util.NoSuchElementException; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.compute.domain.SecurityGroup; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/ImagesToRegionAndIdMap.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/ImagesToRegionAndIdMap.java index f0504cfbd3..66ee8954e2 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/ImagesToRegionAndIdMap.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/ImagesToRegionAndIdMap.java @@ -21,7 +21,7 @@ import static com.google.common.collect.Maps.uniqueIndex; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Image; import org.jclouds.ec2.compute.domain.RegionAndName; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PasswordCredentialsFromWindowsInstance.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PasswordCredentialsFromWindowsInstance.java index ed34f67c21..453400ec4d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PasswordCredentialsFromWindowsInstance.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PasswordCredentialsFromWindowsInstance.java @@ -25,9 +25,9 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference; 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.compute.reference.ComputeServiceConstants; import org.jclouds.domain.LoginCredentials; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PresentInstances.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PresentInstances.java index 58892afb1f..3ce1b57573 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PresentInstances.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/PresentInstances.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.ec2.EC2Api; import org.jclouds.ec2.compute.domain.RegionAndName; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java index fde40b4f25..459420edb3 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java @@ -29,7 +29,7 @@ import java.util.NoSuchElementException; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.compute.domain.Hardware; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/WindowsLoginCredentialsFromEncryptedData.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/WindowsLoginCredentialsFromEncryptedData.java index 6e1b646abc..0f110959b0 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/WindowsLoginCredentialsFromEncryptedData.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/WindowsLoginCredentialsFromEncryptedData.java @@ -23,7 +23,7 @@ import java.security.PrivateKey; import java.security.spec.KeySpec; import javax.crypto.Cipher; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.crypto.Crypto; import org.jclouds.crypto.Pems; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/internal/EC2ComputeServiceContextImpl.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/internal/EC2ComputeServiceContextImpl.java index 74d61c0d0a..5729953cd4 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/internal/EC2ComputeServiceContextImpl.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/internal/EC2ComputeServiceContextImpl.java @@ -16,8 +16,8 @@ */ package org.jclouds.ec2.compute.internal; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.Context; import org.jclouds.compute.Utils; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImpl.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImpl.java index ea76c03117..3648282bc4 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImpl.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImpl.java @@ -22,9 +22,9 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.concurrent.ExecutionException; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.jclouds.collect.Memoized; import org.jclouds.compute.domain.Hardware; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeeded.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeeded.java index 72d2393b0f..f633a143d1 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeeded.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeeded.java @@ -19,9 +19,9 @@ package org.jclouds.ec2.compute.loaders; import static com.google.common.base.Preconditions.checkNotNull; 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.compute.reference.ComputeServiceConstants; import org.jclouds.ec2.EC2Api; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/LoadPublicIpForInstanceOrNull.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/LoadPublicIpForInstanceOrNull.java index dd21344963..c997895044 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/LoadPublicIpForInstanceOrNull.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/LoadPublicIpForInstanceOrNull.java @@ -18,8 +18,8 @@ package org.jclouds.ec2.compute.loaders; import java.util.NoSuchElementException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.ec2.EC2Api; import org.jclouds.ec2.compute.domain.RegionAndName; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/RegionAndIdToImage.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/RegionAndIdToImage.java index 90d129d98f..8b56faaa77 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/RegionAndIdToImage.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/RegionAndIdToImage.java @@ -21,8 +21,8 @@ import static org.jclouds.ec2.options.DescribeImagesOptions.Builder.imageIds; import java.util.concurrent.ExecutionException; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Image; import org.jclouds.ec2.EC2Api; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/predicates/SecurityGroupPresent.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/predicates/SecurityGroupPresent.java index 6dbef139c1..37a0e5031d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/predicates/SecurityGroupPresent.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/predicates/SecurityGroupPresent.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.NoSuchElementException; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.ec2.EC2Api; import org.jclouds.ec2.compute.domain.RegionAndName; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java index 32a6baec82..345975cf9c 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java @@ -22,9 +22,9 @@ import static com.google.common.base.Preconditions.checkState; import static org.jclouds.ssh.SshKeys.fingerprintPrivateKey; import static org.jclouds.ssh.SshKeys.sha1PrivateKey; -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import java.util.Set; import java.util.concurrent.ConcurrentMap; @@ -186,7 +186,7 @@ public class CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions { // allows us to mock this method @VisibleForTesting - public javax.inject.Provider getOptionsProvider() { + public jakarta.inject.Provider getOptionsProvider() { return optionsProvider; } } diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/DescribeImagesParallel.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/DescribeImagesParallel.java index 77bb6e901b..992066e328 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/DescribeImagesParallel.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/DescribeImagesParallel.java @@ -27,9 +27,9 @@ import java.util.Set; import java.util.concurrent.Callable; 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.compute.reference.ComputeServiceConstants; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java index c66a3b6415..33150b342c 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java @@ -27,9 +27,9 @@ import static org.jclouds.compute.functions.DefaultCredentialsFromImageOrOverrid import static org.jclouds.ec2.compute.util.EC2ComputeUtils.getZoneFromLocationOrNull; 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 java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2DestroyNodeStrategy.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2DestroyNodeStrategy.java index e53ad7a736..7250103a86 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2DestroyNodeStrategy.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2DestroyNodeStrategy.java @@ -21,9 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.concurrent.ExecutionException; 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.aws.util.AWSUtils; import org.jclouds.compute.domain.NodeMetadata; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2GetImageStrategy.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2GetImageStrategy.java index 55a7889d70..a2e718906d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2GetImageStrategy.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2GetImageStrategy.java @@ -21,8 +21,8 @@ import static com.google.common.collect.Iterables.getOnlyElement; import java.util.NoSuchElementException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.compute.strategy.GetImageStrategy; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2GetNodeMetadataStrategy.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2GetNodeMetadataStrategy.java index 0d7fa77fe3..5b9053f211 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2GetNodeMetadataStrategy.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2GetNodeMetadataStrategy.java @@ -21,8 +21,8 @@ import static com.google.common.collect.Iterables.getOnlyElement; import java.util.NoSuchElementException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.compute.domain.NodeMetadata; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java index 0c2a40bb75..09d4091222 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java @@ -31,8 +31,8 @@ import static com.google.common.collect.Multimaps.transformValues; import java.util.Set; 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.aws.util.AWSUtils; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2PopulateDefaultLoginCredentialsForImageStrategy.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2PopulateDefaultLoginCredentialsForImageStrategy.java index f50a194a4e..fac0bc729c 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2PopulateDefaultLoginCredentialsForImageStrategy.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2PopulateDefaultLoginCredentialsForImageStrategy.java @@ -20,9 +20,9 @@ import static com.google.common.base.Preconditions.checkArgument; import java.util.Map; -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.compute.domain.OsFamily; import org.jclouds.compute.strategy.impl.ReturnCredentialsBoundToImage; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2RebootNodeStrategy.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2RebootNodeStrategy.java index fbc80961c9..e163a5ad92 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2RebootNodeStrategy.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2RebootNodeStrategy.java @@ -16,8 +16,8 @@ */ package org.jclouds.ec2.compute.strategy; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.compute.domain.NodeMetadata; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ResumeNodeStrategy.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ResumeNodeStrategy.java index 6c5a09316c..cce59709f6 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ResumeNodeStrategy.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ResumeNodeStrategy.java @@ -16,8 +16,8 @@ */ package org.jclouds.ec2.compute.strategy; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.compute.domain.NodeMetadata; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2SuspendNodeStrategy.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2SuspendNodeStrategy.java index ec737a2ca8..5f08c59095 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2SuspendNodeStrategy.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2SuspendNodeStrategy.java @@ -16,8 +16,8 @@ */ package org.jclouds.ec2.compute.strategy; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.compute.domain.NodeMetadata; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/ReviseParsedImage.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/ReviseParsedImage.java index 18dabd7da5..8d740d2ac6 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/ReviseParsedImage.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/ReviseParsedImage.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.compute.strategy; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.ImageBuilder; import org.jclouds.compute.domain.OperatingSystem; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2HardwareSupplier.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2HardwareSupplier.java index 7ba4d1cda6..e89d2ce6ac 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2HardwareSupplier.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2HardwareSupplier.java @@ -24,7 +24,7 @@ import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_xlarge; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Hardware; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java index 8c3377e858..23e50e2092 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java @@ -26,9 +26,9 @@ import java.util.Map.Entry; 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.compute.domain.Image; import org.jclouds.compute.reference.ComputeServiceConstants; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/RegionAndNameToImageSupplier.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/RegionAndNameToImageSupplier.java index ae9daeaab3..c10cc14fbb 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/RegionAndNameToImageSupplier.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/RegionAndNameToImageSupplier.java @@ -20,9 +20,9 @@ import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; 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.compute.domain.Image; import org.jclouds.ec2.compute.domain.RegionAndName; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/util/EC2ComputeUtils.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/util/EC2ComputeUtils.java index 766da1cd2e..9cbbc7e502 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/util/EC2ComputeUtils.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/util/EC2ComputeUtils.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.compute.util; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.domain.Location; import org.jclouds.domain.LocationScope; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/AMIApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/AMIApi.java index 41b2b75ec5..1186df66cf 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/AMIApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/AMIApi.java @@ -21,7 +21,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Map; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/AvailabilityZoneAndRegionApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/AvailabilityZoneAndRegionApi.java index 6a3f5d0c18..9433f7eded 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/AvailabilityZoneAndRegionApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/AvailabilityZoneAndRegionApi.java @@ -22,7 +22,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticBlockStoreApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticBlockStoreApi.java index 54a17174bf..a96a5f6077 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticBlockStoreApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticBlockStoreApi.java @@ -20,7 +20,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticIPAddressApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticIPAddressApi.java index eacd705f5c..a02f8f2c87 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticIPAddressApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticIPAddressApi.java @@ -20,7 +20,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/InstanceApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/InstanceApi.java index 5726feb79c..43f62a9475 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/InstanceApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/InstanceApi.java @@ -21,7 +21,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Map; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/KeyPairApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/KeyPairApi.java index 0cce30ff89..1e46d06a8e 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/KeyPairApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/KeyPairApi.java @@ -20,7 +20,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/SecurityGroupApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/SecurityGroupApi.java index 23b73a57a1..8bc5cf029e 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/SecurityGroupApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/SecurityGroupApi.java @@ -20,7 +20,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/SubnetApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/SubnetApi.java index 21b06e42f0..1808292e45 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/SubnetApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/SubnetApi.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/TagApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/TagApi.java index 476be18554..ffad794b35 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/TagApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/TagApi.java @@ -20,7 +20,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/features/WindowsApi.java b/apis/ec2/src/main/java/org/jclouds/ec2/features/WindowsApi.java index 1802128888..ba0b0214ad 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/features/WindowsApi.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/features/WindowsApi.java @@ -20,7 +20,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/functions/ConvertUnencodedBytesToBase64EncodedString.java b/apis/ec2/src/main/java/org/jclouds/ec2/functions/ConvertUnencodedBytesToBase64EncodedString.java index 0ff9dde1be..88a339fc99 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/functions/ConvertUnencodedBytesToBase64EncodedString.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/functions/ConvertUnencodedBytesToBase64EncodedString.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.io.BaseEncoding.base64; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.google.common.base.Function; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/functions/EncodedRSAPublicKeyToBase64.java b/apis/ec2/src/main/java/org/jclouds/ec2/functions/EncodedRSAPublicKeyToBase64.java index f42022ce1b..3b3e559a86 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/functions/EncodedRSAPublicKeyToBase64.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/functions/EncodedRSAPublicKeyToBase64.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.io.BaseEncoding.base64; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.util.Predicates2; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceHasIpAddress.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceHasIpAddress.java index 38f225dbbb..c42ca633e5 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceHasIpAddress.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceHasIpAddress.java @@ -17,7 +17,7 @@ package org.jclouds.ec2.predicates; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.AWSResponseException; import org.jclouds.ec2.EC2Api; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateRunning.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateRunning.java index 5d4dd9a5fd..1b4bcd99eb 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateRunning.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateRunning.java @@ -17,7 +17,7 @@ package org.jclouds.ec2.predicates; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.ec2.EC2Api; import org.jclouds.ec2.domain.InstanceState; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateStopped.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateStopped.java index 42484df718..122d797b6f 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateStopped.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateStopped.java @@ -17,7 +17,7 @@ package org.jclouds.ec2.predicates; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.ec2.domain.InstanceState; import org.jclouds.ec2.domain.Reservation; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateTerminated.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateTerminated.java index dbbb6265ac..d6f10a6204 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateTerminated.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/InstanceStateTerminated.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.predicates; import java.util.NoSuchElementException; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.ec2.EC2Api; import org.jclouds.ec2.domain.InstanceState; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/SnapshotCompleted.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/SnapshotCompleted.java index 33711b87ed..a2f8f450c7 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/SnapshotCompleted.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/SnapshotCompleted.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.predicates; import static org.jclouds.ec2.options.DescribeSnapshotsOptions.Builder.snapshotIds; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.ec2.domain.Snapshot; import org.jclouds.ec2.features.ElasticBlockStoreApi; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAttached.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAttached.java index 87d8b4ca10..6d3b81c48b 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAttached.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAttached.java @@ -17,7 +17,7 @@ package org.jclouds.ec2.predicates; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.ec2.domain.Attachment; import org.jclouds.ec2.domain.Volume; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAvailable.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAvailable.java index c1e1e4ff1f..7b7eaff738 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAvailable.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeAvailable.java @@ -17,7 +17,7 @@ package org.jclouds.ec2.predicates; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.ec2.domain.Volume; import org.jclouds.ec2.features.ElasticBlockStoreApi; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/suppliers/DescribeAvailabilityZonesInRegion.java b/apis/ec2/src/main/java/org/jclouds/ec2/suppliers/DescribeAvailabilityZonesInRegion.java index 67cb55d192..035a3fe707 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/suppliers/DescribeAvailabilityZonesInRegion.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/suppliers/DescribeAvailabilityZonesInRegion.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.suppliers; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ec2.EC2Api; import org.jclouds.ec2.domain.AvailabilityZoneInfo; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/suppliers/DescribeRegionsForRegionURIs.java b/apis/ec2/src/main/java/org/jclouds/ec2/suppliers/DescribeRegionsForRegionURIs.java index 909faa95b9..cd843d081d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/suppliers/DescribeRegionsForRegionURIs.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/suppliers/DescribeRegionsForRegionURIs.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ec2.EC2Api; import org.jclouds.location.suppliers.RegionIdToURISupplier; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/AttachmentHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/AttachmentHandler.java index f1c284990d..372bfd2f32 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/AttachmentHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/AttachmentHandler.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.xml; import java.util.Date; import jakarta.annotation.Resource; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.util.AWSUtils; import org.jclouds.date.DateService; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/BundleTaskHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/BundleTaskHandler.java index 48de6f275e..5422bc9877 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/BundleTaskHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/BundleTaskHandler.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.xml; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.util.AWSUtils; import org.jclouds.date.DateService; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java index 908e5c66c1..554d07aee7 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.util.AWSUtils; import org.jclouds.date.DateService; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAddressesResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAddressesResponseHandler.java index 3a74fa41a4..3f6a9a5f86 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAddressesResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAddressesResponseHandler.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.util.AWSUtils; import org.jclouds.ec2.domain.PublicIpInstanceIdPair; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAvailabilityZonesResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAvailabilityZonesResponseHandler.java index 77cf6d07e7..5ecb7bed28 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAvailabilityZonesResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeAvailabilityZonesResponseHandler.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.xml; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ec2.domain.AvailabilityZoneInfo; import org.jclouds.http.functions.ParseSax; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeBundleTasksResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeBundleTasksResponseHandler.java index 14d8c6b696..147e5de2d0 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeBundleTasksResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeBundleTasksResponseHandler.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.xml; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ec2.domain.BundleTask; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java index 5fcdaadfa2..91720a5eed 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.util.SaxUtils.currentOrNull; import static org.jclouds.util.SaxUtils.equalsOrSuffix; import jakarta.annotation.Resource; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map; import java.util.Set; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandler.java index 1cff73736d..d1144e4d91 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.ec2.domain.Reservation; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeKeyPairsResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeKeyPairsResponseHandler.java index 45fc9d9703..e0e85b51fe 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeKeyPairsResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeKeyPairsResponseHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.util.SaxUtils.currentOrNull; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.util.AWSUtils; import org.jclouds.ec2.domain.KeyPair; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeSecurityGroupsResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeSecurityGroupsResponseHandler.java index 0b1164db54..af66c94273 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeSecurityGroupsResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeSecurityGroupsResponseHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeSnapshotsResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeSnapshotsResponseHandler.java index 48a26632eb..d93756d241 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeSnapshotsResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeSnapshotsResponseHandler.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.xml; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ec2.domain.Snapshot; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeVolumesResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeVolumesResponseHandler.java index 806087fa4c..c5d35bdd54 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeVolumesResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeVolumesResponseHandler.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.xml; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ec2.domain.Volume; import org.jclouds.http.HttpRequest; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/GetPasswordDataResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/GetPasswordDataResponseHandler.java index 9f326f1c14..b235c0c0ad 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/GetPasswordDataResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/GetPasswordDataResponseHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.xml; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.ec2.domain.PasswordData; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/InstanceStateChangeHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/InstanceStateChangeHandler.java index f85789cd5d..844dec6904 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/InstanceStateChangeHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/InstanceStateChangeHandler.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.xml; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.util.AWSUtils; import org.jclouds.ec2.domain.InstanceState; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/KeyPairResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/KeyPairResponseHandler.java index b4d0f96a15..7641f15e61 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/KeyPairResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/KeyPairResponseHandler.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.xml; import static org.jclouds.util.SaxUtils.currentOrNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.util.AWSUtils; import org.jclouds.ec2.domain.KeyPair; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/RunInstancesResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/RunInstancesResponseHandler.java index 6c957065bf..7dc16703bf 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/RunInstancesResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/RunInstancesResponseHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.ec2.xml; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.ec2.domain.Reservation; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/SnapshotHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/SnapshotHandler.java index 92eff4877a..af5d9d8d17 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/SnapshotHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/SnapshotHandler.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.xml; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.util.AWSUtils; import org.jclouds.date.DateService; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/SubnetHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/SubnetHandler.java index 1dd21e188b..d7ee5000dc 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/SubnetHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/SubnetHandler.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.xml; import static org.jclouds.util.SaxUtils.currentOrNull; import static org.jclouds.util.SaxUtils.equalsOrSuffix; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ec2.domain.Subnet; import org.jclouds.http.functions.ParseSax; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java index 8f752eb432..67e2e4f23f 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java @@ -36,7 +36,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.compute.domain.ComputeMetadata; import org.jclouds.compute.domain.Hardware; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImplTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImplTest.java index 7086978b76..ad4114b90b 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImplTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImplTest.java @@ -28,7 +28,7 @@ import static org.testng.Assert.fail; import java.util.NoSuchElementException; import java.util.Set; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.collect.Memoized; import org.jclouds.compute.domain.Hardware; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java index 421cb8acb6..cb41756a35 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java @@ -25,7 +25,7 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; -import javax.inject.Provider; +import jakarta.inject.Provider; import java.util.Set; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; @@ -84,7 +84,7 @@ public class CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest { .sha1OfPrivateKey("13:36:74:b9:56:bb:07:96:c0:19:ab:00:7f:9f:06:d2:16:a0:45:32") .fingerprint("60:15:d1:f1:d9:e2:3c:e2:ee:a9:64:6a:42:a7:34:0c").keyMaterial(CREDENTIALS.credential).build(); - private static final Provider OPTIONS_PROVIDER = new javax.inject.Provider() { + private static final Provider OPTIONS_PROVIDER = new jakarta.inject.Provider() { @Override public RunInstancesOptions get() { diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/features/BaseEC2ApiTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/features/BaseEC2ApiTest.java index be2a732ed1..267be95840 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/features/BaseEC2ApiTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/features/BaseEC2ApiTest.java @@ -24,7 +24,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.apis.ApiMetadata; import org.jclouds.aws.domain.Region; @@ -81,7 +81,7 @@ public abstract class BaseEC2ApiTest extends BaseRestAnnotationProcessingTest return "2009-11-08T15:54:08.897Z"; } - static class Zones implements javax.inject.Provider> { + static class Zones implements jakarta.inject.Provider> { @Override public Map get() { return ImmutableMap. of("us-east-1a", "us-east-1"); diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/BaseEC2HandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/BaseEC2HandlerTest.java index d789d86ad1..412f1a8c4d 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/BaseEC2HandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/BaseEC2HandlerTest.java @@ -19,7 +19,7 @@ package org.jclouds.ec2.xml; import java.util.Map; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.domain.Region; import org.jclouds.http.functions.BaseHandlerTest; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeAvailabilityZonesResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeAvailabilityZonesResponseHandlerTest.java index b29dd8ddb0..571ff0033f 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeAvailabilityZonesResponseHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeAvailabilityZonesResponseHandlerTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import java.io.InputStream; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.ec2.domain.AvailabilityZoneInfo; import org.jclouds.http.functions.BaseHandlerTest; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextString.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextString.java index f056a1c110..77c4fd50e5 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextString.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextString.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextString.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextString.java index 8ed85ce36e..1dea718adf 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextString.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextString.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindServerToPlainTextString.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindServerToPlainTextString.java index c2f0217258..d8b8890103 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindServerToPlainTextString.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/binders/BindServerToPlainTextString.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java index f3b27be087..47868cbecd 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/config/ElasticStackComputeServiceContextModule.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/config/ElasticStackComputeServiceContextModule.java index 7736aad7fb..c95e9b1e21 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/config/ElasticStackComputeServiceContextModule.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/config/ElasticStackComputeServiceContextModule.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/ServerInfoToNodeMetadata.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/ServerInfoToNodeMetadata.java index 628dc92d16..fd6cdfac0f 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/ServerInfoToNodeMetadata.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/ServerInfoToNodeMetadata.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/StandardDriveToWellKnownImage.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/StandardDriveToWellKnownImage.java index 74235a4ce0..cb0ffb6fd6 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/StandardDriveToWellKnownImage.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/StandardDriveToWellKnownImage.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/WellKnownImageToImage.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/WellKnownImageToImage.java index 6c16805eb3..5deaac3bca 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/WellKnownImageToImage.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/functions/WellKnownImageToImage.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java index e8ab235111..ae7c1e0a84 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMap.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMap.java index 6c6d5b4262..42cc706eb9 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMap.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMap.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/DriveDataToMap.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/DriveDataToMap.java index 2349571064..10a5b87a34 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/DriveDataToMap.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/DriveDataToMap.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java index 432a4af43c..0976df763d 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java index 08dfb64d98..83c5492fc6 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSet.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSet.java index 491b923dff..a01a3cff20 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSet.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSet.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java index d3427a7269..6509c8b03f 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToServerInfoSet.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToServerInfoSet.java index c1304a02fc..54e3971403 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToServerInfoSet.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToServerInfoSet.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToStandardDriveSet.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToStandardDriveSet.java index 187d1e2a4a..ef8fa80773 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToStandardDriveSet.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToStandardDriveSet.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfMapsToListOfKeyValuesDelimitedByBlankLines.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfMapsToListOfKeyValuesDelimitedByBlankLines.java index 2c922a0a9f..5caad648c7 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfMapsToListOfKeyValuesDelimitedByBlankLines.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfMapsToListOfKeyValuesDelimitedByBlankLines.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDevices.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDevices.java index cc285647ac..a75ff4db80 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDevices.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDevices.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java index 0dc14ee5ac..7ed151a646 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveMetrics.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveMetrics.java index 0bd7b22452..4130247ea0 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveMetrics.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveMetrics.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToNICs.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToNICs.java index c0eca00a64..4dd00cf3dc 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToNICs.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToNICs.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java index 12ffb9dbf6..da0caec12f 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerMetrics.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerMetrics.java index a70959d9fc..bf737598b3 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerMetrics.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerMetrics.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToStandardDrive.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToStandardDrive.java index a7aa9d3eb5..a108138eef 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToStandardDrive.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToStandardDrive.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ReturnPayload.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ReturnPayload.java index 768760adeb..8680ce0a9c 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ReturnPayload.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ReturnPayload.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java index 3bd6ff21a8..b2785db501 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/SplitNewlines.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/SplitNewlines.java index 68239c8a1f..18625f1a54 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/SplitNewlines.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/SplitNewlines.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandler.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandler.java index ec57535997..08430e0b0b 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandler.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandler.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java index f0e0e53b93..2139b39421 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java @@ -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; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/suppliers/StandardDiskImageSupplier.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/suppliers/StandardDiskImageSupplier.java index caf7cd3f2d..7e6e6b8c0f 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/suppliers/StandardDiskImageSupplier.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/suppliers/StandardDiskImageSupplier.java @@ -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; diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/suppliers/MockStandardDiskImageSupplier.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/suppliers/MockStandardDiskImageSupplier.java index 72954f4fbe..b541a01c0e 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/suppliers/MockStandardDiskImageSupplier.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/suppliers/MockStandardDiskImageSupplier.java @@ -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; diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java index fa99ed9751..660d89cb1d 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java @@ -58,9 +58,9 @@ import java.util.UUID; import java.util.regex.Pattern; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import com.google.common.base.Strings; import org.jclouds.blobstore.ContainerNotFoundException; diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/util/internal/FileSystemBlobUtilsImpl.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/util/internal/FileSystemBlobUtilsImpl.java index 2dbd2ad92e..8508e830cc 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/util/internal/FileSystemBlobUtilsImpl.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/util/internal/FileSystemBlobUtilsImpl.java @@ -18,7 +18,7 @@ package org.jclouds.filesystem.util.internal; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.blobstore.LocalStorageStrategy; import org.jclouds.blobstore.domain.BlobBuilder; diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java index 1b983cc556..5343a2a29f 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.assertj.core.api.Fail; import org.jclouds.blobstore.domain.Blob; diff --git a/apis/glacier/src/main/java/org/jclouds/glacier/GlacierClient.java b/apis/glacier/src/main/java/org/jclouds/glacier/GlacierClient.java index 1e0f78cc91..0d8c1a546f 100644 --- a/apis/glacier/src/main/java/org/jclouds/glacier/GlacierClient.java +++ b/apis/glacier/src/main/java/org/jclouds/glacier/GlacierClient.java @@ -22,7 +22,7 @@ import java.io.Closeable; import java.net.URI; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; diff --git a/apis/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BaseSlicingStrategy.java b/apis/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BaseSlicingStrategy.java index dc15230747..c3504825a4 100644 --- a/apis/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BaseSlicingStrategy.java +++ b/apis/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BaseSlicingStrategy.java @@ -19,7 +19,7 @@ package org.jclouds.glacier.blobstore.strategy.internal; import static com.google.common.base.Preconditions.checkNotNull; import static java.lang.Math.sqrt; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.glacier.blobstore.strategy.PayloadSlice; import org.jclouds.glacier.blobstore.strategy.SlicingStrategy; diff --git a/apis/glacier/src/main/java/org/jclouds/glacier/config/GlacierHttpApiModule.java b/apis/glacier/src/main/java/org/jclouds/glacier/config/GlacierHttpApiModule.java index 7e32eabcd0..47093c94b3 100644 --- a/apis/glacier/src/main/java/org/jclouds/glacier/config/GlacierHttpApiModule.java +++ b/apis/glacier/src/main/java/org/jclouds/glacier/config/GlacierHttpApiModule.java @@ -18,7 +18,7 @@ package org.jclouds.glacier.config; import java.util.concurrent.TimeUnit; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.date.DateService; diff --git a/apis/glacier/src/main/java/org/jclouds/glacier/filters/RequestAuthorizeSignature.java b/apis/glacier/src/main/java/org/jclouds/glacier/filters/RequestAuthorizeSignature.java index 6c3cfed494..3d334efad7 100644 --- a/apis/glacier/src/main/java/org/jclouds/glacier/filters/RequestAuthorizeSignature.java +++ b/apis/glacier/src/main/java/org/jclouds/glacier/filters/RequestAuthorizeSignature.java @@ -19,10 +19,10 @@ package org.jclouds.glacier.filters; import static com.google.common.base.Preconditions.checkNotNull; 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; diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/AuthorizationApi.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/AuthorizationApi.java index 57cfa3c3d7..5af1b5d3b4 100644 --- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/AuthorizationApi.java +++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/AuthorizationApi.java @@ -20,7 +20,7 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.io.Closeable; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/Authorization.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/Authorization.java index cefc5acc32..3ed3f3491c 100644 --- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/Authorization.java +++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/Authorization.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Retention(value = RetentionPolicy.RUNTIME) @Target(value = {ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD}) diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/CertificateFingerprintSupplier.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/CertificateFingerprintSupplier.java index b59064c070..76cb92539d 100644 --- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/CertificateFingerprintSupplier.java +++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/CertificateFingerprintSupplier.java @@ -29,7 +29,7 @@ import java.security.cert.X509Certificate; import com.google.inject.Inject; import com.google.inject.Singleton; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.domain.Credentials; import org.jclouds.location.Provider; diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthConfigFactory.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthConfigFactory.java index 63124d0dbd..7a6d25d1a1 100644 --- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthConfigFactory.java +++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthConfigFactory.java @@ -21,7 +21,7 @@ import static org.jclouds.oauth.v2.config.OAuthProperties.RESOURCE; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.http.HttpRequest; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthModule.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthModule.java index ffc03cd27a..007f6eed1e 100644 --- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthModule.java +++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthModule.java @@ -27,8 +27,8 @@ import java.net.URI; import java.security.PrivateKey; import java.util.Map; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.oauth.v2.AuthorizationApi; import org.jclouds.oauth.v2.domain.CertificateFingerprint; @@ -59,7 +59,7 @@ public final class OAuthModule extends AbstractModule { @Provides @Authorization - protected Supplier oauthEndpoint(@javax.inject.Named("oauth.endpoint") String endpoint) { + protected Supplier oauthEndpoint(@jakarta.inject.Named("oauth.endpoint") String endpoint) { return Suppliers.ofInstance(URI.create(endpoint)); } diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/PrivateKeySupplier.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/PrivateKeySupplier.java index 4873dc9937..cd8b9bd7ef 100644 --- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/PrivateKeySupplier.java +++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/PrivateKeySupplier.java @@ -28,8 +28,8 @@ import java.security.NoSuchAlgorithmException; import java.security.PrivateKey; import java.security.spec.InvalidKeySpecException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.domain.Credentials; import org.jclouds.location.Provider; diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/BearerTokenFromCredentials.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/BearerTokenFromCredentials.java index 61eacf1c61..01f8f0e942 100644 --- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/BearerTokenFromCredentials.java +++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/BearerTokenFromCredentials.java @@ -18,7 +18,7 @@ package org.jclouds.oauth.v2.filters; import static java.lang.String.format; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.domain.Credentials; import org.jclouds.http.HttpException; diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsJWTBearerTokenFlow.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsJWTBearerTokenFlow.java index 9adb848066..542f5fb8f0 100644 --- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsJWTBearerTokenFlow.java +++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsJWTBearerTokenFlow.java @@ -21,8 +21,8 @@ import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.domain.Credentials; import org.jclouds.http.HttpException; diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsSecretFlow.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsSecretFlow.java index 85f43099fc..f62ff21126 100644 --- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsSecretFlow.java +++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/ClientCredentialsSecretFlow.java @@ -19,7 +19,7 @@ package org.jclouds.oauth.v2.filters; import static java.util.concurrent.TimeUnit.SECONDS; import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.domain.Credentials; import org.jclouds.http.HttpException; diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java index 39bcacef78..3fa69b2587 100644 --- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java +++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/JWTBearerTokenFlow.java @@ -19,8 +19,8 @@ package org.jclouds.oauth.v2.filters; import static java.util.concurrent.TimeUnit.SECONDS; import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.domain.Credentials; import org.jclouds.http.HttpException; diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/ClaimsToAssertion.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/ClaimsToAssertion.java index d40f12e0d0..c6ecf835fd 100644 --- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/ClaimsToAssertion.java +++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/ClaimsToAssertion.java @@ -29,8 +29,8 @@ import java.security.Signature; import java.security.SignatureException; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.json.Json; import org.jclouds.oauth.v2.config.Authorization; diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/ClientCredentialsClaimsToAssertion.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/ClientCredentialsClaimsToAssertion.java index b43f579995..96d7e1f031 100644 --- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/ClientCredentialsClaimsToAssertion.java +++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/ClientCredentialsClaimsToAssertion.java @@ -29,8 +29,8 @@ import java.security.Signature; import java.security.SignatureException; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.json.Json; import org.jclouds.oauth.v2.config.Authorization; diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/filters/TestJWTBearerTokenFlow.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/filters/TestJWTBearerTokenFlow.java index 23ac7df052..65a6efc53d 100644 --- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/filters/TestJWTBearerTokenFlow.java +++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/filters/TestJWTBearerTokenFlow.java @@ -18,8 +18,8 @@ package org.jclouds.oauth.v2.filters; import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.domain.Credentials; import org.jclouds.location.Provider; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderHttpApiModule.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderHttpApiModule.java index f8c472f14e..337cc56682 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderHttpApiModule.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderHttpApiModule.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.cinder.v1.config; import java.net.URI; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.annotation.ClientError; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderParserModule.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderParserModule.java index 3b2d1572e1..b97d517f21 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderParserModule.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderParserModule.java @@ -31,7 +31,7 @@ import org.jclouds.openstack.cinder.v1.domain.Snapshot; import org.jclouds.openstack.cinder.v1.domain.SnapshotExtendedAttributes; import org.jclouds.openstack.cinder.v1.domain.Volume; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import java.beans.ConstructorProperties; import java.lang.reflect.Type; import java.util.Date; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java index ab247888cc..862da2a90c 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Date; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.Optional; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java index aec25dcc6e..72054c2543 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java @@ -21,7 +21,7 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import org.jclouds.javax.annotation.Nullable; -import javax.inject.Named; +import jakarta.inject.Named; import java.beans.ConstructorProperties; /** diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java index edae69e9c3..da5838ba7c 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.Map; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java index 92008f37af..6edbdd6564 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java index d045bad01f..c92e7031c2 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java @@ -23,7 +23,7 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import org.jclouds.javax.annotation.Nullable; -import javax.inject.Named; +import jakarta.inject.Named; import java.beans.ConstructorProperties; import java.util.Date; import java.util.Map; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/QuotaApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/QuotaApi.java index 7f9c73112f..a6c8f824a4 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/QuotaApi.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/QuotaApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.cinder.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java index b9bed910ff..856b6da5db 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.cinder.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java index 42b0a741a1..a0ea8f648c 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.cinder.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java index 56d43e0f52..93a31c1f9d 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.cinder.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/handlers/CinderErrorHandler.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/handlers/CinderErrorHandler.java index 06a6a9565b..08204253ca 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/handlers/CinderErrorHandler.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/handlers/CinderErrorHandler.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.cinder.v1.handlers; import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java index f549b2f31f..8bd2c3a6e3 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java @@ -21,7 +21,7 @@ import static com.google.common.base.MoreObjects.toStringHelper; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java index 1b986a1bb2..ccefa6b94e 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java @@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Map.Entry; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/config/Authentication.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/config/Authentication.java index b4d59f5cda..9351e38b2a 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/config/Authentication.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/config/Authentication.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Retention(value = RetentionPolicy.RUNTIME) @Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD }) diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/config/AuthenticationModule.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/config/AuthenticationModule.java index 6731fe826c..e7cc0af450 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/config/AuthenticationModule.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/config/AuthenticationModule.java @@ -24,8 +24,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.domain.Credentials; import org.jclouds.http.HttpRetryHandler; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/config/CredentialType.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/config/CredentialType.java index d3952962aa..856b953718 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/config/CredentialType.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/config/CredentialType.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @see CredentialTypes diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/filters/AuthenticateRequest.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/filters/AuthenticateRequest.java index 6ee125c33f..7ada8574c5 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/filters/AuthenticateRequest.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/filters/AuthenticateRequest.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.keystone.auth.filters; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpException; import org.jclouds.http.HttpRequest; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/AuthenticateApiAccessKeyCredentials.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/AuthenticateApiAccessKeyCredentials.java index 47c2fccaef..ad53301bfb 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/AuthenticateApiAccessKeyCredentials.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/AuthenticateApiAccessKeyCredentials.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.keystone.auth.functions; import static org.jclouds.openstack.keystone.auth.config.CredentialTypes.API_ACCESS_KEY_CREDENTIALS; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.openstack.keystone.auth.AuthenticationApi; import org.jclouds.openstack.keystone.auth.config.CredentialType; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/AuthenticatePasswordCredentials.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/AuthenticatePasswordCredentials.java index 2513bd2760..25e984264f 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/AuthenticatePasswordCredentials.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/AuthenticatePasswordCredentials.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.keystone.auth.functions; import static org.jclouds.openstack.keystone.auth.config.CredentialTypes.PASSWORD_CREDENTIALS; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.openstack.keystone.auth.AuthenticationApi; import org.jclouds.openstack.keystone.auth.config.CredentialType; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/AuthenticateTokenCredentials.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/AuthenticateTokenCredentials.java index fac0289d7d..a8f85976ff 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/AuthenticateTokenCredentials.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/AuthenticateTokenCredentials.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.keystone.auth.functions; import static org.jclouds.openstack.keystone.auth.config.CredentialTypes.TOKEN_CREDENTIALS; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.openstack.keystone.auth.AuthenticationApi; import org.jclouds.openstack.keystone.auth.config.CredentialType; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/handlers/RetryOnRenew.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/handlers/RetryOnRenew.java index 9a3f202936..66cbc58a73 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/handlers/RetryOnRenew.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/handlers/RetryOnRenew.java @@ -19,7 +19,7 @@ package org.jclouds.openstack.keystone.auth.handlers; import java.util.concurrent.TimeUnit; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.domain.Credentials; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/config/KeystoneAdminURLModule.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/config/KeystoneAdminURLModule.java index a70a2223fb..9bf7bc8701 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/config/KeystoneAdminURLModule.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/config/KeystoneAdminURLModule.java @@ -22,8 +22,8 @@ import static org.jclouds.util.Suppliers2.getLastValueInMap; import java.net.URI; import java.util.NoSuchElementException; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.location.Provider; import org.jclouds.openstack.keystone.catalog.suppliers.RegionIdToAdminURIFromServiceEndpointsForTypeAndVersion; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/config/ServiceCatalogModule.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/config/ServiceCatalogModule.java index 9019c7c5a0..260890bf7b 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/config/ServiceCatalogModule.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/config/ServiceCatalogModule.java @@ -22,8 +22,8 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.location.Provider; import org.jclouds.location.suppliers.ImplicitLocationSupplier; @@ -74,7 +74,7 @@ public class ServiceCatalogModule extends AbstractModule { *
    *
  1. add this module to your {@link org.jclouds.apis.ApiMetadata#getDefaultModules()}
    2. *
  2. create a service-specific annotation, such as {@code @CloudDNS}, and make sure that has the meta-annotation - * {@link javax.inject.Qualifier}
    3. + * {@link jakarta.inject.Qualifier} *
  3. add the above annotation to any {@code Api} classes by placing it on the type. ex. * {@code @Endpoint(CloudDNS.class)}
    4. *
  4. add the following to your {@link org.jclouds.rest.config.RestClientModule}
    5. diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/AdminURL.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/AdminURL.java index b727ca1837..85c023bba5 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/AdminURL.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/AdminURL.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.catalog.functions; import static org.jclouds.openstack.keystone.catalog.ServiceEndpoint.Interface.ADMIN; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.openstack.keystone.catalog.ServiceEndpoint; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/InternalURL.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/InternalURL.java index dfe44e3d3f..9fac9411dc 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/InternalURL.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/InternalURL.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.catalog.functions; import static org.jclouds.openstack.keystone.catalog.ServiceEndpoint.Interface.INTERNAL; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.openstack.keystone.catalog.ServiceEndpoint; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/PublicURLOrInternal.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/PublicURLOrInternal.java index cbf01f967d..d373b25965 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/PublicURLOrInternal.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/PublicURLOrInternal.java @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.openstack.keystone.catalog.ServiceEndpoint; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/ReturnRegionOrProvider.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/ReturnRegionOrProvider.java index db1d314996..8a8b28a08c 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/ReturnRegionOrProvider.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/functions/ReturnRegionOrProvider.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.keystone.catalog.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.location.Provider; import org.jclouds.openstack.keystone.catalog.ServiceEndpoint; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/suppliers/RegionIdToAdminURIFromServiceEndpointsForTypeAndVersion.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/suppliers/RegionIdToAdminURIFromServiceEndpointsForTypeAndVersion.java index 742d4403a0..b3370380d7 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/suppliers/RegionIdToAdminURIFromServiceEndpointsForTypeAndVersion.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/suppliers/RegionIdToAdminURIFromServiceEndpointsForTypeAndVersion.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.catalog.suppliers; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.keystone.catalog.ServiceEndpoint; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/suppliers/RegionIdToURIFromServiceEndpointsForTypeAndVersion.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/suppliers/RegionIdToURIFromServiceEndpointsForTypeAndVersion.java index 7065ee59e4..998c6135f7 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/suppliers/RegionIdToURIFromServiceEndpointsForTypeAndVersion.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/catalog/suppliers/RegionIdToURIFromServiceEndpointsForTypeAndVersion.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.catalog.suppliers; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.suppliers.RegionIdToURISupplier; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java index 6715d52c68..269d3685f7 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.v2_0; import java.io.Closeable; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.core.MediaType; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java index 9980830cdd..c2fff8d92c 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java @@ -24,8 +24,8 @@ import static org.jclouds.openstack.keystone.auth.config.CredentialTypes.findCre import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/catalog/V2ServiceCatalog.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/catalog/V2ServiceCatalog.java index b256823e0c..655d60e064 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/catalog/V2ServiceCatalog.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/catalog/V2ServiceCatalog.java @@ -24,8 +24,8 @@ import java.net.URI; import java.util.List; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.logging.Logger; import org.jclouds.openstack.keystone.auth.domain.AuthInfo; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneHttpApiModule.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneHttpApiModule.java index 34c23585f6..f5c3a68daf 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneHttpApiModule.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneHttpApiModule.java @@ -20,7 +20,7 @@ import java.net.URI; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.annotation.ClientError; @@ -66,7 +66,7 @@ public class KeystoneHttpApiModule extends HttpApiModule { @Provides @Singleton - public final LoadingCache> provideExtensionsByRegion(final javax.inject.Provider keystoneApi) { + public final LoadingCache> provideExtensionsByRegion(final jakarta.inject.Provider keystoneApi) { return CacheBuilder.newBuilder().expireAfterWrite(23, TimeUnit.HOURS) .build(CacheLoader.from(Suppliers.memoize(new Supplier>() { @Override diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/NamespaceAliases.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/NamespaceAliases.java index 2a9f28f109..961a6fe038 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/NamespaceAliases.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/NamespaceAliases.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Retention(value = RetentionPolicy.RUNTIME) @Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD }) diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java index fa354b832b..67f87d42b5 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java @@ -22,7 +22,7 @@ import java.beans.ConstructorProperties; import java.util.Date; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.v2_0.domain.Link; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java index e11a0aae19..fb290295e6 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.keystone.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApi.java index aeb28f5ead..49522b3392 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.keystone.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApi.java index b2ffa99c50..d5bf92d774 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.keystone.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.POST; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApi.java index 56e2898006..18298d2092 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.keystone.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.POST; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApi.java index 009ecd5456..95951ca136 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.v2_0.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TokenApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TokenApi.java index cd6d85584c..63b31dc1a9 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TokenApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TokenApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.v2_0.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.HEAD; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/UserApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/UserApi.java index 9e3a6ab26d..b9640151f8 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/UserApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/UserApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.v2_0.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/ParseServices.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/ParseServices.java index b41de06e96..60c1d328df 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/ParseServices.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/ParseServices.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/ParseTenants.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/ParseTenants.java index 8d2425a5ab..2594dff0c8 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/ParseTenants.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/ParseTenants.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import com.google.common.base.Optional; import org.jclouds.collect.IterableWithMarker; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/ParseUsers.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/ParseUsers.java index 87c54130c1..b94215d271 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/ParseUsers.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/ParseUsers.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import com.google.common.base.Optional; import org.jclouds.collect.IterableWithMarker; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/handlers/KeystoneErrorHandler.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/handlers/KeystoneErrorHandler.java index 520e3268c3..9279f0fe1d 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/handlers/KeystoneErrorHandler.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/handlers/KeystoneErrorHandler.java @@ -25,8 +25,8 @@ import org.jclouds.http.HttpResponseException; import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.ResourceNotFoundException; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java index 2827c1bec6..211b9fd6fd 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java index 5d3c84fe32..1f920d5037 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java index 6b0f260b62..01bdecb04b 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java @@ -20,7 +20,7 @@ import static com.google.common.base.Objects.equal; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java index c47e61ffa5..fe45dc04e6 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java @@ -20,7 +20,7 @@ import static com.google.common.base.Objects.equal; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindAccessKeyAuthToJsonPayload.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindAccessKeyAuthToJsonPayload.java index d9e3da0fa2..9d92f4c525 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindAccessKeyAuthToJsonPayload.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindAccessKeyAuthToJsonPayload.java @@ -21,8 +21,8 @@ import org.jclouds.openstack.keystone.auth.domain.ApiAccessKeyCredentials; import org.jclouds.openstack.keystone.auth.domain.TenantOrDomainAndCredentials; import org.jclouds.openstack.keystone.v3.domain.Auth; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import static java.util.Collections.singletonList; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindPasswordAuthToJsonPayload.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindPasswordAuthToJsonPayload.java index 5e0ce7b22a..6167ba6a71 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindPasswordAuthToJsonPayload.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindPasswordAuthToJsonPayload.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.keystone.v3.binders; import static java.util.Collections.singletonList; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.json.Json; import org.jclouds.openstack.keystone.auth.domain.PasswordCredentials; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindTokenAuthToJsonPayload.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindTokenAuthToJsonPayload.java index a3e01a6d47..6dd48aaf60 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindTokenAuthToJsonPayload.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindTokenAuthToJsonPayload.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.keystone.v3.binders; import static java.util.Collections.singletonList; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.json.Json; import org.jclouds.openstack.keystone.auth.domain.TenantOrDomainAndCredentials; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/catalog/V3ServiceCatalog.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/catalog/V3ServiceCatalog.java index e1c1f7cb73..73434a7afa 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/catalog/V3ServiceCatalog.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/catalog/V3ServiceCatalog.java @@ -19,8 +19,8 @@ package org.jclouds.openstack.keystone.v3.catalog; import java.util.List; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.logging.Logger; import org.jclouds.openstack.keystone.auth.domain.AuthInfo; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/AuthApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/AuthApi.java index 7fb3e1ae47..9c0d0f187d 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/AuthApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/AuthApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.keystone.v3.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.HEAD; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/CatalogApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/CatalogApi.java index 67bc8d637a..877b17f320 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/CatalogApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/CatalogApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.v3.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/ProjectApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/ProjectApi.java index 456f774562..118902735f 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/ProjectApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/ProjectApi.java @@ -19,7 +19,7 @@ package org.jclouds.openstack.keystone.v3.features; 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; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/RegionApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/RegionApi.java index cbd0bcdbe0..b745c29637 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/RegionApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/RegionApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.v3.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/UserApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/UserApi.java index f7107b656e..0fb02d6dd7 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/UserApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/features/UserApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.v3.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/parsers/ParseTokenFromHttpResponse.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/parsers/ParseTokenFromHttpResponse.java index 0f0ca70f13..e67739a2a2 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/parsers/ParseTokenFromHttpResponse.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/parsers/ParseTokenFromHttpResponse.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.v3.parsers; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseFirstJsonValueNamed; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java index 9f948ae559..2a569c4925 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Date; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java index d7fa692296..e0b6ea20c5 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.Objects; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java index 0136b82a3c..db6012684c 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.net.URI; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java index 62918e8ec3..0a7063c319 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.Objects; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/features/ExtensionApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/features/ExtensionApi.java index 2d3bfeda52..86c2155593 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/features/ExtensionApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/features/ExtensionApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.v2_0.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/functions/PresentWhenExtensionAnnotationMatchesExtensionSet.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/functions/PresentWhenExtensionAnnotationMatchesExtensionSet.java index 7507067a79..7a49b0bd09 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/functions/PresentWhenExtensionAnnotationMatchesExtensionSet.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/functions/PresentWhenExtensionAnnotationMatchesExtensionSet.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.openstack.keystone.v2_0.config.NamespaceAliases; import org.jclouds.openstack.v2_0.domain.Extension; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Compute.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Compute.java index b779998039..cedfb9cdff 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Compute.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Compute.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Compute (Nova) diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Extension.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Extension.java index f82cf46b3e..83bc986ef9 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Extension.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Extension.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * An extension of a {@link ServiceType service}. In order for us to understand diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Identity.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Identity.java index f69fdd9d63..44692e2fdf 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Identity.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Identity.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Identity Service (Keystone) diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Image.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Image.java index 2085b09d2f..0e5ac12d7c 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Image.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/Image.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Image Service (Glance) diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/ObjectStore.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/ObjectStore.java index 854866253a..a99e5e4c2f 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/ObjectStore.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/services/ObjectStore.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Object Storage (Swift) diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/config/ProviderModuleExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/config/ProviderModuleExpectTest.java index fbc6bad9de..4798169a58 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/config/ProviderModuleExpectTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/config/ProviderModuleExpectTest.java @@ -30,8 +30,8 @@ import java.lang.annotation.Target; import java.net.URI; import java.util.Properties; -import javax.inject.Qualifier; -import javax.inject.Singleton; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import jakarta.ws.rs.HEAD; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java index 0b1c8901f6..185feda250 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.location.Provider; import org.jclouds.openstack.keystone.auth.domain.AuthInfo; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java index 3a632e23db..d62e876b51 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.location.Provider; import org.jclouds.openstack.keystone.auth.domain.AuthInfo; diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java index f3c634694b..3a2890a734 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/auth/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java @@ -22,7 +22,7 @@ import java.net.URI; import java.util.List; import java.util.NoSuchElementException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.location.Provider; import org.jclouds.location.suppliers.RegionIdToURISupplier; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/config/NeutronHttpApiModule.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/config/NeutronHttpApiModule.java index b8ac2c6fb2..768288f313 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/config/NeutronHttpApiModule.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/config/NeutronHttpApiModule.java @@ -22,8 +22,8 @@ import java.net.URI; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.annotation.ClientError; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java index 289efe5d98..ecd0a9fc5a 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java index dd89a2faa8..6de1fe5ec5 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java index 3cfe064248..6bb00aa54c 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java index dbb550cf1c..6db90834f9 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java index 0d7cf4c48d..376f81d9ae 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java index cb4264aa1b..e3bd43bd8e 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java index d8fca09169..35cbeb3e54 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java index 8add46514e..74a79efbb7 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java index f22d2fae86..49f74f1915 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java index 7330c9b293..79de2754cf 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java index 710c0bfcf5..ae2d0ebb2d 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java index ae4b91351d..d053b7c34b 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java index 6a1b8b739c..a749b2b3e8 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java index 1f0570925a..c2115e890f 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Collection; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java index 29ec99132d..96645f753f 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain.lbaas.v1; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java index ad8d46820b..b89a7e9ad3 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain.lbaas.v1; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java index bff6cfe1db..276977c99e 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain.lbaas.v1; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java index 513914139d..bb06bb8f22 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain.lbaas.v1; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java index 07989e741a..b9d10af9ce 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain.lbaas.v1; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java index c984ac4d11..2f4c5d3644 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain.lbaas.v1; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java index d3539a95de..f364c2d962 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain.lbaas.v1; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java index 86a3bc61b0..3158ff9036 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.neutron.v2.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java index 835b7eeede..1b3e848e17 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.neutron.v2.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java index cd4e198abf..3625df2faa 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.neutron.v2.extensions.lbaas.v1; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/FloatingIPApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/FloatingIPApi.java index 1421473cc2..16ecdd30b7 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/FloatingIPApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/FloatingIPApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.neutron.v2.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java index b735a76535..61328eb35e 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.neutron.v2.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java index f33ff86db4..3972420518 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApi.java index 6549ddaed5..56db5c1f25 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.neutron.v2.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java index 6af8308e29..c52a8fd487 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FirewallPolicyToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FirewallPolicyToPagedIterable.java index f70a83db8a..37a75fd32f 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FirewallPolicyToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FirewallPolicyToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FirewallRuleToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FirewallRuleToPagedIterable.java index eff4dc1692..e667604908 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FirewallRuleToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FirewallRuleToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FirewallToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FirewallToPagedIterable.java index 5d6892a056..d178530121 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FirewallToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FirewallToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FloatingIPsToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FloatingIPsToPagedIterable.java index 058ea3f746..e8c97040d0 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FloatingIPsToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/FloatingIPsToPagedIterable.java @@ -25,7 +25,7 @@ import org.jclouds.openstack.neutron.v2.domain.FloatingIP; import org.jclouds.openstack.neutron.v2.features.FloatingIPApi; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/NetworksToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/NetworksToPagedIterable.java index c8983817d4..af836889f7 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/NetworksToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/NetworksToPagedIterable.java @@ -25,7 +25,7 @@ import org.jclouds.openstack.neutron.v2.domain.Network; import org.jclouds.openstack.neutron.v2.features.NetworkApi; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFirewallPolicies.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFirewallPolicies.java index 4773e2ba78..75e77ab898 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFirewallPolicies.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFirewallPolicies.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.neutron.v2.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFirewallRules.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFirewallRules.java index 126a2ce3a2..be058a6b6b 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFirewallRules.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFirewallRules.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.neutron.v2.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFirewalls.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFirewalls.java index 89208cd505..7a73d399e4 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFirewalls.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFirewalls.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.neutron.v2.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFloatingIPs.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFloatingIPs.java index 6529627636..9d30d878d1 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFloatingIPs.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseFloatingIPs.java @@ -21,8 +21,8 @@ import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; import org.jclouds.openstack.neutron.v2.domain.FloatingIPs; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * Used by jclouds to provide more specific collections and fallbacks. diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseNetworks.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseNetworks.java index 0f9b8aa155..7c00cd76b2 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseNetworks.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseNetworks.java @@ -22,8 +22,8 @@ import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; import org.jclouds.openstack.neutron.v2.domain.Networks; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * Used by jclouds to provide more specific collections and fallbacks. diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParsePorts.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParsePorts.java index ab169dd38e..1bd9579486 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParsePorts.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParsePorts.java @@ -21,8 +21,8 @@ import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; import org.jclouds.openstack.neutron.v2.domain.Ports; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * Used by jclouds to provide more specific collections and fallbacks. diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseRouters.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseRouters.java index f0acde74b6..f48ee12632 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseRouters.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseRouters.java @@ -21,8 +21,8 @@ import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; import org.jclouds.openstack.neutron.v2.domain.Routers; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * Used by jclouds to provide more specific collections and fallbacks. diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseRules.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseRules.java index 954180b7e5..81e060000b 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseRules.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseRules.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.neutron.v2.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseSecurityGroups.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseSecurityGroups.java index 386478154c..92b10356df 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseSecurityGroups.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseSecurityGroups.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.neutron.v2.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseSubnets.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseSubnets.java index 0c985ee564..77bd80299c 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseSubnets.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/ParseSubnets.java @@ -21,8 +21,8 @@ import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; import org.jclouds.openstack.neutron.v2.domain.Subnets; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * Used by jclouds to provide more specific collections and fallbacks. diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/PortsToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/PortsToPagedIterable.java index cad5517548..dc86544a41 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/PortsToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/PortsToPagedIterable.java @@ -25,7 +25,7 @@ import org.jclouds.openstack.neutron.v2.domain.Port; import org.jclouds.openstack.neutron.v2.features.PortApi; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/RouterToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/RouterToPagedIterable.java index 5ce4def2da..cc37f07e30 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/RouterToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/RouterToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/RulesToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/RulesToPagedIterable.java index e4283c2f6e..3c8b15501c 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/RulesToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/RulesToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/SecurityGroupsToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/SecurityGroupsToPagedIterable.java index ddb42402a4..3052afab25 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/SecurityGroupsToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/SecurityGroupsToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/SubnetsToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/SubnetsToPagedIterable.java index a5e6abe246..8ada571a97 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/SubnetsToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/SubnetsToPagedIterable.java @@ -25,7 +25,7 @@ import org.jclouds.openstack.neutron.v2.domain.Subnet; import org.jclouds.openstack.neutron.v2.features.SubnetApi; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/VersionAwareRegionToEndpoint.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/VersionAwareRegionToEndpoint.java index 36c93b972f..b94e651fa7 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/VersionAwareRegionToEndpoint.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/VersionAwareRegionToEndpoint.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkState; import java.net.URI; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.location.Region; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/HealthMonitorsToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/HealthMonitorsToPagedIterable.java index e925b81e2c..3bc98ac0a4 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/HealthMonitorsToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/HealthMonitorsToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.functions.lbaas.v1; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/MembersToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/MembersToPagedIterable.java index 23b1719e33..69af954d5a 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/MembersToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/MembersToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.functions.lbaas.v1; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParseHealthMonitors.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParseHealthMonitors.java index d74ceaf5f9..b2032a2fa3 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParseHealthMonitors.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParseHealthMonitors.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.neutron.v2.functions.lbaas.v1; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParseMembers.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParseMembers.java index 252a5b0490..3c8a4abc9f 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParseMembers.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParseMembers.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.neutron.v2.functions.lbaas.v1; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParsePools.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParsePools.java index adf81da08a..ba00343c13 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParsePools.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParsePools.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.neutron.v2.functions.lbaas.v1; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParseVIPs.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParseVIPs.java index d97710c325..5256b1aeb8 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParseVIPs.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/ParseVIPs.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.neutron.v2.functions.lbaas.v1; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/PoolsToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/PoolsToPagedIterable.java index c59b9668b6..2ae9f209c9 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/PoolsToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/PoolsToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.functions.lbaas.v1; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/VIPsToPagedIterable.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/VIPsToPagedIterable.java index 5731b2fd28..fb42bb3dba 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/VIPsToPagedIterable.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/functions/lbaas/v1/VIPsToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.neutron.v2.functions.lbaas.v1; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/handlers/NeutronErrorHandler.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/handlers/NeutronErrorHandler.java index 5aaaae5569..523785f536 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/handlers/NeutronErrorHandler.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/handlers/NeutronErrorHandler.java @@ -23,7 +23,7 @@ import org.jclouds.http.HttpResponseException; import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.ResourceNotFoundException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; diff --git a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/features/NovaEC2KeyPairApi.java b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/features/NovaEC2KeyPairApi.java index 21c09399d7..09003d4115 100644 --- a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/features/NovaEC2KeyPairApi.java +++ b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/features/NovaEC2KeyPairApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/internal/HyphenToNullIso8601Codec.java b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/internal/HyphenToNullIso8601Codec.java index 6142c8cc24..f24cab5086 100644 --- a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/internal/HyphenToNullIso8601Codec.java +++ b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/internal/HyphenToNullIso8601Codec.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.ec2.internal; import java.util.Date; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.date.DateService; import org.jclouds.date.internal.DateServiceDateCodecFactory.DateServiceIso8601Codec; diff --git a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/loaders/NovaCreateSecurityGroupIfNeeded.java b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/loaders/NovaCreateSecurityGroupIfNeeded.java index e9e0957596..533bf72423 100644 --- a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/loaders/NovaCreateSecurityGroupIfNeeded.java +++ b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/loaders/NovaCreateSecurityGroupIfNeeded.java @@ -18,9 +18,9 @@ package org.jclouds.openstack.nova.ec2.loaders; import static com.google.common.base.Preconditions.checkNotNull; -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.aws.AWSResponseException; import org.jclouds.ec2.EC2Api; diff --git a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/strategy/NovaReviseParsedImage.java b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/strategy/NovaReviseParsedImage.java index 94446e3e8d..3909afb249 100644 --- a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/strategy/NovaReviseParsedImage.java +++ b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/strategy/NovaReviseParsedImage.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.ec2.strategy; 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.compute.domain.ImageBuilder; import org.jclouds.compute.domain.OperatingSystem; diff --git a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/xml/NovaCreateVolumeResponseHandler.java b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/xml/NovaCreateVolumeResponseHandler.java index 3041b09f97..687915d12c 100644 --- a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/xml/NovaCreateVolumeResponseHandler.java +++ b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/xml/NovaCreateVolumeResponseHandler.java @@ -19,7 +19,7 @@ package org.jclouds.openstack.nova.ec2.xml; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.ec2.domain.Attachment; diff --git a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/xml/NovaDescribeImagesResponseHandler.java b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/xml/NovaDescribeImagesResponseHandler.java index 3b57d5cbef..c13959f841 100644 --- a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/xml/NovaDescribeImagesResponseHandler.java +++ b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/xml/NovaDescribeImagesResponseHandler.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.ec2.xml; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ec2.domain.Image; import org.jclouds.ec2.domain.Image.ImageType; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindConsoleToJsonPayload.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindConsoleToJsonPayload.java index 82f69f3d07..b6663ecef6 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindConsoleToJsonPayload.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindConsoleToJsonPayload.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.binders; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindKeyPairToJsonPayload.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindKeyPairToJsonPayload.java index 509de12634..c4c3f3dd42 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindKeyPairToJsonPayload.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindKeyPairToJsonPayload.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.binders; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindMetadataToJsonPayload.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindMetadataToJsonPayload.java index c0fa3bbed6..85609ba4a1 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindMetadataToJsonPayload.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindMetadataToJsonPayload.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.nova.v2_0.binders; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindSecurityGroupRuleToJsonPayload.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindSecurityGroupRuleToJsonPayload.java index b7bdacf319..64413e2bbb 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindSecurityGroupRuleToJsonPayload.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindSecurityGroupRuleToJsonPayload.java @@ -23,8 +23,8 @@ import static com.google.common.collect.Iterables.find; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeService.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeService.java index c28319cb1d..3dd870ecce 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeService.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeService.java @@ -25,10 +25,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.collect.Memoized; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java index 7142d49074..fd4e08890b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java @@ -30,8 +30,8 @@ import java.util.Map; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.compute.ComputeServiceAdapter; import org.jclouds.compute.domain.Template; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java index 867f260253..6a47ca097a 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java @@ -26,8 +26,8 @@ import static org.jclouds.util.Predicates2.retry; import java.util.Map; import java.util.Set; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtension.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtension.java index c7a3f1e1db..939685a2ff 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtension.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtension.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Context; import org.jclouds.compute.domain.SecurityGroup; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtension.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtension.java index 26f36e03fe..902b0a09b7 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtension.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtension.java @@ -28,9 +28,9 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; 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; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java index 153a4065d1..b5a0e8d163 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java @@ -30,7 +30,7 @@ import static org.jclouds.openstack.nova.v2_0.predicates.SecurityGroupPredicates import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.inject.Inject; import org.jclouds.Constants; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java index 3a7d6c2cfd..40c4e26069 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.collect.Sets; import org.jclouds.Context; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CleanupResources.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CleanupResources.java index f579bb549c..e91852b3fd 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CleanupResources.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CleanupResources.java @@ -22,9 +22,9 @@ import static org.jclouds.openstack.nova.v2_0.compute.strategy.ApplyNovaTemplate 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.compute.domain.NodeMetadata; import org.jclouds.compute.domain.SecurityGroup; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CreateSecurityGroupIfNeeded.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CreateSecurityGroupIfNeeded.java index cae54cae37..b12c1070ef 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CreateSecurityGroupIfNeeded.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CreateSecurityGroupIfNeeded.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import com.google.common.annotations.VisibleForTesting; import org.jclouds.Context; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/FlavorInRegionToHardware.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/FlavorInRegionToHardware.java index 7387bed4e7..7c1560a650 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/FlavorInRegionToHardware.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/FlavorInRegionToHardware.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.HardwareBuilder; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInRegionToImage.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInRegionToImage.java index 35a6787d29..41c02f4c26 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInRegionToImage.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInRegionToImage.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.ImageBuilder; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java index ad8bc87ddd..0a9165fcd9 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java @@ -30,8 +30,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.compute.domain.OperatingSystem; import org.jclouds.compute.domain.OsFamily; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NeutronSecurityGroupToSecurityGroup.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NeutronSecurityGroupToSecurityGroup.java index 67c31e9078..c5fa7d49b1 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NeutronSecurityGroupToSecurityGroup.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NeutronSecurityGroupToSecurityGroup.java @@ -28,7 +28,7 @@ import org.jclouds.net.domain.IpProtocol; import org.jclouds.openstack.neutron.v2.domain.Rule; import org.jclouds.openstack.neutron.v2.domain.RuleDirection; -import javax.inject.Inject; +import jakarta.inject.Inject; import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.transform; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupInRegionToSecurityGroup.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupInRegionToSecurityGroup.java index 189d4f9786..0e78cc34c7 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupInRegionToSecurityGroup.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupInRegionToSecurityGroup.java @@ -25,8 +25,8 @@ import java.util.Collection; import java.util.Map; 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.SecurityGroup; import org.jclouds.compute.domain.SecurityGroupBuilder; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java index 9e200528bb..c1056a44f8 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java @@ -20,8 +20,8 @@ import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.transform; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.compute.domain.SecurityGroup; import org.jclouds.compute.domain.SecurityGroupBuilder; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/OrphanedGroupsByRegionId.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/OrphanedGroupsByRegionId.java index 1a42952a6a..7ac49ead26 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/OrphanedGroupsByRegionId.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/OrphanedGroupsByRegionId.java @@ -23,7 +23,7 @@ import static com.google.common.collect.Sets.filter; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.compute.ComputeService; import org.jclouds.compute.domain.NodeMetadata; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java index 232a01ab18..85a0ccef5b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java @@ -19,7 +19,7 @@ package org.jclouds.openstack.nova.v2_0.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.Supplier; import com.google.inject.Inject; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInRegionToNodeMetadata.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInRegionToNodeMetadata.java index aabb7169a4..f97fe93d57 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInRegionToNodeMetadata.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInRegionToNodeMetadata.java @@ -36,8 +36,8 @@ import java.util.NoSuchElementException; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.google.common.base.Optional; import org.jclouds.collect.Memoized; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/loaders/FindSecurityGroupOrCreate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/loaders/FindSecurityGroupOrCreate.java index 274e4efa43..8c065ad417 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/loaders/FindSecurityGroupOrCreate.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/loaders/FindSecurityGroupOrCreate.java @@ -19,7 +19,7 @@ package org.jclouds.openstack.nova.v2_0.compute.loaders; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.compute.domain.SecurityGroup; import org.jclouds.openstack.nova.v2_0.domain.regionscoped.RegionAndName; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/loaders/LoadFloatingIpsForInstance.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/loaders/LoadFloatingIpsForInstance.java index 2e404d5762..3d3f577f6a 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/loaders/LoadFloatingIpsForInstance.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/loaders/LoadFloatingIpsForInstance.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.nova.v2_0.compute.loaders; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import com.google.common.base.Function; import org.jclouds.openstack.nova.v2_0.NovaApi; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/predicates/AllNodesInGroupTerminated.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/predicates/AllNodesInGroupTerminated.java index 0d6812feeb..cafdde6762 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/predicates/AllNodesInGroupTerminated.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/predicates/AllNodesInGroupTerminated.java @@ -23,7 +23,7 @@ import static org.jclouds.compute.predicates.NodePredicates.inGroup; import static org.jclouds.compute.predicates.NodePredicates.locationId; import static org.jclouds.compute.predicates.NodePredicates.parentLocationId; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.compute.ComputeService; import org.jclouds.compute.domain.ComputeMetadata; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java index 908728e6d2..426b3aece9 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java @@ -25,9 +25,9 @@ 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.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.Constants; import org.jclouds.compute.config.CustomizationResponse; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/config/NovaHttpApiModule.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/config/NovaHttpApiModule.java index c6d99ef933..d536dc40b2 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/config/NovaHttpApiModule.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/config/NovaHttpApiModule.java @@ -34,8 +34,8 @@ import org.jclouds.rest.ConfiguresHttpApi; import org.jclouds.rest.config.HttpApiModule; import org.jclouds.rest.functions.ImplicitOptionalConverter; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import java.net.URI; import java.util.Set; import java.util.concurrent.TimeUnit; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/config/NovaParserModule.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/config/NovaParserModule.java index bde077adff..1752f1a459 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/config/NovaParserModule.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/config/NovaParserModule.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.google.common.collect.Maps; import com.google.gson.JsonObject; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java index 79b10eafb4..20d2a2d9f9 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java @@ -26,7 +26,7 @@ import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; import org.jclouds.javax.annotation.Nullable; -import javax.inject.Named; +import jakarta.inject.Named; /** * IP address diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/BlockDeviceMapping.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/BlockDeviceMapping.java index 9938b7cfec..0ca2f1ac35 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/BlockDeviceMapping.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/BlockDeviceMapping.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.v2_0.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FixedIP.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FixedIP.java index 43dc288ad6..9ac233f122 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FixedIP.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FixedIP.java @@ -21,7 +21,7 @@ import com.google.common.base.Objects; import com.google.common.base.MoreObjects.ToStringHelper; import org.jclouds.javax.annotation.Nullable; -import javax.inject.Named; +import jakarta.inject.Named; import java.beans.ConstructorProperties; /** diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java index c33ffda2d2..da6ac18478 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.v2_0.domain.Link; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java index c3481bb133..8a99383a68 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java index e40a9ea213..2e084e96ce 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.v2_0.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java index 610efce035..bdf875f748 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.Map; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java index cf72bbc87e..2dd7df06eb 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java index a28d80adb7..006bfe8e43 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.collect.ImmutableList; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java index ae12919330..f6aaab24f7 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.v2_0.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; import org.jclouds.net.domain.IpProtocol; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/InterfaceAttachment.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/InterfaceAttachment.java index 4c1d6edaa2..284dcad572 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/InterfaceAttachment.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/InterfaceAttachment.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java index f91ba5cef8..71e00a2ebb 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java index d6b8f579ed..ea59ffad61 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java index 5c9de23fa5..f69b1db17f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java index 15df34753b..8afeec4d33 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; import org.jclouds.net.domain.IpProtocol; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java index 5aff1ac37a..e3c40efaf0 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java @@ -22,7 +22,7 @@ import java.beans.ConstructorProperties; import java.util.Date; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.v2_0.domain.Link; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java index ac0d5732cd..eec8219b3d 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.v2_0.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java index 44ed882dd4..912a1e455c 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.v2_0.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java index ebe6c05b41..0fe711086d 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.Map; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.v2_0.domain.Link; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java index 89830fb142..ee305e7245 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Date; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java index af64978830..9acebda90b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java @@ -22,7 +22,7 @@ import java.beans.ConstructorProperties; import java.util.Date; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java index cd9c8c681b..8ab42f60de 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java index 7da0f76e32..db5ecbf17a 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java index 0cb1b6f1ca..5d7eee081c 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.Map; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java index f5e30505fe..6f27389e75 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Date; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java index ff0ae8f4cd..737547c72d 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java @@ -22,7 +22,7 @@ import java.beans.ConstructorProperties; import java.util.Date; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AttachInterfaceApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AttachInterfaceApi.java index 8811d9c61f..a846fa930b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AttachInterfaceApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AttachInterfaceApi.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApi.java index c42d2a5b9c..3c06213f88 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApi.java index 9a05f51d2e..0bde3d8b6a 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java index 474ded88ec..60342e01ed 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.v2_0.extensions; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java index d801155373..4b0178985c 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java index 01ce2fadf0..6b04b7f23f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.PUT; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java index 54dbbc5c1c..45ec612844 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.v2_0.extensions; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApi.java index 17cf5dd0db..a35e0a5218 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java index 65754a1d37..0de8d53df2 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java index 8ac25f88d9..b93686eb5d 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.PUT; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java index 68150e74d1..ccfb94ecaf 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java index 2aa4b6814f..7cf368bb2e 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java index 67c08144d1..db8489e6b9 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java index e8e08f2280..7b14a01ffe 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java index f9b5553234..2b8141632e 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java index c69f0ae91f..bdeda5cb71 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java index d9456673db..779b0a424b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.extensions; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java index 5408d03355..4218f2255b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.v2_0.extensions; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/FlavorApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/FlavorApi.java index bde7068115..1b1f37503e 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/FlavorApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/FlavorApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ImageApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ImageApi.java index a2ab10f980..5786e4ce70 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ImageApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ImageApi.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.v2_0.features; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ServerApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ServerApi.java index 8ea38b96b8..a0db75d71a 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ServerApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ServerApi.java @@ -21,7 +21,7 @@ import com.google.common.base.Optional; import java.util.Map; 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; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/OverLimitParser.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/OverLimitParser.java index f6ec1afa16..3d4f66ac39 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/OverLimitParser.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/OverLimitParser.java @@ -21,7 +21,7 @@ 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 org.jclouds.json.Json; import org.jclouds.logging.Logger; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/ParseImageIdFromLocationHeader.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/ParseImageIdFromLocationHeader.java index ec7f005634..14a56e346a 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/ParseImageIdFromLocationHeader.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/ParseImageIdFromLocationHeader.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/OnlyMetadataValueOrNull.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/OnlyMetadataValueOrNull.java index ba9ad1f1e0..7c204eb99b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/OnlyMetadataValueOrNull.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/OnlyMetadataValueOrNull.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseFlavorDetails.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseFlavorDetails.java index 48b146f0b7..a0f8b34f40 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseFlavorDetails.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseFlavorDetails.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseFlavors.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseFlavors.java index dc2e1e8ece..1bb85c1bcf 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseFlavors.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseFlavors.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import com.google.common.base.Optional; import org.jclouds.collect.IterableWithMarker; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseImageDetails.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseImageDetails.java index 65c0aab506..79d2abab7e 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseImageDetails.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseImageDetails.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import com.google.common.base.Optional; import org.jclouds.collect.IterableWithMarker; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseImages.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseImages.java index b33c2f96ec..a86068e05b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseImages.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseImages.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseKeyPairs.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseKeyPairs.java index ad84f9ab51..2609fdcb7c 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseKeyPairs.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseKeyPairs.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.nova.v2_0.functions.internal; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseFirstJsonValueNamed; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseServerDetails.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseServerDetails.java index f85e8a70da..53f248b618 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseServerDetails.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseServerDetails.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import com.google.common.base.Optional; import org.jclouds.collect.IterableWithMarker; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseServers.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseServers.java index cc4d9adea0..3b00f9e8da 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseServers.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseServers.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandler.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandler.java index 29e735c4c4..4bd27f6754 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandler.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandler.java @@ -25,9 +25,9 @@ import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; 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.Constants; import org.jclouds.date.DateCodecFactory; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java index 1b1fbd7d92..3136bab2ee 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java @@ -21,7 +21,7 @@ import static com.google.common.base.MoreObjects.toStringHelper; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java index 4ea3508e09..9e6b4edd10 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java @@ -28,8 +28,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.http.HttpRequest; import org.jclouds.openstack.nova.v2_0.domain.BlockDeviceMapping; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java index 7741c19962..2cd8ff2a9e 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java @@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Map.Entry; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java index 3772434f7c..4215da742e 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java @@ -21,7 +21,7 @@ import static com.google.common.base.MoreObjects.toStringHelper; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java index aeb870eb1b..91a09ccc4a 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java @@ -21,7 +21,7 @@ import static com.google.common.base.MoreObjects.toStringHelper; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/RebuildServerOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/RebuildServerOptions.java index 1e269fc60c..569cef1ccd 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/RebuildServerOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/RebuildServerOptions.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/FindSecurityGroupWithNameAndReturnTrue.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/FindSecurityGroupWithNameAndReturnTrue.java index 7e7e91a38e..e29fd48f19 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/FindSecurityGroupWithNameAndReturnTrue.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/FindSecurityGroupWithNameAndReturnTrue.java @@ -23,7 +23,7 @@ import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicReference; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.logging.Logger; import org.jclouds.openstack.nova.v2_0.NovaApi; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtensionLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtensionLiveTest.java index bc7e52b718..5eca17c578 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtensionLiveTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NeutronSecurityGroupExtensionLiveTest.java @@ -19,7 +19,7 @@ package org.jclouds.openstack.nova.v2_0.compute.extensions; import java.util.Properties; import java.util.concurrent.ExecutionException; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.Optional; import org.jclouds.Context; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionLiveTest.java index a923e91de8..d4d45a8a90 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionLiveTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionLiveTest.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.ComputeService; import org.jclouds.compute.domain.SecurityGroup; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java index e58df8993c..ab311cc055 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.Context; import org.jclouds.blobstore.BlobRequestSigner; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java index a7e0c7d20e..4b5248afb1 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java @@ -46,8 +46,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.blobstore.BlobStore; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java index bcd94709bd..75a681c115 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java @@ -23,7 +23,7 @@ import java.net.URI; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.blobstore.domain.Blob; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/config/SignUsingTemporaryUrls.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/config/SignUsingTemporaryUrls.java index 43a876da4e..44ea85f152 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/config/SignUsingTemporaryUrls.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/config/SignUsingTemporaryUrls.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.swift.v1.blobstore.config; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.date.TimeStamp; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/config/SwiftBlobStoreContextModule.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/config/SwiftBlobStoreContextModule.java index bbc392a617..b184ca28bb 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/config/SwiftBlobStoreContextModule.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/config/SwiftBlobStoreContextModule.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.swift.v1.blobstore.config; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStoreContext; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftAuthenticationModule.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftAuthenticationModule.java index 6fd0bf72cc..2218ee889f 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftAuthenticationModule.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftAuthenticationModule.java @@ -30,7 +30,7 @@ import java.util.Date; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java index 1da53a4db4..fc06b8120c 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java @@ -20,7 +20,7 @@ import static com.google.common.base.Objects.equal; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.Objects; import com.google.common.base.MoreObjects.ToStringHelper; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java index 0df5252926..8831f11953 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java @@ -21,7 +21,7 @@ import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.ACCOUNT_TEMP import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.HEAD; import jakarta.ws.rs.HeaderParam; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java index 002acf2740..db1a3fe1fe 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java @@ -21,7 +21,7 @@ import static com.google.common.net.UrlEscapers.urlFragmentEscaper; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.PUT; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java index af09b495c2..a430304aed 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java @@ -20,7 +20,7 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/DynamicLargeObjectApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/DynamicLargeObjectApi.java index 4f912d9cec..e6675069af 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/DynamicLargeObjectApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/DynamicLargeObjectApi.java @@ -20,7 +20,7 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.PUT; import jakarta.ws.rs.Path; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java index 77408e691d..17c415306c 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java @@ -23,7 +23,7 @@ import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.OBJECT_COPY_ import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java index 7fdb2c52e6..5a39c0ee27 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java @@ -21,7 +21,7 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseObjectFromResponse.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseObjectFromResponse.java index 1b63af16c8..d752b8fc14 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseObjectFromResponse.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseObjectFromResponse.java @@ -24,7 +24,7 @@ import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.OBJECT_DELET import java.net.URI; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.http.HttpRequest; diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseObjectListFromResponse.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseObjectListFromResponse.java index 38c9100685..b76fcd9707 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseObjectListFromResponse.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseObjectListFromResponse.java @@ -23,7 +23,7 @@ import static org.jclouds.util.Strings2.urlEncode; import java.util.Date; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/config/TroveHttpApiModule.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/config/TroveHttpApiModule.java index 1c127cc8e6..cadf9df6be 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/config/TroveHttpApiModule.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/config/TroveHttpApiModule.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.trove.v1.config; import java.net.URI; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.annotation.ClientError; diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/DatabaseApi.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/DatabaseApi.java index 543e34ae0b..1240158e84 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/DatabaseApi.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/DatabaseApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.trove.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/FlavorApi.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/FlavorApi.java index 7536f840bb..e5328f9177 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/FlavorApi.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/FlavorApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.trove.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/InstanceApi.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/InstanceApi.java index 3303f04509..e522f92016 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/InstanceApi.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/InstanceApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.trove.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/UserApi.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/UserApi.java index f00549e5b7..9065fc4b65 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/UserApi.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/UserApi.java @@ -19,7 +19,7 @@ package org.jclouds.openstack.trove.v1.features; 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; diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/filters/EncodeDotsForUserGet.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/filters/EncodeDotsForUserGet.java index c1a1f5f7e0..57b109c70f 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/filters/EncodeDotsForUserGet.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/filters/EncodeDotsForUserGet.java @@ -19,7 +19,7 @@ package org.jclouds.openstack.trove.v1.filters; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpException; import org.jclouds.http.HttpRequest; diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/handlers/TroveErrorHandler.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/handlers/TroveErrorHandler.java index d0db7709cf..5182289cfd 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/handlers/TroveErrorHandler.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/handlers/TroveErrorHandler.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.trove.v1.handlers; import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java index eb11085af3..12db9a5083 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java @@ -20,7 +20,7 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.io.Closeable; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/CreateReverseDNSToJSON.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/CreateReverseDNSToJSON.java index c9ce7d6c92..cd29f652ca 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/CreateReverseDNSToJSON.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/CreateReverseDNSToJSON.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java index 567d3b2988..d425730259 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java @@ -22,8 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; 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.http.HttpRequest; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateReverseDNSToJSON.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateReverseDNSToJSON.java index 3827f981f3..99d76f9ae8 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateReverseDNSToJSON.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateReverseDNSToJSON.java @@ -23,7 +23,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/config/CloudDNS.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/config/CloudDNS.java index 51c2286f0e..20534e95f4 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/config/CloudDNS.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/config/CloudDNS.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Represents a component related to Rackspace Cloud DNS. diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java index b3d754ea50..be4b6085b9 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java @@ -20,7 +20,7 @@ import java.util.Date; 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; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/LimitApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/LimitApi.java index 128f1517b0..7497f4d75b 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/LimitApi.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/LimitApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.clouddns.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/RecordApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/RecordApi.java index 060fd300e4..499b51efd2 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/RecordApi.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/RecordApi.java @@ -19,7 +19,7 @@ package org.jclouds.rackspace.clouddns.v1.features; import java.util.Map; 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; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.java index 0c8b2eec8e..c68b193b79 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.java @@ -20,7 +20,7 @@ import java.net.URI; import java.util.Map; 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; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/DomainsToPagedIterable.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/DomainsToPagedIterable.java index 1920feb664..237fa34773 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/DomainsToPagedIterable.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/DomainsToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.rackspace.clouddns.v1.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseDomain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseDomain.java index 5e9aa69cad..54b6ada7e1 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseDomain.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseDomain.java @@ -24,8 +24,8 @@ import java.util.Date; import java.util.Map; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseDomains.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseDomains.java index 912bda59ae..57e321b7a9 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseDomains.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseDomains.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseJob.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseJob.java index 3f9a76f09c..249d1a8753 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseJob.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseJob.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.domain.JsonBall; import org.jclouds.http.HttpResponse; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseOnlyRecord.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseOnlyRecord.java index 16e1d67abd..91cd8bb9a6 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseOnlyRecord.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseOnlyRecord.java @@ -22,7 +22,7 @@ import static org.jclouds.rackspace.clouddns.v1.functions.ParseRecord.toRecordDe import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseRecord.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseRecord.java index 87ded462e7..dd28778141 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseRecord.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseRecord.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseRecords.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseRecords.java index 4038ceed60..6f18d0586e 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseRecords.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseRecords.java @@ -21,7 +21,7 @@ import static org.jclouds.rackspace.clouddns.v1.functions.ParseRecord.toRecordDe import java.beans.ConstructorProperties; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseSubdomains.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseSubdomains.java index dbf1994429..8d29eadd81 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseSubdomains.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/ParseSubdomains.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/RecordsToPagedIterable.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/RecordsToPagedIterable.java index fbe7edf9b4..a3ac887796 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/RecordsToPagedIterable.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/RecordsToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.rackspace.clouddns.v1.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/SubdomainsToPagedIterable.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/SubdomainsToPagedIterable.java index 874cf6299e..29cd9b4199 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/SubdomainsToPagedIterable.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/functions/SubdomainsToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.rackspace.clouddns.v1.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/binders/BindCDNPurgeEmailAddressesToHeaders.java b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/binders/BindCDNPurgeEmailAddressesToHeaders.java index a2cb5bd44b..bd6b9db439 100644 --- a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/binders/BindCDNPurgeEmailAddressesToHeaders.java +++ b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/binders/BindCDNPurgeEmailAddressesToHeaders.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.rackspace.cloudfiles.v1.reference.CloudFilesHeaders; diff --git a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java index 7d18eef276..0b418708b4 100644 --- a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java +++ b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.net.URI; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.Objects; import com.google.common.base.MoreObjects.ToStringHelper; diff --git a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java index c4ab5ffcfb..3e9101e726 100644 --- a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java +++ b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java @@ -23,7 +23,7 @@ import static org.jclouds.rackspace.cloudfiles.v1.reference.CloudFilesHeaders.CD 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; diff --git a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java index 07f6f250a2..f2af9af7b3 100644 --- a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java +++ b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java @@ -22,8 +22,8 @@ import static com.google.common.base.Preconditions.checkState; import java.net.URI; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.suppliers.RegionIdToURISupplier; diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationApi.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationApi.java index edfc52291f..4345c04cdc 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationApi.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.cloudidentity.v2_0; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java index 254a53b4f6..a787bbd80f 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java @@ -16,8 +16,8 @@ */ package org.jclouds.rackspace.cloudidentity.v2_0.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.openstack.keystone.auth.config.CredentialType; import org.jclouds.openstack.keystone.auth.domain.AuthInfo; diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/DateParser.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/DateParser.java index 2c21110daf..102a1a4e0f 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/DateParser.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/DateParser.java @@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.date.DateService; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/binders/BindMetadataToJsonPayload.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/binders/BindMetadataToJsonPayload.java index f08b108c92..8ac59627e8 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/binders/BindMetadataToJsonPayload.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/binders/BindMetadataToJsonPayload.java @@ -22,8 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java index d42ade4a2e..8eebf4bdc2 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java @@ -18,7 +18,7 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApi.java index f22eceab97..8ebf3a300d 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApi.java index dbd5c30bf0..190d91d47e 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApi.java index 4cf687f2ba..da47e79e94 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.PUT; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApi.java index 13f7e45f9e..1cfeba7334 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApi.java index 35ee5d0c43..d4ed2d458b 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java index 01d59b2e74..99fe063cbf 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java @@ -18,7 +18,7 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java index abc5300c9c..079d779fa8 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java @@ -19,7 +19,7 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import java.util.Map; 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; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApi.java index cd701c60d8..33fc40ed0f 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApi.java @@ -18,7 +18,7 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.features; import java.util.Date; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApi.java index 338159e440..bf982a6455 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApi.java index 926b2fefd9..1320f0120d 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApi.java index 3f151866f8..9c2bd03ee8 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java index 7bc286f362..8dac2bb8e3 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java @@ -19,7 +19,7 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import java.net.URI; import jakarta.annotation.Resource; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.logging.Logger; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRuleWithId; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/DateParser.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/DateParser.java index 617307ea30..77949c05f1 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/DateParser.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/DateParser.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.text.SimpleDateFormat; import java.util.Date; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.google.common.base.Function; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseAlgorithms.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseAlgorithms.java index 0d5ce4ef4a..c881d5a140 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseAlgorithms.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseAlgorithms.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancer.java index 06ddb735a0..f3ea601a10 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancer.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkState; import java.net.URI; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerUsages.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerUsages.java index 900633fe2b..ff6073988a 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerUsages.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerUsages.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java index fcbc099843..cae7f8a101 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.net.URI; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.IterableWithMarkers; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseMetadata.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseMetadata.java index 7e199f8f14..669799b136 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseMetadata.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseMetadata.java @@ -23,7 +23,7 @@ import java.lang.reflect.Type; import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponseException; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedBoolean.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedBoolean.java index 8d92d5fb10..179ad83a38 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedBoolean.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedBoolean.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedString.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedString.java index 17ab094dde..20e9a244f6 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedString.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedString.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNode.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNode.java index 5af5477424..9a7449c4d0 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNode.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNode.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java index 2d0359a346..b02c4a6a9e 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseSessionPersistence.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseSessionPersistence.java index 8c0b578338..c5f185898f 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseSessionPersistence.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseSessionPersistence.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java index 03630caac5..71ad8eae24 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java @@ -23,7 +23,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java index 9090ca86ae..a5f957455e 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java @@ -18,8 +18,8 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.functions; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java index 41d3256913..88fb19fb00 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java @@ -19,9 +19,9 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.strategy; import static com.google.common.base.Preconditions.checkNotNull; 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.loadbalancer.domain.LoadBalancerMetadata; import org.jclouds.loadbalancer.reference.LoadBalancerConstants; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java index 18fc18af15..5968d51258 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java @@ -18,8 +18,8 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.strategy; 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.loadbalancer.domain.LoadBalancerMetadata; import org.jclouds.loadbalancer.strategy.GetLoadBalancerMetadataStrategy; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java index 8cc090ef3e..7c7b16e0f2 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java @@ -20,8 +20,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.loadbalancer.domain.LoadBalancerMetadata; import org.jclouds.loadbalancer.strategy.ListLoadBalancersStrategy; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java index 5d9be6c394..dcd3fd7fe8 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java @@ -19,9 +19,9 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.strategy; import static com.google.common.base.Preconditions.checkNotNull; 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.compute.domain.NodeMetadata; import org.jclouds.domain.Location; diff --git a/apis/route53/src/main/java/org/jclouds/route53/Route53Api.java b/apis/route53/src/main/java/org/jclouds/route53/Route53Api.java index c5adae4390..cbd9bab587 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/Route53Api.java +++ b/apis/route53/src/main/java/org/jclouds/route53/Route53Api.java @@ -18,7 +18,7 @@ package org.jclouds.route53; import java.io.Closeable; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; diff --git a/apis/route53/src/main/java/org/jclouds/route53/binders/BindChangeBatch.java b/apis/route53/src/main/java/org/jclouds/route53/binders/BindChangeBatch.java index 9ab3d2fc9e..25544e7a0c 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/binders/BindChangeBatch.java +++ b/apis/route53/src/main/java/org/jclouds/route53/binders/BindChangeBatch.java @@ -18,7 +18,7 @@ package org.jclouds.route53.binders; import static org.jclouds.io.Payloads.newStringPayload; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.io.Payload; diff --git a/apis/route53/src/main/java/org/jclouds/route53/binders/BindNextRecord.java b/apis/route53/src/main/java/org/jclouds/route53/binders/BindNextRecord.java index 238c771a4d..6891d64ab2 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/binders/BindNextRecord.java +++ b/apis/route53/src/main/java/org/jclouds/route53/binders/BindNextRecord.java @@ -16,7 +16,7 @@ */ package org.jclouds.route53.binders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest.Builder; diff --git a/apis/route53/src/main/java/org/jclouds/route53/config/Route53HttpApiModule.java b/apis/route53/src/main/java/org/jclouds/route53/config/Route53HttpApiModule.java index 1ee323c8f0..d386a210ee 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/config/Route53HttpApiModule.java +++ b/apis/route53/src/main/java/org/jclouds/route53/config/Route53HttpApiModule.java @@ -18,7 +18,7 @@ package org.jclouds.route53.config; import java.util.Date; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.config.AWSHttpApiModule; import org.jclouds.date.DateService; diff --git a/apis/route53/src/main/java/org/jclouds/route53/features/HostedZoneApi.java b/apis/route53/src/main/java/org/jclouds/route53/features/HostedZoneApi.java index 0fcc5c79e4..5cc6b93708 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/features/HostedZoneApi.java +++ b/apis/route53/src/main/java/org/jclouds/route53/features/HostedZoneApi.java @@ -18,7 +18,7 @@ package org.jclouds.route53.features; import static jakarta.ws.rs.core.MediaType.APPLICATION_XML; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; diff --git a/apis/route53/src/main/java/org/jclouds/route53/features/ResourceRecordSetApi.java b/apis/route53/src/main/java/org/jclouds/route53/features/ResourceRecordSetApi.java index c8a90ce664..891db5bed0 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/features/ResourceRecordSetApi.java +++ b/apis/route53/src/main/java/org/jclouds/route53/features/ResourceRecordSetApi.java @@ -18,7 +18,7 @@ package org.jclouds.route53.features; import static jakarta.ws.rs.core.MediaType.APPLICATION_XML; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/route53/src/main/java/org/jclouds/route53/filters/RestAuthentication.java b/apis/route53/src/main/java/org/jclouds/route53/filters/RestAuthentication.java index dd288c1da6..5a973f0d97 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/filters/RestAuthentication.java +++ b/apis/route53/src/main/java/org/jclouds/route53/filters/RestAuthentication.java @@ -26,9 +26,9 @@ import java.security.NoSuchAlgorithmException; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; -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.aws.domain.SessionCredentials; import org.jclouds.date.TimeStamp; diff --git a/apis/route53/src/main/java/org/jclouds/route53/functions/HostedZonesToPagedIterable.java b/apis/route53/src/main/java/org/jclouds/route53/functions/HostedZonesToPagedIterable.java index b0fca9ae69..dd07ccc080 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/functions/HostedZonesToPagedIterable.java +++ b/apis/route53/src/main/java/org/jclouds/route53/functions/HostedZonesToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.route53.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.CallerArg0ToPagedIterable; diff --git a/apis/route53/src/main/java/org/jclouds/route53/functions/ResourceRecordSetIterableToPagedIterable.java b/apis/route53/src/main/java/org/jclouds/route53/functions/ResourceRecordSetIterableToPagedIterable.java index 65f2f43ab6..dcf0aebf37 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/functions/ResourceRecordSetIterableToPagedIterable.java +++ b/apis/route53/src/main/java/org/jclouds/route53/functions/ResourceRecordSetIterableToPagedIterable.java @@ -18,7 +18,7 @@ package org.jclouds.route53.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.CallerArg0ToPagedIterable; diff --git a/apis/route53/src/main/java/org/jclouds/route53/handlers/Route53ErrorHandler.java b/apis/route53/src/main/java/org/jclouds/route53/handlers/Route53ErrorHandler.java index a172904eb8..51c85f7ab4 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/handlers/Route53ErrorHandler.java +++ b/apis/route53/src/main/java/org/jclouds/route53/handlers/Route53ErrorHandler.java @@ -19,9 +19,9 @@ package org.jclouds.route53.handlers; import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; import static org.jclouds.http.HttpUtils.releasePayload; -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.aws.AWSResponseException; import org.jclouds.aws.domain.AWSError; diff --git a/apis/route53/src/main/java/org/jclouds/route53/xml/ChangeHandler.java b/apis/route53/src/main/java/org/jclouds/route53/xml/ChangeHandler.java index 2f89e23aa1..4d9280dd2c 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/xml/ChangeHandler.java +++ b/apis/route53/src/main/java/org/jclouds/route53/xml/ChangeHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.util.SaxUtils.currentOrNull; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; diff --git a/apis/s3/src/main/java/org/jclouds/s3/Bucket.java b/apis/s3/src/main/java/org/jclouds/s3/Bucket.java index 2855f70614..33717766cb 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/Bucket.java +++ b/apis/s3/src/main/java/org/jclouds/s3/Bucket.java @@ -23,7 +23,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; /** * Annotates the parameter that this is a bucket. diff --git a/apis/s3/src/main/java/org/jclouds/s3/S3Client.java b/apis/s3/src/main/java/org/jclouds/s3/S3Client.java index a849d5e5aa..8dc28d575e 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/S3Client.java +++ b/apis/s3/src/main/java/org/jclouds/s3/S3Client.java @@ -23,7 +23,7 @@ import java.io.Closeable; import java.util.Map; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; import jakarta.ws.rs.HEAD; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindACLToXMLPayload.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindACLToXMLPayload.java index 21c4d6e3cd..468fd35517 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindACLToXMLPayload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindACLToXMLPayload.java @@ -22,7 +22,7 @@ import static org.jclouds.s3.binders.XMLHelper.createDocument; import static org.jclouds.s3.binders.XMLHelper.elem; import static org.jclouds.s3.binders.XMLHelper.elemWithText; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import jakarta.ws.rs.core.MediaType; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindAsHostPrefixIfConfigured.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindAsHostPrefixIfConfigured.java index 4fb18acd5a..6e19043b4f 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindAsHostPrefixIfConfigured.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindAsHostPrefixIfConfigured.java @@ -19,9 +19,9 @@ package org.jclouds.s3.binders; import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_SERVICE_PATH; import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_VIRTUAL_HOST_BUCKETS; -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.http.HttpRequest; import org.jclouds.rest.Binder; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayload.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayload.java index 77008d482b..cc77dd9d0d 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayload.java @@ -23,7 +23,7 @@ import static org.jclouds.s3.binders.XMLHelper.elemWithText; import java.util.Collection; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import jakarta.ws.rs.core.MediaType; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindNoBucketLoggingToXmlPayload.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindNoBucketLoggingToXmlPayload.java index 2f9f8a8729..28b223d0de 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindNoBucketLoggingToXmlPayload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindNoBucketLoggingToXmlPayload.java @@ -16,8 +16,8 @@ */ package org.jclouds.s3.binders; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.rest.Binder; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindObjectMetadataToRequest.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindObjectMetadataToRequest.java index 836f20bed3..982a94d3d9 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindObjectMetadataToRequest.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindObjectMetadataToRequest.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.io.BaseEncoding.base64; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.blobstore.binders.BindMapToHeadersWithPrefix; import org.jclouds.http.HttpRequest; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindPartIdsAndETagsToRequest.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindPartIdsAndETagsToRequest.java index c011e5eaa5..8082e27e82 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindPartIdsAndETagsToRequest.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindPartIdsAndETagsToRequest.java @@ -22,7 +22,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 jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindPayerToXmlPayload.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindPayerToXmlPayload.java index 36102ec3a1..26ec45b9de 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindPayerToXmlPayload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindPayerToXmlPayload.java @@ -19,7 +19,7 @@ package org.jclouds.s3.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 jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequest.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequest.java index e611bd90d6..3ac59168f0 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequest.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequest.java @@ -19,8 +19,8 @@ package org.jclouds.s3.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 org.jclouds.blobstore.binders.BindMapToHeadersWithPrefix; import org.jclouds.http.HttpRequest; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java index 9707f4fece..af0391f716 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.blobstore.util.BlobStoreUtils.cleanRequest; import static org.jclouds.reflect.Reflection2.method; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.blobstore.domain.Blob; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java index 195b637202..f366200789 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java @@ -25,9 +25,9 @@ import java.util.List; import java.util.Map; 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.blobstore.BlobStoreContext; import org.jclouds.blobstore.ContainerNotFoundException; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/config/S3BlobStoreContextModule.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/config/S3BlobStoreContextModule.java index 9c76eeece8..d21499a3d0 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/config/S3BlobStoreContextModule.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/config/S3BlobStoreContextModule.java @@ -20,7 +20,7 @@ import static com.google.inject.Scopes.SINGLETON; import java.util.concurrent.TimeUnit; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.blobstore.BlobStore; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObject.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObject.java index 24c592eda7..fa7f498ad2 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObject.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObject.java @@ -18,8 +18,8 @@ package org.jclouds.s3.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.blobstore.domain.Blob; import org.jclouds.s3.domain.S3Object; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceList.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceList.java index ea710d4646..b71ef86e7f 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceList.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceList.java @@ -18,8 +18,8 @@ package org.jclouds.s3.blobstore.functions; import java.util.SortedSet; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceMetadata.java index ea37e6c92e..2afb41ae4c 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceMetadata.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceMetadata.java @@ -17,8 +17,8 @@ package org.jclouds.s3.blobstore.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.blobstore.domain.MutableStorageMetadata; import org.jclouds.blobstore.domain.StorageMetadata; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadata.java index d88aae0e9a..a99fbee5ee 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadata.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadata.java @@ -22,9 +22,9 @@ import java.util.Set; import java.util.concurrent.Callable; 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.blobstore.domain.PageSet; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/CommonPrefixesToResourceMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/CommonPrefixesToResourceMetadata.java index a2f6174ee2..d4f7387b20 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/CommonPrefixesToResourceMetadata.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/CommonPrefixesToResourceMetadata.java @@ -16,7 +16,7 @@ */ package org.jclouds.s3.blobstore.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.blobstore.domain.MutableStorageMetadata; import org.jclouds.blobstore.domain.StorageMetadata; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ContainerToBucketListOptions.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ContainerToBucketListOptions.java index a5d9231b62..3da1116f47 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ContainerToBucketListOptions.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ContainerToBucketListOptions.java @@ -18,7 +18,7 @@ package org.jclouds.s3.blobstore.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.blobstore.options.ListContainerOptions; import org.jclouds.s3.options.ListBucketOptions; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/LocationFromBucketName.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/LocationFromBucketName.java index f53e361893..d4faf14f4c 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/LocationFromBucketName.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/LocationFromBucketName.java @@ -24,8 +24,8 @@ import java.util.NoSuchElementException; 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.domain.Location; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlob.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlob.java index 2269028b34..97ae914f3b 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlob.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlob.java @@ -18,8 +18,8 @@ package org.jclouds.s3.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.blobstore.domain.Blob; import org.jclouds.blobstore.domain.Blob.Factory; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java index 8af059a1c0..3762a5f4b9 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java @@ -16,8 +16,8 @@ */ package org.jclouds.s3.blobstore.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.blobstore.domain.MutableBlobMetadata; import org.jclouds.blobstore.domain.StorageType; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/internal/BackoffOnNotFoundWhenGetBucketACL.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/internal/BackoffOnNotFoundWhenGetBucketACL.java index 061ff0c673..503dcdb282 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/internal/BackoffOnNotFoundWhenGetBucketACL.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/internal/BackoffOnNotFoundWhenGetBucketACL.java @@ -18,7 +18,7 @@ package org.jclouds.s3.blobstore.internal; import static com.google.common.base.Throwables.propagate; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.rest.ResourceNotFoundException; import org.jclouds.s3.S3Client; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/internal/S3BlobStoreContextImpl.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/internal/S3BlobStoreContextImpl.java index 220606c19d..3028ec67c6 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/internal/S3BlobStoreContextImpl.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/internal/S3BlobStoreContextImpl.java @@ -16,8 +16,8 @@ */ package org.jclouds.s3.blobstore.internal; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.Context; import org.jclouds.blobstore.BlobRequestSigner; diff --git a/apis/s3/src/main/java/org/jclouds/s3/config/S3HttpApiModule.java b/apis/s3/src/main/java/org/jclouds/s3/config/S3HttpApiModule.java index 88160d3235..8b1965d6ac 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/config/S3HttpApiModule.java +++ b/apis/s3/src/main/java/org/jclouds/s3/config/S3HttpApiModule.java @@ -21,8 +21,8 @@ import java.util.Date; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.Constants; import org.jclouds.aws.config.AWSHttpApiModule; diff --git a/apis/s3/src/main/java/org/jclouds/s3/config/S3ObjectModule.java b/apis/s3/src/main/java/org/jclouds/s3/config/S3ObjectModule.java index fbe27343a5..b7eb10621e 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/config/S3ObjectModule.java +++ b/apis/s3/src/main/java/org/jclouds/s3/config/S3ObjectModule.java @@ -16,8 +16,8 @@ */ package org.jclouds.s3.config; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jclouds.blobstore.config.BlobStoreObjectModule; import org.jclouds.s3.domain.MutableObjectMetadata; diff --git a/apis/s3/src/main/java/org/jclouds/s3/domain/internal/S3ObjectImpl.java b/apis/s3/src/main/java/org/jclouds/s3/domain/internal/S3ObjectImpl.java index 2ecaa3c271..40103eaedf 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/domain/internal/S3ObjectImpl.java +++ b/apis/s3/src/main/java/org/jclouds/s3/domain/internal/S3ObjectImpl.java @@ -18,7 +18,7 @@ package org.jclouds.s3.domain.internal; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.internal.PayloadEnclosingImpl; import org.jclouds.io.Payload; diff --git a/apis/s3/src/main/java/org/jclouds/s3/fallbacks/FalseIfBucketAlreadyOwnedByYouOrOperationAbortedWhenBucketExists.java b/apis/s3/src/main/java/org/jclouds/s3/fallbacks/FalseIfBucketAlreadyOwnedByYouOrOperationAbortedWhenBucketExists.java index 4b58ffae15..129e142324 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/fallbacks/FalseIfBucketAlreadyOwnedByYouOrOperationAbortedWhenBucketExists.java +++ b/apis/s3/src/main/java/org/jclouds/s3/fallbacks/FalseIfBucketAlreadyOwnedByYouOrOperationAbortedWhenBucketExists.java @@ -21,7 +21,7 @@ import static com.google.common.base.Throwables.propagate; import static org.jclouds.s3.util.S3Utils.getBucketName; import static org.jclouds.util.Throwables2.getFirstThrowableOfType; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.Fallback; import org.jclouds.aws.AWSResponseException; diff --git a/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerBase.java b/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerBase.java index 66d5231edc..e2e40dc1ed 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerBase.java +++ b/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerBase.java @@ -38,7 +38,7 @@ import java.util.Map; import java.util.SortedMap; import java.util.TimeZone; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.google.common.base.Joiner; import com.google.common.base.Supplier; diff --git a/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerForAuthorizationHeader.java b/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerForAuthorizationHeader.java index 41091f7607..884d9e46b3 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerForAuthorizationHeader.java +++ b/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerForAuthorizationHeader.java @@ -36,7 +36,7 @@ import org.jclouds.io.Payload; import org.jclouds.location.Provider; import org.jclouds.util.Closeables2; -import javax.inject.Named; +import jakarta.inject.Named; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerForChunkedUpload.java b/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerForChunkedUpload.java index 91a0d4e6b2..a7657abfe2 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerForChunkedUpload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerForChunkedUpload.java @@ -42,7 +42,7 @@ import java.io.IOException; import java.security.InvalidKeyException; import java.util.Date; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.aws.domain.SessionCredentials; import org.jclouds.crypto.Crypto; diff --git a/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerForQueryString.java b/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerForQueryString.java index 537e66c21f..255be26b78 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerForQueryString.java +++ b/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerForQueryString.java @@ -35,7 +35,7 @@ import static com.google.common.io.BaseEncoding.base16; import java.util.Date; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.aws.domain.SessionCredentials; import org.jclouds.crypto.Crypto; diff --git a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV2.java b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV2.java index abd1c0f4cd..d61db3ffd1 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV2.java +++ b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV2.java @@ -36,10 +36,10 @@ import java.util.Set; import java.util.concurrent.TimeUnit; 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.aws.domain.SessionCredentials; diff --git a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4.java b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4.java index f50b730db6..4cbd3b8687 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4.java +++ b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4.java @@ -24,7 +24,7 @@ import org.jclouds.io.Payload; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.jclouds.s3.S3Client; -import javax.inject.Inject; +import jakarta.inject.Inject; @Singleton public class RequestAuthorizeSignatureV4 implements RequestAuthorizeSignature { diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/AssignCorrectHostnameForBucket.java b/apis/s3/src/main/java/org/jclouds/s3/functions/AssignCorrectHostnameForBucket.java index 3a203b9be4..756b9cd756 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/AssignCorrectHostnameForBucket.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/AssignCorrectHostnameForBucket.java @@ -18,7 +18,7 @@ package org.jclouds.s3.functions; import java.net.URI; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.s3.Bucket; diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/BindRegionToXmlPayload.java b/apis/s3/src/main/java/org/jclouds/s3/functions/BindRegionToXmlPayload.java index 25ebc77fac..3de3c1a353 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/BindRegionToXmlPayload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/BindRegionToXmlPayload.java @@ -22,8 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull; 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 jakarta.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/DefaultEndpointThenInvalidateRegion.java b/apis/s3/src/main/java/org/jclouds/s3/functions/DefaultEndpointThenInvalidateRegion.java index 8b087c6dba..1c38d6f04d 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/DefaultEndpointThenInvalidateRegion.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/DefaultEndpointThenInvalidateRegion.java @@ -18,7 +18,7 @@ package org.jclouds.s3.functions; import java.net.URI; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.javax.annotation.Nullable; import org.jclouds.s3.Bucket; diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/ETagFromHttpResponseViaRegex.java b/apis/s3/src/main/java/org/jclouds/s3/functions/ETagFromHttpResponseViaRegex.java index 953dbcd209..b35637f324 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/ETagFromHttpResponseViaRegex.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/ETagFromHttpResponseViaRegex.java @@ -19,8 +19,8 @@ package org.jclouds.s3.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; diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/GetRegionForBucket.java b/apis/s3/src/main/java/org/jclouds/s3/functions/GetRegionForBucket.java index bd057156ee..a5dde789a8 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/GetRegionForBucket.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/GetRegionForBucket.java @@ -19,8 +19,8 @@ package org.jclouds.s3.functions; import java.util.concurrent.ExecutionException; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.logging.Logger; import org.jclouds.s3.Bucket; diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/ObjectKey.java b/apis/s3/src/main/java/org/jclouds/s3/functions/ObjectKey.java index e9c18bbcf5..7c54d09e17 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/ObjectKey.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/ObjectKey.java @@ -16,7 +16,7 @@ */ package org.jclouds.s3.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.s3.domain.S3Object; diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/ObjectMetadataKey.java b/apis/s3/src/main/java/org/jclouds/s3/functions/ObjectMetadataKey.java index f5c555e27a..c08b4d86cd 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/ObjectMetadataKey.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/ObjectMetadataKey.java @@ -16,7 +16,7 @@ */ package org.jclouds.s3.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.s3.domain.ObjectMetadata; diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/ParseObjectFromHeadersAndHttpContent.java b/apis/s3/src/main/java/org/jclouds/s3/functions/ParseObjectFromHeadersAndHttpContent.java index 5195f17074..d9d3536fb3 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/ParseObjectFromHeadersAndHttpContent.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/ParseObjectFromHeadersAndHttpContent.java @@ -16,7 +16,7 @@ */ package org.jclouds.s3.functions; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeaders.java b/apis/s3/src/main/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeaders.java index aadb313238..6ca4d40cf5 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeaders.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeaders.java @@ -22,8 +22,8 @@ import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_M import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.functions.ParseSystemAndUserMetadataFromHeaders; diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/UploadIdFromHttpResponseViaRegex.java b/apis/s3/src/main/java/org/jclouds/s3/functions/UploadIdFromHttpResponseViaRegex.java index 1d3edb14ac..67501b40fb 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/UploadIdFromHttpResponseViaRegex.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/UploadIdFromHttpResponseViaRegex.java @@ -19,8 +19,8 @@ package org.jclouds.s3.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; diff --git a/apis/s3/src/main/java/org/jclouds/s3/handlers/ParseS3ErrorFromXmlContent.java b/apis/s3/src/main/java/org/jclouds/s3/handlers/ParseS3ErrorFromXmlContent.java index 3e28b1edb9..ce59adca9d 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/handlers/ParseS3ErrorFromXmlContent.java +++ b/apis/s3/src/main/java/org/jclouds/s3/handlers/ParseS3ErrorFromXmlContent.java @@ -23,9 +23,9 @@ import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_VIRTUAL_HOST_BUCK import java.net.URI; import java.util.List; -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.aws.domain.AWSError; import org.jclouds.aws.handlers.ParseAWSErrorFromXmlContent; diff --git a/apis/s3/src/main/java/org/jclouds/s3/handlers/S3RedirectionRetryHandler.java b/apis/s3/src/main/java/org/jclouds/s3/handlers/S3RedirectionRetryHandler.java index fa6ed11060..bfbef0ca61 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/handlers/S3RedirectionRetryHandler.java +++ b/apis/s3/src/main/java/org/jclouds/s3/handlers/S3RedirectionRetryHandler.java @@ -21,8 +21,8 @@ import static org.jclouds.http.Uris.uriBuilder; import java.net.URI; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.aws.domain.AWSError; import org.jclouds.aws.util.AWSUtils; diff --git a/apis/s3/src/main/java/org/jclouds/s3/options/CopyObjectOptions.java b/apis/s3/src/main/java/org/jclouds/s3/options/CopyObjectOptions.java index d9e606433b..ea26503b5a 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/options/CopyObjectOptions.java +++ b/apis/s3/src/main/java/org/jclouds/s3/options/CopyObjectOptions.java @@ -32,8 +32,8 @@ import java.util.Date; import java.util.Map; import java.util.Map.Entry; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.date.DateService; import org.jclouds.date.internal.SimpleDateFormatDateService; diff --git a/apis/s3/src/main/java/org/jclouds/s3/options/PutBucketOptions.java b/apis/s3/src/main/java/org/jclouds/s3/options/PutBucketOptions.java index 5028688c40..7dedafc0a3 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/options/PutBucketOptions.java +++ b/apis/s3/src/main/java/org/jclouds/s3/options/PutBucketOptions.java @@ -22,8 +22,8 @@ import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG; import java.util.Map.Entry; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.http.options.BaseHttpRequestOptions; import org.jclouds.s3.domain.CannedAccessPolicy; diff --git a/apis/s3/src/main/java/org/jclouds/s3/options/PutObjectOptions.java b/apis/s3/src/main/java/org/jclouds/s3/options/PutObjectOptions.java index 3ae6d3077f..708f02fde5 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/options/PutObjectOptions.java +++ b/apis/s3/src/main/java/org/jclouds/s3/options/PutObjectOptions.java @@ -24,8 +24,8 @@ import static org.jclouds.s3.reference.S3Headers.DEFAULT_AMAZON_HEADERTAG; import java.util.Map.Entry; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.http.options.BaseHttpRequestOptions; import org.jclouds.s3.domain.CannedAccessPolicy; diff --git a/apis/s3/src/main/java/org/jclouds/s3/predicates/validators/BucketNameValidator.java b/apis/s3/src/main/java/org/jclouds/s3/predicates/validators/BucketNameValidator.java index 046e9ba41d..5f77b447d2 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/predicates/validators/BucketNameValidator.java +++ b/apis/s3/src/main/java/org/jclouds/s3/predicates/validators/BucketNameValidator.java @@ -16,7 +16,7 @@ */ package org.jclouds.s3.predicates.validators; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.predicates.Validator; diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/CopyObjectHandler.java b/apis/s3/src/main/java/org/jclouds/s3/xml/CopyObjectHandler.java index 26f18f45a9..53bafc75fc 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/CopyObjectHandler.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/CopyObjectHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.util.SaxUtils.currentOrNull; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/ListAllMyBucketsHandler.java b/apis/s3/src/main/java/org/jclouds/s3/xml/ListAllMyBucketsHandler.java index 058a358e84..f8b503160f 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/ListAllMyBucketsHandler.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/ListAllMyBucketsHandler.java @@ -21,7 +21,7 @@ import static org.jclouds.util.SaxUtils.currentOrNull; import java.util.Date; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java b/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java index 27e21555d9..84d643f9aa 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java @@ -23,7 +23,7 @@ import static org.jclouds.util.SaxUtils.currentOrNull; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/ListMultipartUploadsHandler.java b/apis/s3/src/main/java/org/jclouds/s3/xml/ListMultipartUploadsHandler.java index 7434f8f457..9fe9a96d90 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/ListMultipartUploadsHandler.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/ListMultipartUploadsHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.util.SaxUtils.currentOrNull; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/LocationConstraintHandler.java b/apis/s3/src/main/java/org/jclouds/s3/xml/LocationConstraintHandler.java index 9ff90e1b37..20c27f353a 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/LocationConstraintHandler.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/LocationConstraintHandler.java @@ -18,7 +18,7 @@ package org.jclouds.s3.xml; import static org.jclouds.util.SaxUtils.currentOrNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.domain.Region; import org.jclouds.http.HttpRequest; diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/PartIdsFromHttpResponse.java b/apis/s3/src/main/java/org/jclouds/s3/xml/PartIdsFromHttpResponse.java index fa8ac81932..a71cb2b80b 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/PartIdsFromHttpResponse.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/PartIdsFromHttpResponse.java @@ -22,7 +22,7 @@ import java.util.Date; import java.util.Map; import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/PartIdsFromHttpResponseFull.java b/apis/s3/src/main/java/org/jclouds/s3/xml/PartIdsFromHttpResponseFull.java index 471a362241..7e195e874b 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/PartIdsFromHttpResponseFull.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/PartIdsFromHttpResponseFull.java @@ -21,7 +21,7 @@ import static org.jclouds.util.SaxUtils.currentOrNull; import java.util.Date; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; diff --git a/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketToContainerListOptions.java b/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketToContainerListOptions.java index 578097789a..606356c48c 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketToContainerListOptions.java +++ b/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketToContainerListOptions.java @@ -16,7 +16,7 @@ */ package org.jclouds.s3.blobstore.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.blobstore.options.ListContainerOptions; import org.jclouds.s3.options.ListBucketOptions; diff --git a/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/ResourceToBucketList.java b/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/ResourceToBucketList.java index 74fa4e2dca..18563f85c0 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/ResourceToBucketList.java +++ b/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/ResourceToBucketList.java @@ -18,8 +18,8 @@ package org.jclouds.s3.blobstore.functions; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.PageSet; diff --git a/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4ChunkedUploadTest.java b/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4ChunkedUploadTest.java index 63f16d2436..ec7f8b5d49 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4ChunkedUploadTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4ChunkedUploadTest.java @@ -45,7 +45,7 @@ import org.jclouds.s3.options.PutObjectOptions; import org.jclouds.util.Closeables2; import org.testng.annotations.Test; -import javax.inject.Named; +import jakarta.inject.Named; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4Test.java b/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4Test.java index b59a26b0b3..bbe019c8cd 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4Test.java +++ b/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4Test.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import java.util.Date; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.ContextBuilder; diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindAttributeNamesToIndexedFormParams.java b/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindAttributeNamesToIndexedFormParams.java index 0617f9ce50..8dae6178f2 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindAttributeNamesToIndexedFormParams.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindAttributeNamesToIndexedFormParams.java @@ -18,7 +18,7 @@ package org.jclouds.sqs.binders; 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; diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/features/MessageApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/features/MessageApi.java index f67bf0f2f4..e40913ea69 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/features/MessageApi.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/features/MessageApi.java @@ -21,7 +21,7 @@ import static org.jclouds.sqs.reference.SQSParameters.VERSION; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/features/PermissionApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/features/PermissionApi.java index b51749a4ed..6d5b4d515a 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/features/PermissionApi.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/features/PermissionApi.java @@ -19,7 +19,7 @@ package org.jclouds.sqs.features; import static org.jclouds.sqs.reference.SQSParameters.ACTION; import static org.jclouds.sqs.reference.SQSParameters.VERSION; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/features/QueueApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/features/QueueApi.java index 7d8e716a22..cf07715832 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/features/QueueApi.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/features/QueueApi.java @@ -22,7 +22,7 @@ import static org.jclouds.sqs.reference.SQSParameters.VERSION; import java.net.URI; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/handlers/ParseSQSErrorFromXmlContent.java b/apis/sqs/src/main/java/org/jclouds/sqs/handlers/ParseSQSErrorFromXmlContent.java index 7223c86e28..6b09436b58 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/handlers/ParseSQSErrorFromXmlContent.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/handlers/ParseSQSErrorFromXmlContent.java @@ -18,8 +18,8 @@ package org.jclouds.sqs.handlers; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.aws.domain.AWSError; import org.jclouds.aws.handlers.ParseAWSErrorFromXmlContent; diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/handlers/SQSErrorRetryHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/handlers/SQSErrorRetryHandler.java index b16a3725a6..a2ecd488db 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/handlers/SQSErrorRetryHandler.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/handlers/SQSErrorRetryHandler.java @@ -22,7 +22,7 @@ import static org.jclouds.sqs.config.SQSProperties.CREATE_QUEUE_RETRY_INTERVAL; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.aws.domain.AWSError; import org.jclouds.aws.handlers.AWSClientErrorRetryHandler; diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/xml/ChangeMessageVisibilityBatchResponseHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/ChangeMessageVisibilityBatchResponseHandler.java index 1f9e60be9a..acb15442f5 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/xml/ChangeMessageVisibilityBatchResponseHandler.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/xml/ChangeMessageVisibilityBatchResponseHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.sqs.xml; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * @see creds; - private final javax.inject.Provider iso8601Timestamp; + private final jakarta.inject.Provider iso8601Timestamp; private final ServiceAndRegion serviceAndRegion; @Inject FormSignerV4(@ApiVersion String apiVersion, @Provider Supplier creds, - @TimeStamp javax.inject.Provider iso8601Timestamp, ServiceAndRegion serviceAndRegion) { + @TimeStamp jakarta.inject.Provider iso8601Timestamp, ServiceAndRegion serviceAndRegion) { this.apiVersion = apiVersion; this.creds = creds; this.iso8601Timestamp = iso8601Timestamp; diff --git a/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java b/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java index 32a95fc006..f14f1f94d0 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java +++ b/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java @@ -23,8 +23,8 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.aws.AWSResponseException; import org.jclouds.aws.domain.AWSError; diff --git a/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java b/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java index ae49d2974f..ca55dd9075 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java +++ b/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java @@ -25,10 +25,10 @@ import java.util.Collection; import java.util.Map; 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.aws.domain.AWSError; import org.jclouds.aws.domain.Region; diff --git a/apis/sts/src/main/java/org/jclouds/aws/xml/SessionCredentialsHandler.java b/apis/sts/src/main/java/org/jclouds/aws/xml/SessionCredentialsHandler.java index e194c31404..1e7cb27338 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/xml/SessionCredentialsHandler.java +++ b/apis/sts/src/main/java/org/jclouds/aws/xml/SessionCredentialsHandler.java @@ -18,7 +18,7 @@ package org.jclouds.aws.xml; import static org.jclouds.util.SaxUtils.currentOrNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.domain.SessionCredentials; import org.jclouds.date.DateService; diff --git a/apis/sts/src/main/java/org/jclouds/sts/STSApi.java b/apis/sts/src/main/java/org/jclouds/sts/STSApi.java index dce6ab879e..a57959de81 100644 --- a/apis/sts/src/main/java/org/jclouds/sts/STSApi.java +++ b/apis/sts/src/main/java/org/jclouds/sts/STSApi.java @@ -18,7 +18,7 @@ package org.jclouds.sts; import java.io.Closeable; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV4LiveTest.java b/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV4LiveTest.java index 0cc56ef02d..a54da53139 100644 --- a/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV4LiveTest.java +++ b/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV4LiveTest.java @@ -24,7 +24,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.apis.BaseApiLiveTest; import org.jclouds.aws.domain.SessionCredentials; diff --git a/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV4Test.java b/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV4Test.java index 94a8ff6068..0885354124 100644 --- a/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV4Test.java +++ b/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV4Test.java @@ -19,7 +19,7 @@ package org.jclouds.aws.filters; import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.aws.domain.SessionCredentials; import org.jclouds.aws.filters.FormSignerV4.ServiceAndRegion; diff --git a/apis/sts/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java b/apis/sts/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java index fb20d1f842..639f848c4a 100644 --- a/apis/sts/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java +++ b/apis/sts/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java @@ -27,7 +27,7 @@ import static org.testng.Assert.assertNull; import java.io.IOException; import java.io.InputStream; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.aws.domain.AWSError; import org.jclouds.aws.filters.FormSignerV2Test; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java b/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java index c9ba42dbcf..de247f87f3 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.functions.BlobToHttpGetOptions; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java b/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java index b696095240..1a208a4f99 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java @@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentSkipListMap; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobAccess; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/binders/BindBlobToMultipartForm.java b/blobstore/src/main/java/org/jclouds/blobstore/binders/BindBlobToMultipartForm.java index 56bc48688c..bc1d960878 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/binders/BindBlobToMultipartForm.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/binders/BindBlobToMultipartForm.java @@ -19,7 +19,7 @@ package org.jclouds.blobstore.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.blobstore.domain.Blob; import org.jclouds.http.HttpRequest; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/binders/BindMapToHeadersWithPrefix.java b/blobstore/src/main/java/org/jclouds/blobstore/binders/BindMapToHeadersWithPrefix.java index b96cfa37f9..3ba7cc05a7 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/binders/BindMapToHeadersWithPrefix.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/binders/BindMapToHeadersWithPrefix.java @@ -22,9 +22,9 @@ import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_M import java.util.Map; -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.http.HttpRequest; import org.jclouds.rest.Binder; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/binders/BindUserMetadataToHeadersWithPrefix.java b/blobstore/src/main/java/org/jclouds/blobstore/binders/BindUserMetadataToHeadersWithPrefix.java index ecb360a3a7..ec141a6628 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/binders/BindUserMetadataToHeadersWithPrefix.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/binders/BindUserMetadataToHeadersWithPrefix.java @@ -19,8 +19,8 @@ package org.jclouds.blobstore.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 org.jclouds.blobstore.domain.Blob; import org.jclouds.http.HttpRequest; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/config/BlobStoreObjectModule.java b/blobstore/src/main/java/org/jclouds/blobstore/config/BlobStoreObjectModule.java index d6571140b9..ae7395a8a3 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/config/BlobStoreObjectModule.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/config/BlobStoreObjectModule.java @@ -16,8 +16,8 @@ */ package org.jclouds.blobstore.config; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.MutableBlobMetadata; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java index d1d915169c..96a9b81f4c 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java @@ -42,8 +42,8 @@ import java.util.UUID; import java.util.concurrent.ExecutorService; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import com.google.common.hash.Hasher; import com.google.common.hash.Hashing; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobImpl.java index b3af16cf6f..4fb9c8a655 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobImpl.java @@ -18,7 +18,7 @@ package org.jclouds.blobstore.domain.internal; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.MutableBlobMetadata; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/functions/BlobName.java b/blobstore/src/main/java/org/jclouds/blobstore/functions/BlobName.java index 800379589a..7c1b89532f 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/functions/BlobName.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/functions/BlobName.java @@ -18,7 +18,7 @@ package org.jclouds.blobstore.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.blobstore.domain.Blob; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/functions/BlobToHttpGetOptions.java b/blobstore/src/main/java/org/jclouds/blobstore/functions/BlobToHttpGetOptions.java index f1d3f05c78..0a34dc5b3f 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/functions/BlobToHttpGetOptions.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/functions/BlobToHttpGetOptions.java @@ -18,7 +18,7 @@ package org.jclouds.blobstore.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.options.GetOptions; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/functions/HttpGetOptionsListToGetOptions.java b/blobstore/src/main/java/org/jclouds/blobstore/functions/HttpGetOptionsListToGetOptions.java index 9d9467c922..4a92ee1dea 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/functions/HttpGetOptionsListToGetOptions.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/functions/HttpGetOptionsListToGetOptions.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.blobstore.options.GetOptions; import org.jclouds.date.DateService; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContent.java b/blobstore/src/main/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContent.java index 8f6aec28da..c0eebe5626 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContent.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContent.java @@ -18,7 +18,7 @@ package org.jclouds.blobstore.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.MutableBlobMetadata; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeaders.java b/blobstore/src/main/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeaders.java index cc2abb7a10..083493a0a6 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeaders.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeaders.java @@ -25,9 +25,9 @@ import static org.jclouds.blobstore.util.BlobStoreUtils.getNameFor; import java.net.URI; import java.util.Map.Entry; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.jclouds.blobstore.domain.MutableBlobMetadata; import org.jclouds.date.DateService; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/functions/PrefixToResourceMetadata.java b/blobstore/src/main/java/org/jclouds/blobstore/functions/PrefixToResourceMetadata.java index 21a3dc18d5..ce928b307a 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/functions/PrefixToResourceMetadata.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/functions/PrefixToResourceMetadata.java @@ -18,7 +18,7 @@ package org.jclouds.blobstore.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.blobstore.domain.MutableStorageMetadata; import org.jclouds.blobstore.domain.StorageMetadata; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/functions/ResourceMetadataToRelativePathResourceMetadata.java b/blobstore/src/main/java/org/jclouds/blobstore/functions/ResourceMetadataToRelativePathResourceMetadata.java index 48bf980937..566656b0ad 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/functions/ResourceMetadataToRelativePathResourceMetadata.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/functions/ResourceMetadataToRelativePathResourceMetadata.java @@ -18,7 +18,7 @@ package org.jclouds.blobstore.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java index 1c0ba0c313..10f4344f3e 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java @@ -33,7 +33,7 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStoreContext; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/internal/BlobStoreContextImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/internal/BlobStoreContextImpl.java index 6aea926034..8c9783fe50 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/internal/BlobStoreContextImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/internal/BlobStoreContextImpl.java @@ -18,8 +18,8 @@ package org.jclouds.blobstore.internal; 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.Context; import org.jclouds.blobstore.BlobRequestSigner; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/internal/RequestSigningUnsupported.java b/blobstore/src/main/java/org/jclouds/blobstore/internal/RequestSigningUnsupported.java index 298b044597..c344c3e80a 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/internal/RequestSigningUnsupported.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/internal/RequestSigningUnsupported.java @@ -16,7 +16,7 @@ */ package org.jclouds.blobstore.internal; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.blobstore.domain.Blob; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/ConcatenateContainerLists.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/ConcatenateContainerLists.java index 7e23fcf3e2..75a5cec1a1 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/ConcatenateContainerLists.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/ConcatenateContainerLists.java @@ -18,7 +18,7 @@ package org.jclouds.blobstore.strategy.internal; import java.util.List; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.domain.PageSet; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/CountBlobTypeInList.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/CountBlobTypeInList.java index 3aef7c5bc1..4624170c4a 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/CountBlobTypeInList.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/CountBlobTypeInList.java @@ -16,8 +16,8 @@ */ package org.jclouds.blobstore.strategy.internal; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.blobstore.options.ListContainerOptions; import org.jclouds.blobstore.strategy.CountListStrategy; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java index bd01c319cc..49eb50e4bb 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java @@ -28,8 +28,8 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; 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.blobstore.BlobStore; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/FetchBlobMetadata.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/FetchBlobMetadata.java index de47a6bf03..f7a7e7be4c 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/FetchBlobMetadata.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/FetchBlobMetadata.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.concurrent.Callable; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.util.concurrent.Futures; import org.jclouds.Constants; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java index c4ac90bad1..4d0d5180d7 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java @@ -21,8 +21,8 @@ import static org.jclouds.concurrent.FutureIterables.transformParallel; 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.blobstore.BlobStore; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/ListContainerAndRecurseThroughFolders.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/ListContainerAndRecurseThroughFolders.java index 132d1ac28d..1e0128c126 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/ListContainerAndRecurseThroughFolders.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/ListContainerAndRecurseThroughFolders.java @@ -25,7 +25,7 @@ import static com.google.common.collect.Sets.newLinkedHashSet; import java.util.List; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.StorageMetadata; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkerFileMkdirStrategy.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkerFileMkdirStrategy.java index cbb8cfe417..a94fe3663c 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkerFileMkdirStrategy.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkerFileMkdirStrategy.java @@ -18,8 +18,8 @@ package org.jclouds.blobstore.strategy.internal; import static org.jclouds.io.Payloads.newByteArrayPayload; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.domain.StorageType; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java index 239ef83ab2..7021934e38 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java @@ -25,8 +25,8 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; 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.blobstore.BlobStore; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersGetDirectoryStrategy.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersGetDirectoryStrategy.java index 1bc4feed08..be667a941b 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersGetDirectoryStrategy.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersGetDirectoryStrategy.java @@ -16,7 +16,7 @@ */ package org.jclouds.blobstore.strategy.internal; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.domain.BlobMetadata; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java index 4a6c2936dc..f16deac309 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java @@ -20,7 +20,7 @@ package org.jclouds.blobstore.strategy.internal; import static com.google.common.base.Preconditions.checkArgument; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.blobstore.reference.BlobStoreConstants; import org.jclouds.logging.Logger; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java index 4fb4641ead..118a18b6b3 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java @@ -24,8 +24,8 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; 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.blobstore.BlobStore; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/util/internal/BlobUtilsImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/util/internal/BlobUtilsImpl.java index 1fac0483c0..72ca49b5eb 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/util/internal/BlobUtilsImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/util/internal/BlobUtilsImpl.java @@ -18,9 +18,9 @@ package org.jclouds.blobstore.util.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.blobstore.domain.BlobBuilder; import org.jclouds.blobstore.options.ListContainerOptions; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java index 028f569a31..b3d7388c1b 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java @@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals; import java.io.IOException; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.apis.ApiMetadata; import org.jclouds.blobstore.config.LocalBlobStore; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java index 145d9f3e46..fddfdb85a2 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java @@ -21,7 +21,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; -import javax.inject.Provider; +import jakarta.inject.Provider; import jakarta.ws.rs.core.MediaType; import org.jclouds.blobstore.config.BlobStoreObjectModule; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java index 273659887b..bbd5aea1c9 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java @@ -18,7 +18,7 @@ package org.jclouds.blobstore.functions; import static org.testng.Assert.assertEquals; -import javax.inject.Provider; +import jakarta.inject.Provider; import jakarta.ws.rs.core.MediaType; import org.jclouds.blobstore.domain.BlobMetadata; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/functions/ResourceMetadataToRelativePathResourceMetadataTest.java b/blobstore/src/test/java/org/jclouds/blobstore/functions/ResourceMetadataToRelativePathResourceMetadataTest.java index 711d612ac4..f8f5aa15b3 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/functions/ResourceMetadataToRelativePathResourceMetadataTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/functions/ResourceMetadataToRelativePathResourceMetadataTest.java @@ -18,7 +18,7 @@ package org.jclouds.blobstore.functions; import static org.testng.Assert.assertEquals; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.blobstore.domain.MutableBlobMetadata; import org.jclouds.blobstore.domain.StorageMetadata; diff --git a/common/googlecloud/src/main/java/org/jclouds/googlecloud/config/CurrentProject.java b/common/googlecloud/src/main/java/org/jclouds/googlecloud/config/CurrentProject.java index 705f7e8ce2..67b7b5a069 100644 --- a/common/googlecloud/src/main/java/org/jclouds/googlecloud/config/CurrentProject.java +++ b/common/googlecloud/src/main/java/org/jclouds/googlecloud/config/CurrentProject.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** Associated bindings with the current project. */ @Retention(value = RetentionPolicy.RUNTIME) diff --git a/common/openstack/src/main/java/org/jclouds/openstack/config/OpenStackAuthenticationModule.java b/common/openstack/src/main/java/org/jclouds/openstack/config/OpenStackAuthenticationModule.java index 49870b8673..435b079bbc 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/config/OpenStackAuthenticationModule.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/config/OpenStackAuthenticationModule.java @@ -24,8 +24,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.date.TimeStamp; import org.jclouds.domain.Credentials; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java b/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java index 04828dd065..b449596bd0 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.net.URI; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.javax.annotation.Nullable; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/filters/AddTimestampQuery.java b/common/openstack/src/main/java/org/jclouds/openstack/filters/AddTimestampQuery.java index 686828bae1..9f6a5b32e2 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/filters/AddTimestampQuery.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/filters/AddTimestampQuery.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.filters; import java.util.Date; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.date.TimeStamp; import org.jclouds.http.HttpException; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/filters/AuthenticateRequest.java b/common/openstack/src/main/java/org/jclouds/openstack/filters/AuthenticateRequest.java index 33f70fcf7d..ee55d95ea3 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/filters/AuthenticateRequest.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/filters/AuthenticateRequest.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.filters; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpException; import org.jclouds.http.HttpRequest; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java b/common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java index 887c7cec5f..24702609c5 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.functions; import java.net.URI; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.openstack.domain.AuthenticationResponse; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/handlers/RetryOnRenew.java b/common/openstack/src/main/java/org/jclouds/openstack/handlers/RetryOnRenew.java index dde0c6c4a8..c316debe87 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/handlers/RetryOnRenew.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/handlers/RetryOnRenew.java @@ -19,7 +19,7 @@ package org.jclouds.openstack.handlers; import java.util.concurrent.TimeUnit; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.domain.Credentials; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/internal/Authentication.java b/common/openstack/src/main/java/org/jclouds/openstack/internal/Authentication.java index ce58cbb40b..9157f375ca 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/internal/Authentication.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/internal/Authentication.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Represents a component related to Rackspace Cloud Files. diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/binders/BindCredentialsToJsonPayload.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/binders/BindCredentialsToJsonPayload.java index 727d040c5f..23c5dd6e06 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/binders/BindCredentialsToJsonPayload.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/binders/BindCredentialsToJsonPayload.java @@ -18,8 +18,8 @@ package org.jclouds.openstack.keystone.v1_1.binders; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/config/AuthenticationServiceModule.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/config/AuthenticationServiceModule.java index 4d4888859d..d135578900 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/config/AuthenticationServiceModule.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/config/AuthenticationServiceModule.java @@ -23,8 +23,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.domain.Credentials; import org.jclouds.http.HttpRetryHandler; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/functions/PublicURLOrInternalIfNull.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/functions/PublicURLOrInternalIfNull.java index c70b5f9eeb..032e36e69f 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/functions/PublicURLOrInternalIfNull.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/functions/PublicURLOrInternalIfNull.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.v1_1.functions; import java.net.URI; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.openstack.keystone.v1_1.domain.Endpoint; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/functions/RegionFirstPartOfDNSNameOrProvider.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/functions/RegionFirstPartOfDNSNameOrProvider.java index 5cf6540291..f410df6e8e 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/functions/RegionFirstPartOfDNSNameOrProvider.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/functions/RegionFirstPartOfDNSNameOrProvider.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.keystone.v1_1.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.location.Provider; import org.jclouds.openstack.keystone.v1_1.domain.Endpoint; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/handlers/RetryOnRenew.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/handlers/RetryOnRenew.java index c5b1623aa3..00539891d6 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/handlers/RetryOnRenew.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/handlers/RetryOnRenew.java @@ -19,7 +19,7 @@ package org.jclouds.openstack.keystone.v1_1.handlers; import java.util.concurrent.TimeUnit; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.domain.Credentials; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java index 61e8477246..84651e1600 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java @@ -20,7 +20,7 @@ import java.net.URI; import java.util.Collection; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.suppliers.RegionIdToURISupplier; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java index f44819167a..6f663e7a07 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java @@ -20,7 +20,7 @@ import static com.google.common.collect.Iterables.tryFind; import java.util.NoSuchElementException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.location.suppliers.ImplicitRegionIdSupplier; import org.jclouds.openstack.keystone.v1_1.domain.Auth; diff --git a/common/openstack/src/main/java/org/jclouds/openstack/services/Compute.java b/common/openstack/src/main/java/org/jclouds/openstack/services/Compute.java index f1b6806dfd..e6490c4f5d 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/services/Compute.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/services/Compute.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Compute (Nova) diff --git a/common/openstack/src/main/java/org/jclouds/openstack/services/Extension.java b/common/openstack/src/main/java/org/jclouds/openstack/services/Extension.java index dd3c68b486..10a9141a5b 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/services/Extension.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/services/Extension.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * An extension of a {@link ServiceType service}. In order for us to understand diff --git a/common/openstack/src/main/java/org/jclouds/openstack/services/Image.java b/common/openstack/src/main/java/org/jclouds/openstack/services/Image.java index 68c073128c..f864fc8fc2 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/services/Image.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/services/Image.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Image Service (Glance) diff --git a/common/openstack/src/main/java/org/jclouds/openstack/services/ObjectStore.java b/common/openstack/src/main/java/org/jclouds/openstack/services/ObjectStore.java index dff1a50ce9..1170da1d41 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/services/ObjectStore.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/services/ObjectStore.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Object Storage (Swift) diff --git a/common/openstack/src/test/java/org/jclouds/openstack/internal/TestOpenStackAuthenticationModule.java b/common/openstack/src/test/java/org/jclouds/openstack/internal/TestOpenStackAuthenticationModule.java index af39ff2652..e6a82f666a 100644 --- a/common/openstack/src/test/java/org/jclouds/openstack/internal/TestOpenStackAuthenticationModule.java +++ b/common/openstack/src/test/java/org/jclouds/openstack/internal/TestOpenStackAuthenticationModule.java @@ -19,8 +19,8 @@ package org.jclouds.openstack.internal; 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.domain.Credentials; import org.jclouds.openstack.config.OpenStackAuthenticationModule; diff --git a/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplierTest.java b/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplierTest.java index 4529295638..caf8c08c39 100644 --- a/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplierTest.java +++ b/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplierTest.java @@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals; import java.net.URI; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.location.Provider; import org.jclouds.location.suppliers.RegionIdToURISupplier; diff --git a/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplierTest.java b/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplierTest.java index 20675e1ed7..6094b64e40 100644 --- a/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplierTest.java +++ b/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplierTest.java @@ -18,7 +18,7 @@ package org.jclouds.openstack.keystone.v1_1.suppliers; import static org.testng.Assert.assertEquals; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.location.Provider; import org.jclouds.location.suppliers.ImplicitRegionIdSupplier; diff --git a/compute/src/main/java/org/jclouds/cim/functions/HardwareBuilderFromResourceAllocations.java b/compute/src/main/java/org/jclouds/cim/functions/HardwareBuilderFromResourceAllocations.java index af508678f7..03198aabf9 100644 --- a/compute/src/main/java/org/jclouds/cim/functions/HardwareBuilderFromResourceAllocations.java +++ b/compute/src/main/java/org/jclouds/cim/functions/HardwareBuilderFromResourceAllocations.java @@ -20,7 +20,7 @@ import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.find; import static com.google.common.collect.Iterables.transform; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.cim.CIMPredicates; import org.jclouds.cim.ResourceAllocationSettingData; diff --git a/compute/src/main/java/org/jclouds/compute/callables/InitScriptConfigurationForTasks.java b/compute/src/main/java/org/jclouds/compute/callables/InitScriptConfigurationForTasks.java index 3650197d21..7a9947e79a 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/InitScriptConfigurationForTasks.java +++ b/compute/src/main/java/org/jclouds/compute/callables/InitScriptConfigurationForTasks.java @@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import com.google.common.base.Supplier; import com.google.inject.Inject; diff --git a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilComplete.java b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilComplete.java index b0b426fd25..856d510110 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilComplete.java +++ b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilComplete.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.compute.domain.ExecResponse; import org.jclouds.compute.domain.NodeMetadata; diff --git a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java index dfe70c7c01..1d69c0df9b 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java +++ b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.domain.ExecResponse; import org.jclouds.compute.domain.NodeMetadata; diff --git a/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java b/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java index 94cfc37af7..3b2da15a5b 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java +++ b/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.domain.ExecResponse; import org.jclouds.compute.domain.NodeMetadata; diff --git a/compute/src/main/java/org/jclouds/compute/config/AdminAccessConfiguration.java b/compute/src/main/java/org/jclouds/compute/config/AdminAccessConfiguration.java index 5746ea31a1..0cd75e18c4 100644 --- a/compute/src/main/java/org/jclouds/compute/config/AdminAccessConfiguration.java +++ b/compute/src/main/java/org/jclouds/compute/config/AdminAccessConfiguration.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.security.SecureRandom; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.config.AdminAccessConfiguration.Default; import org.jclouds.compute.functions.Sha512Crypt; diff --git a/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java b/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java index 39265b9ff9..f4d1709d2f 100644 --- a/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java +++ b/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java @@ -27,8 +27,8 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.compute.callables.BlockUntilInitScriptStatusIsZeroThenReturnOutput; diff --git a/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java b/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java index f79757d220..cdf3b244df 100644 --- a/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java +++ b/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java @@ -22,8 +22,8 @@ import static com.google.common.base.Predicates.notNull; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.compute.ComputeServiceAdapter; import org.jclouds.compute.domain.Hardware; diff --git a/compute/src/main/java/org/jclouds/compute/config/ComputeServiceTimeoutsModule.java b/compute/src/main/java/org/jclouds/compute/config/ComputeServiceTimeoutsModule.java index 9634d1e90a..563ef0b1f8 100644 --- a/compute/src/main/java/org/jclouds/compute/config/ComputeServiceTimeoutsModule.java +++ b/compute/src/main/java/org/jclouds/compute/config/ComputeServiceTimeoutsModule.java @@ -26,8 +26,8 @@ import static org.jclouds.util.Predicates2.retry; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.NodeMetadata; diff --git a/compute/src/main/java/org/jclouds/compute/config/GetLoginForProviderFromPropertiesAndStoreCredentialsOrReturnNull.java b/compute/src/main/java/org/jclouds/compute/config/GetLoginForProviderFromPropertiesAndStoreCredentialsOrReturnNull.java index 9b0a91a50f..eabf9d0c55 100644 --- a/compute/src/main/java/org/jclouds/compute/config/GetLoginForProviderFromPropertiesAndStoreCredentialsOrReturnNull.java +++ b/compute/src/main/java/org/jclouds/compute/config/GetLoginForProviderFromPropertiesAndStoreCredentialsOrReturnNull.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.config.ValueOfConfigurationKeyOrNull; import org.jclouds.domain.Credentials; @@ -33,7 +33,7 @@ import com.google.inject.Inject; @Singleton public class GetLoginForProviderFromPropertiesAndStoreCredentialsOrReturnNull implements - javax.inject.Provider { + jakarta.inject.Provider { private final ValueOfConfigurationKeyOrNull config; private final String provider; private final Map credentialStore; diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/ArbitraryCpuRamTemplateBuilderImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/ArbitraryCpuRamTemplateBuilderImpl.java index db7fcd3388..d630fdad72 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/ArbitraryCpuRamTemplateBuilderImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/ArbitraryCpuRamTemplateBuilderImpl.java @@ -28,9 +28,9 @@ import org.jclouds.compute.options.TemplateOptions; import org.jclouds.compute.util.AutomaticHardwareIdSpec; import org.jclouds.domain.Location; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import java.util.NoSuchElementException; import java.util.Set; diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java index 48d749888d..e1b689983a 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java @@ -47,9 +47,9 @@ import org.jclouds.domain.Location; import org.jclouds.logging.Logger; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import java.util.Comparator; import java.util.Iterator; import java.util.List; diff --git a/compute/src/main/java/org/jclouds/compute/extensions/internal/DelegatingImageExtension.java b/compute/src/main/java/org/jclouds/compute/extensions/internal/DelegatingImageExtension.java index c3888325b1..497dc4225b 100644 --- a/compute/src/main/java/org/jclouds/compute/extensions/internal/DelegatingImageExtension.java +++ b/compute/src/main/java/org/jclouds/compute/extensions/internal/DelegatingImageExtension.java @@ -19,8 +19,8 @@ package org.jclouds.compute.extensions.internal; import java.util.Map; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.compute.config.ComputeServiceAdapterContextModule.AddDefaultCredentialsToImage; import org.jclouds.compute.domain.CloneImageTemplate; diff --git a/compute/src/main/java/org/jclouds/compute/functions/CreateSshClientOncePortIsListeningOnNode.java b/compute/src/main/java/org/jclouds/compute/functions/CreateSshClientOncePortIsListeningOnNode.java index cbe5a5f564..439d6ea0be 100644 --- a/compute/src/main/java/org/jclouds/compute/functions/CreateSshClientOncePortIsListeningOnNode.java +++ b/compute/src/main/java/org/jclouds/compute/functions/CreateSshClientOncePortIsListeningOnNode.java @@ -23,8 +23,8 @@ import static com.google.common.base.Preconditions.checkState; import java.util.concurrent.TimeUnit; 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.NodeMetadata; import org.jclouds.compute.reference.ComputeServiceConstants; diff --git a/compute/src/main/java/org/jclouds/compute/functions/DefaultCredentialsFromImageOrOverridingCredentials.java b/compute/src/main/java/org/jclouds/compute/functions/DefaultCredentialsFromImageOrOverridingCredentials.java index 23ca423332..9326314d8b 100644 --- a/compute/src/main/java/org/jclouds/compute/functions/DefaultCredentialsFromImageOrOverridingCredentials.java +++ b/compute/src/main/java/org/jclouds/compute/functions/DefaultCredentialsFromImageOrOverridingCredentials.java @@ -16,7 +16,7 @@ */ package org.jclouds.compute.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Template; import org.jclouds.compute.options.RunScriptOptions; diff --git a/compute/src/main/java/org/jclouds/compute/functions/InstallKeysAndRunScript.java b/compute/src/main/java/org/jclouds/compute/functions/InstallKeysAndRunScript.java index 594c4247d1..fec8983cef 100644 --- a/compute/src/main/java/org/jclouds/compute/functions/InstallKeysAndRunScript.java +++ b/compute/src/main/java/org/jclouds/compute/functions/InstallKeysAndRunScript.java @@ -20,7 +20,7 @@ import static com.google.common.collect.Lists.newArrayList; import java.util.List; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.options.TemplateOptions; diff --git a/compute/src/main/java/org/jclouds/compute/functions/NodeAndTemplateOptionsToStatementWithoutPublicKey.java b/compute/src/main/java/org/jclouds/compute/functions/NodeAndTemplateOptionsToStatementWithoutPublicKey.java index c4e26dd0b2..7046e2b100 100644 --- a/compute/src/main/java/org/jclouds/compute/functions/NodeAndTemplateOptionsToStatementWithoutPublicKey.java +++ b/compute/src/main/java/org/jclouds/compute/functions/NodeAndTemplateOptionsToStatementWithoutPublicKey.java @@ -16,7 +16,7 @@ */ package org.jclouds.compute.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.options.TemplateOptions; diff --git a/compute/src/main/java/org/jclouds/compute/functions/PollNodeRunning.java b/compute/src/main/java/org/jclouds/compute/functions/PollNodeRunning.java index 47dbfb9118..1439d33473 100644 --- a/compute/src/main/java/org/jclouds/compute/functions/PollNodeRunning.java +++ b/compute/src/main/java/org/jclouds/compute/functions/PollNodeRunning.java @@ -25,8 +25,8 @@ import static org.jclouds.compute.util.ComputeServiceUtils.formatStatus; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.NodeMetadata.Status; diff --git a/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java b/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java index 9aef0cfac8..e288130c9a 100644 --- a/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java +++ b/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java @@ -40,10 +40,10 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; 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.collect.Memoized; diff --git a/compute/src/main/java/org/jclouds/compute/internal/ComputeServiceContextImpl.java b/compute/src/main/java/org/jclouds/compute/internal/ComputeServiceContextImpl.java index 91b908c40b..577878eaaa 100644 --- a/compute/src/main/java/org/jclouds/compute/internal/ComputeServiceContextImpl.java +++ b/compute/src/main/java/org/jclouds/compute/internal/ComputeServiceContextImpl.java @@ -18,8 +18,8 @@ package org.jclouds.compute.internal; 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.Context; import org.jclouds.compute.ComputeService; diff --git a/compute/src/main/java/org/jclouds/compute/internal/FormatSharedNamesAndAppendUniqueStringToThoseWhichRepeat.java b/compute/src/main/java/org/jclouds/compute/internal/FormatSharedNamesAndAppendUniqueStringToThoseWhichRepeat.java index ccfb2db6c0..33de2b9e24 100644 --- a/compute/src/main/java/org/jclouds/compute/internal/FormatSharedNamesAndAppendUniqueStringToThoseWhichRepeat.java +++ b/compute/src/main/java/org/jclouds/compute/internal/FormatSharedNamesAndAppendUniqueStringToThoseWhichRepeat.java @@ -25,8 +25,8 @@ import java.util.NoSuchElementException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.compute.functions.GroupNamingConvention; import org.jclouds.predicates.Validator; diff --git a/compute/src/main/java/org/jclouds/compute/internal/PersistNodeCredentials.java b/compute/src/main/java/org/jclouds/compute/internal/PersistNodeCredentials.java index 88b3350653..8dd5de1f35 100644 --- a/compute/src/main/java/org/jclouds/compute/internal/PersistNodeCredentials.java +++ b/compute/src/main/java/org/jclouds/compute/internal/PersistNodeCredentials.java @@ -16,7 +16,7 @@ */ package org.jclouds.compute.internal; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.javax.annotation.Nullable; diff --git a/compute/src/main/java/org/jclouds/compute/internal/UtilsImpl.java b/compute/src/main/java/org/jclouds/compute/internal/UtilsImpl.java index 980b99932c..ce61d930be 100644 --- a/compute/src/main/java/org/jclouds/compute/internal/UtilsImpl.java +++ b/compute/src/main/java/org/jclouds/compute/internal/UtilsImpl.java @@ -18,7 +18,7 @@ package org.jclouds.compute.internal; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.Utils; import org.jclouds.compute.domain.NodeMetadata; diff --git a/compute/src/main/java/org/jclouds/compute/predicates/AtomicImageAvailable.java b/compute/src/main/java/org/jclouds/compute/predicates/AtomicImageAvailable.java index 62683e5f4a..6fd41094b5 100644 --- a/compute/src/main/java/org/jclouds/compute/predicates/AtomicImageAvailable.java +++ b/compute/src/main/java/org/jclouds/compute/predicates/AtomicImageAvailable.java @@ -16,8 +16,8 @@ */ package org.jclouds.compute.predicates; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Image.Status; import org.jclouds.compute.predicates.internal.RefreshImageAndDoubleCheckOnFailUnlessStatusInvalid; diff --git a/compute/src/main/java/org/jclouds/compute/predicates/AtomicNodeRunning.java b/compute/src/main/java/org/jclouds/compute/predicates/AtomicNodeRunning.java index a9b9bfb49a..472d5e9213 100644 --- a/compute/src/main/java/org/jclouds/compute/predicates/AtomicNodeRunning.java +++ b/compute/src/main/java/org/jclouds/compute/predicates/AtomicNodeRunning.java @@ -16,8 +16,8 @@ */ package org.jclouds.compute.predicates; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.NodeMetadata.Status; import org.jclouds.compute.predicates.internal.RefreshNodeAndDoubleCheckOnFailUnlessStatusInvalid; diff --git a/compute/src/main/java/org/jclouds/compute/predicates/AtomicNodeSuspended.java b/compute/src/main/java/org/jclouds/compute/predicates/AtomicNodeSuspended.java index 604d0efde4..cfea74c9d0 100644 --- a/compute/src/main/java/org/jclouds/compute/predicates/AtomicNodeSuspended.java +++ b/compute/src/main/java/org/jclouds/compute/predicates/AtomicNodeSuspended.java @@ -16,8 +16,8 @@ */ package org.jclouds.compute.predicates; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.NodeMetadata.Status; import org.jclouds.compute.predicates.internal.RefreshNodeAndDoubleCheckOnFailUnlessStatusInvalid; diff --git a/compute/src/main/java/org/jclouds/compute/predicates/ScriptStatusReturnsZero.java b/compute/src/main/java/org/jclouds/compute/predicates/ScriptStatusReturnsZero.java index 9770b5c3f1..10bd5227b7 100644 --- a/compute/src/main/java/org/jclouds/compute/predicates/ScriptStatusReturnsZero.java +++ b/compute/src/main/java/org/jclouds/compute/predicates/ScriptStatusReturnsZero.java @@ -17,7 +17,7 @@ package org.jclouds.compute.predicates; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.ExecResponse; import org.jclouds.logging.Logger; diff --git a/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshImageAndDoubleCheckOnFailUnlessStatusInvalid.java b/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshImageAndDoubleCheckOnFailUnlessStatusInvalid.java index 34b3c8fd3f..477b7cf514 100644 --- a/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshImageAndDoubleCheckOnFailUnlessStatusInvalid.java +++ b/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshImageAndDoubleCheckOnFailUnlessStatusInvalid.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Image.Status; diff --git a/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshNodeAndDoubleCheckOnFailUnlessStatusInvalid.java b/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshNodeAndDoubleCheckOnFailUnlessStatusInvalid.java index 9fd3cea058..f40f884176 100644 --- a/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshNodeAndDoubleCheckOnFailUnlessStatusInvalid.java +++ b/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshNodeAndDoubleCheckOnFailUnlessStatusInvalid.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.NodeMetadata.Status; diff --git a/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java b/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java index 52c6789b58..159ae91385 100644 --- a/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java +++ b/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java @@ -32,8 +32,8 @@ import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_SCRIPT import java.security.SecureRandom; import java.util.concurrent.TimeUnit; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.util.Predicates2; diff --git a/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java b/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java index f553ce2ab5..bf74227273 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.callables.RunScriptOnNode; import org.jclouds.compute.config.CustomizationResponse; diff --git a/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java b/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java index a601bf5a55..9f3f119897 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.concurrent.Callable; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.compute.callables.RunScriptOnNode; import org.jclouds.compute.domain.NodeMetadata; diff --git a/compute/src/main/java/org/jclouds/compute/strategy/PrioritizeCredentialsFromTemplate.java b/compute/src/main/java/org/jclouds/compute/strategy/PrioritizeCredentialsFromTemplate.java index 26251fb26e..8cca18a108 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/PrioritizeCredentialsFromTemplate.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/PrioritizeCredentialsFromTemplate.java @@ -18,8 +18,8 @@ package org.jclouds.compute.strategy; 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.compute.domain.Template; import org.jclouds.domain.LoginCredentials; diff --git a/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java b/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java index c92a43f0b3..2f728e4753 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.concurrent.Callable; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.callables.RunScriptOnNode; import org.jclouds.compute.domain.ExecResponse; diff --git a/compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java b/compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java index 465de3f371..f621067b54 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java @@ -28,9 +28,9 @@ import static org.jclouds.compute.util.ComputeServiceUtils.formatStatus; 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.compute.ComputeServiceAdapter; import org.jclouds.compute.ComputeServiceAdapter.NodeAndInitialCredentials; diff --git a/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java index 1d5380a044..61d56b4f07 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java @@ -29,9 +29,9 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; 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 com.google.common.base.MoreObjects; import org.jclouds.Constants; diff --git a/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java b/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java index 1b51a74b1d..507826f158 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java @@ -20,9 +20,9 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Map; -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.compute.domain.Image; import org.jclouds.compute.domain.OsFamily; diff --git a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java index 6251bbf2ce..e564b9e37a 100644 --- a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java +++ b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java @@ -26,10 +26,10 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentMap; -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.compute.JCloudsNativeComputeServiceAdapter; diff --git a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceDependenciesModule.java b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceDependenciesModule.java index 375f761d30..6b81c77045 100644 --- a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceDependenciesModule.java +++ b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceDependenciesModule.java @@ -21,9 +21,9 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicInteger; -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.compute.domain.Hardware; import org.jclouds.compute.domain.NodeMetadata; diff --git a/compute/src/main/java/org/jclouds/compute/stub/extensions/StubSecurityGroupExtension.java b/compute/src/main/java/org/jclouds/compute/stub/extensions/StubSecurityGroupExtension.java index f0f219f6dd..158ca68a27 100644 --- a/compute/src/main/java/org/jclouds/compute/stub/extensions/StubSecurityGroupExtension.java +++ b/compute/src/main/java/org/jclouds/compute/stub/extensions/StubSecurityGroupExtension.java @@ -24,9 +24,9 @@ import static com.google.common.collect.Iterables.filter; import java.util.Set; import java.util.concurrent.ConcurrentMap; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.jclouds.compute.domain.SecurityGroup; import org.jclouds.compute.domain.SecurityGroupBuilder; diff --git a/compute/src/main/java/org/jclouds/compute/suppliers/ImageCacheSupplier.java b/compute/src/main/java/org/jclouds/compute/suppliers/ImageCacheSupplier.java index 96b9009640..7828bec1a8 100644 --- a/compute/src/main/java/org/jclouds/compute/suppliers/ImageCacheSupplier.java +++ b/compute/src/main/java/org/jclouds/compute/suppliers/ImageCacheSupplier.java @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.domain.Image; import org.jclouds.compute.reference.ComputeServiceConstants; diff --git a/compute/src/main/java/org/jclouds/compute/util/ComputeUtils.java b/compute/src/main/java/org/jclouds/compute/util/ComputeUtils.java index ac25891554..e620b8c170 100644 --- a/compute/src/main/java/org/jclouds/compute/util/ComputeUtils.java +++ b/compute/src/main/java/org/jclouds/compute/util/ComputeUtils.java @@ -22,9 +22,9 @@ 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.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.Constants; import org.jclouds.compute.config.CustomizationResponse; diff --git a/compute/src/main/java/org/jclouds/compute/util/ConcurrentOpenSocketFinder.java b/compute/src/main/java/org/jclouds/compute/util/ConcurrentOpenSocketFinder.java index 00d62b1adc..ba0895ce7a 100644 --- a/compute/src/main/java/org/jclouds/compute/util/ConcurrentOpenSocketFinder.java +++ b/compute/src/main/java/org/jclouds/compute/util/ConcurrentOpenSocketFinder.java @@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.reference.ComputeServiceConstants; diff --git a/compute/src/main/java/org/jclouds/ovf/xml/DeploymentOptionSectionHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/DeploymentOptionSectionHandler.java index 7a56410137..d049a3f4f4 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/DeploymentOptionSectionHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/DeploymentOptionSectionHandler.java @@ -21,8 +21,8 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jclouds.ovf.Configuration; import org.jclouds.ovf.DeploymentOptionSection; diff --git a/compute/src/main/java/org/jclouds/ovf/xml/DiskSectionHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/DiskSectionHandler.java index 76ffcce013..39315a5259 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/DiskSectionHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/DiskSectionHandler.java @@ -23,8 +23,8 @@ import java.net.URI; import java.util.Map; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jclouds.logging.Logger; import org.jclouds.ovf.Disk; diff --git a/compute/src/main/java/org/jclouds/ovf/xml/EnvelopeHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/EnvelopeHandler.java index bcedb997ef..b1dbd160a9 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/EnvelopeHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/EnvelopeHandler.java @@ -16,8 +16,8 @@ */ package org.jclouds.ovf.xml; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jclouds.ovf.Envelope; import org.jclouds.ovf.VirtualSystem; diff --git a/compute/src/main/java/org/jclouds/ovf/xml/NetworkSectionHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/NetworkSectionHandler.java index 4a34432b62..5aa9598052 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/NetworkSectionHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/NetworkSectionHandler.java @@ -21,8 +21,8 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jclouds.ovf.Network; import org.jclouds.ovf.NetworkSection; diff --git a/compute/src/main/java/org/jclouds/ovf/xml/OperatingSystemSectionHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/OperatingSystemSectionHandler.java index fa717a32ba..9a11240f41 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/OperatingSystemSectionHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/OperatingSystemSectionHandler.java @@ -22,8 +22,8 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jclouds.ovf.OperatingSystemSection; import org.xml.sax.Attributes; diff --git a/compute/src/main/java/org/jclouds/ovf/xml/ProductSectionHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/ProductSectionHandler.java index e4e996f783..034dbd3fca 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/ProductSectionHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/ProductSectionHandler.java @@ -21,8 +21,8 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jclouds.ovf.ProductSection; import org.jclouds.ovf.Property; diff --git a/compute/src/main/java/org/jclouds/ovf/xml/SectionHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/SectionHandler.java index e3561d8bae..bea9cd4cb7 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/SectionHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/SectionHandler.java @@ -19,7 +19,7 @@ package org.jclouds.ovf.xml; import static org.jclouds.util.SaxUtils.currentOrNull; import static org.jclouds.util.SaxUtils.equalsOrSuffix; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.http.functions.ParseSax; import org.jclouds.ovf.Section; diff --git a/compute/src/main/java/org/jclouds/ovf/xml/VirtualHardwareSectionHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/VirtualHardwareSectionHandler.java index cf5bcc3cf5..5c801af675 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/VirtualHardwareSectionHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/VirtualHardwareSectionHandler.java @@ -22,8 +22,8 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jclouds.cim.xml.ResourceAllocationSettingDataHandler; import org.jclouds.cim.xml.VirtualSystemSettingDataHandler; diff --git a/compute/src/main/java/org/jclouds/ovf/xml/VirtualSystemHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/VirtualSystemHandler.java index 545eb521d8..10669cfd19 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/VirtualSystemHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/VirtualSystemHandler.java @@ -16,8 +16,8 @@ */ package org.jclouds.ovf.xml; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jclouds.ovf.VirtualSystem; import org.jclouds.ovf.xml.internal.BaseVirtualSystemHandler; diff --git a/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseEnvelopeHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseEnvelopeHandler.java index 4b21d8d570..3e1df6d820 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseEnvelopeHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseEnvelopeHandler.java @@ -20,8 +20,8 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Map; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.jclouds.http.functions.ParseSax; import org.jclouds.ovf.internal.BaseEnvelope; diff --git a/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseVirtualSystemHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseVirtualSystemHandler.java index b4bbf7f593..eafb518df6 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseVirtualSystemHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseVirtualSystemHandler.java @@ -22,8 +22,8 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Map; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.jclouds.ovf.Section; import org.jclouds.ovf.internal.BaseVirtualSystem; diff --git a/compute/src/main/java/org/jclouds/ssh/internal/RsaSshKeyPairGenerator.java b/compute/src/main/java/org/jclouds/ssh/internal/RsaSshKeyPairGenerator.java index 24e620ff4f..2951dc8da3 100644 --- a/compute/src/main/java/org/jclouds/ssh/internal/RsaSshKeyPairGenerator.java +++ b/compute/src/main/java/org/jclouds/ssh/internal/RsaSshKeyPairGenerator.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.security.SecureRandom; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.crypto.Crypto; import org.jclouds.ssh.SshKeyPairGenerator; diff --git a/compute/src/test/java/org/jclouds/compute/domain/TemplateBuilderSpecTest.java b/compute/src/test/java/org/jclouds/compute/domain/TemplateBuilderSpecTest.java index 8c117512d7..f1d1cdedd5 100644 --- a/compute/src/test/java/org/jclouds/compute/domain/TemplateBuilderSpecTest.java +++ b/compute/src/test/java/org/jclouds/compute/domain/TemplateBuilderSpecTest.java @@ -26,7 +26,7 @@ import static org.testng.Assert.fail; import java.lang.reflect.Field; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.ContextBuilder; import org.jclouds.domain.LoginCredentials; diff --git a/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java b/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java index cc2708c913..cb718de9de 100644 --- a/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java +++ b/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java @@ -30,7 +30,7 @@ import java.util.Arrays; import java.util.NoSuchElementException; import java.util.Set; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.HardwareBuilder; diff --git a/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java b/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java index 47132ea697..fd27902f21 100644 --- a/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java @@ -27,7 +27,7 @@ import java.util.NoSuchElementException; import java.util.concurrent.ExecutionException; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.ComputeService; import org.jclouds.compute.RunNodesException; diff --git a/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseSecurityGroupExtensionLiveTest.java b/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseSecurityGroupExtensionLiveTest.java index e28047b705..5e8c34910c 100644 --- a/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseSecurityGroupExtensionLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseSecurityGroupExtensionLiveTest.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.ComputeService; import org.jclouds.compute.ComputeServiceContext; diff --git a/core/pom.xml b/core/pom.xml index 35d137aa8b..be3189c3de 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -61,6 +61,10 @@ jakarta.annotation jakarta.annotation-api + + jakarta.inject + jakarta.inject-api + com.sun.xml.bind jaxb-impl diff --git a/core/src/main/java/org/jclouds/annotations/Name.java b/core/src/main/java/org/jclouds/annotations/Name.java index ce8ca1e3f9..96fbcd7658 100644 --- a/core/src/main/java/org/jclouds/annotations/Name.java +++ b/core/src/main/java/org/jclouds/annotations/Name.java @@ -16,7 +16,7 @@ */ package org.jclouds.annotations; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/core/src/main/java/org/jclouds/collect/Memoized.java b/core/src/main/java/org/jclouds/collect/Memoized.java index d5eae037ec..bcd5cfa073 100644 --- a/core/src/main/java/org/jclouds/collect/Memoized.java +++ b/core/src/main/java/org/jclouds/collect/Memoized.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; /** * Designates that this object is going to return cached results diff --git a/core/src/main/java/org/jclouds/concurrent/FutureIterables.java b/core/src/main/java/org/jclouds/concurrent/FutureIterables.java index e2d049dc20..0a32661e53 100644 --- a/core/src/main/java/org/jclouds/concurrent/FutureIterables.java +++ b/core/src/main/java/org/jclouds/concurrent/FutureIterables.java @@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.http.handlers.BackoffLimitedRetryHandler; diff --git a/core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java b/core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java index 1321d470c1..738540558a 100644 --- a/core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java +++ b/core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java @@ -28,8 +28,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; import jakarta.annotation.Resource; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.lifecycle.Closer; import org.jclouds.logging.Logger; diff --git a/core/src/main/java/org/jclouds/concurrent/config/ScheduledExecutorServiceModule.java b/core/src/main/java/org/jclouds/concurrent/config/ScheduledExecutorServiceModule.java index 3f5f4af77f..99fea2996b 100644 --- a/core/src/main/java/org/jclouds/concurrent/config/ScheduledExecutorServiceModule.java +++ b/core/src/main/java/org/jclouds/concurrent/config/ScheduledExecutorServiceModule.java @@ -26,8 +26,8 @@ import static org.jclouds.concurrent.config.ExecutorServiceModule.shutdownOnClos import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.lifecycle.Closer; diff --git a/core/src/main/java/org/jclouds/config/ValueOfConfigurationKeyOrNull.java b/core/src/main/java/org/jclouds/config/ValueOfConfigurationKeyOrNull.java index 18be6adadf..5f48fe06c3 100644 --- a/core/src/main/java/org/jclouds/config/ValueOfConfigurationKeyOrNull.java +++ b/core/src/main/java/org/jclouds/config/ValueOfConfigurationKeyOrNull.java @@ -19,7 +19,7 @@ package org.jclouds.config; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.inject.name.Names.named; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.google.common.base.Function; import com.google.inject.ConfigurationException; diff --git a/core/src/main/java/org/jclouds/date/TimeStamp.java b/core/src/main/java/org/jclouds/date/TimeStamp.java index 5d6bff6583..e7e15643ab 100644 --- a/core/src/main/java/org/jclouds/date/TimeStamp.java +++ b/core/src/main/java/org/jclouds/date/TimeStamp.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Related to a TimeStamp diff --git a/core/src/main/java/org/jclouds/date/internal/DateServiceDateCodecFactory.java b/core/src/main/java/org/jclouds/date/internal/DateServiceDateCodecFactory.java index 24e443d6b6..4397bf92b6 100644 --- a/core/src/main/java/org/jclouds/date/internal/DateServiceDateCodecFactory.java +++ b/core/src/main/java/org/jclouds/date/internal/DateServiceDateCodecFactory.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.date.DateCodec; import org.jclouds.date.DateCodecFactory; diff --git a/core/src/main/java/org/jclouds/encryption/internal/JCECrypto.java b/core/src/main/java/org/jclouds/encryption/internal/JCECrypto.java index 3b4962fadb..6312380a91 100644 --- a/core/src/main/java/org/jclouds/encryption/internal/JCECrypto.java +++ b/core/src/main/java/org/jclouds/encryption/internal/JCECrypto.java @@ -28,8 +28,8 @@ import javax.crypto.Cipher; import javax.crypto.Mac; import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.SecretKeySpec; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.crypto.Crypto; import org.jclouds.javax.annotation.Nullable; diff --git a/core/src/main/java/org/jclouds/events/config/EventBusModule.java b/core/src/main/java/org/jclouds/events/config/EventBusModule.java index 84ab8d96d4..a7f833d804 100644 --- a/core/src/main/java/org/jclouds/events/config/EventBusModule.java +++ b/core/src/main/java/org/jclouds/events/config/EventBusModule.java @@ -19,8 +19,8 @@ package org.jclouds.events.config; import static com.google.inject.Scopes.SINGLETON; import static org.jclouds.Constants.PROPERTY_USER_THREADS; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.events.config.annotations.AsyncBus; import org.jclouds.events.handlers.DeadEventLoggingHandler; diff --git a/core/src/main/java/org/jclouds/events/config/annotations/AsyncBus.java b/core/src/main/java/org/jclouds/events/config/annotations/AsyncBus.java index c8e3446241..665b8df3bd 100644 --- a/core/src/main/java/org/jclouds/events/config/annotations/AsyncBus.java +++ b/core/src/main/java/org/jclouds/events/config/annotations/AsyncBus.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 {@link EventBus} injection, providing a flexible way to inject the diff --git a/core/src/main/java/org/jclouds/events/handlers/DeadEventLoggingHandler.java b/core/src/main/java/org/jclouds/events/handlers/DeadEventLoggingHandler.java index d71ba2d91c..abee16b03a 100644 --- a/core/src/main/java/org/jclouds/events/handlers/DeadEventLoggingHandler.java +++ b/core/src/main/java/org/jclouds/events/handlers/DeadEventLoggingHandler.java @@ -17,7 +17,7 @@ package org.jclouds.events.handlers; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.logging.Logger; diff --git a/core/src/main/java/org/jclouds/fallbacks/HeaderToRetryAfterException.java b/core/src/main/java/org/jclouds/fallbacks/HeaderToRetryAfterException.java index 1d330a590a..f0fa518067 100644 --- a/core/src/main/java/org/jclouds/fallbacks/HeaderToRetryAfterException.java +++ b/core/src/main/java/org/jclouds/fallbacks/HeaderToRetryAfterException.java @@ -21,7 +21,7 @@ import static com.google.common.base.Throwables.propagate; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.NANOSECONDS; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateCodec; import org.jclouds.date.DateCodecFactory; diff --git a/core/src/main/java/org/jclouds/fallbacks/MapHttp4xxCodesToExceptions.java b/core/src/main/java/org/jclouds/fallbacks/MapHttp4xxCodesToExceptions.java index a810c9f98a..5dbaffcee7 100644 --- a/core/src/main/java/org/jclouds/fallbacks/MapHttp4xxCodesToExceptions.java +++ b/core/src/main/java/org/jclouds/fallbacks/MapHttp4xxCodesToExceptions.java @@ -19,8 +19,8 @@ package org.jclouds.fallbacks; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.Fallback; import org.jclouds.http.HttpResponseException; diff --git a/core/src/main/java/org/jclouds/functions/IdentityFunction.java b/core/src/main/java/org/jclouds/functions/IdentityFunction.java index 1c8301dc65..c4af0c7a1c 100644 --- a/core/src/main/java/org/jclouds/functions/IdentityFunction.java +++ b/core/src/main/java/org/jclouds/functions/IdentityFunction.java @@ -16,7 +16,7 @@ */ package org.jclouds.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.google.common.base.Function; diff --git a/core/src/main/java/org/jclouds/functions/JoinOnComma.java b/core/src/main/java/org/jclouds/functions/JoinOnComma.java index e26329a6cc..85a014d7b0 100644 --- a/core/src/main/java/org/jclouds/functions/JoinOnComma.java +++ b/core/src/main/java/org/jclouds/functions/JoinOnComma.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.lang.reflect.Array; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.google.common.base.Function; import com.google.common.base.Joiner; diff --git a/core/src/main/java/org/jclouds/functions/OnlyElementOrNull.java b/core/src/main/java/org/jclouds/functions/OnlyElementOrNull.java index 49fba9bdb7..2a8d69f6fa 100644 --- a/core/src/main/java/org/jclouds/functions/OnlyElementOrNull.java +++ b/core/src/main/java/org/jclouds/functions/OnlyElementOrNull.java @@ -16,7 +16,7 @@ */ package org.jclouds.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.google.common.base.Function; import com.google.common.collect.Iterables; diff --git a/core/src/main/java/org/jclouds/functions/ToLowerCase.java b/core/src/main/java/org/jclouds/functions/ToLowerCase.java index 4dc6e60254..686109affa 100644 --- a/core/src/main/java/org/jclouds/functions/ToLowerCase.java +++ b/core/src/main/java/org/jclouds/functions/ToLowerCase.java @@ -18,7 +18,7 @@ package org.jclouds.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.google.common.base.Function; diff --git a/core/src/main/java/org/jclouds/http/HttpUtils.java b/core/src/main/java/org/jclouds/http/HttpUtils.java index 7909a2e591..b00c3ff8b2 100644 --- a/core/src/main/java/org/jclouds/http/HttpUtils.java +++ b/core/src/main/java/org/jclouds/http/HttpUtils.java @@ -46,8 +46,8 @@ import java.lang.annotation.Annotation; import java.util.Collection; import java.util.Map.Entry; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import jakarta.ws.rs.HttpMethod; import org.jclouds.Constants; diff --git a/core/src/main/java/org/jclouds/http/annotation/ClientError.java b/core/src/main/java/org/jclouds/http/annotation/ClientError.java index e4d61bc0cb..6c46ac2209 100644 --- a/core/src/main/java/org/jclouds/http/annotation/ClientError.java +++ b/core/src/main/java/org/jclouds/http/annotation/ClientError.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; /** * Implies that the object can address {@link org.jclouds.http.HttpResponse}s diff --git a/core/src/main/java/org/jclouds/http/annotation/Redirection.java b/core/src/main/java/org/jclouds/http/annotation/Redirection.java index ba4b98d03c..3aae54175d 100644 --- a/core/src/main/java/org/jclouds/http/annotation/Redirection.java +++ b/core/src/main/java/org/jclouds/http/annotation/Redirection.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; /** * Implies that the object can address {@link org.jclouds.http.HttpResponse}s that contain status diff --git a/core/src/main/java/org/jclouds/http/annotation/ServerError.java b/core/src/main/java/org/jclouds/http/annotation/ServerError.java index 7b48b3c0de..cbad450462 100644 --- a/core/src/main/java/org/jclouds/http/annotation/ServerError.java +++ b/core/src/main/java/org/jclouds/http/annotation/ServerError.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; /** * Implies that the object can address {@link org.jclouds.http.HttpResponse}s that contain status diff --git a/core/src/main/java/org/jclouds/http/config/SSLModule.java b/core/src/main/java/org/jclouds/http/config/SSLModule.java index 52fb7d7fba..08c0e5eacc 100644 --- a/core/src/main/java/org/jclouds/http/config/SSLModule.java +++ b/core/src/main/java/org/jclouds/http/config/SSLModule.java @@ -21,8 +21,8 @@ import java.security.cert.X509Certificate; import java.util.Map; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; diff --git a/core/src/main/java/org/jclouds/http/filters/BasicAuthentication.java b/core/src/main/java/org/jclouds/http/filters/BasicAuthentication.java index 9603154ec7..97c9a39905 100644 --- a/core/src/main/java/org/jclouds/http/filters/BasicAuthentication.java +++ b/core/src/main/java/org/jclouds/http/filters/BasicAuthentication.java @@ -21,8 +21,8 @@ import static com.google.common.io.BaseEncoding.base64; import static com.google.common.net.HttpHeaders.AUTHORIZATION; import static java.lang.String.format; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.domain.Credentials; import org.jclouds.http.HttpException; diff --git a/core/src/main/java/org/jclouds/http/functions/ParseETagHeader.java b/core/src/main/java/org/jclouds/http/functions/ParseETagHeader.java index 9b7d755eb0..15df96ca38 100644 --- a/core/src/main/java/org/jclouds/http/functions/ParseETagHeader.java +++ b/core/src/main/java/org/jclouds/http/functions/ParseETagHeader.java @@ -19,7 +19,7 @@ package org.jclouds.http.functions; import static com.google.common.net.HttpHeaders.ETAG; import static org.jclouds.http.HttpUtils.releasePayload; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpException; import org.jclouds.http.HttpResponse; diff --git a/core/src/main/java/org/jclouds/http/functions/ParseJson.java b/core/src/main/java/org/jclouds/http/functions/ParseJson.java index 414b38625d..319c3411ec 100644 --- a/core/src/main/java/org/jclouds/http/functions/ParseJson.java +++ b/core/src/main/java/org/jclouds/http/functions/ParseJson.java @@ -24,8 +24,8 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; import jakarta.annotation.Resource; -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.HttpResponseException; diff --git a/core/src/main/java/org/jclouds/http/functions/ParseXMLWithJAXB.java b/core/src/main/java/org/jclouds/http/functions/ParseXMLWithJAXB.java index 4ea3496e89..2b451fb322 100644 --- a/core/src/main/java/org/jclouds/http/functions/ParseXMLWithJAXB.java +++ b/core/src/main/java/org/jclouds/http/functions/ParseXMLWithJAXB.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.io.InputStream; import jakarta.annotation.Resource; -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.HttpResponseException; diff --git a/core/src/main/java/org/jclouds/http/functions/ReleasePayloadAndReturn.java b/core/src/main/java/org/jclouds/http/functions/ReleasePayloadAndReturn.java index fbb8d59a5f..a343c0bc8f 100644 --- a/core/src/main/java/org/jclouds/http/functions/ReleasePayloadAndReturn.java +++ b/core/src/main/java/org/jclouds/http/functions/ReleasePayloadAndReturn.java @@ -19,7 +19,7 @@ package org.jclouds.http.functions; import static org.jclouds.http.HttpUtils.releasePayload; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; import org.jclouds.logging.Logger; diff --git a/core/src/main/java/org/jclouds/http/functions/ReturnInputStream.java b/core/src/main/java/org/jclouds/http/functions/ReturnInputStream.java index 2a6d5bfcd1..cbd7ea153a 100644 --- a/core/src/main/java/org/jclouds/http/functions/ReturnInputStream.java +++ b/core/src/main/java/org/jclouds/http/functions/ReturnInputStream.java @@ -18,7 +18,7 @@ package org.jclouds.http.functions; import java.io.InputStream; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; diff --git a/core/src/main/java/org/jclouds/http/functions/ReturnStringIf2xx.java b/core/src/main/java/org/jclouds/http/functions/ReturnStringIf2xx.java index 04409391a8..e651b41acb 100644 --- a/core/src/main/java/org/jclouds/http/functions/ReturnStringIf2xx.java +++ b/core/src/main/java/org/jclouds/http/functions/ReturnStringIf2xx.java @@ -21,7 +21,7 @@ import static org.jclouds.http.HttpUtils.releasePayload; import java.io.IOException; import java.io.InputStream; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpException; import org.jclouds.http.HttpResponse; diff --git a/core/src/main/java/org/jclouds/http/functions/ReturnTrueIf201.java b/core/src/main/java/org/jclouds/http/functions/ReturnTrueIf201.java index e44e98d27a..eb4d9ce59c 100644 --- a/core/src/main/java/org/jclouds/http/functions/ReturnTrueIf201.java +++ b/core/src/main/java/org/jclouds/http/functions/ReturnTrueIf201.java @@ -18,7 +18,7 @@ package org.jclouds.http.functions; import static org.jclouds.http.HttpUtils.releasePayload; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; diff --git a/core/src/main/java/org/jclouds/http/functions/ReturnTrueIf2xx.java b/core/src/main/java/org/jclouds/http/functions/ReturnTrueIf2xx.java index 3bfea4e95a..ca5937451a 100644 --- a/core/src/main/java/org/jclouds/http/functions/ReturnTrueIf2xx.java +++ b/core/src/main/java/org/jclouds/http/functions/ReturnTrueIf2xx.java @@ -18,7 +18,7 @@ package org.jclouds.http.functions; import static org.jclouds.http.HttpUtils.releasePayload; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; diff --git a/core/src/main/java/org/jclouds/http/functions/UnwrapOnlyJsonValue.java b/core/src/main/java/org/jclouds/http/functions/UnwrapOnlyJsonValue.java index 164294f9da..cd52015168 100644 --- a/core/src/main/java/org/jclouds/http/functions/UnwrapOnlyJsonValue.java +++ b/core/src/main/java/org/jclouds/http/functions/UnwrapOnlyJsonValue.java @@ -18,8 +18,8 @@ package org.jclouds.http.functions; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; diff --git a/core/src/main/java/org/jclouds/http/functions/UnwrapOnlyJsonValueInSet.java b/core/src/main/java/org/jclouds/http/functions/UnwrapOnlyJsonValueInSet.java index 2b4739984d..0ccfc3f695 100644 --- a/core/src/main/java/org/jclouds/http/functions/UnwrapOnlyJsonValueInSet.java +++ b/core/src/main/java/org/jclouds/http/functions/UnwrapOnlyJsonValueInSet.java @@ -18,8 +18,8 @@ package org.jclouds.http.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; diff --git a/core/src/main/java/org/jclouds/http/functions/config/SaxParserModule.java b/core/src/main/java/org/jclouds/http/functions/config/SaxParserModule.java index c2705d9fc5..d059e4a362 100644 --- a/core/src/main/java/org/jclouds/http/functions/config/SaxParserModule.java +++ b/core/src/main/java/org/jclouds/http/functions/config/SaxParserModule.java @@ -16,8 +16,8 @@ */ package org.jclouds.http.functions.config; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; diff --git a/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java b/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java index 0312a3befa..0a84dc0d6e 100644 --- a/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java +++ b/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.Random; 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.http.HttpCommand; diff --git a/core/src/main/java/org/jclouds/http/handlers/CloseContentAndSetExceptionErrorHandler.java b/core/src/main/java/org/jclouds/http/handlers/CloseContentAndSetExceptionErrorHandler.java index a3a12adaab..39a9befc9c 100644 --- a/core/src/main/java/org/jclouds/http/handlers/CloseContentAndSetExceptionErrorHandler.java +++ b/core/src/main/java/org/jclouds/http/handlers/CloseContentAndSetExceptionErrorHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.http.HttpUtils.releasePayload; import java.io.IOException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; diff --git a/core/src/main/java/org/jclouds/http/handlers/DelegatingErrorHandler.java b/core/src/main/java/org/jclouds/http/handlers/DelegatingErrorHandler.java index ad8049c805..9096b37b98 100644 --- a/core/src/main/java/org/jclouds/http/handlers/DelegatingErrorHandler.java +++ b/core/src/main/java/org/jclouds/http/handlers/DelegatingErrorHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.http.handlers; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; diff --git a/core/src/main/java/org/jclouds/http/handlers/DelegatingRetryHandler.java b/core/src/main/java/org/jclouds/http/handlers/DelegatingRetryHandler.java index 35411bcc9a..478a6e49ea 100644 --- a/core/src/main/java/org/jclouds/http/handlers/DelegatingRetryHandler.java +++ b/core/src/main/java/org/jclouds/http/handlers/DelegatingRetryHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.http.handlers; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpResponse; diff --git a/core/src/main/java/org/jclouds/http/handlers/RateLimitRetryHandler.java b/core/src/main/java/org/jclouds/http/handlers/RateLimitRetryHandler.java index 9cf13cf660..8be4758e96 100644 --- a/core/src/main/java/org/jclouds/http/handlers/RateLimitRetryHandler.java +++ b/core/src/main/java/org/jclouds/http/handlers/RateLimitRetryHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.Constants.PROPERTY_MAX_RATE_LIMIT_WAIT; import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpResponse; diff --git a/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java b/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java index 31df2ef0bd..f276ecad69 100644 --- a/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java +++ b/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java @@ -24,8 +24,8 @@ import static org.jclouds.http.Uris.uriBuilder; import java.net.URI; 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.http.HttpCommand; diff --git a/core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java b/core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java index a2d5ea08a3..d3cb5794b3 100644 --- a/core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java +++ b/core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java @@ -29,7 +29,7 @@ import java.net.ProtocolException; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.http.HttpCommand; diff --git a/core/src/main/java/org/jclouds/http/internal/HttpWire.java b/core/src/main/java/org/jclouds/http/internal/HttpWire.java index 57cec86992..c58ac89a65 100644 --- a/core/src/main/java/org/jclouds/http/internal/HttpWire.java +++ b/core/src/main/java/org/jclouds/http/internal/HttpWire.java @@ -23,7 +23,7 @@ import org.jclouds.logging.Logger; import org.jclouds.logging.internal.Wire; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; public class HttpWire extends Wire { diff --git a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java index 1e455e221a..1af1ea8907 100644 --- a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java +++ b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java @@ -39,8 +39,8 @@ import java.net.URL; import java.util.List; import java.util.Map; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; diff --git a/core/src/main/java/org/jclouds/http/internal/SignatureWire.java b/core/src/main/java/org/jclouds/http/internal/SignatureWire.java index 71e1331bb7..3943af8141 100644 --- a/core/src/main/java/org/jclouds/http/internal/SignatureWire.java +++ b/core/src/main/java/org/jclouds/http/internal/SignatureWire.java @@ -17,7 +17,7 @@ package org.jclouds.http.internal; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.logging.Logger; diff --git a/core/src/main/java/org/jclouds/internal/ContextImpl.java b/core/src/main/java/org/jclouds/internal/ContextImpl.java index 533d4df703..3e163fa228 100644 --- a/core/src/main/java/org/jclouds/internal/ContextImpl.java +++ b/core/src/main/java/org/jclouds/internal/ContextImpl.java @@ -27,7 +27,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.Context; import org.jclouds.annotations.Name; diff --git a/core/src/main/java/org/jclouds/internal/FilterStringsBoundToInjectorByName.java b/core/src/main/java/org/jclouds/internal/FilterStringsBoundToInjectorByName.java index a8bc6b0465..4c25cabfae 100644 --- a/core/src/main/java/org/jclouds/internal/FilterStringsBoundToInjectorByName.java +++ b/core/src/main/java/org/jclouds/internal/FilterStringsBoundToInjectorByName.java @@ -22,8 +22,8 @@ import java.lang.annotation.Annotation; import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -57,7 +57,7 @@ public class FilterStringsBoundToInjectorByName implements Function input) { Annotation annotation = input.getKey().getAnnotation(); - return (annotation instanceof javax.inject.Named) ? javax.inject.Named.class.cast(annotation) + return (annotation instanceof jakarta.inject.Named) ? jakarta.inject.Named.class.cast(annotation) .value() : com.google.inject.name.Named.class.cast(annotation).value(); } diff --git a/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java b/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java index 8de6b02a04..4182b8fd2c 100644 --- a/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java +++ b/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java @@ -26,7 +26,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.NoSuchElementException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.io.ContentMetadata; import org.jclouds.io.Payload; diff --git a/core/src/main/java/org/jclouds/json/config/GsonModule.java b/core/src/main/java/org/jclouds/json/config/GsonModule.java index 8b2a89117d..709e4aff56 100644 --- a/core/src/main/java/org/jclouds/json/config/GsonModule.java +++ b/core/src/main/java/org/jclouds/json/config/GsonModule.java @@ -29,8 +29,8 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import org.jclouds.date.DateService; import org.jclouds.domain.Credentials; diff --git a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java index db9d2e3e86..cfb5d3b3ef 100644 --- a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java +++ b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java @@ -74,7 +74,7 @@ import com.google.gson.stream.JsonWriter; * new ExtractSerializedName(), new ExtractNamed()); * * deserializationStrategy = new AnnotationConstructorNamingStrategy( - * ImmutableSet.of(javax.inject.Inject.class), + * ImmutableSet.of(jakarta.inject.Inject.class), * ImmutableSet.of(new ExtractNamed())); * * factory = new DeserializationConstructorAndReflectiveTypeAdapterFactory(new ConstructorConstructor(), diff --git a/core/src/main/java/org/jclouds/json/internal/GsonWrapper.java b/core/src/main/java/org/jclouds/json/internal/GsonWrapper.java index c841a068af..100b2330b3 100644 --- a/core/src/main/java/org/jclouds/json/internal/GsonWrapper.java +++ b/core/src/main/java/org/jclouds/json/internal/GsonWrapper.java @@ -21,8 +21,8 @@ import java.io.InputStreamReader; import java.lang.reflect.Type; import java.nio.charset.Charset; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.json.Json; diff --git a/core/src/main/java/org/jclouds/json/internal/NamingStrategies.java b/core/src/main/java/org/jclouds/json/internal/NamingStrategies.java index 8e0cc3f222..cbb5f8bb36 100644 --- a/core/src/main/java/org/jclouds/json/internal/NamingStrategies.java +++ b/core/src/main/java/org/jclouds/json/internal/NamingStrategies.java @@ -35,7 +35,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.json.SerializedNames; diff --git a/core/src/main/java/org/jclouds/lifecycle/Closer.java b/core/src/main/java/org/jclouds/lifecycle/Closer.java index 4643bb560f..a12a3d0e92 100644 --- a/core/src/main/java/org/jclouds/lifecycle/Closer.java +++ b/core/src/main/java/org/jclouds/lifecycle/Closer.java @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Atomics; diff --git a/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java b/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java index fb7b831b3d..3f0f7873de 100644 --- a/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java +++ b/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java @@ -32,7 +32,7 @@ import java.util.concurrent.ScheduledExecutorService; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.lifecycle.Closer; diff --git a/core/src/main/java/org/jclouds/location/Iso3166.java b/core/src/main/java/org/jclouds/location/Iso3166.java index b7ffbed397..3f0b742bf0 100644 --- a/core/src/main/java/org/jclouds/location/Iso3166.java +++ b/core/src/main/java/org/jclouds/location/Iso3166.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Related to a Iso3166 code diff --git a/core/src/main/java/org/jclouds/location/Provider.java b/core/src/main/java/org/jclouds/location/Provider.java index 94ef3c0f85..ab39c1acf5 100644 --- a/core/src/main/java/org/jclouds/location/Provider.java +++ b/core/src/main/java/org/jclouds/location/Provider.java @@ -25,7 +25,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; /** * Designates that this Resource qualifies an object to a provider of a rest service. diff --git a/core/src/main/java/org/jclouds/location/Region.java b/core/src/main/java/org/jclouds/location/Region.java index 950f4b4b60..37bc3d5131 100644 --- a/core/src/main/java/org/jclouds/location/Region.java +++ b/core/src/main/java/org/jclouds/location/Region.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Related to a Region-scoped resource. diff --git a/core/src/main/java/org/jclouds/location/Zone.java b/core/src/main/java/org/jclouds/location/Zone.java index 05618d144c..51ca581c26 100644 --- a/core/src/main/java/org/jclouds/location/Zone.java +++ b/core/src/main/java/org/jclouds/location/Zone.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Related to a Zone-scoped resource. diff --git a/core/src/main/java/org/jclouds/location/config/LocationModule.java b/core/src/main/java/org/jclouds/location/config/LocationModule.java index d8c5de3007..1700601d98 100644 --- a/core/src/main/java/org/jclouds/location/config/LocationModule.java +++ b/core/src/main/java/org/jclouds/location/config/LocationModule.java @@ -25,8 +25,8 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; diff --git a/core/src/main/java/org/jclouds/location/functions/RegionToEndpoint.java b/core/src/main/java/org/jclouds/location/functions/RegionToEndpoint.java index 4180f324e2..f0b46c48bc 100644 --- a/core/src/main/java/org/jclouds/location/functions/RegionToEndpoint.java +++ b/core/src/main/java/org/jclouds/location/functions/RegionToEndpoint.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkState; import java.net.URI; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.location.Region; diff --git a/core/src/main/java/org/jclouds/location/functions/RegionToEndpointOrProviderIfNull.java b/core/src/main/java/org/jclouds/location/functions/RegionToEndpointOrProviderIfNull.java index a59c3cebec..2e8cf1b5cb 100644 --- a/core/src/main/java/org/jclouds/location/functions/RegionToEndpointOrProviderIfNull.java +++ b/core/src/main/java/org/jclouds/location/functions/RegionToEndpointOrProviderIfNull.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkArgument; import java.net.URI; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Provider; diff --git a/core/src/main/java/org/jclouds/location/functions/ZoneToEndpoint.java b/core/src/main/java/org/jclouds/location/functions/ZoneToEndpoint.java index cb844dc2b1..731aeb6748 100644 --- a/core/src/main/java/org/jclouds/location/functions/ZoneToEndpoint.java +++ b/core/src/main/java/org/jclouds/location/functions/ZoneToEndpoint.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkState; import java.net.URI; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.location.Zone; diff --git a/core/src/main/java/org/jclouds/location/predicates/LocationPredicates.java b/core/src/main/java/org/jclouds/location/predicates/LocationPredicates.java index ec3cc48e6b..186c621c4f 100644 --- a/core/src/main/java/org/jclouds/location/predicates/LocationPredicates.java +++ b/core/src/main/java/org/jclouds/location/predicates/LocationPredicates.java @@ -18,7 +18,7 @@ package org.jclouds.location.predicates; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.domain.Location; import org.jclouds.domain.LocationScope; diff --git a/core/src/main/java/org/jclouds/location/predicates/fromconfig/AnyOrConfiguredRegionId.java b/core/src/main/java/org/jclouds/location/predicates/fromconfig/AnyOrConfiguredRegionId.java index 2eec4be541..b65e9fe29c 100644 --- a/core/src/main/java/org/jclouds/location/predicates/fromconfig/AnyOrConfiguredRegionId.java +++ b/core/src/main/java/org/jclouds/location/predicates/fromconfig/AnyOrConfiguredRegionId.java @@ -20,8 +20,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.location.predicates.RegionIdFilter; import org.jclouds.location.suppliers.fromconfig.RegionIdsFromConfiguration; diff --git a/core/src/main/java/org/jclouds/location/predicates/fromconfig/AnyOrConfiguredZoneId.java b/core/src/main/java/org/jclouds/location/predicates/fromconfig/AnyOrConfiguredZoneId.java index cefc11ece7..7ffec2e703 100644 --- a/core/src/main/java/org/jclouds/location/predicates/fromconfig/AnyOrConfiguredZoneId.java +++ b/core/src/main/java/org/jclouds/location/predicates/fromconfig/AnyOrConfiguredZoneId.java @@ -20,8 +20,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.location.predicates.ZoneIdFilter; import org.jclouds.location.suppliers.fromconfig.ZoneIdsFromConfiguration; diff --git a/core/src/main/java/org/jclouds/location/suppliers/all/JustProvider.java b/core/src/main/java/org/jclouds/location/suppliers/all/JustProvider.java index ae62fb27d2..65bd0794fa 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/all/JustProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/all/JustProvider.java @@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/core/src/main/java/org/jclouds/location/suppliers/all/RegionToProvider.java b/core/src/main/java/org/jclouds/location/suppliers/all/RegionToProvider.java index 8d8c819d00..d2f007c4a8 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/all/RegionToProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/all/RegionToProvider.java @@ -22,8 +22,8 @@ import static com.google.common.base.Preconditions.checkState; 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.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/core/src/main/java/org/jclouds/location/suppliers/all/RegionToProviderOrJustProvider.java b/core/src/main/java/org/jclouds/location/suppliers/all/RegionToProviderOrJustProvider.java index 759255ba14..2649362f7f 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/all/RegionToProviderOrJustProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/all/RegionToProviderOrJustProvider.java @@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; 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.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToProvider.java b/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToProvider.java index 78c4d67e63..37f1db0cb9 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToProvider.java @@ -23,8 +23,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.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToRegionToProviderOrJustProvider.java b/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToRegionToProviderOrJustProvider.java index b126c9dbd3..74f245a17d 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToRegionToProviderOrJustProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToRegionToProviderOrJustProvider.java @@ -23,8 +23,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.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/core/src/main/java/org/jclouds/location/suppliers/derived/ZoneIdToURIFromJoinOnRegionIdToURI.java b/core/src/main/java/org/jclouds/location/suppliers/derived/ZoneIdToURIFromJoinOnRegionIdToURI.java index f630cd510f..ddb53d93e8 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/derived/ZoneIdToURIFromJoinOnRegionIdToURI.java +++ b/core/src/main/java/org/jclouds/location/suppliers/derived/ZoneIdToURIFromJoinOnRegionIdToURI.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.location.Region; import org.jclouds.location.Zone; diff --git a/core/src/main/java/org/jclouds/location/suppliers/derived/ZoneIdsFromRegionIdToZoneIdsValues.java b/core/src/main/java/org/jclouds/location/suppliers/derived/ZoneIdsFromRegionIdToZoneIdsValues.java index cd54ca8b7b..0217598fc8 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/derived/ZoneIdsFromRegionIdToZoneIdsValues.java +++ b/core/src/main/java/org/jclouds/location/suppliers/derived/ZoneIdsFromRegionIdToZoneIdsValues.java @@ -19,7 +19,7 @@ package org.jclouds.location.suppliers.derived; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.location.Zone; import org.jclouds.location.suppliers.ZoneIdsSupplier; diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToIso3166CodesFromConfiguration.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToIso3166CodesFromConfiguration.java index 50ca94a5af..e738ac95e5 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToIso3166CodesFromConfiguration.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToIso3166CodesFromConfiguration.java @@ -24,8 +24,8 @@ import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE; 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.location.Iso3166; import org.jclouds.location.suppliers.LocationIdToIso3166CodesSupplier; diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java index cf60336d43..0c192781ea 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.config.ValueOfConfigurationKeyOrNull; import org.jclouds.location.Provider; diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/ProviderURIFromProviderMetadata.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/ProviderURIFromProviderMetadata.java index af8b857597..bcf81e63ee 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/ProviderURIFromProviderMetadata.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/ProviderURIFromProviderMetadata.java @@ -16,8 +16,8 @@ */ package org.jclouds.location.suppliers.fromconfig; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.location.suppliers.ProviderURISupplier; import org.jclouds.providers.ProviderMetadata; diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToURIFromConfigurationOrDefaultToProvider.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToURIFromConfigurationOrDefaultToProvider.java index 4066bee41d..ebbfef651a 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToURIFromConfigurationOrDefaultToProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToURIFromConfigurationOrDefaultToProvider.java @@ -21,8 +21,8 @@ import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION; import java.net.URI; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.config.ValueOfConfigurationKeyOrNull; import org.jclouds.location.Provider; diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java index 4ec416a496..8830ede67a 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java @@ -22,8 +22,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.config.ValueOfConfigurationKeyOrNull; import org.jclouds.location.Provider; diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdsFromConfiguration.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdsFromConfiguration.java index d858edbe2c..cc1ea834bf 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdsFromConfiguration.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdsFromConfiguration.java @@ -18,8 +18,8 @@ package org.jclouds.location.suppliers.fromconfig; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.config.ValueOfConfigurationKeyOrNull; import org.jclouds.location.Provider; diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/SplitConfigurationKey.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/SplitConfigurationKey.java index 1a287f6b02..d88174f03d 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/SplitConfigurationKey.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/SplitConfigurationKey.java @@ -19,7 +19,7 @@ package org.jclouds.location.suppliers.fromconfig; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.config.ValueOfConfigurationKeyOrNull; import org.jclouds.location.Provider; diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/ZoneIdToURIFromConfigurationOrDefaultToProvider.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/ZoneIdToURIFromConfigurationOrDefaultToProvider.java index 10ec53bd63..c76cf11516 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/ZoneIdToURIFromConfigurationOrDefaultToProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/ZoneIdToURIFromConfigurationOrDefaultToProvider.java @@ -21,8 +21,8 @@ import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE; import java.net.URI; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.config.ValueOfConfigurationKeyOrNull; import org.jclouds.location.Provider; diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/ZoneIdsFromConfiguration.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/ZoneIdsFromConfiguration.java index 48f5aaf2ad..def44ae34c 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/ZoneIdsFromConfiguration.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/ZoneIdsFromConfiguration.java @@ -18,8 +18,8 @@ package org.jclouds.location.suppliers.fromconfig; import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.config.ValueOfConfigurationKeyOrNull; import org.jclouds.location.Provider; diff --git a/core/src/main/java/org/jclouds/location/suppliers/implicit/FirstNetwork.java b/core/src/main/java/org/jclouds/location/suppliers/implicit/FirstNetwork.java index 6fcef3401e..7844081b20 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/implicit/FirstNetwork.java +++ b/core/src/main/java/org/jclouds/location/suppliers/implicit/FirstNetwork.java @@ -24,8 +24,8 @@ import static org.jclouds.location.predicates.LocationPredicates.isNetwork; import java.util.NoSuchElementException; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; diff --git a/core/src/main/java/org/jclouds/location/suppliers/implicit/FirstRegion.java b/core/src/main/java/org/jclouds/location/suppliers/implicit/FirstRegion.java index f3b31dbe75..15fe40fb43 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/implicit/FirstRegion.java +++ b/core/src/main/java/org/jclouds/location/suppliers/implicit/FirstRegion.java @@ -24,8 +24,8 @@ import static org.jclouds.location.predicates.LocationPredicates.isRegion; import java.util.NoSuchElementException; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; diff --git a/core/src/main/java/org/jclouds/location/suppliers/implicit/FirstZone.java b/core/src/main/java/org/jclouds/location/suppliers/implicit/FirstZone.java index 90f814a4d8..d5d2ac26ff 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/implicit/FirstZone.java +++ b/core/src/main/java/org/jclouds/location/suppliers/implicit/FirstZone.java @@ -24,8 +24,8 @@ import static org.jclouds.location.predicates.LocationPredicates.isZone; import java.util.NoSuchElementException; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; diff --git a/core/src/main/java/org/jclouds/location/suppliers/implicit/GetRegionIdMatchingProviderURIOrNull.java b/core/src/main/java/org/jclouds/location/suppliers/implicit/GetRegionIdMatchingProviderURIOrNull.java index b5de425672..7ae9c9e531 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/implicit/GetRegionIdMatchingProviderURIOrNull.java +++ b/core/src/main/java/org/jclouds/location/suppliers/implicit/GetRegionIdMatchingProviderURIOrNull.java @@ -19,8 +19,8 @@ package org.jclouds.location.suppliers.implicit; import java.net.URI; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.location.Provider; import org.jclouds.location.Region; diff --git a/core/src/main/java/org/jclouds/location/suppliers/implicit/OnlyLocationOrFirstRegionOptionallyMatchingRegionId.java b/core/src/main/java/org/jclouds/location/suppliers/implicit/OnlyLocationOrFirstRegionOptionallyMatchingRegionId.java index 33eca68850..f27696e735 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/implicit/OnlyLocationOrFirstRegionOptionallyMatchingRegionId.java +++ b/core/src/main/java/org/jclouds/location/suppliers/implicit/OnlyLocationOrFirstRegionOptionallyMatchingRegionId.java @@ -26,8 +26,8 @@ import static org.jclouds.location.predicates.LocationPredicates.isZoneOrRegionW import java.util.NoSuchElementException; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; diff --git a/core/src/main/java/org/jclouds/location/suppliers/implicit/OnlyLocationOrFirstZone.java b/core/src/main/java/org/jclouds/location/suppliers/implicit/OnlyLocationOrFirstZone.java index b6b8f3fd44..a7c886ff5f 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/implicit/OnlyLocationOrFirstZone.java +++ b/core/src/main/java/org/jclouds/location/suppliers/implicit/OnlyLocationOrFirstZone.java @@ -25,8 +25,8 @@ import static org.jclouds.location.predicates.LocationPredicates.isZone; import java.util.NoSuchElementException; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; diff --git a/core/src/main/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResource.java b/core/src/main/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResource.java index c7459cfe27..e73e3c1f57 100644 --- a/core/src/main/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResource.java +++ b/core/src/main/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResource.java @@ -24,8 +24,8 @@ import java.util.Arrays; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.logging.Logger; import org.jclouds.logging.Logger.LoggerFactory; diff --git a/core/src/main/java/org/jclouds/logging/config/LoggingModule.java b/core/src/main/java/org/jclouds/logging/config/LoggingModule.java index 5d50f7338d..46db1e2866 100644 --- a/core/src/main/java/org/jclouds/logging/config/LoggingModule.java +++ b/core/src/main/java/org/jclouds/logging/config/LoggingModule.java @@ -18,7 +18,7 @@ package org.jclouds.logging.config; import static com.google.inject.matcher.Matchers.any; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.logging.Logger; diff --git a/core/src/main/java/org/jclouds/predicates/InetSocketAddressConnect.java b/core/src/main/java/org/jclouds/predicates/InetSocketAddressConnect.java index da7c96c98e..e55cfa0f76 100644 --- a/core/src/main/java/org/jclouds/predicates/InetSocketAddressConnect.java +++ b/core/src/main/java/org/jclouds/predicates/InetSocketAddressConnect.java @@ -25,8 +25,8 @@ import java.net.Socket; import java.net.URI; import jakarta.annotation.Resource; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.logging.Logger; diff --git a/core/src/main/java/org/jclouds/predicates/SocketOpenUnsupported.java b/core/src/main/java/org/jclouds/predicates/SocketOpenUnsupported.java index e9be2f0f8f..e3f1cfb9a8 100644 --- a/core/src/main/java/org/jclouds/predicates/SocketOpenUnsupported.java +++ b/core/src/main/java/org/jclouds/predicates/SocketOpenUnsupported.java @@ -16,7 +16,7 @@ */ package org.jclouds.predicates; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.google.common.net.HostAndPort; diff --git a/core/src/main/java/org/jclouds/predicates/validators/DnsNameValidator.java b/core/src/main/java/org/jclouds/predicates/validators/DnsNameValidator.java index 046cc06deb..7f90d02d13 100644 --- a/core/src/main/java/org/jclouds/predicates/validators/DnsNameValidator.java +++ b/core/src/main/java/org/jclouds/predicates/validators/DnsNameValidator.java @@ -19,8 +19,8 @@ package org.jclouds.predicates.validators; import static com.google.common.base.CharMatcher.inRange; import static com.google.common.base.CharMatcher.is; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.predicates.Validator; diff --git a/core/src/main/java/org/jclouds/providers/config/BindProviderMetadataContextAndCredentials.java b/core/src/main/java/org/jclouds/providers/config/BindProviderMetadataContextAndCredentials.java index 0e00715528..a7efdab927 100644 --- a/core/src/main/java/org/jclouds/providers/config/BindProviderMetadataContextAndCredentials.java +++ b/core/src/main/java/org/jclouds/providers/config/BindProviderMetadataContextAndCredentials.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Properties; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.Context; import org.jclouds.domain.Credentials; diff --git a/core/src/main/java/org/jclouds/proxy/ProxyForURI.java b/core/src/main/java/org/jclouds/proxy/ProxyForURI.java index ab54bb0a47..3c6c004770 100644 --- a/core/src/main/java/org/jclouds/proxy/ProxyForURI.java +++ b/core/src/main/java/org/jclouds/proxy/ProxyForURI.java @@ -28,8 +28,8 @@ import java.net.ProxySelector; import java.net.SocketAddress; import java.net.URI; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.domain.Credentials; diff --git a/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java b/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java index 86121b2966..5f8f328e0c 100644 --- a/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java +++ b/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java @@ -29,8 +29,8 @@ import static org.jclouds.Constants.PROPERTY_PROXY_ENABLE_SSL_PROXY; import java.net.Proxy; import java.net.Proxy.Type; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.domain.Credentials; import org.jclouds.proxy.ProxyConfig; diff --git a/core/src/main/java/org/jclouds/rest/InputParamValidator.java b/core/src/main/java/org/jclouds/rest/InputParamValidator.java index 8586240412..59e436962e 100644 --- a/core/src/main/java/org/jclouds/rest/InputParamValidator.java +++ b/core/src/main/java/org/jclouds/rest/InputParamValidator.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.predicates.Validator; import org.jclouds.reflect.Invocation; diff --git a/core/src/main/java/org/jclouds/rest/annotations/Api.java b/core/src/main/java/org/jclouds/rest/annotations/Api.java index b4dff01ea6..a53b047a6f 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/Api.java +++ b/core/src/main/java/org/jclouds/rest/annotations/Api.java @@ -25,7 +25,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; /** * Designates that this Resource qualifies an object to an api. diff --git a/core/src/main/java/org/jclouds/rest/annotations/ApiVersion.java b/core/src/main/java/org/jclouds/rest/annotations/ApiVersion.java index 473ff0386d..876a64a7a5 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/ApiVersion.java +++ b/core/src/main/java/org/jclouds/rest/annotations/ApiVersion.java @@ -25,7 +25,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; /** * Designates that this Resource qualifies an object to an api version. diff --git a/core/src/main/java/org/jclouds/rest/annotations/ApiVersionOverride.java b/core/src/main/java/org/jclouds/rest/annotations/ApiVersionOverride.java index 0307806b5e..56a6943439 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/ApiVersionOverride.java +++ b/core/src/main/java/org/jclouds/rest/annotations/ApiVersionOverride.java @@ -22,7 +22,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; /** diff --git a/core/src/main/java/org/jclouds/rest/annotations/BuildVersion.java b/core/src/main/java/org/jclouds/rest/annotations/BuildVersion.java index 2e79c60f7f..53f46f9bba 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/BuildVersion.java +++ b/core/src/main/java/org/jclouds/rest/annotations/BuildVersion.java @@ -25,7 +25,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; /** * Designates that this Resource qualifies an object to an build version. diff --git a/core/src/main/java/org/jclouds/rest/annotations/EndpointParam.java b/core/src/main/java/org/jclouds/rest/annotations/EndpointParam.java index a6feaf8899..395acb662f 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/EndpointParam.java +++ b/core/src/main/java/org/jclouds/rest/annotations/EndpointParam.java @@ -23,7 +23,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.net.URI; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.google.common.base.Function; diff --git a/core/src/main/java/org/jclouds/rest/annotations/OnlyElement.java b/core/src/main/java/org/jclouds/rest/annotations/OnlyElement.java index 8279a820b1..1a792c33ef 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/OnlyElement.java +++ b/core/src/main/java/org/jclouds/rest/annotations/OnlyElement.java @@ -25,7 +25,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; /** * Extracts the only element of a collection or null diff --git a/core/src/main/java/org/jclouds/rest/annotations/SinceApiVersion.java b/core/src/main/java/org/jclouds/rest/annotations/SinceApiVersion.java index 09469b2e6e..410261764a 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/SinceApiVersion.java +++ b/core/src/main/java/org/jclouds/rest/annotations/SinceApiVersion.java @@ -25,7 +25,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; /** diff --git a/core/src/main/java/org/jclouds/rest/binders/BindAsHostPrefix.java b/core/src/main/java/org/jclouds/rest/binders/BindAsHostPrefix.java index f88460d6d0..cc8a213b9d 100644 --- a/core/src/main/java/org/jclouds/rest/binders/BindAsHostPrefix.java +++ b/core/src/main/java/org/jclouds/rest/binders/BindAsHostPrefix.java @@ -24,7 +24,7 @@ import static org.jclouds.http.Uris.uriBuilder; import java.net.URI; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.rest.Binder; diff --git a/core/src/main/java/org/jclouds/rest/binders/BindMapToStringPayload.java b/core/src/main/java/org/jclouds/rest/binders/BindMapToStringPayload.java index 0a949c6547..98b6aa99be 100644 --- a/core/src/main/java/org/jclouds/rest/binders/BindMapToStringPayload.java +++ b/core/src/main/java/org/jclouds/rest/binders/BindMapToStringPayload.java @@ -23,7 +23,7 @@ import static org.jclouds.util.Strings2.urlDecode; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/core/src/main/java/org/jclouds/rest/binders/BindToJsonPayload.java b/core/src/main/java/org/jclouds/rest/binders/BindToJsonPayload.java index 698ad399ae..f3fc07ec93 100644 --- a/core/src/main/java/org/jclouds/rest/binders/BindToJsonPayload.java +++ b/core/src/main/java/org/jclouds/rest/binders/BindToJsonPayload.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; diff --git a/core/src/main/java/org/jclouds/rest/binders/BindToJsonPayloadWrappedWith.java b/core/src/main/java/org/jclouds/rest/binders/BindToJsonPayloadWrappedWith.java index ef557a54e7..a8c064935c 100644 --- a/core/src/main/java/org/jclouds/rest/binders/BindToJsonPayloadWrappedWith.java +++ b/core/src/main/java/org/jclouds/rest/binders/BindToJsonPayloadWrappedWith.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; diff --git a/core/src/main/java/org/jclouds/rest/binders/BindToStringPayload.java b/core/src/main/java/org/jclouds/rest/binders/BindToStringPayload.java index 1f1ca35a61..e70e5782ea 100644 --- a/core/src/main/java/org/jclouds/rest/binders/BindToStringPayload.java +++ b/core/src/main/java/org/jclouds/rest/binders/BindToStringPayload.java @@ -16,7 +16,7 @@ */ package org.jclouds.rest.binders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.rest.Binder; diff --git a/core/src/main/java/org/jclouds/rest/binders/BindToXMLPayload.java b/core/src/main/java/org/jclouds/rest/binders/BindToXMLPayload.java index 5b432f5140..f5df0dbba7 100644 --- a/core/src/main/java/org/jclouds/rest/binders/BindToXMLPayload.java +++ b/core/src/main/java/org/jclouds/rest/binders/BindToXMLPayload.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.io.IOException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.io.MutableContentMetadata; diff --git a/core/src/main/java/org/jclouds/rest/config/AnnotatedHttpApiProvider.java b/core/src/main/java/org/jclouds/rest/config/AnnotatedHttpApiProvider.java index b7222eb3c6..4288debabe 100644 --- a/core/src/main/java/org/jclouds/rest/config/AnnotatedHttpApiProvider.java +++ b/core/src/main/java/org/jclouds/rest/config/AnnotatedHttpApiProvider.java @@ -18,8 +18,8 @@ package org.jclouds.rest.config; import java.lang.reflect.Proxy; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.reflect.Invocation; import org.jclouds.rest.internal.DelegatesToInvocationFunction; diff --git a/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java b/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java index 4a4fd6603c..991d58207c 100644 --- a/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java +++ b/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.TransformingMap; import org.jclouds.domain.Credentials; diff --git a/core/src/main/java/org/jclouds/rest/config/ReadAnnotationsAndProperties.java b/core/src/main/java/org/jclouds/rest/config/ReadAnnotationsAndProperties.java index 478aaef743..29065bd3f9 100644 --- a/core/src/main/java/org/jclouds/rest/config/ReadAnnotationsAndProperties.java +++ b/core/src/main/java/org/jclouds/rest/config/ReadAnnotationsAndProperties.java @@ -26,9 +26,9 @@ import static org.jclouds.util.Predicates2.startsWith; import java.util.Map; import java.util.regex.Pattern; -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.reflect.Invocation; import org.jclouds.rest.annotations.Fallback; diff --git a/core/src/main/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersion.java b/core/src/main/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersion.java index 9f0206a0bd..c4484169db 100644 --- a/core/src/main/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersion.java +++ b/core/src/main/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersion.java @@ -19,8 +19,8 @@ package org.jclouds.rest.functions; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.util.Optionals2.unwrapIfOptional; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.reflect.InvocationSuccess; import org.jclouds.rest.annotations.ApiVersion; diff --git a/core/src/main/java/org/jclouds/rest/internal/ApiContextImpl.java b/core/src/main/java/org/jclouds/rest/internal/ApiContextImpl.java index 99fc1f805c..4fdc49d620 100644 --- a/core/src/main/java/org/jclouds/rest/internal/ApiContextImpl.java +++ b/core/src/main/java/org/jclouds/rest/internal/ApiContextImpl.java @@ -18,7 +18,7 @@ package org.jclouds.rest.internal; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.annotations.Name; import org.jclouds.domain.Credentials; diff --git a/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java b/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java index da2a8a9b04..d295d1f20b 100644 --- a/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java +++ b/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java @@ -38,8 +38,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.inject.Inject; -import javax.inject.Qualifier; +import jakarta.inject.Inject; +import jakarta.inject.Qualifier; import org.jclouds.javax.annotation.Nullable; import org.jclouds.lifecycle.Closer; diff --git a/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java b/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java index 126de876d3..de54c102d0 100644 --- a/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java +++ b/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java @@ -24,7 +24,7 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS; import java.util.concurrent.Callable; import jakarta.annotation.Resource; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpCommandExecutorService; diff --git a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java index cd93983d1d..6013006a62 100644 --- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java +++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java @@ -55,7 +55,7 @@ import java.util.NoSuchElementException; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Encoded; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.HeaderParam; diff --git a/core/src/main/java/org/jclouds/rest/internal/TransformerForRequest.java b/core/src/main/java/org/jclouds/rest/internal/TransformerForRequest.java index f39d09f59e..b08a59e6da 100644 --- a/core/src/main/java/org/jclouds/rest/internal/TransformerForRequest.java +++ b/core/src/main/java/org/jclouds/rest/internal/TransformerForRequest.java @@ -26,7 +26,7 @@ import java.lang.reflect.Type; import java.net.URI; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import javax.lang.model.type.NullType; import org.jclouds.functions.IdentityFunction; diff --git a/core/src/main/java/org/jclouds/rest/internal/UtilsImpl.java b/core/src/main/java/org/jclouds/rest/internal/UtilsImpl.java index 6b32d79af9..f6398d702b 100644 --- a/core/src/main/java/org/jclouds/rest/internal/UtilsImpl.java +++ b/core/src/main/java/org/jclouds/rest/internal/UtilsImpl.java @@ -18,7 +18,7 @@ package org.jclouds.rest.internal; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.crypto.Crypto; import org.jclouds.date.DateService; diff --git a/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java b/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java index 5736412be1..2e0ed048e8 100644 --- a/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java +++ b/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.google.common.base.Objects; import com.google.common.base.MoreObjects.ToStringHelper; diff --git a/core/src/main/java/org/jclouds/util/InetAddresses2.java b/core/src/main/java/org/jclouds/util/InetAddresses2.java index 7c86242695..7983c7f117 100644 --- a/core/src/main/java/org/jclouds/util/InetAddresses2.java +++ b/core/src/main/java/org/jclouds/util/InetAddresses2.java @@ -18,7 +18,7 @@ package org.jclouds.util; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.google.common.base.Predicate; import com.google.common.base.Splitter; diff --git a/core/src/main/java/org/jclouds/xml/internal/JAXBParser.java b/core/src/main/java/org/jclouds/xml/internal/JAXBParser.java index a858492f5e..f8cbde20ff 100644 --- a/core/src/main/java/org/jclouds/xml/internal/JAXBParser.java +++ b/core/src/main/java/org/jclouds/xml/internal/JAXBParser.java @@ -20,8 +20,8 @@ import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; diff --git a/core/src/test/java/org/jclouds/http/IntegrationTestClient.java b/core/src/test/java/org/jclouds/http/IntegrationTestClient.java index 8ef755fa7c..f39553c70b 100644 --- a/core/src/test/java/org/jclouds/http/IntegrationTestClient.java +++ b/core/src/test/java/org/jclouds/http/IntegrationTestClient.java @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import jakarta.ws.rs.GET; import jakarta.ws.rs.HEAD; import jakarta.ws.rs.HeaderParam; diff --git a/core/src/test/java/org/jclouds/http/internal/BaseHttpCommandExecutorServiceTest.java b/core/src/test/java/org/jclouds/http/internal/BaseHttpCommandExecutorServiceTest.java index 3a017e1102..88b2bfb966 100644 --- a/core/src/test/java/org/jclouds/http/internal/BaseHttpCommandExecutorServiceTest.java +++ b/core/src/test/java/org/jclouds/http/internal/BaseHttpCommandExecutorServiceTest.java @@ -33,8 +33,8 @@ import static org.testng.Assert.fail; import java.io.IOException; import java.io.InputStream; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.easymock.EasyMock; import org.easymock.IAnswer; diff --git a/core/src/test/java/org/jclouds/http/internal/TrackingJavaUrlHttpCommandExecutorService.java b/core/src/test/java/org/jclouds/http/internal/TrackingJavaUrlHttpCommandExecutorService.java index 5b827653fe..2f14e5e181 100644 --- a/core/src/test/java/org/jclouds/http/internal/TrackingJavaUrlHttpCommandExecutorService.java +++ b/core/src/test/java/org/jclouds/http/internal/TrackingJavaUrlHttpCommandExecutorService.java @@ -25,9 +25,9 @@ import java.net.URI; import java.util.Collection; import java.util.List; -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 javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; diff --git a/core/src/test/java/org/jclouds/internal/FilterStringsBoundToInjectorByNameTest.java b/core/src/test/java/org/jclouds/internal/FilterStringsBoundToInjectorByNameTest.java index 6a3fc7b34e..f2de32b22f 100644 --- a/core/src/test/java/org/jclouds/internal/FilterStringsBoundToInjectorByNameTest.java +++ b/core/src/test/java/org/jclouds/internal/FilterStringsBoundToInjectorByNameTest.java @@ -18,7 +18,7 @@ package org.jclouds.internal; import static org.testng.Assert.assertEquals; -import javax.inject.Named; +import jakarta.inject.Named; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/jclouds/json/BaseParserTest.java b/core/src/test/java/org/jclouds/json/BaseParserTest.java index 16d03cf413..695f1d735b 100644 --- a/core/src/test/java/org/jclouds/json/BaseParserTest.java +++ b/core/src/test/java/org/jclouds/json/BaseParserTest.java @@ -24,7 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.config.SaxParserModule; diff --git a/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java b/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java index bb671c322a..ef15e025a8 100644 --- a/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java +++ b/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java @@ -27,8 +27,8 @@ import java.lang.reflect.Type; import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.json.SerializedNames; import com.google.gson.ReflectionAccessFilter; @@ -101,7 +101,7 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactoryTest } } - @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = ".* parameter 0 failed to be named by AnnotationBasedNamingStrategy requiring one of javax.inject.Named") + @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = ".* parameter 0 failed to be named by AnnotationBasedNamingStrategy requiring one of jakarta.inject.Named") public void testSerializedNameRequiredOnAllParameters() { parameterizedCtorFactory .create(gson, TypeToken.get(WithDeserializationConstructorButWithoutSerializedName.class)); diff --git a/core/src/test/java/org/jclouds/json/internal/NamingStrategiesTest.java b/core/src/test/java/org/jclouds/json/internal/NamingStrategiesTest.java index 917d0bfe76..10b7645aa4 100644 --- a/core/src/test/java/org/jclouds/json/internal/NamingStrategiesTest.java +++ b/core/src/test/java/org/jclouds/json/internal/NamingStrategiesTest.java @@ -23,8 +23,8 @@ import static org.testng.Assert.fail; import java.beans.ConstructorProperties; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.json.internal.NamingStrategies.AnnotationConstructorNamingStrategy; import org.jclouds.json.internal.NamingStrategies.AnnotationFieldNamingStrategy; diff --git a/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java b/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java index ea07a9cae2..1fc314f0f2 100644 --- a/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java +++ b/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java @@ -24,8 +24,8 @@ import java.lang.reflect.Field; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.logging.Logger; import org.jclouds.logging.config.BindLoggersAnnotatedWithResource.AssignLoggerToField; diff --git a/core/src/test/java/org/jclouds/providers/config/BindProviderMetadataContextAndCredentialsTest.java b/core/src/test/java/org/jclouds/providers/config/BindProviderMetadataContextAndCredentialsTest.java index 22cc9f8b4c..aaacc37ccc 100644 --- a/core/src/test/java/org/jclouds/providers/config/BindProviderMetadataContextAndCredentialsTest.java +++ b/core/src/test/java/org/jclouds/providers/config/BindProviderMetadataContextAndCredentialsTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertEquals; import java.util.Properties; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.Constants; import org.jclouds.Context; @@ -53,7 +53,7 @@ public class BindProviderMetadataContextAndCredentialsTest { @SuppressWarnings("unused") private static class ExpectedBindings { - private final javax.inject.Provider backend; + private final jakarta.inject.Provider backend; private final ProviderMetadata providerMetadata; private final Credentials creds; private final String providerId; @@ -63,7 +63,7 @@ public class BindProviderMetadataContextAndCredentialsTest { private final String buildVersion; @Inject - private ExpectedBindings(@Provider javax.inject.Provider backend, ProviderMetadata providerMetadata, + private ExpectedBindings(@Provider jakarta.inject.Provider backend, ProviderMetadata providerMetadata, @Provider Supplier creds, @Provider String providerId, @Iso3166 Set iso3166Codes, @Api String apiId, @ApiVersion String apiVersion, @Nullable @BuildVersion String buildVersion, @Provider TypeToken backendToken, FilterStringsBoundToInjectorByName filter) { diff --git a/core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java b/core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java index 11f190ea98..a882bb8ebf 100644 --- a/core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java @@ -22,7 +22,7 @@ import java.io.Closeable; import java.util.NoSuchElementException; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java b/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java index 6ac2a58851..c2e758d6af 100644 --- a/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java +++ b/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import java.util.Properties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java index 5c45faad76..2fafd5d4c0 100644 --- a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java @@ -34,9 +34,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; -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.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.Difference; diff --git a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java index ec3b6188bc..7479f0e879 100644 --- a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java @@ -29,8 +29,8 @@ import java.io.IOException; import java.util.Date; import java.util.Map.Entry; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.concurrent.config.ConfiguresExecutorService; import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions; diff --git a/core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java b/core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java index e6b8b7d40a..11e4fde0bb 100644 --- a/core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java @@ -25,7 +25,7 @@ import static org.testng.Assert.assertEquals; import java.util.concurrent.TimeUnit; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpCommandExecutorService; diff --git a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java index ad8bc95964..15da5b411f 100644 --- a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java @@ -54,9 +54,9 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.ExecutionException; -import javax.inject.Named; -import javax.inject.Qualifier; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.Encoded; import jakarta.ws.rs.FormParam; diff --git a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCHttpCommandExecutorService.java b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCHttpCommandExecutorService.java index fcc30e8e12..74ad7ed120 100644 --- a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCHttpCommandExecutorService.java +++ b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCHttpCommandExecutorService.java @@ -24,8 +24,8 @@ import static org.jclouds.http.HttpUtils.filterOutContentHeaders; import java.io.IOException; import java.net.URI; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.apache.http.Header; import org.apache.http.HttpHeaders; diff --git a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java index e410c2a171..6e112d6791 100644 --- a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java +++ b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java @@ -23,7 +23,7 @@ import java.io.UnsupportedEncodingException; import java.util.Map; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import jakarta.ws.rs.HttpMethod; import org.apache.http.HttpEntity; diff --git a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java index 0227074578..8b5ec3fb79 100644 --- a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java +++ b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java @@ -22,8 +22,8 @@ import java.net.ProxySelector; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import javax.net.ssl.SSLContext; import org.apache.http.HttpVersion; diff --git a/drivers/bouncycastle/src/main/java/org/jclouds/encryption/bouncycastle/BouncyCastleCrypto.java b/drivers/bouncycastle/src/main/java/org/jclouds/encryption/bouncycastle/BouncyCastleCrypto.java index ea1bf6b17c..851f64601c 100644 --- a/drivers/bouncycastle/src/main/java/org/jclouds/encryption/bouncycastle/BouncyCastleCrypto.java +++ b/drivers/bouncycastle/src/main/java/org/jclouds/encryption/bouncycastle/BouncyCastleCrypto.java @@ -21,7 +21,7 @@ import java.security.cert.CertificateException; import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.jclouds.encryption.internal.JCECrypto; diff --git a/drivers/joda/src/main/java/org/jclouds/date/joda/JodaDateService.java b/drivers/joda/src/main/java/org/jclouds/date/joda/JodaDateService.java index 2d1fdc70ef..47875bb17a 100644 --- a/drivers/joda/src/main/java/org/jclouds/date/joda/JodaDateService.java +++ b/drivers/joda/src/main/java/org/jclouds/date/joda/JodaDateService.java @@ -23,7 +23,7 @@ import static org.jclouds.date.internal.DateUtils.trimToMillis; import java.util.Date; import java.util.Locale; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.date.DateService; import org.joda.time.DateTime; diff --git a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java index 6f084b12c9..8cb0764972 100644 --- a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java +++ b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java @@ -39,7 +39,7 @@ import java.net.ConnectException; import jakarta.annotation.PreDestroy; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.domain.ExecChannel; import org.jclouds.compute.domain.ExecResponse; diff --git a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java index d51788a0ed..8f4e97786f 100644 --- a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java +++ b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java @@ -18,7 +18,7 @@ package org.jclouds.ssh.jsch.config; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.domain.LoginCredentials; diff --git a/drivers/netty/src/main/java/org/jclouds/netty/io/NettyPayloadSlicer.java b/drivers/netty/src/main/java/org/jclouds/netty/io/NettyPayloadSlicer.java index 261e014a19..eac796c69b 100644 --- a/drivers/netty/src/main/java/org/jclouds/netty/io/NettyPayloadSlicer.java +++ b/drivers/netty/src/main/java/org/jclouds/netty/io/NettyPayloadSlicer.java @@ -18,7 +18,7 @@ package org.jclouds.netty.io; import java.io.File; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.io.Payload; import org.jclouds.io.Payloads; diff --git a/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/OkHttpCommandExecutorService.java b/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/OkHttpCommandExecutorService.java index 861adacc4d..885c111717 100644 --- a/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/OkHttpCommandExecutorService.java +++ b/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/OkHttpCommandExecutorService.java @@ -29,7 +29,7 @@ import java.net.Proxy; import java.net.URI; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import javax.net.ssl.SSLSocketFactory; import okhttp3.Authenticator; diff --git a/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/config/OkHttpCommandExecutorServiceModule.java b/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/config/OkHttpCommandExecutorServiceModule.java index 40cd85db3d..d1f102703d 100644 --- a/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/config/OkHttpCommandExecutorServiceModule.java +++ b/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/config/OkHttpCommandExecutorServiceModule.java @@ -18,7 +18,7 @@ package org.jclouds.http.okhttp.config; import java.util.concurrent.TimeUnit; -import javax.inject.Named; +import jakarta.inject.Named; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; import javax.net.ssl.X509TrustManager; diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java index ba66b19c3e..264682cca8 100644 --- a/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java +++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.util.List; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import net.schmizz.sshj.SSHClient; import net.schmizz.sshj.common.Buffer.BufferException; diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java index d64c9154b1..6228278941 100644 --- a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java +++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java @@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit; import jakarta.annotation.PreDestroy; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import net.schmizz.sshj.SSHClient; import net.schmizz.sshj.common.IOUtils; diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java b/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java index 4daae8eaee..a77389a1f3 100644 --- a/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java +++ b/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java @@ -16,7 +16,7 @@ */ package org.jclouds.sshj.config; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.domain.LoginCredentials; diff --git a/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java b/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java index 8cf33d1214..c2bcc6f50e 100644 --- a/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java +++ b/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java @@ -27,8 +27,8 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import jakarta.annotation.Resource; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.compute.domain.NodeMetadata; diff --git a/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/LoadBalancerServiceContextImpl.java b/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/LoadBalancerServiceContextImpl.java index eac844a7e2..49401f8ea3 100644 --- a/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/LoadBalancerServiceContextImpl.java +++ b/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/LoadBalancerServiceContextImpl.java @@ -18,8 +18,8 @@ package org.jclouds.loadbalancer.internal; 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.Context; import org.jclouds.internal.BaseView; diff --git a/project/pom.xml b/project/pom.xml index c6933a5a2e..22cbde1631 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -223,7 +223,7 @@ 2.10.1 32.0.0-jre - 5.1.0 + 7.0.0 3.14.9 1.0.1 @@ -319,6 +319,12 @@ 2.0.0 + + jakarta.inject + jakarta.inject-api + 2.0.1 + + com.sun.xml.bind jaxb-impl diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindLaunchSpecificationToFormParams.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindLaunchSpecificationToFormParams.java index c3f271a15d..8664e24b6c 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindLaunchSpecificationToFormParams.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindLaunchSpecificationToFormParams.java @@ -22,7 +22,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.aws.ec2.domain.LaunchSpecification; import org.jclouds.aws.ec2.domain.LaunchSpecification.IAMInstanceProfileRequest; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindSpotInstanceRequestIdsToIndexedFormParams.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindSpotInstanceRequestIdsToIndexedFormParams.java index 11816dfe2b..02312f5a2c 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindSpotInstanceRequestIdsToIndexedFormParams.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindSpotInstanceRequestIdsToIndexedFormParams.java @@ -16,7 +16,7 @@ */ package org.jclouds.aws.ec2.binders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindVpcIdsToIndexedFormParams.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindVpcIdsToIndexedFormParams.java index 9c0c5cc1ff..841cb4f4fb 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindVpcIdsToIndexedFormParams.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindVpcIdsToIndexedFormParams.java @@ -16,7 +16,7 @@ */ package org.jclouds.aws.ec2.binders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.util.AWSUtils; import org.jclouds.http.HttpRequest; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java index cc2f13abc8..f6d7512bda 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java @@ -29,10 +29,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentMap; 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.aws.ec2.AWSEC2Api; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderImpl.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderImpl.java index aca71411ee..e9c2430f24 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderImpl.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderImpl.java @@ -18,9 +18,9 @@ package org.jclouds.aws.ec2.compute; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.jclouds.collect.Memoized; import org.jclouds.compute.domain.Hardware; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java index 6b6ab6abf5..9750bdd786 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.ec2.compute.AWSEC2TemplateBuilderImpl; import org.jclouds.aws.ec2.compute.functions.AWSRunningInstanceToNodeMetadata; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceDependenciesModule.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceDependenciesModule.java index 4e2dacf6d5..f0cf59ca88 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceDependenciesModule.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceDependenciesModule.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.Set; import java.util.logging.Logger; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.aws.ec2.compute.AWSEC2ComputeService; import org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/ClusterCompute.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/ClusterCompute.java index bb2191b2a3..a53d8b12fa 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/ClusterCompute.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/ClusterCompute.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Related to a ClusterCompute resource. diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/ImageQuery.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/ImageQuery.java index 76bdd98443..4f407adf70 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/ImageQuery.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/ImageQuery.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Related to an Image Query diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2SecurityGroupExtension.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2SecurityGroupExtension.java index 6c10493d8d..e7d14a649a 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2SecurityGroupExtension.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2SecurityGroupExtension.java @@ -22,8 +22,8 @@ import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.collect.Iterables.transform; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.util.Map; import java.util.Set; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/functions/AWSEC2SecurityGroupToSecurityGroup.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/functions/AWSEC2SecurityGroupToSecurityGroup.java index c145bafb78..84bd3fc725 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/functions/AWSEC2SecurityGroupToSecurityGroup.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/functions/AWSEC2SecurityGroupToSecurityGroup.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.compute.functions; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/functions/AWSRunningInstanceToNodeMetadata.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/functions/AWSRunningInstanceToNodeMetadata.java index bdb109dd35..cf201cbf16 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/functions/AWSRunningInstanceToNodeMetadata.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/functions/AWSRunningInstanceToNodeMetadata.java @@ -19,8 +19,8 @@ package org.jclouds.aws.ec2.compute.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.aws.ec2.domain.AWSRunningInstance; import org.jclouds.collect.Memoized; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/functions/PresentSpotRequestsAndInstances.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/functions/PresentSpotRequestsAndInstances.java index 65275a9ed3..78b29c5e34 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/functions/PresentSpotRequestsAndInstances.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/functions/PresentSpotRequestsAndInstances.java @@ -30,7 +30,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.ec2.AWSEC2Api; import org.jclouds.aws.ec2.domain.AWSRunningInstance; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/internal/AWSEC2ComputeServiceContextImpl.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/internal/AWSEC2ComputeServiceContextImpl.java index 6fdcd4f7b9..7ad3568908 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/internal/AWSEC2ComputeServiceContextImpl.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/internal/AWSEC2ComputeServiceContextImpl.java @@ -16,8 +16,8 @@ */ package org.jclouds.aws.ec2.compute.internal; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.Context; import org.jclouds.aws.ec2.compute.AWSEC2ComputeService; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java index c78f744b98..b90e72d590 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java @@ -23,9 +23,9 @@ import java.util.Map; 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.aws.ec2.AWSEC2Api; import org.jclouds.aws.ec2.features.AWSSecurityGroupApi; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2CreateNodesInGroupThenAddToSet.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2CreateNodesInGroupThenAddToSet.java index de61f8808c..22b4a23b04 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2CreateNodesInGroupThenAddToSet.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2CreateNodesInGroupThenAddToSet.java @@ -25,9 +25,9 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; 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.aws.ec2.AWSEC2Api; import org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2DestroyNodeStrategy.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2DestroyNodeStrategy.java index e14b52a394..cf9adf8ec5 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2DestroyNodeStrategy.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2DestroyNodeStrategy.java @@ -22,9 +22,9 @@ import static com.google.common.collect.Iterables.getOnlyElement; import java.util.Map; import java.util.NoSuchElementException; -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.aws.ec2.AWSEC2Api; import org.jclouds.compute.strategy.GetNodeMetadataStrategy; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2GetNodeMetadataStrategy.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2GetNodeMetadataStrategy.java index 3ea27879a6..232806034c 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2GetNodeMetadataStrategy.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2GetNodeMetadataStrategy.java @@ -19,8 +19,8 @@ package org.jclouds.aws.ec2.compute.strategy; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.getOnlyElement; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.aws.ec2.AWSEC2Api; import org.jclouds.aws.ec2.domain.SpotInstanceRequest; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ListNodesStrategy.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ListNodesStrategy.java index 017eb6f738..3bf0be2d39 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ListNodesStrategy.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ListNodesStrategy.java @@ -25,8 +25,8 @@ import static com.google.common.collect.Iterables.transform; import java.util.Set; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.Constants; import org.jclouds.aws.ec2.AWSEC2Api; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ReviseParsedImage.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ReviseParsedImage.java index 86fa6d0552..d88ae19ac7 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ReviseParsedImage.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ReviseParsedImage.java @@ -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.compute.domain.ImageBuilder; import org.jclouds.compute.domain.OperatingSystem; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java index 2496bd9d72..1b813ba9fa 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java @@ -23,10 +23,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentMap; 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.aws.ec2.AWSEC2Api; import org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java index 647e8670ff..33c2a62d44 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java @@ -119,8 +119,8 @@ import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.x1_32xlarge; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.aws.ec2.compute.config.ClusterCompute; import org.jclouds.compute.domain.Hardware; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java index e46027fd47..b0212f5763 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java @@ -30,8 +30,8 @@ import java.util.Map; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.aws.ec2.compute.config.ClusterCompute; import org.jclouds.aws.ec2.compute.config.ImageQuery; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java index 49952c7ebc..9195f0cc46 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java @@ -24,8 +24,8 @@ import java.util.Map.Entry; import java.util.concurrent.Callable; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.compute.domain.Image; import org.jclouds.compute.reference.ComputeServiceConstants; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/config/AWSEC2HttpApiModule.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/config/AWSEC2HttpApiModule.java index c162c2fa9c..88d41cf9d9 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/config/AWSEC2HttpApiModule.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/config/AWSEC2HttpApiModule.java @@ -20,7 +20,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.ec2.AWSEC2Api; import org.jclouds.aws.ec2.domain.AWSRunningInstance; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSAMIApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSAMIApi.java index 902509e2c1..5b217f5d98 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSAMIApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSAMIApi.java @@ -20,7 +20,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSInstanceApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSInstanceApi.java index cdc640abd4..69b6cadbf7 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSInstanceApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSInstanceApi.java @@ -20,7 +20,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSKeyPairApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSKeyPairApi.java index 330aea01c9..d158209aed 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSKeyPairApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSKeyPairApi.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApi.java index 62714d247e..6046cd07a6 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApi.java @@ -20,7 +20,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSubnetApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSubnetApi.java index 1f349e5c32..5b5bee0fa0 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSubnetApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/AWSSubnetApi.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/InternetGatewayApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/InternetGatewayApi.java index c1b0e4202a..aad2754843 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/InternetGatewayApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/InternetGatewayApi.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/MonitoringApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/MonitoringApi.java index 69fac02073..19adb34fda 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/MonitoringApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/MonitoringApi.java @@ -20,7 +20,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/PlacementGroupApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/PlacementGroupApi.java index 7103343029..d109cfdf20 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/PlacementGroupApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/PlacementGroupApi.java @@ -20,7 +20,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/RouteTableApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/RouteTableApi.java index fffc7fc318..9a37850a2b 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/RouteTableApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/RouteTableApi.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/SpotInstanceApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/SpotInstanceApi.java index 18687e649a..b835a719b1 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/SpotInstanceApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/SpotInstanceApi.java @@ -20,7 +20,7 @@ import static org.jclouds.aws.reference.FormParameters.ACTION; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/VPCApi.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/VPCApi.java index b5705fb41a..f3514772a7 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/VPCApi.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/features/VPCApi.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.features; import static org.jclouds.aws.reference.FormParameters.ACTION; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java index d276ffe658..78018a2855 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java @@ -20,9 +20,9 @@ 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.Named; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.aws.AWSResponseException; import org.jclouds.aws.ec2.AWSEC2Api; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/ImportOrReturnExistingKeypair.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/ImportOrReturnExistingKeypair.java index efe00d1e79..db01f48715 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/ImportOrReturnExistingKeypair.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/ImportOrReturnExistingKeypair.java @@ -20,9 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.ssh.SshKeys.fingerprintPublicKey; 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.aws.ec2.AWSEC2Api; import org.jclouds.aws.ec2.domain.RegionNameAndPublicKeyMaterial; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupAvailable.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupAvailable.java index 5fda399e51..c9e147c1b5 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupAvailable.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupAvailable.java @@ -19,7 +19,7 @@ package org.jclouds.aws.ec2.predicates; import java.util.NoSuchElementException; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.ec2.AWSEC2Api; import org.jclouds.aws.ec2.domain.PlacementGroup; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupDeleted.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupDeleted.java index 8363dd671c..9554f6d55d 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupDeleted.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/PlacementGroupDeleted.java @@ -19,7 +19,7 @@ package org.jclouds.aws.ec2.predicates; import java.util.NoSuchElementException; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.ec2.AWSEC2Api; import org.jclouds.aws.ec2.domain.PlacementGroup; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/SpotInstanceRequestActive.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/SpotInstanceRequestActive.java index 04bba04a0b..fd977bf8aa 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/SpotInstanceRequestActive.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/predicates/SpotInstanceRequestActive.java @@ -19,7 +19,7 @@ package org.jclouds.aws.ec2.predicates; import java.util.NoSuchElementException; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.ec2.AWSEC2Api; import org.jclouds.aws.ec2.domain.SpotInstanceRequest; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/AWSDescribeInstancesResponseHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/AWSDescribeInstancesResponseHandler.java index 2379bc87c1..c5b0a21209 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/AWSDescribeInstancesResponseHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/AWSDescribeInstancesResponseHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.ec2.domain.Reservation; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/AWSEC2DescribeSecurityGroupsResponseHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/AWSEC2DescribeSecurityGroupsResponseHandler.java index ecb3d942fe..ca0b0626f7 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/AWSEC2DescribeSecurityGroupsResponseHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/AWSEC2DescribeSecurityGroupsResponseHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.http.HttpRequest; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/AWSRunInstancesResponseHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/AWSRunInstancesResponseHandler.java index 2712d6c145..61a2c0bf23 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/AWSRunInstancesResponseHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/AWSRunInstancesResponseHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.aws.ec2.xml; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.ec2.domain.Reservation; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/CreateRouteTableResponseHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/CreateRouteTableResponseHandler.java index eacb4f21ff..0ebad97ef8 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/CreateRouteTableResponseHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/CreateRouteTableResponseHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.aws.ec2.xml; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.ec2.domain.RouteTable; import org.jclouds.http.functions.ParseSax; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribePlacementGroupsResponseHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribePlacementGroupsResponseHandler.java index c301ffe1d6..f68375b369 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribePlacementGroupsResponseHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribePlacementGroupsResponseHandler.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.xml; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.ec2.domain.PlacementGroup; import org.jclouds.http.HttpRequest; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeReservedInstancesOfferingResponseHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeReservedInstancesOfferingResponseHandler.java index 8cb50c1078..01ae4834a2 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeReservedInstancesOfferingResponseHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeReservedInstancesOfferingResponseHandler.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.xml; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ec2.domain.ReservedInstancesOffering; import org.jclouds.http.HttpRequest; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeRouteTablesResponseHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeRouteTablesResponseHandler.java index 0146f67f75..bc91403ea2 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeRouteTablesResponseHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeRouteTablesResponseHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.ec2.domain.RouteTable; import org.jclouds.http.functions.ParseSax; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeSpotPriceHistoryResponseHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeSpotPriceHistoryResponseHandler.java index 403a9c5304..2fb9676c9c 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeSpotPriceHistoryResponseHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeSpotPriceHistoryResponseHandler.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.xml; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.ec2.domain.Spot; import org.jclouds.http.HttpRequest; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/InternetGatewayHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/InternetGatewayHandler.java index 1082f62ee5..1a06ef7435 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/InternetGatewayHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/InternetGatewayHandler.java @@ -19,7 +19,7 @@ package org.jclouds.aws.ec2.xml; import static org.jclouds.util.SaxUtils.currentOrNull; import static org.jclouds.util.SaxUtils.equalsOrSuffix; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.ec2.domain.InternetGateway; import org.jclouds.ec2.xml.TagSetHandler; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/LaunchSpecificationHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/LaunchSpecificationHandler.java index 147e3ebf64..9d97dcda3c 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/LaunchSpecificationHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/LaunchSpecificationHandler.java @@ -19,7 +19,7 @@ package org.jclouds.aws.ec2.xml; import static org.jclouds.util.SaxUtils.equalsOrSuffix; import jakarta.annotation.Resource; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.ec2.domain.LaunchSpecification; import org.jclouds.aws.ec2.domain.LaunchSpecification.Builder; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/PlacementGroupHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/PlacementGroupHandler.java index 8454c7ed60..3798e7370a 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/PlacementGroupHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/PlacementGroupHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.aws.ec2.xml; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.ec2.domain.PlacementGroup; import org.jclouds.aws.ec2.domain.PlacementGroup.State; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/ReservedInstancesOfferingHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/ReservedInstancesOfferingHandler.java index af176d278c..a40458c294 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/ReservedInstancesOfferingHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/ReservedInstancesOfferingHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.aws.ec2.xml; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.util.AWSUtils; import org.jclouds.ec2.domain.ReservedInstancesOffering; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/RouteTableHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/RouteTableHandler.java index 733815d732..0e467cea73 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/RouteTableHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/RouteTableHandler.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.xml; import static org.jclouds.util.SaxUtils.equalsOrSuffix; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.ec2.domain.RouteTable; import org.jclouds.ec2.xml.TagSetHandler; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotHandler.java index 18134a7336..63a866d133 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.aws.ec2.xml; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.ec2.domain.Spot; import org.jclouds.aws.util.AWSUtils; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotInstanceHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotInstanceHandler.java index e63599d960..69fcf5b6a7 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotInstanceHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotInstanceHandler.java @@ -19,7 +19,7 @@ package org.jclouds.aws.ec2.xml; import static org.jclouds.util.SaxUtils.currentOrNull; import static org.jclouds.util.SaxUtils.equalsOrSuffix; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.ec2.domain.SpotInstanceRequest; import org.jclouds.aws.ec2.domain.SpotInstanceRequest.Builder; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotInstancesHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotInstancesHandler.java index 47be7d9454..48dff1ff46 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotInstancesHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotInstancesHandler.java @@ -18,7 +18,7 @@ package org.jclouds.aws.ec2.xml; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.ec2.domain.SpotInstanceRequest; import org.jclouds.http.HttpRequest; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/VPCHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/VPCHandler.java index 6eb3d344dc..a4908f474e 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/VPCHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/VPCHandler.java @@ -19,7 +19,7 @@ package org.jclouds.aws.ec2.xml; import static org.jclouds.util.SaxUtils.currentOrNull; import static org.jclouds.util.SaxUtils.equalsOrSuffix; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.aws.ec2.domain.VPC; import org.jclouds.ec2.xml.TagSetHandler; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java index fd49aa27ae..aea636c602 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java @@ -32,7 +32,7 @@ import static org.testng.Assert.assertEquals; import java.util.Set; import java.util.concurrent.ConcurrentMap; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.aws.domain.Region; import org.jclouds.aws.ec2.AWSEC2Api; @@ -64,7 +64,7 @@ import com.google.common.collect.ImmutableSet; @Test(groups = "unit", singleThreaded = true, testName = "CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsTest") public class CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsTest { - private static final Provider OPTIONS_PROVIDER = new javax.inject.Provider() { + private static final Provider OPTIONS_PROVIDER = new jakarta.inject.Provider() { @Override public RunInstancesOptions get() { diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/BaseAWSEC2ApiTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/BaseAWSEC2ApiTest.java index 349b780943..3f46204b48 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/BaseAWSEC2ApiTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/BaseAWSEC2ApiTest.java @@ -27,7 +27,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.domain.Region; import org.jclouds.aws.ec2.AWSEC2ProviderMetadata; diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java index 3d9f17a555..b795cec5b0 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java @@ -20,8 +20,8 @@ import static org.jclouds.s3.domain.ObjectMetadata.StorageClass.REDUCED_REDUNDAN import java.util.Set; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jclouds.aws.domain.Region; import org.jclouds.aws.s3.AWSS3Client; diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/internal/AWSS3BlobStoreContextImpl.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/internal/AWSS3BlobStoreContextImpl.java index 83d66b04b2..8b4a3edb99 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/internal/AWSS3BlobStoreContextImpl.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/internal/AWSS3BlobStoreContextImpl.java @@ -16,8 +16,8 @@ */ package org.jclouds.aws.s3.blobstore.internal; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.Context; import org.jclouds.aws.s3.blobstore.AWSS3BlobStore; diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/config/AWSS3HttpApiModule.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/config/AWSS3HttpApiModule.java index 409fc1b86c..20cf963168 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/config/AWSS3HttpApiModule.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/config/AWSS3HttpApiModule.java @@ -18,7 +18,7 @@ package org.jclouds.aws.s3.config; import static org.jclouds.aws.domain.Region.US_STANDARD; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.aws.s3.AWSS3Client; import org.jclouds.aws.s3.filters.AWSRequestAuthorizeSignatureV4; diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/filters/AWSRequestAuthorizeSignature.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/filters/AWSRequestAuthorizeSignature.java index 6eac649e88..038c1e6195 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/filters/AWSRequestAuthorizeSignature.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/filters/AWSRequestAuthorizeSignature.java @@ -23,10 +23,10 @@ import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_SERVICE_PATH; import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_VIRTUAL_HOST_BUCKETS; import static org.jclouds.s3.reference.S3Constants.TEMPORARY_SIGNATURE_PARAM; -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.crypto.Crypto; import org.jclouds.date.DateService; diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/filters/AWSRequestAuthorizeSignatureV4.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/filters/AWSRequestAuthorizeSignatureV4.java index 3450d9d890..1afa832348 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/filters/AWSRequestAuthorizeSignatureV4.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/filters/AWSRequestAuthorizeSignatureV4.java @@ -20,8 +20,8 @@ import static org.jclouds.http.utils.Queries.queryParser; import static org.jclouds.s3.filters.AwsSignatureV4Constants.AMZ_SIGNATURE_PARAM; import static org.jclouds.s3.reference.S3Constants.TEMPORARY_SIGNATURE_PARAM; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import com.google.common.collect.Multimap; diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/predicates/validators/AWSS3BucketNameValidator.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/predicates/validators/AWSS3BucketNameValidator.java index 30339b3edf..dc2123b780 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/predicates/validators/AWSS3BucketNameValidator.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/predicates/validators/AWSS3BucketNameValidator.java @@ -16,7 +16,7 @@ */ package org.jclouds.aws.s3.predicates.validators; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.s3.predicates.validators.BucketNameValidator; diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java index 998ee60e2c..d372fe3d55 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import java.util.Date; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.aws.s3.config.AWSS3HttpApiModule; diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerV4ExpectTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerV4ExpectTest.java index 23fc97d11d..456c08603a 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerV4ExpectTest.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerV4ExpectTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertEquals; import java.util.Date; import java.util.Properties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.aws.s3.AWSS3ApiMetadata; diff --git a/providers/azureblob/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java b/providers/azureblob/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java index 06caac3dc3..a3b0c04580 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java +++ b/providers/azureblob/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java @@ -29,10 +29,10 @@ import java.util.Map; import java.util.Map.Entry; 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 com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/AzureStorageClientErrorRetryHandler.java b/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/AzureStorageClientErrorRetryHandler.java index 8bb3cdc99b..f57f81aa3f 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/AzureStorageClientErrorRetryHandler.java +++ b/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/AzureStorageClientErrorRetryHandler.java @@ -19,7 +19,7 @@ package org.jclouds.azure.storage.handlers; import java.io.ByteArrayInputStream; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.azure.storage.domain.AzureStorageError; diff --git a/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java b/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java index c149172743..61c6e9055d 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java +++ b/providers/azureblob/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.util.regex.Pattern; import jakarta.annotation.Resource; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.azure.storage.AzureStorageResponseException; import org.jclouds.azure.storage.domain.AzureStorageError; diff --git a/providers/azureblob/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java b/providers/azureblob/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java index b6a751d12a..46991565d3 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java +++ b/providers/azureblob/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java @@ -18,8 +18,8 @@ package org.jclouds.azure.storage.util; import java.io.InputStream; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.jclouds.azure.storage.domain.AzureStorageError; import org.jclouds.azure.storage.filters.SharedKeyLiteAuthentication; diff --git a/providers/azureblob/src/main/java/org/jclouds/azure/storage/util/storageurl/AppendAccountToEndpoint.java b/providers/azureblob/src/main/java/org/jclouds/azure/storage/util/storageurl/AppendAccountToEndpoint.java index 31de79fcf2..a96ba5a823 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azure/storage/util/storageurl/AppendAccountToEndpoint.java +++ b/providers/azureblob/src/main/java/org/jclouds/azure/storage/util/storageurl/AppendAccountToEndpoint.java @@ -21,8 +21,8 @@ import com.google.common.base.Supplier; import org.jclouds.domain.Credentials; import org.jclouds.location.Provider; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import static org.jclouds.azure.storage.util.storageurl.TrailingSlashUtil.ensureTrailingSlash; import java.net.URI; diff --git a/providers/azureblob/src/main/java/org/jclouds/azure/storage/util/storageurl/StorageAccountInVhost.java b/providers/azureblob/src/main/java/org/jclouds/azure/storage/util/storageurl/StorageAccountInVhost.java index 0fafac6a7c..5abdd46a14 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azure/storage/util/storageurl/StorageAccountInVhost.java +++ b/providers/azureblob/src/main/java/org/jclouds/azure/storage/util/storageurl/StorageAccountInVhost.java @@ -21,9 +21,9 @@ import org.jclouds.azure.storage.config.AuthType; import org.jclouds.domain.Credentials; import org.jclouds.location.Provider; -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 java.net.URI; import static org.jclouds.azure.storage.config.AzureStorageProperties.ACCOUNT; import static org.jclouds.azure.storage.util.storageurl.TrailingSlashUtil.ensureTrailingSlash; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java index 457869b39f..31f991104f 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java @@ -23,7 +23,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; import jakarta.ws.rs.HEAD; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToMultipartRequest.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToMultipartRequest.java index 969a3c27fb..93676bda48 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToMultipartRequest.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToMultipartRequest.java @@ -19,7 +19,7 @@ package org.jclouds.azureblob.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 com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimaps; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequest.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequest.java index cc1a4ab2cd..24d5a2b352 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequest.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequest.java @@ -19,8 +19,8 @@ package org.jclouds.azureblob.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 org.jclouds.azure.storage.reference.AzureStorageHeaders; import org.jclouds.azureblob.blobstore.functions.AzureBlobToBlob; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureContentMetadataToRequest.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureContentMetadataToRequest.java index 2a577754a4..d92739387b 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureContentMetadataToRequest.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureContentMetadataToRequest.java @@ -19,7 +19,7 @@ package org.jclouds.azureblob.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.azure.storage.reference.AzureStorageHeaders; import org.jclouds.http.HttpRequest; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindPublicAccessToRequest.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindPublicAccessToRequest.java index c6d23fccaf..83be320314 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindPublicAccessToRequest.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindPublicAccessToRequest.java @@ -19,8 +19,8 @@ package org.jclouds.azureblob.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 org.jclouds.azureblob.domain.PublicAccess; import org.jclouds.http.HttpRequest; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java index f058576e69..31a121e207 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java @@ -22,9 +22,9 @@ import java.net.URI; import java.util.Date; 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.azure.storage.config.AuthType; import org.jclouds.azure.storage.filters.SharedKeyLiteAuthentication; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobStore.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobStore.java index b05b4895b0..75e9998117 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobStore.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobStore.java @@ -28,8 +28,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.azure.storage.domain.BoundedSet; import org.jclouds.azureblob.AzureBlobClient; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/config/AzureBlobStoreContextModule.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/config/AzureBlobStoreContextModule.java index 3e48ab5608..e36de25fa5 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/config/AzureBlobStoreContextModule.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/config/AzureBlobStoreContextModule.java @@ -32,8 +32,8 @@ import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.attr.ConsistencyModel; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import java.util.concurrent.TimeUnit; public class AzureBlobStoreContextModule extends AbstractModule { diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/AzureBlobToBlob.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/AzureBlobToBlob.java index ae449d0a38..55da562bba 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/AzureBlobToBlob.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/AzureBlobToBlob.java @@ -18,8 +18,8 @@ package org.jclouds.azureblob.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.azureblob.domain.AzureBlob; import org.jclouds.blobstore.domain.Blob; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/BlobMetadataToBlobProperties.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/BlobMetadataToBlobProperties.java index 831f6a5c2a..e61fc4e9a7 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/BlobMetadataToBlobProperties.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/BlobMetadataToBlobProperties.java @@ -18,7 +18,7 @@ package org.jclouds.azureblob.blobstore.functions; import java.util.Map.Entry; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.azureblob.domain.MutableBlobProperties; import org.jclouds.azureblob.domain.internal.MutableBlobPropertiesImpl; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/BlobPropertiesToBlobMetadata.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/BlobPropertiesToBlobMetadata.java index f485addcae..f14959d718 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/BlobPropertiesToBlobMetadata.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/BlobPropertiesToBlobMetadata.java @@ -18,8 +18,8 @@ package org.jclouds.azureblob.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.azureblob.domain.AccessTier; import org.jclouds.azureblob.domain.BlobProperties; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/BlobToAzureBlob.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/BlobToAzureBlob.java index 31bfe1e4f2..dbb91c8006 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/BlobToAzureBlob.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/BlobToAzureBlob.java @@ -18,8 +18,8 @@ package org.jclouds.azureblob.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.azureblob.domain.AzureBlob; import org.jclouds.blobstore.domain.Blob; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ContainerToResourceMetadata.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ContainerToResourceMetadata.java index 896e208909..796c05a8bf 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ContainerToResourceMetadata.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ContainerToResourceMetadata.java @@ -16,8 +16,8 @@ */ package org.jclouds.azureblob.blobstore.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.azureblob.domain.ContainerProperties; import org.jclouds.blobstore.domain.MutableStorageMetadata; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListBlobsResponseToResourceList.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListBlobsResponseToResourceList.java index d8f0c47b70..3f0828ca33 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListBlobsResponseToResourceList.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListBlobsResponseToResourceList.java @@ -18,8 +18,8 @@ package org.jclouds.azureblob.blobstore.functions; import java.util.SortedSet; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.azureblob.domain.ListBlobsResponse; import org.jclouds.blobstore.domain.PageSet; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListOptionsToListBlobsOptions.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListOptionsToListBlobsOptions.java index a2f9dca68a..28e12703c1 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListOptionsToListBlobsOptions.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/functions/ListOptionsToListBlobsOptions.java @@ -18,7 +18,7 @@ package org.jclouds.azureblob.blobstore.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.azureblob.options.ListBlobsOptions; import org.jclouds.blobstore.options.ListContainerOptions; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobHttpApiModule.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobHttpApiModule.java index 82c7b29099..a58c88d15d 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobHttpApiModule.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobHttpApiModule.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; import java.util.Map; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.inject.Scopes; import org.jclouds.azure.storage.config.AzureStorageOAuthConfigFactory; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobModule.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobModule.java index f0460ba1bc..3186c80258 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobModule.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobModule.java @@ -16,9 +16,9 @@ */ package org.jclouds.azureblob.config; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.jclouds.azure.storage.config.AuthType; import org.jclouds.azureblob.domain.AzureBlob; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/AzureBlobImpl.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/AzureBlobImpl.java index efa1892566..e9b24bc7a0 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/AzureBlobImpl.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/AzureBlobImpl.java @@ -18,7 +18,7 @@ package org.jclouds.azureblob.domain.internal; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.azureblob.domain.AzureBlob; import org.jclouds.azureblob.domain.MutableBlobProperties; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParseBlobFromHeadersAndHttpContent.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParseBlobFromHeadersAndHttpContent.java index bf81211993..c17c0cdac3 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParseBlobFromHeadersAndHttpContent.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParseBlobFromHeadersAndHttpContent.java @@ -16,8 +16,8 @@ */ package org.jclouds.azureblob.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.azureblob.domain.AzureBlob; import org.jclouds.azureblob.domain.MutableBlobProperties; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParseBlobPropertiesFromHeaders.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParseBlobPropertiesFromHeaders.java index c7446344a9..657996a2a9 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParseBlobPropertiesFromHeaders.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParseBlobPropertiesFromHeaders.java @@ -18,7 +18,7 @@ package org.jclouds.azureblob.functions; import static com.google.common.base.Preconditions.checkArgument; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.azureblob.blobstore.functions.BlobMetadataToBlobProperties; import org.jclouds.azureblob.domain.AccessTier; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParseContainerPropertiesFromHeaders.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParseContainerPropertiesFromHeaders.java index 9fd9be2916..766c261016 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParseContainerPropertiesFromHeaders.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParseContainerPropertiesFromHeaders.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkArgument; import java.util.Map.Entry; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.azureblob.domain.ContainerProperties; import org.jclouds.azureblob.domain.MutableContainerPropertiesWithMetadata; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParsePublicAccessHeader.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParsePublicAccessHeader.java index c5d7bff499..d17a97cdb1 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParsePublicAccessHeader.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/functions/ParsePublicAccessHeader.java @@ -18,7 +18,7 @@ package org.jclouds.azureblob.functions; import static org.jclouds.http.HttpUtils.releasePayload; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.azureblob.domain.PublicAccess; import org.jclouds.http.HttpResponse; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/handlers/ParseAzureBlobErrorFromXmlContent.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/handlers/ParseAzureBlobErrorFromXmlContent.java index e6c20ae5b1..58ccda3300 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/handlers/ParseAzureBlobErrorFromXmlContent.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/handlers/ParseAzureBlobErrorFromXmlContent.java @@ -18,8 +18,8 @@ package org.jclouds.azureblob.handlers; import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.azure.storage.domain.AzureStorageError; import org.jclouds.azure.storage.handlers.ParseAzureStorageErrorFromXmlContent; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/predicates/validators/ContainerNameValidator.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/predicates/validators/ContainerNameValidator.java index f10479a5d5..b1b666aba7 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/predicates/validators/ContainerNameValidator.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/predicates/validators/ContainerNameValidator.java @@ -16,7 +16,7 @@ */ package org.jclouds.azureblob.predicates.validators; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.predicates.validators.DnsNameValidator; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/xml/AccountNameEnumerationResultsHandler.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/xml/AccountNameEnumerationResultsHandler.java index 48b3a6e7b5..dbf04e70b9 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/xml/AccountNameEnumerationResultsHandler.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/xml/AccountNameEnumerationResultsHandler.java @@ -24,7 +24,7 @@ import java.util.Date; import java.util.Map; import java.util.SortedSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.azure.storage.domain.BoundedSet; import org.jclouds.azure.storage.domain.internal.BoundedHashSet; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/xml/ContainerNameEnumerationResultsHandler.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/xml/ContainerNameEnumerationResultsHandler.java index 807bc8a025..28a22e6f12 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/xml/ContainerNameEnumerationResultsHandler.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/xml/ContainerNameEnumerationResultsHandler.java @@ -24,7 +24,7 @@ import java.util.Date; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.azureblob.domain.AccessTier; import org.jclouds.azureblob.domain.BlobProperties; diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/functions/ListBlobsOptionsToListOptions.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/functions/ListBlobsOptionsToListOptions.java index d0bf2e290a..d1e1bb7204 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/functions/ListBlobsOptionsToListOptions.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/functions/ListBlobsOptionsToListOptions.java @@ -16,7 +16,7 @@ */ package org.jclouds.azureblob.blobstore.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.azureblob.options.ListBlobsOptions; import org.jclouds.blobstore.options.ListContainerOptions; diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/functions/ResourceToListBlobsResponse.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/functions/ResourceToListBlobsResponse.java index 356872ee6c..2b67699db0 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/functions/ResourceToListBlobsResponse.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/functions/ResourceToListBlobsResponse.java @@ -18,8 +18,8 @@ package org.jclouds.azureblob.blobstore.functions; import java.util.SortedSet; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.azureblob.domain.BlobProperties; import org.jclouds.azureblob.domain.ListBlobsResponse; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeService.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeService.java index 9a85abe940..89a884d632 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeService.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeService.java @@ -25,10 +25,10 @@ import java.util.Map.Entry; 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.azurecompute.arm.compute.domain.ResourceGroupAndName; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java index e2323644ad..1984302d1e 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java @@ -39,9 +39,9 @@ import java.util.List; import java.util.Map; 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.azurecompute.arm.AzureComputeApi; import org.jclouds.azurecompute.arm.compute.config.AzurePredicatesModule.PublicIpAvailablePredicateFactory; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureComputeServiceContextModule.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureComputeServiceContextModule.java index 0a81ecb180..4ee3135e14 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureComputeServiceContextModule.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureComputeServiceContextModule.java @@ -16,7 +16,7 @@ */ package org.jclouds.azurecompute.arm.compute.config; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.azurecompute.arm.compute.AzureComputeService; import org.jclouds.azurecompute.arm.compute.AzureComputeServiceAdapter; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java index 3f8dfae833..85ff05263c 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java @@ -31,8 +31,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.azurecompute.arm.AzureComputeApi; import org.jclouds.azurecompute.arm.compute.config.AzurePredicatesModule.SecurityGroupAvailablePredicateFactory; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/LocationToLocation.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/LocationToLocation.java index 7c60175ab2..7bec0a4f9f 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/LocationToLocation.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/LocationToLocation.java @@ -16,8 +16,8 @@ */ package org.jclouds.azurecompute.arm.compute.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.azurecompute.arm.domain.Location; import org.jclouds.azurecompute.arm.domain.Region; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/LocationToResourceGroupName.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/LocationToResourceGroupName.java index c97850a2b1..e52180af00 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/LocationToResourceGroupName.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/LocationToResourceGroupName.java @@ -19,8 +19,8 @@ package org.jclouds.azurecompute.arm.compute.functions; import static org.jclouds.compute.config.ComputeServiceProperties.RESOURCENAME_DELIMITER; import static org.jclouds.compute.config.ComputeServiceProperties.RESOURCENAME_PREFIX; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.google.common.base.Function; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityGroupToSecurityGroup.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityGroupToSecurityGroup.java index d38f94cdf0..34ec8f02bb 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityGroupToSecurityGroup.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityGroupToSecurityGroup.java @@ -25,7 +25,7 @@ import static org.jclouds.azurecompute.arm.domain.IdReference.extractResourceGro import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.azurecompute.arm.domain.NetworkSecurityGroup; import org.jclouds.azurecompute.arm.domain.NetworkSecurityRule; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityRuleToIpPermission.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityRuleToIpPermission.java index bdf70347d1..2d16595f68 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityRuleToIpPermission.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityRuleToIpPermission.java @@ -17,8 +17,8 @@ package org.jclouds.azurecompute.arm.compute.functions; import jakarta.annotation.Resource; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.azurecompute.arm.domain.NetworkSecurityRule; import org.jclouds.azurecompute.arm.domain.NetworkSecurityRuleProperties.Access; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/TemplateToAvailabilitySet.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/TemplateToAvailabilitySet.java index fb703c7823..af0bb2c540 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/TemplateToAvailabilitySet.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/TemplateToAvailabilitySet.java @@ -22,9 +22,9 @@ import java.util.HashMap; 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.azurecompute.arm.AzureComputeApi; import org.jclouds.azurecompute.arm.compute.options.AzureTemplateOptions; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToNodeMetadata.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToNodeMetadata.java index d313e1dbb4..6c65cac6bd 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToNodeMetadata.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToNodeMetadata.java @@ -31,8 +31,8 @@ import java.util.List; import java.util.Map; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.azurecompute.arm.AzureComputeApi; import org.jclouds.azurecompute.arm.compute.domain.LocationAndName; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToStatus.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToStatus.java index 324e6eab67..caae4ed88b 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToStatus.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToStatus.java @@ -19,8 +19,8 @@ package org.jclouds.azurecompute.arm.compute.functions; import static com.google.common.collect.Iterables.transform; import static org.jclouds.azurecompute.arm.domain.IdReference.extractResourceGroup; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.azurecompute.arm.AzureComputeApi; import org.jclouds.azurecompute.arm.compute.functions.VirtualMachineToStatus.StatusAndBackendStatus; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/CreateSecurityGroupIfNeeded.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/CreateSecurityGroupIfNeeded.java index 196e319abf..4f4c40b321 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/CreateSecurityGroupIfNeeded.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/CreateSecurityGroupIfNeeded.java @@ -24,9 +24,9 @@ import java.util.List; 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.azurecompute.arm.AzureComputeApi; import org.jclouds.azurecompute.arm.compute.config.AzurePredicatesModule.SecurityGroupAvailablePredicateFactory; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/DefaultResourceGroup.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/DefaultResourceGroup.java index 6e09de48c7..3b346ad3ff 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/DefaultResourceGroup.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/loaders/DefaultResourceGroup.java @@ -19,9 +19,9 @@ package org.jclouds.azurecompute.arm.compute.loaders; 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.azurecompute.arm.AzureComputeApi; import org.jclouds.azurecompute.arm.compute.functions.LocationToResourceGroupName; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CleanupResources.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CleanupResources.java index 7a8e5daf91..5c84da350b 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CleanupResources.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CleanupResources.java @@ -32,9 +32,9 @@ import java.util.List; import java.util.Map; 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.azurecompute.arm.AzureComputeApi; import org.jclouds.azurecompute.arm.compute.domain.ResourceGroupAndName; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodes.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodes.java index a4fab49939..ab8981910f 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodes.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodes.java @@ -29,9 +29,9 @@ import java.util.Arrays; import java.util.Map; 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.Constants; import org.jclouds.azurecompute.arm.AzureComputeApi; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/AzureComputeHttpApiModule.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/AzureComputeHttpApiModule.java index 10a981ebd6..75b0cfcd3d 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/AzureComputeHttpApiModule.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/AzureComputeHttpApiModule.java @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.azurecompute.arm.AzureComputeApi; import org.jclouds.azurecompute.arm.compute.config.AzureNameValidator; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/GraphRBAC.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/GraphRBAC.java index 11b13c7774..53f19bfdd9 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/GraphRBAC.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/GraphRBAC.java @@ -23,9 +23,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.net.URI; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Qualifier; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Qualifier; import com.google.common.base.Supplier; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/OAuthResource.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/OAuthResource.java index e0349647e9..df81031448 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/OAuthResource.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/OAuthResource.java @@ -20,7 +20,7 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Configures a custom OAuth resource for certain APIs and methods. diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/Tenant.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/Tenant.java index 5524361dd1..44018e07e7 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/Tenant.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/Tenant.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Qualifies an object that describes the current tenant. diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ActivityLogAlertApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ActivityLogAlertApi.java index 284ab12882..81391a6c73 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ActivityLogAlertApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ActivityLogAlertApi.java @@ -20,7 +20,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AlertApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AlertApi.java index 9bd83fca15..d490599c5c 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AlertApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AlertApi.java @@ -18,7 +18,7 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AvailabilitySetApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AvailabilitySetApi.java index 5d0ea20110..6ca00ff98f 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AvailabilitySetApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/AvailabilitySetApi.java @@ -21,7 +21,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DeploymentApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DeploymentApi.java index bbd7ab7874..0f1b5c1468 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DeploymentApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DeploymentApi.java @@ -19,7 +19,7 @@ package org.jclouds.azurecompute.arm.features; import java.net.URI; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DiskApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DiskApi.java index 5eedbf56d2..9e164b0d4b 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DiskApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/DiskApi.java @@ -20,7 +20,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ImageApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ImageApi.java index eebd0955a4..40541d490f 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ImageApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ImageApi.java @@ -19,7 +19,7 @@ package org.jclouds.azurecompute.arm.features; import java.net.URI; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LoadBalancerApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LoadBalancerApi.java index 15bc4ad0ce..1c7124a777 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LoadBalancerApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LoadBalancerApi.java @@ -19,7 +19,7 @@ package org.jclouds.azurecompute.arm.features; import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocalNetworkGatewayApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocalNetworkGatewayApi.java index df482e52cc..8650a29bcf 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocalNetworkGatewayApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocalNetworkGatewayApi.java @@ -21,7 +21,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocationApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocationApi.java index 1fe8d14a54..c8035716f1 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocationApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocationApi.java @@ -18,7 +18,7 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricAlertApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricAlertApi.java index 27321197b2..5fb049c278 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricAlertApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricAlertApi.java @@ -20,7 +20,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricDefinitionsApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricDefinitionsApi.java index f92e2bec60..fe6011f729 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricDefinitionsApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricDefinitionsApi.java @@ -17,7 +17,7 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricsApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricsApi.java index c5bc0bc1e0..86dee9766c 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricsApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/MetricsApi.java @@ -17,7 +17,7 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApi.java index bb4c409f90..5f9763d51a 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApi.java @@ -19,7 +19,7 @@ package org.jclouds.azurecompute.arm.features; import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityGroupApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityGroupApi.java index 8d81992b8f..a48bcb0388 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityGroupApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityGroupApi.java @@ -19,7 +19,7 @@ package org.jclouds.azurecompute.arm.features; import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityRuleApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityRuleApi.java index 0b6a908704..7cb6649214 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityRuleApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/NetworkSecurityRuleApi.java @@ -19,7 +19,7 @@ package org.jclouds.azurecompute.arm.features; import java.net.URI; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/OSImageApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/OSImageApi.java index 56781adcbf..e4a0a95cea 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/OSImageApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/OSImageApi.java @@ -18,7 +18,7 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/PublicIPAddressApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/PublicIPAddressApi.java index d041e953c7..c2282aa2cf 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/PublicIPAddressApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/PublicIPAddressApi.java @@ -18,7 +18,7 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceGroupApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceGroupApi.java index 0c075f3390..6b6cd5ab31 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceGroupApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceGroupApi.java @@ -21,7 +21,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceProviderApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceProviderApi.java index 8f7985a659..f93beb2117 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceProviderApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceProviderApi.java @@ -19,7 +19,7 @@ package org.jclouds.azurecompute.arm.features; import java.io.Closeable; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/StorageAccountApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/StorageAccountApi.java index b179fa19bc..7eec33b2a7 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/StorageAccountApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/StorageAccountApi.java @@ -20,7 +20,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/SubnetApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/SubnetApi.java index 7245d97fe3..e8d5572d5a 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/SubnetApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/SubnetApi.java @@ -18,7 +18,7 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VMSizeApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VMSizeApi.java index 3495dc2795..95da663149 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VMSizeApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VMSizeApi.java @@ -18,7 +18,7 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VaultApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VaultApi.java index 66ee15b0be..2e306f9c1c 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VaultApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VaultApi.java @@ -19,7 +19,7 @@ package org.jclouds.azurecompute.arm.features; import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineApi.java index 0aaadd2bdd..46880d9950 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineApi.java @@ -19,7 +19,7 @@ package org.jclouds.azurecompute.arm.features; import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApi.java index bb51fdc9ca..2caa0fb96d 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApi.java @@ -33,7 +33,7 @@ import org.jclouds.rest.annotations.MapBinder; import org.jclouds.rest.annotations.ResponseParser; import org.jclouds.rest.binders.BindToJsonPayload; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.PUT; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkApi.java index 9fbbf6c80b..8c066a354d 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkApi.java @@ -18,7 +18,7 @@ package org.jclouds.azurecompute.arm.features; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayApi.java index a71f3ace8d..35aac2a1ba 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayApi.java @@ -21,7 +21,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayConnectionApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayConnectionApi.java index 7ca2a7b3dc..f41dafd1f8 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayConnectionApi.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/VirtualNetworkGatewayConnectionApi.java @@ -21,7 +21,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/filters/ApiVersionFilter.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/filters/ApiVersionFilter.java index 904c2e8bf8..9a3758c81b 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/filters/ApiVersionFilter.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/filters/ApiVersionFilter.java @@ -23,7 +23,7 @@ import static org.jclouds.util.Predicates2.startsWith; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpException; import org.jclouds.http.HttpRequest; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/FalseOn204.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/FalseOn204.java index 6b73260215..ce01891420 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/FalseOn204.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/FalseOn204.java @@ -18,7 +18,7 @@ package org.jclouds.azurecompute.arm.functions; import com.google.common.base.Function; import org.jclouds.http.HttpResponse; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import static org.jclouds.http.HttpUtils.releasePayload; /** diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/ParseJobStatus.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/ParseJobStatus.java index 045431caaa..7414634a82 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/ParseJobStatus.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/ParseJobStatus.java @@ -19,7 +19,7 @@ import com.google.common.base.Function; import org.jclouds.azurecompute.arm.util.GetEnumValue; import org.jclouds.http.HttpResponse; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /** * Parses job status from http response */ diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/StatusCodeParser.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/StatusCodeParser.java index 4c14ec2983..edac65bd68 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/StatusCodeParser.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/StatusCodeParser.java @@ -18,7 +18,7 @@ package org.jclouds.azurecompute.arm.functions; import com.google.common.base.Function; import org.jclouds.http.HttpResponse; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import static org.jclouds.http.HttpUtils.releasePayload; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/URIParser.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/URIParser.java index 5493f04f36..c1ed8f4a78 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/URIParser.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/URIParser.java @@ -17,7 +17,7 @@ package org.jclouds.azurecompute.arm.functions; import java.net.URI; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureComputeErrorHandler.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureComputeErrorHandler.java index 6673001ac5..bf562b1f96 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureComputeErrorHandler.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureComputeErrorHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.azurecompute.arm.handlers.AzureRateLimitRetryHandler.i import java.io.IOException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.azurecompute.arm.exceptions.AzureComputeRateLimitExceededException; import org.jclouds.http.HttpCommand; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRateLimitRetryHandler.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRateLimitRetryHandler.java index bbe7908385..16295e6976 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRateLimitRetryHandler.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRateLimitRetryHandler.java @@ -16,8 +16,8 @@ */ package org.jclouds.azurecompute.arm.handlers; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpResponse; diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRetryableErrorHandler.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRetryableErrorHandler.java index bed03c5d50..2512bfb705 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRetryableErrorHandler.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRetryableErrorHandler.java @@ -19,8 +19,8 @@ package org.jclouds.azurecompute.arm.handlers; import static org.jclouds.azurecompute.arm.handlers.AzureRateLimitRetryHandler.isRateLimitError; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.azurecompute.arm.domain.Error; import org.jclouds.http.HttpCommand; diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/filters/ApiVersionFilterTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/filters/ApiVersionFilterTest.java index f3b15ce97c..78d55d8b16 100644 --- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/filters/ApiVersionFilterTest.java +++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/filters/ApiVersionFilterTest.java @@ -25,7 +25,7 @@ import static org.testng.Assert.assertEquals; import java.util.Properties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; diff --git a/providers/b2/src/main/java/org/jclouds/b2/blobstore/B2BlobStore.java b/providers/b2/src/main/java/org/jclouds/b2/blobstore/B2BlobStore.java index 7fec40a762..f9a93744a5 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/blobstore/B2BlobStore.java +++ b/providers/b2/src/main/java/org/jclouds/b2/blobstore/B2BlobStore.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.b2.B2Api; import org.jclouds.b2.B2ResponseException; diff --git a/providers/b2/src/main/java/org/jclouds/b2/config/B2HttpApiModule.java b/providers/b2/src/main/java/org/jclouds/b2/config/B2HttpApiModule.java index a30f9a428e..7452d8b520 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/config/B2HttpApiModule.java +++ b/providers/b2/src/main/java/org/jclouds/b2/config/B2HttpApiModule.java @@ -19,8 +19,8 @@ package org.jclouds.b2.config; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.Constants; import org.jclouds.collect.Memoized; diff --git a/providers/b2/src/main/java/org/jclouds/b2/features/AuthorizationApi.java b/providers/b2/src/main/java/org/jclouds/b2/features/AuthorizationApi.java index 9f8b2e68d5..f2001cc090 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/features/AuthorizationApi.java +++ b/providers/b2/src/main/java/org/jclouds/b2/features/AuthorizationApi.java @@ -18,7 +18,7 @@ package org.jclouds.b2.features; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/b2/src/main/java/org/jclouds/b2/features/BucketApi.java b/providers/b2/src/main/java/org/jclouds/b2/features/BucketApi.java index 47ee476564..6746e28d47 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/features/BucketApi.java +++ b/providers/b2/src/main/java/org/jclouds/b2/features/BucketApi.java @@ -20,7 +20,7 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.blobstore.attr.BlobScopes.CONTAINER; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/providers/b2/src/main/java/org/jclouds/b2/features/MultipartApi.java b/providers/b2/src/main/java/org/jclouds/b2/features/MultipartApi.java index 975177d5fa..8027590d4e 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/features/MultipartApi.java +++ b/providers/b2/src/main/java/org/jclouds/b2/features/MultipartApi.java @@ -23,7 +23,7 @@ import static org.jclouds.blobstore.attr.BlobScopes.CONTAINER; import java.util.Collection; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.HeaderParam; import jakarta.ws.rs.POST; diff --git a/providers/b2/src/main/java/org/jclouds/b2/features/ObjectApi.java b/providers/b2/src/main/java/org/jclouds/b2/features/ObjectApi.java index b5ead4ad6b..bdee66d938 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/features/ObjectApi.java +++ b/providers/b2/src/main/java/org/jclouds/b2/features/ObjectApi.java @@ -21,7 +21,7 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jclouds.blobstore.attr.BlobScopes.CONTAINER; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; diff --git a/providers/b2/src/main/java/org/jclouds/b2/filters/B2RetryHandler.java b/providers/b2/src/main/java/org/jclouds/b2/filters/B2RetryHandler.java index 6321897997..dd3d7f9feb 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/filters/B2RetryHandler.java +++ b/providers/b2/src/main/java/org/jclouds/b2/filters/B2RetryHandler.java @@ -20,7 +20,7 @@ import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; import static org.jclouds.http.HttpUtils.releasePayload; import jakarta.annotation.Resource; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.b2.B2Api; import org.jclouds.b2.domain.GetUploadPartResponse; diff --git a/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java b/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java index d79f3daf5d..3cf49a34d8 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java +++ b/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java @@ -18,8 +18,8 @@ package org.jclouds.b2.filters; import java.net.URI; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.http.HttpException; diff --git a/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorizationDownload.java b/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorizationDownload.java index e5f01ed40a..038dd33f9e 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorizationDownload.java +++ b/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorizationDownload.java @@ -18,8 +18,8 @@ package org.jclouds.b2.filters; import java.net.URI; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.http.HttpException; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java index cf7cae7e19..bbcb8ecfb3 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java @@ -31,8 +31,8 @@ import java.util.List; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.compute.ComputeServiceAdapter; import org.jclouds.compute.domain.Template; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/config/DigitalOcean2ComputeServiceContextModule.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/config/DigitalOcean2ComputeServiceContextModule.java index e5b59ba91e..989d58c9ff 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/config/DigitalOcean2ComputeServiceContextModule.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/config/DigitalOcean2ComputeServiceContextModule.java @@ -23,7 +23,7 @@ import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_S import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_TERMINATED; import static org.jclouds.util.Predicates2.retry; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.ComputeServiceAdapter; import org.jclouds.compute.config.ComputeServiceAdapterContextModule; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/extensions/DigitalOcean2ImageExtension.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/extensions/DigitalOcean2ImageExtension.java index 5a2c79e9f0..0f8eea2494 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/extensions/DigitalOcean2ImageExtension.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/extensions/DigitalOcean2ImageExtension.java @@ -24,9 +24,9 @@ import java.util.NoSuchElementException; import java.util.concurrent.Callable; 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.compute.domain.CloneImageTemplate; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/DropletStatusToStatus.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/DropletStatusToStatus.java index 6edadb96cd..c51948e921 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/DropletStatusToStatus.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/DropletStatusToStatus.java @@ -16,7 +16,7 @@ */ package org.jclouds.digitalocean2.compute.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.NodeMetadata.Status; import org.jclouds.digitalocean2.domain.Droplet; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/DropletToNodeMetadata.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/DropletToNodeMetadata.java index 566645db4c..da53786739 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/DropletToNodeMetadata.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/DropletToNodeMetadata.java @@ -24,9 +24,9 @@ import java.util.Map; 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.collect.Memoized; import org.jclouds.compute.domain.Hardware; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/ImageInRegionToImage.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/ImageInRegionToImage.java index 08c6c71686..a4db376fb4 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/ImageInRegionToImage.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/ImageInRegionToImage.java @@ -22,8 +22,8 @@ import static org.jclouds.digitalocean2.compute.internal.ImageInRegion.encodeId; import java.util.Set; -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; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/RegionToLocation.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/RegionToLocation.java index adde1b7ce1..52fc9f62ea 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/RegionToLocation.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/RegionToLocation.java @@ -19,8 +19,8 @@ package org.jclouds.digitalocean2.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.getOnlyElement; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.digitalocean2.domain.Region; import org.jclouds.domain.Location; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/SizeToHardware.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/SizeToHardware.java index 5645d3bcb2..3f7ee41ce9 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/SizeToHardware.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/functions/SizeToHardware.java @@ -16,7 +16,7 @@ */ package org.jclouds.digitalocean2.compute.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.HardwareBuilder; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/strategy/CreateKeyPairsThenCreateNodes.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/strategy/CreateKeyPairsThenCreateNodes.java index 4ecc25cd36..ba287f633e 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/strategy/CreateKeyPairsThenCreateNodes.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/strategy/CreateKeyPairsThenCreateNodes.java @@ -27,9 +27,9 @@ import java.util.Map; 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.Constants; import org.jclouds.compute.config.CustomizationResponse; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/config/DigitalOceanParserModule.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/config/DigitalOceanParserModule.java index e4bb9bcde6..6f3560011f 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/config/DigitalOceanParserModule.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/config/DigitalOceanParserModule.java @@ -35,8 +35,8 @@ import java.security.spec.ECPublicKeySpec; import java.security.spec.InvalidKeySpecException; import java.security.spec.RSAPublicKeySpec; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.digitalocean2.ssh.DSAKeys; import org.jclouds.digitalocean2.ssh.ECDSAKeys; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/options/CreateDropletOptions.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/options/CreateDropletOptions.java index 91fb09073a..8c0b8cc818 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/options/CreateDropletOptions.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/options/CreateDropletOptions.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.javax.annotation.Nullable; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ActionApi.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ActionApi.java index e1233b82ce..29bbccbd41 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ActionApi.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ActionApi.java @@ -21,8 +21,8 @@ import java.io.Closeable; import java.net.URI; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/DropletApi.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/DropletApi.java index cd8353b4fd..006d878f6f 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/DropletApi.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/DropletApi.java @@ -21,8 +21,8 @@ import java.io.Closeable; import java.net.URI; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ImageApi.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ImageApi.java index 1684d004ae..7762dd0b27 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ImageApi.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/ImageApi.java @@ -21,8 +21,8 @@ import java.io.Closeable; import java.net.URI; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/KeyApi.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/KeyApi.java index 96bd43c83f..f34993a86d 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/KeyApi.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/KeyApi.java @@ -21,8 +21,8 @@ import java.io.Closeable; import java.net.URI; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/RegionApi.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/RegionApi.java index 081e8f4c07..b9ca4d2d6d 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/RegionApi.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/RegionApi.java @@ -21,8 +21,8 @@ import java.io.Closeable; import java.net.URI; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/SizeApi.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/SizeApi.java index e6f74d53b7..a8dfe70fcb 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/SizeApi.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/features/SizeApi.java @@ -21,8 +21,8 @@ import java.io.Closeable; import java.net.URI; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/handlers/DigitalOcean2ErrorHandler.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/handlers/DigitalOcean2ErrorHandler.java index 29b7eba06a..357a97dc54 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/handlers/DigitalOcean2ErrorHandler.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/handlers/DigitalOcean2ErrorHandler.java @@ -18,7 +18,7 @@ package org.jclouds.digitalocean2.handlers; import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.digitalocean2.exceptions.DigitalOcean2RateLimitExceededException; import org.jclouds.http.HttpCommand; diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/handlers/DigitalOcean2RateLimitRetryHandler.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/handlers/DigitalOcean2RateLimitRetryHandler.java index debb8f8afa..1f27adc893 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/handlers/DigitalOcean2RateLimitRetryHandler.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/handlers/DigitalOcean2RateLimitRetryHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.digitalocean2.handlers; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpResponse; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTApi.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTApi.java index 6b6168eddf..763d9f9e80 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTApi.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTApi.java @@ -20,7 +20,7 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.io.Closeable; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/binders/CreateRecordBinder.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/binders/CreateRecordBinder.java index 61333be858..4da4ec0f9e 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/binders/CreateRecordBinder.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/binders/CreateRecordBinder.java @@ -21,7 +21,7 @@ import static org.jclouds.http.Uris.uriBuilder; import java.net.URI; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.dynect.v3.domain.CreateRecord; import org.jclouds.http.HttpRequest; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTHttpApiModule.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTHttpApiModule.java index 5074b8040e..501db1083c 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTHttpApiModule.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTHttpApiModule.java @@ -27,9 +27,9 @@ import java.net.HttpURLConnection; import java.net.Proxy; import java.net.URI; -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 javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java index d047f6b052..13e9719a42 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.dynect.v3.domain.GeoService; import org.jclouds.dynect.v3.domain.Node; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java index 9deecc60a0..b0297674ed 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java @@ -20,7 +20,7 @@ import static com.google.common.base.Objects.equal; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.dynect.v3.domain.Zone.SerialStyle; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java index 0217840bd2..4d1496d734 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.Objects; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java index ec6aeebbdd..39910751e0 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.MoreObjects.ToStringHelper; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java index 08fa9ca292..0db9961d30 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.dynect.v3.domain.Zone.SerialStyle; import org.jclouds.dynect.v3.domain.rdata.SOAData; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java index 2347899d01..6c911d277d 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.domain.Credentials; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java index eb714e797b..5dd9ba6ad9 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.CaseFormat; import com.google.common.base.Objects; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoRegionGroupApi.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoRegionGroupApi.java index f53b7fddba..57a9c3034a 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoRegionGroupApi.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoRegionGroupApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.dynect.v3.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoServiceApi.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoServiceApi.java index 6fb024d30f..793e93b7ba 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoServiceApi.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoServiceApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.dynect.v3.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/RecordApi.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/RecordApi.java index 6620f7e9fd..ed43d48f5e 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/RecordApi.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/RecordApi.java @@ -20,7 +20,7 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Map; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/SessionApi.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/SessionApi.java index 536a5c00bc..9b3ec34c1f 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/SessionApi.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/SessionApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.dynect.v3.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; import jakarta.ws.rs.HeaderParam; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/ZoneApi.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/ZoneApi.java index 438c0337ec..75b1dec4f1 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/ZoneApi.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/features/ZoneApi.java @@ -18,7 +18,7 @@ package org.jclouds.dynect.v3.features; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/handlers/GetJobRedirectionRetryHandler.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/handlers/GetJobRedirectionRetryHandler.java index 8239584f44..b4b3fd0b7a 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/handlers/GetJobRedirectionRetryHandler.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/handlers/GetJobRedirectionRetryHandler.java @@ -19,8 +19,8 @@ import static com.google.common.net.HttpHeaders.LOCATION; import static jakarta.ws.rs.HttpMethod.GET; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpRequest; diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/loaders/LoginUserInOrgWithPassword.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/loaders/LoginUserInOrgWithPassword.java index e53fbc8fe2..730f458ada 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/loaders/LoginUserInOrgWithPassword.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/loaders/LoginUserInOrgWithPassword.java @@ -16,8 +16,8 @@ */ package org.jclouds.dynect.v3.loaders; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.dynect.v3.domain.Session; import org.jclouds.dynect.v3.domain.SessionCredentials; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java b/providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java index 53df537126..2756f2b31a 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java @@ -32,9 +32,9 @@ import java.util.Set; import java.util.UUID; 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; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/DatacenterToLocation.java b/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/DatacenterToLocation.java index 013f5c9177..ebd8a4e473 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/DatacenterToLocation.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/DatacenterToLocation.java @@ -18,7 +18,7 @@ package org.jclouds.glesys.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/OSTemplateToImage.java b/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/OSTemplateToImage.java index 6261dc5990..1ac86ce1c4 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/OSTemplateToImage.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/OSTemplateToImage.java @@ -18,8 +18,8 @@ package org.jclouds.glesys.compute.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.compute.domain.Image; import org.jclouds.compute.domain.Image.Status; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageName.java b/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageName.java index 46a9c051a1..37b99e8cdf 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageName.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageName.java @@ -22,8 +22,8 @@ import java.util.Map; 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.compute.domain.OsFamily; import org.jclouds.compute.domain.OsFamilyVersion64Bit; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java b/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java index de777415b7..fa0b4674be 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java @@ -30,9 +30,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.collect.Memoized; import org.jclouds.compute.domain.HardwareBuilder; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerSpecToHardware.java b/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerSpecToHardware.java index e72d0beb70..de236842d5 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerSpecToHardware.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerSpecToHardware.java @@ -21,8 +21,8 @@ import static org.jclouds.location.predicates.LocationPredicates.idEquals; import java.util.Set; -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.Hardware; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java b/providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java index 07e395d268..1688f4c269 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java @@ -19,7 +19,7 @@ package org.jclouds.glesys.config; import java.lang.reflect.Type; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.glesys.domain.GleSYSBoolean; import org.jclouds.glesys.domain.Server; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/features/ArchiveApi.java b/providers/glesys/src/main/java/org/jclouds/glesys/features/ArchiveApi.java index 5ab90d5802..11a64598f5 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/features/ArchiveApi.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/features/ArchiveApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.glesys.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.GET; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/features/DomainApi.java b/providers/glesys/src/main/java/org/jclouds/glesys/features/DomainApi.java index 7138d475eb..42a3901707 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/features/DomainApi.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/features/DomainApi.java @@ -18,7 +18,7 @@ package org.jclouds.glesys.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/features/EmailAccountApi.java b/providers/glesys/src/main/java/org/jclouds/glesys/features/EmailAccountApi.java index c884395874..d404f09de5 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/features/EmailAccountApi.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/features/EmailAccountApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.glesys.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.POST; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/features/IpApi.java b/providers/glesys/src/main/java/org/jclouds/glesys/features/IpApi.java index 297873e5c9..9f21e2e274 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/features/IpApi.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/features/IpApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.glesys.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.GET; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/features/ServerApi.java b/providers/glesys/src/main/java/org/jclouds/glesys/features/ServerApi.java index 7c033c2aac..86ab1a10c4 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/features/ServerApi.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/features/ServerApi.java @@ -19,7 +19,7 @@ package org.jclouds.glesys.features; import java.util.Map; import java.util.SortedMap; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.GET; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/functions/ParseTemplatesFromHttpResponse.java b/providers/glesys/src/main/java/org/jclouds/glesys/functions/ParseTemplatesFromHttpResponse.java index 988466c200..da099a984b 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/functions/ParseTemplatesFromHttpResponse.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/functions/ParseTemplatesFromHttpResponse.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.glesys.domain.OSTemplate; import org.jclouds.http.HttpResponse; diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/handlers/GleSYSErrorHandler.java b/providers/glesys/src/main/java/org/jclouds/glesys/handlers/GleSYSErrorHandler.java index 469e6e57a7..c893841cd4 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/handlers/GleSYSErrorHandler.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/handlers/GleSYSErrorHandler.java @@ -18,7 +18,7 @@ package org.jclouds.glesys.handlers; import java.io.IOException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/binders/BindIdsToQueryParams.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/binders/BindIdsToQueryParams.java index afc342f1f2..b29873d95a 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/binders/BindIdsToQueryParams.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/binders/BindIdsToQueryParams.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.transform; import static org.jclouds.gogrid.reference.GoGridQueryParams.ID_KEY; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.rest.Binder; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/GoGridComputeService.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/GoGridComputeService.java index 96ac4d7d42..aee4a58c46 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/GoGridComputeService.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/GoGridComputeService.java @@ -23,10 +23,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.collect.Memoized; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/config/GoGridComputeServiceContextModule.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/config/GoGridComputeServiceContextModule.java index 9ef70e339c..89d588795d 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/config/GoGridComputeServiceContextModule.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/config/GoGridComputeServiceContextModule.java @@ -21,7 +21,7 @@ import static org.jclouds.compute.util.ComputeServiceUtils.getSpace; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.ComputeServiceAdapter; import org.jclouds.compute.config.ComputeServiceAdapterContextModule; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/OptionToLocation.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/OptionToLocation.java index 361b5421c1..201170b4d8 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/OptionToLocation.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/OptionToLocation.java @@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; 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.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerImageToImage.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerImageToImage.java index c21934b87f..3509d0a456 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerImageToImage.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerImageToImage.java @@ -21,9 +21,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.compute.domain.Image; import org.jclouds.compute.domain.ImageBuilder; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadata.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadata.java index 18cd90dc80..87edfa06a5 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadata.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadata.java @@ -22,8 +22,8 @@ import java.util.NoSuchElementException; 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.Hardware; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java index a618afbe66..e492923025 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java @@ -23,8 +23,8 @@ import java.security.SecureRandom; 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.compute.ComputeServiceAdapter; import org.jclouds.compute.domain.Hardware; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/suppliers/GoGridHardwareSupplier.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/suppliers/GoGridHardwareSupplier.java index e8477b249a..4ec5c4cfca 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/suppliers/GoGridHardwareSupplier.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/suppliers/GoGridHardwareSupplier.java @@ -18,7 +18,7 @@ package org.jclouds.gogrid.compute.suppliers; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.HardwareBuilder; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridHttpApiModule.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridHttpApiModule.java index 6ec1301453..bdc0dbf071 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridHttpApiModule.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridHttpApiModule.java @@ -20,7 +20,7 @@ import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; import java.util.concurrent.TimeUnit; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.date.TimeStamp; import org.jclouds.gogrid.GoGridApi; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridParserModule.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridParserModule.java index 3fb8d86d56..f173957d25 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridParserModule.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridParserModule.java @@ -19,7 +19,7 @@ package org.jclouds.gogrid.config; import java.lang.reflect.Type; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.gogrid.domain.IpState; import org.jclouds.gogrid.domain.JobState; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/filters/SharedKeyLiteAuthentication.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/filters/SharedKeyLiteAuthentication.java index 8141db9544..6e9eb183a8 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/filters/SharedKeyLiteAuthentication.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/filters/SharedKeyLiteAuthentication.java @@ -22,8 +22,8 @@ import static com.google.common.io.BaseEncoding.base16; import static java.lang.String.format; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.date.TimeStamp; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseCredentialsFromJsonResponse.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseCredentialsFromJsonResponse.java index a9c56c92ae..77a192a29e 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseCredentialsFromJsonResponse.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseCredentialsFromJsonResponse.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.domain.Credentials; import org.jclouds.http.HttpResponse; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseImageFromJsonResponse.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseImageFromJsonResponse.java index dfe1c39cab..ea422908d8 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseImageFromJsonResponse.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseImageFromJsonResponse.java @@ -16,7 +16,7 @@ */ package org.jclouds.gogrid.functions; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.gogrid.domain.ServerImage; import org.jclouds.http.HttpResponse; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseImageListFromJsonResponse.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseImageListFromJsonResponse.java index edca9fdaf8..ba2d0d85f3 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseImageListFromJsonResponse.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseImageListFromJsonResponse.java @@ -18,7 +18,7 @@ package org.jclouds.gogrid.functions; import java.util.SortedSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.gogrid.domain.ServerImage; import org.jclouds.http.HttpResponse; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseIpListFromJsonResponse.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseIpListFromJsonResponse.java index fbdfc69642..8956bd0b25 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseIpListFromJsonResponse.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseIpListFromJsonResponse.java @@ -18,7 +18,7 @@ package org.jclouds.gogrid.functions; import java.util.SortedSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.gogrid.domain.Ip; import org.jclouds.http.HttpResponse; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseJobListFromJsonResponse.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseJobListFromJsonResponse.java index 086a50260b..15ec3e915a 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseJobListFromJsonResponse.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseJobListFromJsonResponse.java @@ -18,7 +18,7 @@ package org.jclouds.gogrid.functions; import java.util.SortedSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.gogrid.domain.Job; import org.jclouds.http.HttpResponse; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseLoadBalancerFromJsonResponse.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseLoadBalancerFromJsonResponse.java index 05a05cd507..5bdc0e57ea 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseLoadBalancerFromJsonResponse.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseLoadBalancerFromJsonResponse.java @@ -16,7 +16,7 @@ */ package org.jclouds.gogrid.functions; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.gogrid.domain.LoadBalancer; import org.jclouds.http.HttpResponse; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseLoadBalancerListFromJsonResponse.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseLoadBalancerListFromJsonResponse.java index 874e458540..37586b2a05 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseLoadBalancerListFromJsonResponse.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseLoadBalancerListFromJsonResponse.java @@ -18,7 +18,7 @@ package org.jclouds.gogrid.functions; import java.util.SortedSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.gogrid.domain.LoadBalancer; import org.jclouds.http.HttpResponse; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseOptionsFromJsonResponse.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseOptionsFromJsonResponse.java index b585a5d395..8bdd30d9af 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseOptionsFromJsonResponse.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseOptionsFromJsonResponse.java @@ -18,7 +18,7 @@ package org.jclouds.gogrid.functions; import java.util.SortedSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.gogrid.domain.Option; import org.jclouds.http.HttpResponse; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseServerNameToCredentialsMapFromJsonResponse.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseServerNameToCredentialsMapFromJsonResponse.java index 2561d80cc2..b4eb61f40e 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseServerNameToCredentialsMapFromJsonResponse.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseServerNameToCredentialsMapFromJsonResponse.java @@ -21,9 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Map; -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.domain.Credentials; import org.jclouds.gogrid.domain.Server; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/location/GoGridDefaultLocationSupplier.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/location/GoGridDefaultLocationSupplier.java index 41262dfb84..055dacb2d1 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/location/GoGridDefaultLocationSupplier.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/location/GoGridDefaultLocationSupplier.java @@ -22,9 +22,9 @@ import static org.jclouds.compute.config.ComputeServiceProperties.TEMPLATE; import java.util.Map; import java.util.Set; -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.domain.Location; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/LoadBalancerLatestJobCompleted.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/LoadBalancerLatestJobCompleted.java index fef51e8b8d..396afa2f96 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/LoadBalancerLatestJobCompleted.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/LoadBalancerLatestJobCompleted.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.gogrid.options.GetJobListOptions.Builder.latestJobForObjectByName; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.gogrid.domain.Job; import org.jclouds.gogrid.domain.JobState; diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/ServerLatestJobCompleted.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/ServerLatestJobCompleted.java index 2537f8b6ab..1f361f35eb 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/ServerLatestJobCompleted.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/predicates/ServerLatestJobCompleted.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.gogrid.options.GetJobListOptions.Builder.latestJobForObjectByName; import jakarta.annotation.Resource; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.gogrid.domain.Job; import org.jclouds.gogrid.domain.JobState; diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseCredentialsFromJsonResponseTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseCredentialsFromJsonResponseTest.java index bfdf43b52e..542fc929b8 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseCredentialsFromJsonResponseTest.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseCredentialsFromJsonResponseTest.java @@ -23,7 +23,7 @@ import java.lang.reflect.Type; import java.net.UnknownHostException; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.domain.Credentials; import org.jclouds.gogrid.domain.IpState; diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseJobsFromJsonResponseTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseJobsFromJsonResponseTest.java index c387d0579e..fe9ddd5e8f 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseJobsFromJsonResponseTest.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseJobsFromJsonResponseTest.java @@ -25,7 +25,7 @@ import java.util.Date; import java.util.Map; import java.util.SortedSet; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.gogrid.domain.Job; import org.jclouds.gogrid.domain.JobProperties; diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseLoadBalancersFromJsonResponseTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseLoadBalancersFromJsonResponseTest.java index 4d8ae2b314..abf1ed0cb4 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseLoadBalancersFromJsonResponseTest.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseLoadBalancersFromJsonResponseTest.java @@ -24,7 +24,7 @@ import java.net.UnknownHostException; import java.util.Map; import java.util.SortedSet; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.gogrid.domain.Ip; import org.jclouds.gogrid.domain.IpPortPair; diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseServerNameToCredentialsMapFromJsonResponseTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseServerNameToCredentialsMapFromJsonResponseTest.java index ec39489ea8..08ecf086ed 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseServerNameToCredentialsMapFromJsonResponseTest.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseServerNameToCredentialsMapFromJsonResponseTest.java @@ -23,7 +23,7 @@ import java.lang.reflect.Type; import java.net.UnknownHostException; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.domain.Credentials; import org.jclouds.gogrid.domain.IpState; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobRequestSigner.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobRequestSigner.java index 88ec7954ad..f91bb83bd8 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobRequestSigner.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobRequestSigner.java @@ -27,7 +27,7 @@ import java.security.SignatureException; import java.util.Map; import jakarta.annotation.Resource; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.Constants; import org.jclouds.blobstore.BlobRequestSigner; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java index 877764333a..b70749212a 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.Blob; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/functions/BucketToStorageMetadata.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/functions/BucketToStorageMetadata.java index f96462a379..f7c964e962 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/functions/BucketToStorageMetadata.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/functions/BucketToStorageMetadata.java @@ -16,7 +16,7 @@ */ package org.jclouds.googlecloudstorage.blobstore.functions; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.blobstore.domain.MutableStorageMetadata; import org.jclouds.blobstore.domain.StorageMetadata; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/functions/ObjectListToStorageMetadata.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/functions/ObjectListToStorageMetadata.java index 4f7f1d0749..2baa21b193 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/functions/ObjectListToStorageMetadata.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/functions/ObjectListToStorageMetadata.java @@ -18,7 +18,7 @@ package org.jclouds.googlecloudstorage.blobstore.functions; import java.util.SortedSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.blobstore.domain.MutableStorageMetadata; import org.jclouds.blobstore.domain.PageSet; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/config/GoogleCloudStorageHttpApiModule.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/config/GoogleCloudStorageHttpApiModule.java index 63fec31fe0..a7bb6b04bd 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/config/GoogleCloudStorageHttpApiModule.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/config/GoogleCloudStorageHttpApiModule.java @@ -16,7 +16,7 @@ */ package org.jclouds.googlecloudstorage.config; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.domain.Credentials; import org.jclouds.googlecloud.config.CurrentProject; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/config/GoogleCloudStorageParserModule.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/config/GoogleCloudStorageParserModule.java index 77933a796b..a1fe0ab79c 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/config/GoogleCloudStorageParserModule.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/config/GoogleCloudStorageParserModule.java @@ -20,7 +20,7 @@ import java.lang.reflect.Type; import java.util.Map; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.googlecloud.config.ListPageAdapterFactory; import org.jclouds.googlecloudstorage.domain.templates.BucketTemplate; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApi.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApi.java index 73c1cf4c31..e328b2bfe6 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApi.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApi.java @@ -20,7 +20,7 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketApi.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketApi.java index 38f4b740f7..4c38a8d80a 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketApi.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/BucketApi.java @@ -18,7 +18,7 @@ package org.jclouds.googlecloudstorage.features; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApi.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApi.java index 922b827e6a..65c032c9fb 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApi.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApi.java @@ -20,7 +20,7 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApi.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApi.java index 008d42d380..6551c5d55d 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApi.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApi.java @@ -20,7 +20,7 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.Encoded; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java index 020b445157..24a4b84524 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java @@ -18,7 +18,7 @@ package org.jclouds.googlecloudstorage.features; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.Encoded; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ResumableUploadApi.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ResumableUploadApi.java index 14c820aa99..2146271259 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ResumableUploadApi.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ResumableUploadApi.java @@ -18,7 +18,7 @@ package org.jclouds.googlecloudstorage.features; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.HeaderParam; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageClientErrorRetryHandler.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageClientErrorRetryHandler.java index 9842328ea9..4f95c285d0 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageClientErrorRetryHandler.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageClientErrorRetryHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.googlecloudstorage.handlers; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import jakarta.ws.rs.core.Response.Status; import org.jclouds.http.HttpCommand; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageErrorHandler.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageErrorHandler.java index d330146673..bbab7a31d9 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageErrorHandler.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageErrorHandler.java @@ -18,7 +18,7 @@ package org.jclouds.googlecloudstorage.handlers; import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageRedirectRetryHandler.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageRedirectRetryHandler.java index b7c236b79c..d7042cadbf 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageRedirectRetryHandler.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/handlers/GoogleCloudStorageRedirectRetryHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.googlecloudstorage.handlers; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpResponse; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/FirewallBinder.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/FirewallBinder.java index 43f7c4883d..69c75fde38 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/FirewallBinder.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/FirewallBinder.java @@ -19,7 +19,7 @@ package org.jclouds.googlecomputeengine.binders; import java.net.URI; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.googlecomputeengine.options.FirewallOptions; import org.jclouds.http.HttpRequest; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinder.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinder.java index e72306b19b..fa21443d45 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinder.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinder.java @@ -19,7 +19,7 @@ package org.jclouds.googlecomputeengine.binders; import java.net.URI; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.googlecomputeengine.domain.ForwardingRule; import org.jclouds.googlecomputeengine.options.ForwardingRuleCreationOptions; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/HttpHealthCheckCreationBinder.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/HttpHealthCheckCreationBinder.java index 08c8424bd1..6208b4afd9 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/HttpHealthCheckCreationBinder.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/HttpHealthCheckCreationBinder.java @@ -18,7 +18,7 @@ package org.jclouds.googlecomputeengine.binders; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.googlecomputeengine.options.HttpHealthCheckCreationOptions; import org.jclouds.http.HttpRequest; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/RouteBinder.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/RouteBinder.java index 6b454bfc7c..8871a0e067 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/RouteBinder.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/RouteBinder.java @@ -19,7 +19,7 @@ package org.jclouds.googlecomputeengine.binders; import java.net.URI; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.googlecomputeengine.options.RouteOptions; import org.jclouds.http.HttpRequest; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeHealthChecksBinder.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeHealthChecksBinder.java index 6c0e0e2ac9..78b79993c0 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeHealthChecksBinder.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeHealthChecksBinder.java @@ -16,7 +16,7 @@ */ package org.jclouds.googlecomputeengine.binders; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Binder used for adding and deleting healthChecks from a target pool. diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeInstancesBinder.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeInstancesBinder.java index 45725058ce..50edc3b7f7 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeInstancesBinder.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeInstancesBinder.java @@ -16,7 +16,7 @@ */ package org.jclouds.googlecomputeengine.binders; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Binder used for adding and deleting instances from a target pool. diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java index 1142b06a3c..3bfc20c8ea 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java @@ -25,9 +25,9 @@ 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 jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.jclouds.Constants; import org.jclouds.collect.Memoized; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java index a1a0d2251e..bbf642dee8 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java @@ -33,8 +33,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.compute.ComputeServiceAdapter; import org.jclouds.compute.domain.Hardware; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/config/GoogleComputeEngineServiceContextModule.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/config/GoogleComputeEngineServiceContextModule.java index ec0af355c5..bce380d09b 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/config/GoogleComputeEngineServiceContextModule.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/config/GoogleComputeEngineServiceContextModule.java @@ -30,8 +30,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.compute.ComputeService; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/domain/internal/GoogleComputeEngineArbitraryCpuRamTemplateBuilderImpl.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/domain/internal/GoogleComputeEngineArbitraryCpuRamTemplateBuilderImpl.java index 8d08950c0a..0c20899662 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/domain/internal/GoogleComputeEngineArbitraryCpuRamTemplateBuilderImpl.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/domain/internal/GoogleComputeEngineArbitraryCpuRamTemplateBuilderImpl.java @@ -27,9 +27,9 @@ import org.jclouds.compute.domain.internal.ArbitraryCpuRamTemplateBuilderImpl; import org.jclouds.compute.options.TemplateOptions; import org.jclouds.domain.Location; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import java.net.URI; import java.util.Set; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallTagNamingConvention.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallTagNamingConvention.java index 61e4fd054c..6b74c51a24 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallTagNamingConvention.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallTagNamingConvention.java @@ -18,7 +18,7 @@ package org.jclouds.googlecomputeengine.compute.functions; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.compute.functions.GroupNamingConvention; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/GoogleComputeEngineImageToImage.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/GoogleComputeEngineImageToImage.java index 37079ba509..d7ae26f30a 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/GoogleComputeEngineImageToImage.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/GoogleComputeEngineImageToImage.java @@ -16,7 +16,7 @@ */ package org.jclouds.googlecomputeengine.compute.functions; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.compute.domain.Image.Status; import org.jclouds.compute.domain.ImageBuilder; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java index c531f13d1c..91301f1afd 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java @@ -34,7 +34,7 @@ import org.jclouds.domain.Location; import org.jclouds.googlecomputeengine.domain.Image; import org.jclouds.googlecomputeengine.domain.Instance; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.net.URI; import java.util.List; import java.util.Map; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeToHardware.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeToHardware.java index a1eaf3601e..c5c76312d3 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeToHardware.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeToHardware.java @@ -19,7 +19,7 @@ package org.jclouds.googlecomputeengine.compute.functions; import java.net.URI; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.collect.Memoized; import org.jclouds.compute.domain.Hardware; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/OrphanedGroupsFromDeadNodes.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/OrphanedGroupsFromDeadNodes.java index 09c4a172fe..6045770c6d 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/OrphanedGroupsFromDeadNodes.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/OrphanedGroupsFromDeadNodes.java @@ -18,7 +18,7 @@ package org.jclouds.googlecomputeengine.compute.functions; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.compute.domain.NodeMetadata; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPassword.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPassword.java index 1adeddeeef..b8c6a6c4ba 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPassword.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ResetWindowsPassword.java @@ -43,8 +43,8 @@ import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.crypto.Crypto; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java index 0ca39577d3..0187d88146 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java @@ -18,7 +18,7 @@ package org.jclouds.googlecomputeengine.compute.functions; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java index 07d532c05f..134fa271c5 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java @@ -17,8 +17,8 @@ package org.jclouds.googlecomputeengine.compute.loaders; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.net.URI; import java.util.concurrent.ExecutionException; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/SubnetworkLoader.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/SubnetworkLoader.java index 26670bcb91..b559e2320f 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/SubnetworkLoader.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/SubnetworkLoader.java @@ -18,8 +18,8 @@ package org.jclouds.googlecomputeengine.compute.loaders; import java.util.concurrent.ExecutionException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.googlecomputeengine.GoogleComputeEngineApi; import org.jclouds.googlecomputeengine.compute.domain.internal.RegionAndName; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/AtomicInstanceVisible.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/AtomicInstanceVisible.java index ab7a512d85..d1583136bc 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/AtomicInstanceVisible.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/AtomicInstanceVisible.java @@ -18,7 +18,7 @@ package org.jclouds.googlecomputeengine.compute.predicates; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.googlecomputeengine.compute.functions.Resources; import org.jclouds.googlecomputeengine.domain.Instance; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/AtomicOperationDone.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/AtomicOperationDone.java index 2bf1c8031c..b25f4d9c9f 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/AtomicOperationDone.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/AtomicOperationDone.java @@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkState; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.googlecomputeengine.compute.functions.Resources; import org.jclouds.googlecomputeengine.domain.Operation; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/GroupIsEmpty.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/GroupIsEmpty.java index 3b5c09370e..02712642bc 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/GroupIsEmpty.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/GroupIsEmpty.java @@ -21,7 +21,7 @@ import static com.google.common.collect.Sets.filter; import static org.jclouds.compute.predicates.NodePredicates.all; import static org.jclouds.compute.predicates.NodePredicates.inGroup; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.compute.ComputeService; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java index e07caa4413..40bd3e2d15 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java @@ -31,8 +31,8 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import jakarta.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jclouds.Constants; import org.jclouds.compute.config.CustomizationResponse; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java index 09ec60c0fd..0fd7db6eeb 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java @@ -26,9 +26,9 @@ import static org.jclouds.rest.config.BinderUtils.bindHttpApi; import java.net.URI; 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 jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java index 43b0a8726b..957a35ca8a 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java @@ -20,7 +20,7 @@ import java.lang.reflect.Type; import java.util.Map; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.googlecloud.config.ListPageAdapterFactory; import org.jclouds.googlecomputeengine.domain.Firewall; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java index d41f48fb71..c97dfa5f1c 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java @@ -20,8 +20,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AggregatedListApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AggregatedListApi.java index 09fb096e26..0f4572eb64 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AggregatedListApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AggregatedListApi.java @@ -20,8 +20,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/BackendServiceApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/BackendServiceApi.java index 270ed9bbaf..877766353c 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/BackendServiceApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/BackendServiceApi.java @@ -21,8 +21,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java index c67e2b7c27..67f6906dbb 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java @@ -20,8 +20,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskTypeApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskTypeApi.java index 2738043343..5640b983af 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskTypeApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskTypeApi.java @@ -20,8 +20,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java index 734b7f7b6d..5780187ccf 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java @@ -21,8 +21,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApi.java index b871022004..9dbd7994c5 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApi.java @@ -21,8 +21,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApi.java index 4631a55c04..c211cd8287 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApi.java @@ -20,8 +20,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java index 5de4026ab6..2291d52bae 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java @@ -21,8 +21,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java index 81c281d4b0..35e5b5a8f4 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java @@ -20,8 +20,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/LicenseApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/LicenseApi.java index 49d9ffc046..5a0df58948 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/LicenseApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/LicenseApi.java @@ -18,7 +18,7 @@ package org.jclouds.googlecomputeengine.features; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java index 921df1a2fb..e3233f9e2f 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java @@ -20,8 +20,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java index 77c91c1e2b..9b2168f1d6 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java @@ -20,8 +20,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java index 07cefde54f..30269eed4a 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java @@ -21,8 +21,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java index 925563dff8..00090ea49f 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java @@ -18,7 +18,7 @@ package org.jclouds.googlecomputeengine.features; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java index 53ca499db8..5643236d89 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java @@ -20,8 +20,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java index cba032c90b..1b6df1f153 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java @@ -21,8 +21,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java index 3db2db4e5e..e41245da8f 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java @@ -20,8 +20,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SubnetworkApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SubnetworkApi.java index e6366e6f52..3b461d03a6 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SubnetworkApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SubnetworkApi.java @@ -20,8 +20,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetHttpProxyApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetHttpProxyApi.java index e58d8adca9..a45552b121 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetHttpProxyApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetHttpProxyApi.java @@ -19,8 +19,8 @@ package org.jclouds.googlecomputeengine.features; import java.net.URI; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetInstanceApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetInstanceApi.java index 5f0049aa75..41abb65f45 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetInstanceApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetInstanceApi.java @@ -20,8 +20,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetPoolApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetPoolApi.java index a7b90b07e4..610fdd13b4 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetPoolApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetPoolApi.java @@ -22,8 +22,8 @@ import java.net.URI; import java.util.Iterator; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/UrlMapApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/UrlMapApi.java index cbe9294bf6..1faf64a78c 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/UrlMapApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/UrlMapApi.java @@ -21,8 +21,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java index 7497a96240..dd0aa07d55 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java @@ -20,8 +20,8 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.Iterator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/packet/src/main/java/org/jclouds/packet/compute/PacketComputeServiceAdapter.java b/providers/packet/src/main/java/org/jclouds/packet/compute/PacketComputeServiceAdapter.java index 16951f88d1..99eaebdebb 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/compute/PacketComputeServiceAdapter.java +++ b/providers/packet/src/main/java/org/jclouds/packet/compute/PacketComputeServiceAdapter.java @@ -20,9 +20,9 @@ import java.util.Map; 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.compute.ComputeServiceAdapter; import org.jclouds.compute.domain.Template; diff --git a/providers/packet/src/main/java/org/jclouds/packet/compute/functions/DeviceStateToStatus.java b/providers/packet/src/main/java/org/jclouds/packet/compute/functions/DeviceStateToStatus.java index 7606bf5aca..e715f6d63e 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/compute/functions/DeviceStateToStatus.java +++ b/providers/packet/src/main/java/org/jclouds/packet/compute/functions/DeviceStateToStatus.java @@ -16,7 +16,7 @@ */ package org.jclouds.packet.compute.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.NodeMetadata.Status; import org.jclouds.packet.domain.Device; diff --git a/providers/packet/src/main/java/org/jclouds/packet/compute/functions/DeviceToNodeMetadata.java b/providers/packet/src/main/java/org/jclouds/packet/compute/functions/DeviceToNodeMetadata.java index 08bdc05d0f..31f9d300c1 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/compute/functions/DeviceToNodeMetadata.java +++ b/providers/packet/src/main/java/org/jclouds/packet/compute/functions/DeviceToNodeMetadata.java @@ -19,9 +19,9 @@ package org.jclouds.packet.compute.functions; import java.util.List; 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.compute.domain.NodeMetadata; import org.jclouds.compute.domain.NodeMetadataBuilder; diff --git a/providers/packet/src/main/java/org/jclouds/packet/compute/functions/FacilityToLocation.java b/providers/packet/src/main/java/org/jclouds/packet/compute/functions/FacilityToLocation.java index c8df1bc74d..684625e2e1 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/compute/functions/FacilityToLocation.java +++ b/providers/packet/src/main/java/org/jclouds/packet/compute/functions/FacilityToLocation.java @@ -16,8 +16,8 @@ */ package org.jclouds.packet.compute.functions; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/providers/packet/src/main/java/org/jclouds/packet/compute/functions/OperatingSystemToImage.java b/providers/packet/src/main/java/org/jclouds/packet/compute/functions/OperatingSystemToImage.java index ce288107d8..ea22bb5d12 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/compute/functions/OperatingSystemToImage.java +++ b/providers/packet/src/main/java/org/jclouds/packet/compute/functions/OperatingSystemToImage.java @@ -22,7 +22,7 @@ import static org.jclouds.compute.domain.OperatingSystem.builder; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.ImageBuilder; diff --git a/providers/packet/src/main/java/org/jclouds/packet/compute/functions/PlanToHardware.java b/providers/packet/src/main/java/org/jclouds/packet/compute/functions/PlanToHardware.java index e6ac2efcb1..4edfceb2c3 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/compute/functions/PlanToHardware.java +++ b/providers/packet/src/main/java/org/jclouds/packet/compute/functions/PlanToHardware.java @@ -16,7 +16,7 @@ */ package org.jclouds.packet.compute.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.HardwareBuilder; diff --git a/providers/packet/src/main/java/org/jclouds/packet/compute/strategy/CreateSshKeysThenCreateNodes.java b/providers/packet/src/main/java/org/jclouds/packet/compute/strategy/CreateSshKeysThenCreateNodes.java index e14c0cb52a..e16a19f609 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/compute/strategy/CreateSshKeysThenCreateNodes.java +++ b/providers/packet/src/main/java/org/jclouds/packet/compute/strategy/CreateSshKeysThenCreateNodes.java @@ -27,9 +27,9 @@ import java.util.Map; 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.Constants; import org.jclouds.compute.config.CustomizationResponse; diff --git a/providers/packet/src/main/java/org/jclouds/packet/features/DeviceApi.java b/providers/packet/src/main/java/org/jclouds/packet/features/DeviceApi.java index b11ebd1409..36f2757037 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/features/DeviceApi.java +++ b/providers/packet/src/main/java/org/jclouds/packet/features/DeviceApi.java @@ -19,8 +19,8 @@ package org.jclouds.packet.features; import java.beans.ConstructorProperties; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/packet/src/main/java/org/jclouds/packet/features/FacilityApi.java b/providers/packet/src/main/java/org/jclouds/packet/features/FacilityApi.java index 2c5ff66e98..6a05d7a463 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/features/FacilityApi.java +++ b/providers/packet/src/main/java/org/jclouds/packet/features/FacilityApi.java @@ -19,8 +19,8 @@ package org.jclouds.packet.features; import java.beans.ConstructorProperties; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/packet/src/main/java/org/jclouds/packet/features/OperatingSystemApi.java b/providers/packet/src/main/java/org/jclouds/packet/features/OperatingSystemApi.java index 527392d3d7..706e5938e7 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/features/OperatingSystemApi.java +++ b/providers/packet/src/main/java/org/jclouds/packet/features/OperatingSystemApi.java @@ -19,8 +19,8 @@ package org.jclouds.packet.features; import java.beans.ConstructorProperties; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/packet/src/main/java/org/jclouds/packet/features/PlanApi.java b/providers/packet/src/main/java/org/jclouds/packet/features/PlanApi.java index 6182aa77f3..c697b8ce06 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/features/PlanApi.java +++ b/providers/packet/src/main/java/org/jclouds/packet/features/PlanApi.java @@ -19,8 +19,8 @@ package org.jclouds.packet.features; import java.beans.ConstructorProperties; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/packet/src/main/java/org/jclouds/packet/features/ProjectApi.java b/providers/packet/src/main/java/org/jclouds/packet/features/ProjectApi.java index bd07ec7713..ab85b832b6 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/features/ProjectApi.java +++ b/providers/packet/src/main/java/org/jclouds/packet/features/ProjectApi.java @@ -19,8 +19,8 @@ package org.jclouds.packet.features; import java.beans.ConstructorProperties; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/packet/src/main/java/org/jclouds/packet/features/SshKeyApi.java b/providers/packet/src/main/java/org/jclouds/packet/features/SshKeyApi.java index ca3fc979fe..b3a04cf41d 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/features/SshKeyApi.java +++ b/providers/packet/src/main/java/org/jclouds/packet/features/SshKeyApi.java @@ -19,8 +19,8 @@ package org.jclouds.packet.features; import java.beans.ConstructorProperties; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/providers/packet/src/main/java/org/jclouds/packet/filters/AddApiVersionToRequest.java b/providers/packet/src/main/java/org/jclouds/packet/filters/AddApiVersionToRequest.java index 70e66fb542..3d1bb2272c 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/filters/AddApiVersionToRequest.java +++ b/providers/packet/src/main/java/org/jclouds/packet/filters/AddApiVersionToRequest.java @@ -18,8 +18,8 @@ package org.jclouds.packet.filters; import java.util.Collection; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpException; import org.jclouds.http.HttpRequest; diff --git a/providers/packet/src/main/java/org/jclouds/packet/filters/AddXAuthTokenToRequest.java b/providers/packet/src/main/java/org/jclouds/packet/filters/AddXAuthTokenToRequest.java index e9d6bddb62..ff8def504e 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/filters/AddXAuthTokenToRequest.java +++ b/providers/packet/src/main/java/org/jclouds/packet/filters/AddXAuthTokenToRequest.java @@ -16,8 +16,8 @@ */ package org.jclouds.packet.filters; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.domain.Credentials; import org.jclouds.http.HttpException; diff --git a/providers/packet/src/main/java/org/jclouds/packet/handlers/PacketErrorHandler.java b/providers/packet/src/main/java/org/jclouds/packet/handlers/PacketErrorHandler.java index 01d870b1ca..9f0fda5652 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/handlers/PacketErrorHandler.java +++ b/providers/packet/src/main/java/org/jclouds/packet/handlers/PacketErrorHandler.java @@ -16,7 +16,7 @@ */ package org.jclouds.packet.handlers; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/ProfitBricksComputeServiceAdapter.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/ProfitBricksComputeServiceAdapter.java index 4018595763..47b53bcab4 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/ProfitBricksComputeServiceAdapter.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/ProfitBricksComputeServiceAdapter.java @@ -29,8 +29,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.compute.ComputeServiceAdapter; import org.jclouds.compute.domain.Hardware; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/concurrent/ProvisioningJob.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/concurrent/ProvisioningJob.java index 7da7d3c04f..58363db48f 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/concurrent/ProvisioningJob.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/concurrent/ProvisioningJob.java @@ -21,7 +21,7 @@ import static org.jclouds.profitbricks.config.ProfitBricksComputeProperties.POLL import java.util.concurrent.Callable; -import javax.inject.Named; +import jakarta.inject.Named; import com.google.common.base.Predicate; import com.google.common.base.Supplier; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/config/ProfitBricksComputeServiceContextModule.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/config/ProfitBricksComputeServiceContextModule.java index e83db06d05..83df2584b0 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/config/ProfitBricksComputeServiceContextModule.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/config/ProfitBricksComputeServiceContextModule.java @@ -28,8 +28,8 @@ import static org.jclouds.util.Predicates2.retry; import java.util.concurrent.TimeUnit; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.compute.ComputeServiceAdapter; import org.jclouds.compute.config.ComputeServiceAdapterContextModule; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/strategy/AssignDataCenterToTemplate.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/strategy/AssignDataCenterToTemplate.java index 328e0a3928..29c91603e8 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/strategy/AssignDataCenterToTemplate.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/compute/strategy/AssignDataCenterToTemplate.java @@ -24,9 +24,9 @@ import java.util.Map; 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.compute.config.CustomizationResponse; import org.jclouds.compute.domain.NodeMetadata; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DataCenterApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DataCenterApi.java index 733615278b..9f6cfb8ff9 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DataCenterApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DataCenterApi.java @@ -17,7 +17,7 @@ package org.jclouds.profitbricks.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DrivesApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DrivesApi.java index 5553aadfff..bcd7ca4f5d 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DrivesApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/DrivesApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.profitbricks.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Produces; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/FirewallApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/FirewallApi.java index 660101f0cf..5f1bb06122 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/FirewallApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/FirewallApi.java @@ -18,7 +18,7 @@ package org.jclouds.profitbricks.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Produces; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ImageApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ImageApi.java index 22b1981219..138a263137 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ImageApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ImageApi.java @@ -17,7 +17,7 @@ package org.jclouds.profitbricks.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/IpBlockApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/IpBlockApi.java index 209b729cb0..6a5427ef8d 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/IpBlockApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/IpBlockApi.java @@ -18,7 +18,7 @@ package org.jclouds.profitbricks.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Produces; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/LoadBalancerApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/LoadBalancerApi.java index 91dafa9900..b182a02710 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/LoadBalancerApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/LoadBalancerApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.profitbricks.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Produces; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/NicApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/NicApi.java index a0cf45594a..4526e96473 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/NicApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/NicApi.java @@ -32,7 +32,7 @@ import org.jclouds.rest.annotations.XMLResponseParser; import org.jclouds.rest.annotations.MapBinder; import org.jclouds.rest.annotations.PayloadParam; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ServerApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ServerApi.java index 3b9de69eb8..30de99aec3 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ServerApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/ServerApi.java @@ -17,7 +17,7 @@ package org.jclouds.profitbricks.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Produces; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/SnapshotApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/SnapshotApi.java index ee735a516d..dc24dc1a83 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/SnapshotApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/SnapshotApi.java @@ -18,7 +18,7 @@ package org.jclouds.profitbricks.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Produces; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/StorageApi.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/StorageApi.java index 6641befc32..2cee809917 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/StorageApi.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/features/StorageApi.java @@ -18,7 +18,7 @@ package org.jclouds.profitbricks.features; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Produces; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/handlers/ProfitBricksHttpErrorHandler.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/handlers/ProfitBricksHttpErrorHandler.java index 847269e054..44fb56da7c 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/handlers/ProfitBricksHttpErrorHandler.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/handlers/ProfitBricksHttpErrorHandler.java @@ -19,7 +19,7 @@ package org.jclouds.profitbricks.handlers; import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; import static org.jclouds.util.Closeables2.closeQuietly; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorService.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorService.java index afca237d22..dc8b78d0c0 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorService.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorService.java @@ -29,8 +29,8 @@ import java.net.Proxy; import java.net.URI; import java.util.regex.Pattern; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; diff --git a/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/suppliers/FixedWellKnownImageSupplier.java b/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/suppliers/FixedWellKnownImageSupplier.java index f807460a53..130468bbfb 100644 --- a/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/suppliers/FixedWellKnownImageSupplier.java +++ b/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/suppliers/FixedWellKnownImageSupplier.java @@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; 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.WellKnownImage; import org.jclouds.elasticstack.suppliers.WellKnownImageSupplier; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/TagToJson.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/TagToJson.java index bea654cacd..8899c9f972 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/TagToJson.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/TagToJson.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkArgument; 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.http.HttpRequest; import org.jclouds.json.Json; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java index 8d1fe8350f..e17a1975ae 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java index 23e026d091..9e868b5283 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java @@ -20,8 +20,8 @@ import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.compute.ComputeServiceAdapter; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java index d273378fd0..874a2b731c 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java @@ -19,8 +19,8 @@ package org.jclouds.softlayer.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Strings.nullToEmpty; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java index 782e93e83f..22a2851b52 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java @@ -20,8 +20,8 @@ import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Preconditions.checkNotNull; 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.Image; import org.jclouds.compute.domain.ImageBuilder; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToHardware.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToHardware.java index 267a931157..203507ced3 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToHardware.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToHardware.java @@ -16,7 +16,7 @@ */ package org.jclouds.softlayer.compute.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.HardwareBuilder; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImage.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImage.java index f9972f08f3..7af9f75cb9 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImage.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImage.java @@ -19,8 +19,8 @@ package org.jclouds.softlayer.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; 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.Image; import org.jclouds.compute.domain.ImageBuilder; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java index 58132fdcc3..65dc6f65b3 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java @@ -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.Image; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java index b4b7ef523c..6daf8f17df 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java @@ -37,9 +37,9 @@ import java.util.Set; import java.util.concurrent.TimeUnit; 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.collect.Memoized; import org.jclouds.compute.ComputeServiceAdapter; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java index 26e7ea175e..02c486f4dd 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java @@ -18,7 +18,7 @@ package org.jclouds.softlayer.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/NetworkApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/NetworkApi.java index 75d58f8043..d4e6c18227 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/NetworkApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/NetworkApi.java @@ -26,7 +26,7 @@ import org.jclouds.rest.annotations.WrapWith; import org.jclouds.softlayer.domain.Network; import org.jclouds.softlayer.domain.Subnet; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Path; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.Produces; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java index 0afea22776..5eb6976e35 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java @@ -18,7 +18,7 @@ package org.jclouds.softlayer.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java index 5055e15156..5c91225f56 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java @@ -18,7 +18,7 @@ package org.jclouds.softlayer.features; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java index 54aa947694..3c54fc6eb2 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java @@ -18,7 +18,7 @@ package org.jclouds.softlayer.handlers; import java.io.IOException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java index 76b7de6c24..2703f9e313 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java @@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals; import java.util.Set; import jakarta.annotation.Resource; -import javax.inject.Named; +import jakarta.inject.Named; import org.jclouds.compute.RunNodesException; import org.jclouds.compute.domain.ExecResponse; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSApi.java index 9e57b46ea1..2bec33c5af 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSApi.java @@ -18,7 +18,7 @@ package org.jclouds.ultradns.ws; import java.io.Closeable; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.POST; import org.jclouds.rest.annotations.Delegate; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalGroupApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalGroupApi.java index 2616be361d..415c69669f 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalGroupApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalGroupApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.ultradns.ws.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalPoolApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalPoolApi.java index b738aabb4a..6fc70f4615 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalPoolApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalPoolApi.java @@ -17,7 +17,7 @@ package org.jclouds.ultradns.ws.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ResourceRecordApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ResourceRecordApi.java index 578bb548d2..d8ae88eaa8 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ResourceRecordApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ResourceRecordApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.ultradns.ws.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/RoundRobinPoolApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/RoundRobinPoolApi.java index a232bb42af..39e5c7e5ae 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/RoundRobinPoolApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/RoundRobinPoolApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.ultradns.ws.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TaskApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TaskApi.java index bc3b23b826..360ba7a1bd 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TaskApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TaskApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.ultradns.ws.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApi.java index b175d16db5..6f1f80f333 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.ultradns.ws.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ZoneApi.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ZoneApi.java index f3628feb35..d299f0466b 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ZoneApi.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/ZoneApi.java @@ -16,7 +16,7 @@ */ package org.jclouds.ultradns.ws.features; -import javax.inject.Named; +import jakarta.inject.Named; import jakarta.ws.rs.POST; import org.jclouds.Fallbacks.NullOnNotFoundOr404; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/filters/SOAPWrapWithPasswordAuth.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/filters/SOAPWrapWithPasswordAuth.java index 203e309c48..7390425938 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/filters/SOAPWrapWithPasswordAuth.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/filters/SOAPWrapWithPasswordAuth.java @@ -19,7 +19,7 @@ package org.jclouds.ultradns.ws.filters; import static com.google.common.base.Preconditions.checkNotNull; import static java.lang.String.format; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.domain.Credentials; import org.jclouds.http.HttpRequest; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/handlers/UltraDNSWSErrorHandler.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/handlers/UltraDNSWSErrorHandler.java index 58e800c369..8b35a364fb 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/handlers/UltraDNSWSErrorHandler.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/handlers/UltraDNSWSErrorHandler.java @@ -18,9 +18,9 @@ package org.jclouds.ultradns.ws.handlers; import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream; import static org.jclouds.http.HttpUtils.releasePayload; -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.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/DirectionalPoolRecordTypeToString.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/DirectionalPoolRecordTypeToString.java index 505f24e6e2..c5a7bcb183 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/DirectionalPoolRecordTypeToString.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/DirectionalPoolRecordTypeToString.java @@ -18,7 +18,7 @@ package org.jclouds.ultradns.ws.internal; import java.util.EnumSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ultradns.ws.domain.DirectionalPool.RecordType; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/RoundRobinPoolRecordTypeToString.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/RoundRobinPoolRecordTypeToString.java index daaef597f1..c1b5dd134d 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/RoundRobinPoolRecordTypeToString.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/RoundRobinPoolRecordTypeToString.java @@ -18,7 +18,7 @@ package org.jclouds.ultradns.ws.internal; import java.util.EnumSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ultradns.ws.domain.RoundRobinPool.RecordType; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/TrafficControllerPoolRecordTypeToString.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/TrafficControllerPoolRecordTypeToString.java index dcf2e9702a..0ea065057c 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/TrafficControllerPoolRecordTypeToString.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/TrafficControllerPoolRecordTypeToString.java @@ -18,7 +18,7 @@ package org.jclouds.ultradns.ws.internal; import java.util.EnumSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.ultradns.ws.domain.TrafficControllerPool.RecordType; diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/xml/ZonePropertiesHandler.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/xml/ZonePropertiesHandler.java index 41c602280d..de49b79b7b 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/xml/ZonePropertiesHandler.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/xml/ZonePropertiesHandler.java @@ -22,7 +22,7 @@ import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functions/InitAdminAccess.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functions/InitAdminAccess.java index dcf558d11d..9ff9a97b5c 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functions/InitAdminAccess.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functions/InitAdminAccess.java @@ -16,7 +16,7 @@ */ package org.jclouds.scriptbuilder.functions; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jclouds.scriptbuilder.domain.AdminAccessVisitor; import org.jclouds.scriptbuilder.statements.login.AdminAccess; diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpecTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpecTest.java index e0dac448de..6eff82b599 100644 --- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpecTest.java +++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpecTest.java @@ -25,7 +25,7 @@ import static org.testng.Assert.fail; import java.io.File; import java.lang.reflect.Field; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.jclouds.json.Json; import org.jclouds.json.config.GsonModule; diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManager.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManager.java index 25fb6a32bd..0d322c72ce 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManager.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManager.java @@ -19,7 +19,7 @@ package org.jclouds.servermanager; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/DatacenterToLocation.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/DatacenterToLocation.java index 615b42e905..78c3935ae0 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/DatacenterToLocation.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/DatacenterToLocation.java @@ -18,9 +18,9 @@ package org.jclouds.servermanager.compute.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.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerManagerHardwareToHardware.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerManagerHardwareToHardware.java index 2e22b66385..3c62b0d2d7 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerManagerHardwareToHardware.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerManagerHardwareToHardware.java @@ -16,7 +16,7 @@ */ package org.jclouds.servermanager.compute.functions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.HardwareBuilder; diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerManagerImageToImage.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerManagerImageToImage.java index 3f9e2f36c2..7704107f83 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerManagerImageToImage.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerManagerImageToImage.java @@ -17,8 +17,8 @@ package org.jclouds.servermanager.compute.functions; 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.Image; import org.jclouds.compute.domain.ImageBuilder; diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerToNodeMetadata.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerToNodeMetadata.java index fa48cf5086..be145116ef 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerToNodeMetadata.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/functions/ServerToNodeMetadata.java @@ -22,8 +22,8 @@ import static com.google.common.collect.FluentIterable.from; 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.collect.Memoized; import org.jclouds.compute.domain.Hardware; diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/strategy/ServerManagerComputeServiceAdapter.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/strategy/ServerManagerComputeServiceAdapter.java index 52206f53c6..d90465bdb1 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/strategy/ServerManagerComputeServiceAdapter.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/compute/strategy/ServerManagerComputeServiceAdapter.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.contains; import static com.google.common.collect.Iterables.filter; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.compute.ComputeServiceAdapter; import org.jclouds.compute.domain.Template;