diff --git a/README.md b/README.md index 9734fbcd78c..e692994adbf 100644 --- a/README.md +++ b/README.md @@ -243,7 +243,7 @@ Import static all other imports import java.* -import javax.* +import jakarta.* import org.* diff --git a/audit-connector/src/main/java/com/sequenceiq/cloudbreak/audit/AuditClient.java b/audit-connector/src/main/java/com/sequenceiq/cloudbreak/audit/AuditClient.java index d1d7603b761..8c4c3f4610a 100644 --- a/audit-connector/src/main/java/com/sequenceiq/cloudbreak/audit/AuditClient.java +++ b/audit-connector/src/main/java/com/sequenceiq/cloudbreak/audit/AuditClient.java @@ -8,7 +8,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/audit-connector/src/main/java/com/sequenceiq/cloudbreak/audit/config/AuditConfig.java b/audit-connector/src/main/java/com/sequenceiq/cloudbreak/audit/config/AuditConfig.java index 135e8c8d51d..11442658d12 100644 --- a/audit-connector/src/main/java/com/sequenceiq/cloudbreak/audit/config/AuditConfig.java +++ b/audit-connector/src/main/java/com/sequenceiq/cloudbreak/audit/config/AuditConfig.java @@ -8,8 +8,8 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/audit-connector/src/main/java/com/sequenceiq/cloudbreak/audit/util/ActorUtil.java b/audit-connector/src/main/java/com/sequenceiq/cloudbreak/audit/util/ActorUtil.java index a1490500ffb..386daa131ec 100644 --- a/audit-connector/src/main/java/com/sequenceiq/cloudbreak/audit/util/ActorUtil.java +++ b/audit-connector/src/main/java/com/sequenceiq/cloudbreak/audit/util/ActorUtil.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.audit.util; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/ClouderaManagerLicenseProvider.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/ClouderaManagerLicenseProvider.java index a8e452820db..8be60b3a0fb 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/ClouderaManagerLicenseProvider.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/ClouderaManagerLicenseProvider.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.auth; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/PaywallCredentialPopulator.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/PaywallCredentialPopulator.java index 26c6a04b835..811fd5ac824 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/PaywallCredentialPopulator.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/PaywallCredentialPopulator.java @@ -2,8 +2,8 @@ import java.util.regex.Pattern; -import javax.inject.Inject; -import javax.ws.rs.client.WebTarget; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.WebTarget; import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; import org.slf4j.Logger; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/EntitlementService.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/EntitlementService.java index 28b7214cb91..a5bb6dde66c 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/EntitlementService.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/EntitlementService.java @@ -108,7 +108,7 @@ import java.util.Locale; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/GrpcUmsClient.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/GrpcUmsClient.java index 3fd2acccbd1..650e02c204e 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/GrpcUmsClient.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/GrpcUmsClient.java @@ -16,7 +16,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/VirtualGroupService.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/VirtualGroupService.java index db8c66b099a..cd97692ba45 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/VirtualGroupService.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/VirtualGroupService.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -91,4 +91,4 @@ private String getVirtualGroupFromUms(String accountId, String environmentCrn, U } return virtualGroup; } -} \ No newline at end of file +} diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/config/UmsClientConfig.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/config/UmsClientConfig.java index 5a3522602af..16c9bbe7823 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/config/UmsClientConfig.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/config/UmsClientConfig.java @@ -3,7 +3,7 @@ import static org.glassfish.jersey.internal.guava.Preconditions.checkArgument; import static org.glassfish.jersey.internal.guava.Preconditions.checkNotNull; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/exception/CustomResponseStatus.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/exception/CustomResponseStatus.java index 9d1951f57e5..ecf0a4b4590 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/exception/CustomResponseStatus.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/exception/CustomResponseStatus.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.auth.altus.exception; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class CustomResponseStatus implements Response.StatusType { diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/exception/UmsErrorExceptionMapper.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/exception/UmsErrorExceptionMapper.java index 16ad4f54089..2574533a711 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/exception/UmsErrorExceptionMapper.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/exception/UmsErrorExceptionMapper.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.auth.altus.exception; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status.Family; import org.springframework.stereotype.Component; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/exception/UnauthorizedExceptionMapper.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/exception/UnauthorizedExceptionMapper.java index a3da8b01067..fee94164bf3 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/exception/UnauthorizedExceptionMapper.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/exception/UnauthorizedExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.auth.altus.exception; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/service/RoleCrnGenerator.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/service/RoleCrnGenerator.java index a6ffc84dabb..92de2bbc9b5 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/service/RoleCrnGenerator.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/altus/service/RoleCrnGenerator.java @@ -2,8 +2,8 @@ import java.util.Set; -import javax.inject.Inject; -import javax.ws.rs.InternalServerErrorException; +import jakarta.inject.Inject; +import jakarta.ws.rs.InternalServerErrorException; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/security/AccountIdBasedPermissionEvaluator.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/security/AccountIdBasedPermissionEvaluator.java index 01928e26375..d3a8a38cd92 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/security/AccountIdBasedPermissionEvaluator.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/security/AccountIdBasedPermissionEvaluator.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Lazy; import org.springframework.security.access.PermissionEvaluator; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/security/ScimAccountGroupReaderFilter.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/security/ScimAccountGroupReaderFilter.java index ce4dec60b24..9a1d3c215cd 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/security/ScimAccountGroupReaderFilter.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/security/ScimAccountGroupReaderFilter.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.inject.Inject; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/security/authentication/AuthenticatedUserService.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/security/authentication/AuthenticatedUserService.java index cc723592dba..6b3f258c219 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/security/authentication/AuthenticatedUserService.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/auth/security/authentication/AuthenticatedUserService.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.auth.security.authentication; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractKeyBasedServiceClient.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractKeyBasedServiceClient.java index d9187ef8aab..081f3d6912a 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractKeyBasedServiceClient.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractKeyBasedServiceClient.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.client; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,4 +24,4 @@ protected WebTarget getWebTarget() { } public abstract T withKeys(String accessKey, String privateKey); -} \ No newline at end of file +} diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractKeyBasedServiceEndpoint.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractKeyBasedServiceEndpoint.java index c95fb7cc3d9..ee72eb16ca0 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractKeyBasedServiceEndpoint.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractKeyBasedServiceEndpoint.java @@ -2,10 +2,10 @@ import java.util.Collections; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.glassfish.jersey.client.proxy.WebResourceFactory; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractUserCrnServiceClient.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractUserCrnServiceClient.java index a0349f8f33d..11469ffb9b4 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractUserCrnServiceClient.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractUserCrnServiceClient.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.client; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractUserCrnServiceEndpoint.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractUserCrnServiceEndpoint.java index 3a80a1eca65..17b0e513168 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractUserCrnServiceEndpoint.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/AbstractUserCrnServiceEndpoint.java @@ -2,10 +2,10 @@ import java.util.Collections; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.glassfish.jersey.client.proxy.WebResourceFactory; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/ApiClientRequestFilter.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/ApiClientRequestFilter.java index 59c85bd6414..8e664350c58 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/ApiClientRequestFilter.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/ApiClientRequestFilter.java @@ -2,8 +2,8 @@ import java.io.IOException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; import org.springframework.stereotype.Component; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/ApiKeyRequestFilter.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/ApiKeyRequestFilter.java index 0f03dcdba38..00cf6e2e433 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/ApiKeyRequestFilter.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/ApiKeyRequestFilter.java @@ -6,10 +6,10 @@ import java.time.OffsetDateTime; import java.time.ZoneOffset; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.http.entity.ContentType; import org.slf4j.Logger; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/ThreadLocalUserCrnWebTargetBuilder.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/ThreadLocalUserCrnWebTargetBuilder.java index ff9a326c91e..34a6d468528 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/ThreadLocalUserCrnWebTargetBuilder.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/ThreadLocalUserCrnWebTargetBuilder.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.client; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.WebTarget; import org.glassfish.jersey.client.ClientProperties; import org.slf4j.Logger; diff --git a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/WebTargetEndpointFactory.java b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/WebTargetEndpointFactory.java index d708c98f21a..ddc9f20f50f 100644 --- a/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/WebTargetEndpointFactory.java +++ b/auth-connector/src/main/java/com/sequenceiq/cloudbreak/client/WebTargetEndpointFactory.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.client; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import org.glassfish.jersey.client.proxy.WebResourceFactory; diff --git a/auth-connector/src/test/java/com/sequenceiq/cloudbreak/auth/PaywallCredentialPopulatorTest.java b/auth-connector/src/test/java/com/sequenceiq/cloudbreak/auth/PaywallCredentialPopulatorTest.java index aaed1eae3ec..bdc7f28b93e 100644 --- a/auth-connector/src/test/java/com/sequenceiq/cloudbreak/auth/PaywallCredentialPopulatorTest.java +++ b/auth-connector/src/test/java/com/sequenceiq/cloudbreak/auth/PaywallCredentialPopulatorTest.java @@ -8,7 +8,7 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; @@ -61,4 +61,4 @@ private WebTarget createWebTarget(String baseUrl) { return RestClientUtil.get().target(StringUtils.stripEnd(baseUrl, "/") + "/manifest.json"); } -} \ No newline at end of file +} diff --git a/auth-connector/src/test/java/com/sequenceiq/cloudbreak/auth/altus/service/RoleCrnGeneratorTest.java b/auth-connector/src/test/java/com/sequenceiq/cloudbreak/auth/altus/service/RoleCrnGeneratorTest.java index 3e89858d878..8747f29a394 100644 --- a/auth-connector/src/test/java/com/sequenceiq/cloudbreak/auth/altus/service/RoleCrnGeneratorTest.java +++ b/auth-connector/src/test/java/com/sequenceiq/cloudbreak/auth/altus/service/RoleCrnGeneratorTest.java @@ -8,7 +8,7 @@ import java.util.Set; -import javax.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.InternalServerErrorException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -68,4 +68,4 @@ private void existingRoleAssertions(Crn testRole1, Crn testRole2, Crn.ResourceTy assertEquals(ACCOUNT_ID, testRole2.getAccountId()); assertEquals(roleType, testRole2.getResourceType()); } -} \ No newline at end of file +} diff --git a/auth-distributor-connector/src/main/java/com/sequenceiq/cloudbreak/authdistributor/GrpcAuthDistributorClient.java b/auth-distributor-connector/src/main/java/com/sequenceiq/cloudbreak/authdistributor/GrpcAuthDistributorClient.java index c72f3d3bcbf..c0b515c4c3e 100644 --- a/auth-distributor-connector/src/main/java/com/sequenceiq/cloudbreak/authdistributor/GrpcAuthDistributorClient.java +++ b/auth-distributor-connector/src/main/java/com/sequenceiq/cloudbreak/authdistributor/GrpcAuthDistributorClient.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/auth-internal-api/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/AccountId.java b/auth-internal-api/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/AccountId.java index c5db9d057f3..59c95d1bd9d 100644 --- a/auth-internal-api/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/AccountId.java +++ b/auth-internal-api/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/AccountId.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Constraint(validatedBy = AccountIdValidator.class) diff --git a/auth-internal-api/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/AccountIdValidator.java b/auth-internal-api/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/AccountIdValidator.java index 445ec0566d9..a69d4d31f9d 100644 --- a/auth-internal-api/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/AccountIdValidator.java +++ b/auth-internal-api/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/AccountIdValidator.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.auth.security.internal; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; diff --git a/auth-internal/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/InternalApiAspects.java b/auth-internal/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/InternalApiAspects.java index 9eac677556c..7c318ee1046 100644 --- a/auth-internal/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/InternalApiAspects.java +++ b/auth-internal/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/InternalApiAspects.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.auth.security.internal; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/auth-internal/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/InternalCrnModifier.java b/auth-internal/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/InternalCrnModifier.java index cfa43199ce3..3cd77824ae7 100644 --- a/auth-internal/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/InternalCrnModifier.java +++ b/auth-internal/src/main/java/com/sequenceiq/cloudbreak/auth/security/internal/InternalCrnModifier.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.beanutils.PropertyUtils; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/AuthorizationInfoEndpoint.java b/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/AuthorizationInfoEndpoint.java index 860bcea31ea..cd1b63ef960 100644 --- a/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/AuthorizationInfoEndpoint.java +++ b/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/AuthorizationInfoEndpoint.java @@ -2,11 +2,11 @@ import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.authorization.info.model.ApiAuthorizationInfo; diff --git a/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/AuthorizationUtilEndpoint.java b/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/AuthorizationUtilEndpoint.java index d5799ff31cc..efb7ad48cb6 100644 --- a/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/AuthorizationUtilEndpoint.java +++ b/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/AuthorizationUtilEndpoint.java @@ -1,10 +1,10 @@ package com.sequenceiq.authorization.info; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.authorization.info.model.CheckResourceRightsV4Request; import com.sequenceiq.authorization.info.model.CheckResourceRightsV4Response; diff --git a/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/CheckResourceRightsV4Request.java b/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/CheckResourceRightsV4Request.java index 15c2e7f7edd..8cb382b2bbb 100644 --- a/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/CheckResourceRightsV4Request.java +++ b/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/CheckResourceRightsV4Request.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/CheckRightOnResourcesV4Request.java b/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/CheckRightOnResourcesV4Request.java index 73f4b139ed3..faba94060b1 100644 --- a/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/CheckRightOnResourcesV4Request.java +++ b/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/CheckRightOnResourcesV4Request.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/CheckRightV4Request.java b/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/CheckRightV4Request.java index 00b10d5a218..2e15e3d638b 100644 --- a/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/CheckRightV4Request.java +++ b/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/CheckRightV4Request.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/ResourceRightsV4.java b/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/ResourceRightsV4.java index 685c0fbc67e..e053e2688cc 100644 --- a/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/ResourceRightsV4.java +++ b/authorization-common-api/src/main/java/com/sequenceiq/authorization/info/model/ResourceRightsV4.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/authorization-common-api/src/main/java/com/sequenceiq/authorization/resource/AuthorizationResourceAction.java b/authorization-common-api/src/main/java/com/sequenceiq/authorization/resource/AuthorizationResourceAction.java index 3711d5646b9..265f1fdf0ab 100644 --- a/authorization-common-api/src/main/java/com/sequenceiq/authorization/resource/AuthorizationResourceAction.java +++ b/authorization-common-api/src/main/java/com/sequenceiq/authorization/resource/AuthorizationResourceAction.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; public enum AuthorizationResourceAction { CHANGE_CREDENTIAL("environments/changeCredential", AuthorizationResourceType.ENVIRONMENT), diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/aspect/CheckPermissionsAspects.java b/authorization-common/src/main/java/com/sequenceiq/authorization/aspect/CheckPermissionsAspects.java index e7ab35f56bf..fbc21dfcaab 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/aspect/CheckPermissionsAspects.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/aspect/CheckPermissionsAspects.java @@ -1,6 +1,6 @@ package com.sequenceiq.authorization.aspect; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/config/AuthorizationConfig.java b/authorization-common/src/main/java/com/sequenceiq/authorization/config/AuthorizationConfig.java index 7bb677d8004..44e96c9c05c 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/config/AuthorizationConfig.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/config/AuthorizationConfig.java @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/controller/AuthorizationInfoController.java b/authorization-common/src/main/java/com/sequenceiq/authorization/controller/AuthorizationInfoController.java index 3950ff53890..b6a9c629e4f 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/controller/AuthorizationInfoController.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/controller/AuthorizationInfoController.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Controller; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/controller/AuthorizationUtilController.java b/authorization-common/src/main/java/com/sequenceiq/authorization/controller/AuthorizationUtilController.java index e1be7e630b0..4d99c4606e1 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/controller/AuthorizationUtilController.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/controller/AuthorizationUtilController.java @@ -1,6 +1,6 @@ package com.sequenceiq.authorization.controller; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Controller; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/AccountAuthorizationService.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/AccountAuthorizationService.java index ff130e7da63..d6b4642ad3e 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/AccountAuthorizationService.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/AccountAuthorizationService.java @@ -1,6 +1,6 @@ package com.sequenceiq.authorization.service; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/CommonPermissionCheckingUtils.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/CommonPermissionCheckingUtils.java index 29bb2c110cf..5bc84767093 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/CommonPermissionCheckingUtils.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/CommonPermissionCheckingUtils.java @@ -11,7 +11,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/CompositeRequestPropertyAuthorizationFactory.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/CompositeRequestPropertyAuthorizationFactory.java index 2849a3c73fb..1165dc2a5cb 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/CompositeRequestPropertyAuthorizationFactory.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/CompositeRequestPropertyAuthorizationFactory.java @@ -7,7 +7,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/DefaultResourceAuthorizationProvider.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/DefaultResourceAuthorizationProvider.java index 104396f3210..b6bc9667d5c 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/DefaultResourceAuthorizationProvider.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/DefaultResourceAuthorizationProvider.java @@ -7,7 +7,7 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/EnvironmentBasedAuthorizationProvider.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/EnvironmentBasedAuthorizationProvider.java index 69e8dc3f2f0..8fec1f228d5 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/EnvironmentBasedAuthorizationProvider.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/EnvironmentBasedAuthorizationProvider.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.MapUtils; import org.slf4j.Logger; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/OwnerAssignmentService.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/OwnerAssignmentService.java index d87bdfb1afe..2a736b1510d 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/OwnerAssignmentService.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/OwnerAssignmentService.java @@ -1,6 +1,6 @@ package com.sequenceiq.authorization.service; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/PermissionCheckService.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/PermissionCheckService.java index 2b8523f3cfd..60946fb3069 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/PermissionCheckService.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/PermissionCheckService.java @@ -5,7 +5,7 @@ import java.lang.annotation.Annotation; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/RequestPropertyAuthorizationFactory.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/RequestPropertyAuthorizationFactory.java index 24f93c6e367..9100d611a8f 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/RequestPropertyAuthorizationFactory.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/RequestPropertyAuthorizationFactory.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.beanutils.NestedNullException; import org.apache.commons.beanutils.PropertyUtils; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceAuthorizationService.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceAuthorizationService.java index 98084d17379..ecd06b68f62 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceAuthorizationService.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceAuthorizationService.java @@ -13,7 +13,7 @@ import java.util.Set; import java.util.function.Function; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceCrnAthorizationFactory.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceCrnAthorizationFactory.java index a82966a90c9..34c0e4384c0 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceCrnAthorizationFactory.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceCrnAthorizationFactory.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceCrnListAuthorizationFactory.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceCrnListAuthorizationFactory.java index 2c760ddf8de..8cea213e657 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceCrnListAuthorizationFactory.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceCrnListAuthorizationFactory.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceNameAuthorizationFactory.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceNameAuthorizationFactory.java index b325f6b0c53..49abff76882 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceNameAuthorizationFactory.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceNameAuthorizationFactory.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceNameFactoryService.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceNameFactoryService.java index 07327a4ce75..ad902a73e57 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceNameFactoryService.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceNameFactoryService.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceNameListAuthorizationFactory.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceNameListAuthorizationFactory.java index fc7a2a98d96..91227a965ee 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceNameListAuthorizationFactory.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/ResourceNameListAuthorizationFactory.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/UmsAccountAuthorizationService.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/UmsAccountAuthorizationService.java index f14891e986c..9413d3eae0c 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/UmsAccountAuthorizationService.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/UmsAccountAuthorizationService.java @@ -1,6 +1,6 @@ package com.sequenceiq.authorization.service; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/UmsResourceAuthorizationService.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/UmsResourceAuthorizationService.java index 9b74c56c96d..73603905068 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/UmsResourceAuthorizationService.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/UmsResourceAuthorizationService.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/UtilAuthorizationService.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/UtilAuthorizationService.java index 7f8f1161bc5..c86f5871e2a 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/UtilAuthorizationService.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/UtilAuthorizationService.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/info/ApiPermissionInfoGenerator.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/info/ApiPermissionInfoGenerator.java index 3dfbabcab04..cb2c053aa68 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/info/ApiPermissionInfoGenerator.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/info/ApiPermissionInfoGenerator.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/list/AbstractAuthorizationFiltering.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/list/AbstractAuthorizationFiltering.java index 16da27fbcae..e59f425e6b6 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/list/AbstractAuthorizationFiltering.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/list/AbstractAuthorizationFiltering.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.sequenceiq.authorization.resource.AuthorizationResourceAction; import com.sequenceiq.cloudbreak.auth.altus.EntitlementService; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/service/list/ResourceFilteringService.java b/authorization-common/src/main/java/com/sequenceiq/authorization/service/list/ResourceFilteringService.java index daf0cfda2f9..a5ef387dafe 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/service/list/ResourceFilteringService.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/service/list/ResourceFilteringService.java @@ -11,7 +11,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; diff --git a/authorization-common/src/main/java/com/sequenceiq/authorization/utils/AuthorizationMessageUtilsService.java b/authorization-common/src/main/java/com/sequenceiq/authorization/utils/AuthorizationMessageUtilsService.java index 8fef8a28405..5a301324315 100644 --- a/authorization-common/src/main/java/com/sequenceiq/authorization/utils/AuthorizationMessageUtilsService.java +++ b/authorization-common/src/main/java/com/sequenceiq/authorization/utils/AuthorizationMessageUtilsService.java @@ -6,7 +6,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/authorization-common/src/test/java/com/sequenceiq/authorization/EnforceAuthorizationAnnotationTestUtil.java b/authorization-common/src/test/java/com/sequenceiq/authorization/EnforceAuthorizationAnnotationTestUtil.java index e31348d5e7d..0b9638993f1 100644 --- a/authorization-common/src/test/java/com/sequenceiq/authorization/EnforceAuthorizationAnnotationTestUtil.java +++ b/authorization-common/src/test/java/com/sequenceiq/authorization/EnforceAuthorizationAnnotationTestUtil.java @@ -20,7 +20,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang3.reflect.FieldUtils; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/DistroXAutoScaleClusterV1Endpoint.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/DistroXAutoScaleClusterV1Endpoint.java index 28879d9fa3e..b11799fda0a 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/DistroXAutoScaleClusterV1Endpoint.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/DistroXAutoScaleClusterV1Endpoint.java @@ -4,15 +4,15 @@ import java.util.List; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.periscope.api.endpoint.validator.ValidDistroXAutoscaleRequest; import com.sequenceiq.periscope.api.model.AutoscaleClusterState; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/DistroXAutoScaleScalingActivityV1Endpoint.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/DistroXAutoScaleScalingActivityV1Endpoint.java index 94751e943e5..caa37ab5f14 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/DistroXAutoScaleScalingActivityV1Endpoint.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/DistroXAutoScaleScalingActivityV1Endpoint.java @@ -2,14 +2,14 @@ import static com.sequenceiq.periscope.doc.ApiDescription.SCALING_ACTIVITY_DESCRIPTION; -import javax.validation.constraints.NotNull; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.springframework.data.domain.Page; import org.springframework.validation.annotation.Validated; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/DistroXAutoScaleYarnRecommendationV1Endpoint.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/DistroXAutoScaleYarnRecommendationV1Endpoint.java index 1d4b22eaf05..6da3a04ad48 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/DistroXAutoScaleYarnRecommendationV1Endpoint.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/DistroXAutoScaleYarnRecommendationV1Endpoint.java @@ -1,11 +1,11 @@ package com.sequenceiq.periscope.api.endpoint.v1; -import javax.validation.constraints.NotNull; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.springframework.validation.annotation.Validated; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/HistoryEndpoint.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/HistoryEndpoint.java index c73c5001c57..7fa35e79e4f 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/HistoryEndpoint.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v1/HistoryEndpoint.java @@ -4,16 +4,16 @@ import java.util.List; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.periscope.api.model.AutoscaleClusterHistoryResponse; import com.sequenceiq.periscope.doc.ApiDescription.HistoryNotes; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v2/AutoScaleClusterV2Endpoint.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v2/AutoScaleClusterV2Endpoint.java index 9cee29b4f12..0acee51c282 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v2/AutoScaleClusterV2Endpoint.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/v2/AutoScaleClusterV2Endpoint.java @@ -2,14 +2,14 @@ import static com.sequenceiq.periscope.doc.ApiDescription.CLUSTERS_DESCRIPTION; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.periscope.api.model.AutoscaleClusterResponse; import com.sequenceiq.periscope.doc.ApiDescription.ClusterNotes; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/DistroXAutoscaleRequestValidator.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/DistroXAutoscaleRequestValidator.java index db4cf22186f..2c8dc7e1b52 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/DistroXAutoscaleRequestValidator.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/DistroXAutoscaleRequestValidator.java @@ -11,9 +11,9 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.sequenceiq.cloudbreak.message.CloudbreakMessagesService; import com.sequenceiq.common.api.util.ValidatorUtil; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/LoadAlertConfigurationRequestValidator.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/LoadAlertConfigurationRequestValidator.java index b8822fd0e31..b15ecc04e20 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/LoadAlertConfigurationRequestValidator.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/LoadAlertConfigurationRequestValidator.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.api.endpoint.validator; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.sequenceiq.common.api.util.ValidatorUtil; import com.sequenceiq.periscope.api.model.LoadAlertConfigurationRequest; @@ -25,4 +25,4 @@ public boolean isValid(LoadAlertConfigurationRequest request, ConstraintValidato return validRequest; } -} \ No newline at end of file +} diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ScalingConfigurationRequestValidator.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ScalingConfigurationRequestValidator.java index 7962f8d32a8..f0523e6a28c 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ScalingConfigurationRequestValidator.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ScalingConfigurationRequestValidator.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.api.endpoint.validator; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.sequenceiq.common.api.util.ValidatorUtil; import com.sequenceiq.periscope.api.model.ScalingConfigurationRequest; @@ -35,4 +35,4 @@ public boolean isValid(ScalingConfigurationRequest request, ConstraintValidatorC return validRequest; } -} \ No newline at end of file +} diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ScalingPolicyRequestValidator.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ScalingPolicyRequestValidator.java index 7b7fdae55e5..28a1c19d29d 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ScalingPolicyRequestValidator.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ScalingPolicyRequestValidator.java @@ -1,8 +1,8 @@ package com.sequenceiq.periscope.api.endpoint.validator; -import javax.inject.Inject; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.sequenceiq.cloudbreak.common.ScalingHardLimitsService; import com.sequenceiq.common.api.util.ValidatorUtil; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidDistroXAutoscaleRequest.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidDistroXAutoscaleRequest.java index b1d29ca1173..720c8acb0d5 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidDistroXAutoscaleRequest.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidDistroXAutoscaleRequest.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Constraint(validatedBy = DistroXAutoscaleRequestValidator.class) diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidLoadAlertConfiguration.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidLoadAlertConfiguration.java index 6730b7ac9b0..59105d44d8d 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidLoadAlertConfiguration.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidLoadAlertConfiguration.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Constraint(validatedBy = LoadAlertConfigurationRequestValidator.class) diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidScalingConfiguration.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidScalingConfiguration.java index 7db339bea84..ace0093f33a 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidScalingConfiguration.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidScalingConfiguration.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Constraint(validatedBy = ScalingConfigurationRequestValidator.class) diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidScalingPolicy.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidScalingPolicy.java index e5a7c514b89..87c527859a0 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidScalingPolicy.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/endpoint/validator/ValidScalingPolicy.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Constraint(validatedBy = ScalingPolicyRequestValidator.class) diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/AbstractAlertJson.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/AbstractAlertJson.java index fc2451d10f2..5582838eae6 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/AbstractAlertJson.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/AbstractAlertJson.java @@ -1,8 +1,8 @@ package com.sequenceiq.periscope.api.model; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.sequenceiq.periscope.doc.ApiDescription.BaseAlertJsonProperties; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/AutoscaleClusterRequest.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/AutoscaleClusterRequest.java index ae91859651b..b60f1f432af 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/AutoscaleClusterRequest.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/AutoscaleClusterRequest.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.periscope.doc.ApiDescription.ClusterJsonsProperties; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/ClusterBaseJson.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/ClusterBaseJson.java index a6b5f95f4d9..c2c65f04644 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/ClusterBaseJson.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/ClusterBaseJson.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.api.model; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.periscope.doc.ApiDescription.ClusterJsonsProperties; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/DistroXAutoscaleClusterRequest.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/DistroXAutoscaleClusterRequest.java index ec1505eb030..2e6750ec6c5 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/DistroXAutoscaleClusterRequest.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/DistroXAutoscaleClusterRequest.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.periscope.doc.ApiDescription.ClusterJsonsProperties; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/LoadAlertConfigurationRequest.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/LoadAlertConfigurationRequest.java index dfd89234961..5b167e21559 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/LoadAlertConfigurationRequest.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/LoadAlertConfigurationRequest.java @@ -1,10 +1,10 @@ package com.sequenceiq.periscope.api.model; -import javax.validation.Valid; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.periscope.api.endpoint.validator.ValidLoadAlertConfiguration; import com.sequenceiq.periscope.doc.ApiDescription.LoadAlertJsonProperties; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/LoadAlertRequest.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/LoadAlertRequest.java index acde0ed5b2f..f19503558f2 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/LoadAlertRequest.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/LoadAlertRequest.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.api.model; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.periscope.doc.ApiDescription.BaseAlertJsonProperties; import com.sequenceiq.periscope.doc.ApiDescription.LoadAlertJsonProperties; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/ScalingConfigurationRequest.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/ScalingConfigurationRequest.java index a4445f02553..99eaa48d818 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/ScalingConfigurationRequest.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/ScalingConfigurationRequest.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.api.model; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonProperty; import com.sequenceiq.periscope.api.endpoint.validator.ValidScalingConfiguration; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/ScalingPolicyBase.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/ScalingPolicyBase.java index ea159c4e7aa..d618b574c8a 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/ScalingPolicyBase.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/ScalingPolicyBase.java @@ -1,9 +1,9 @@ package com.sequenceiq.periscope.api.model; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.sequenceiq.periscope.api.endpoint.validator.ValidScalingPolicy; import com.sequenceiq.periscope.doc.ApiDescription.ScalingPolicyJsonProperties; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/TimeAlertRequest.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/TimeAlertRequest.java index b34215a62cc..2c5d7edf023 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/TimeAlertRequest.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/TimeAlertRequest.java @@ -1,9 +1,9 @@ package com.sequenceiq.periscope.api.model; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import com.sequenceiq.periscope.doc.ApiDescription.BaseAlertJsonProperties; import com.sequenceiq.periscope.doc.ApiDescription.TimeAlertJsonProperties; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/TimeAlertValidationRequest.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/TimeAlertValidationRequest.java index 1e66d4be880..d0c795eb4c2 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/TimeAlertValidationRequest.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/api/model/TimeAlertValidationRequest.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.api.model; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.periscope.doc.ApiDescription.TimeAlertJsonProperties; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/client/AutoscaleUserCrnClient.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/client/AutoscaleUserCrnClient.java index 64bc0a202b2..6680d95121f 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/client/AutoscaleUserCrnClient.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/client/AutoscaleUserCrnClient.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.client; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale-api/src/main/java/com/sequenceiq/periscope/client/internal/AutoscaleApiClientConfig.java b/autoscale-api/src/main/java/com/sequenceiq/periscope/client/internal/AutoscaleApiClientConfig.java index 600330a45b7..a9122b5ba44 100644 --- a/autoscale-api/src/main/java/com/sequenceiq/periscope/client/internal/AutoscaleApiClientConfig.java +++ b/autoscale-api/src/main/java/com/sequenceiq/periscope/client/internal/AutoscaleApiClientConfig.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.client.internal; -import javax.inject.Inject; -import javax.ws.rs.client.WebTarget; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.WebTarget; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.context.annotation.Bean; diff --git a/autoscale-api/src/test/java/com/sequenceiq/periscope/api/endpoint/validator/DistroXAutoscaleRequestValidatorTest.java b/autoscale-api/src/test/java/com/sequenceiq/periscope/api/endpoint/validator/DistroXAutoscaleRequestValidatorTest.java index 8bdb0fdf0cf..1b38d0a5726 100644 --- a/autoscale-api/src/test/java/com/sequenceiq/periscope/api/endpoint/validator/DistroXAutoscaleRequestValidatorTest.java +++ b/autoscale-api/src/test/java/com/sequenceiq/periscope/api/endpoint/validator/DistroXAutoscaleRequestValidatorTest.java @@ -11,9 +11,9 @@ import java.util.List; import java.util.Optional; -import javax.validation.ConstraintValidatorContext; -import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder; -import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder; +import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/config/AppConfig.java b/autoscale/src/main/java/com/sequenceiq/periscope/config/AppConfig.java index f99be11fa32..ed83c3bcf56 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/config/AppConfig.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/config/AppConfig.java @@ -2,8 +2,8 @@ import java.util.concurrent.Executor; -import javax.inject.Inject; -import javax.ws.rs.client.Client; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.Client; import org.quartz.simpl.SimpleJobFactory; import org.slf4j.Logger; @@ -114,4 +114,4 @@ public Executor getAsyncExecutor() { public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { return new SimpleAsyncUncaughtExceptionHandler(); } -} \ No newline at end of file +} diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/config/CachingConfig.java b/autoscale/src/main/java/com/sequenceiq/periscope/config/CachingConfig.java index 5a8341636f4..742b1658894 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/config/CachingConfig.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/config/CachingConfig.java @@ -7,8 +7,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; @@ -87,4 +87,4 @@ public Object generate(Object target, Method method, Object... params) { } } -} \ No newline at end of file +} diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/config/DatabaseConfig.java b/autoscale/src/main/java/com/sequenceiq/periscope/config/DatabaseConfig.java index 0976453d5dd..cb6f92de61c 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/config/DatabaseConfig.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/config/DatabaseConfig.java @@ -5,9 +5,9 @@ import java.sql.SQLException; -import javax.inject.Inject; -import javax.inject.Named; -import javax.persistence.EntityManagerFactory; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.persistence.EntityManagerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -24,7 +24,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import com.sequenceiq.cloudbreak.common.database.BatchProperties; -import com.sequenceiq.cloudbreak.common.database.JpaPropertiesFacory; +import com.sequenceiq.cloudbreak.common.database.JpaPropertiesFactory; import com.sequenceiq.cloudbreak.common.tx.CircuitBreakerType; import com.sequenceiq.cloudbreak.database.MultiDataSourceConfig; import com.sequenceiq.cloudbreak.util.DatabaseUtil; @@ -127,7 +127,7 @@ public EntityManagerFactory entityManagerFactory() throws SQLException { entityManagerFactory.setDataSource(dataSource()); entityManagerFactory.setJpaVendorAdapter(jpaVendorAdapter()); - entityManagerFactory.setJpaProperties(JpaPropertiesFacory.create(hbm2ddlStrategy, debug, dbSchemaName, circuitBreakerType, createBatchProperties(), + entityManagerFactory.setJpaProperties(JpaPropertiesFactory.create(hbm2ddlStrategy, debug, dbSchemaName, circuitBreakerType, createBatchProperties(), enableTransactionInterceptor)); entityManagerFactory.afterPropertiesSet(); return entityManagerFactory.getObject(); diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/config/EndpointConfig.java b/autoscale/src/main/java/com/sequenceiq/periscope/config/EndpointConfig.java index 5850d083502..161c4449501 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/config/EndpointConfig.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/config/EndpointConfig.java @@ -4,9 +4,9 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.ApplicationPath; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.ApplicationPath; import org.glassfish.jersey.server.ResourceConfig; import org.springframework.beans.factory.annotation.Value; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/config/PeriscopeExecutorServiceConfiguration.java b/autoscale/src/main/java/com/sequenceiq/periscope/config/PeriscopeExecutorServiceConfiguration.java index f40fa37ef11..147272c7f4a 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/config/PeriscopeExecutorServiceConfiguration.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/config/PeriscopeExecutorServiceConfiguration.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.config; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/controller/AutoScaleClusterCommonService.java b/autoscale/src/main/java/com/sequenceiq/periscope/controller/AutoScaleClusterCommonService.java index 06a86d3d4cf..75f9c8b8f8e 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/controller/AutoScaleClusterCommonService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/controller/AutoScaleClusterCommonService.java @@ -11,7 +11,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/controller/AutoScaleClusterV2Controller.java b/autoscale/src/main/java/com/sequenceiq/periscope/controller/AutoScaleClusterV2Controller.java index 27394f49a5e..2568eb6eaee 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/controller/AutoScaleClusterV2Controller.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/controller/AutoScaleClusterV2Controller.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.controller; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/controller/DistroXAutoScaleClusterV1Controller.java b/autoscale/src/main/java/com/sequenceiq/periscope/controller/DistroXAutoScaleClusterV1Controller.java index 972b6565521..5fc22a09010 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/controller/DistroXAutoScaleClusterV1Controller.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/controller/DistroXAutoScaleClusterV1Controller.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/controller/DistroXAutoScaleScalingActivityV1Controller.java b/autoscale/src/main/java/com/sequenceiq/periscope/controller/DistroXAutoScaleScalingActivityV1Controller.java index fd51f0f8f72..4618c564d0f 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/controller/DistroXAutoScaleScalingActivityV1Controller.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/controller/DistroXAutoScaleScalingActivityV1Controller.java @@ -4,7 +4,7 @@ import java.time.Instant; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -153,4 +153,4 @@ public Page getScalingActivitiesBetween startTimeFromInEpochMilliSec, startTimeUntilInEpochMilliSec, pageable); return scalingActivityPage.map(distroXAutoscaleScalingActivityResponseConverter::convert); } -} \ No newline at end of file +} diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/controller/DistroXAutoScaleYarnRecommendationV1Controller.java b/autoscale/src/main/java/com/sequenceiq/periscope/controller/DistroXAutoScaleYarnRecommendationV1Controller.java index 5a89ecbb591..d1ffad34750 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/controller/DistroXAutoScaleYarnRecommendationV1Controller.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/controller/DistroXAutoScaleYarnRecommendationV1Controller.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Controller; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/controller/HistoryController.java b/autoscale/src/main/java/com/sequenceiq/periscope/controller/HistoryController.java index fb85531c2cc..130c4514aed 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/controller/HistoryController.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/controller/HistoryController.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Controller; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/AccessDeniedExceptionMapper.java b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/AccessDeniedExceptionMapper.java index e56a914aea0..55f74cadb6a 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/AccessDeniedExceptionMapper.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/AccessDeniedExceptionMapper.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.controller.mapper; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.Provider; import org.springframework.security.access.AccessDeniedException; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/BadRequestExceptionMapper.java b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/BadRequestExceptionMapper.java index c9428f32ddc..20818f02583 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/BadRequestExceptionMapper.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/BadRequestExceptionMapper.java @@ -1,8 +1,8 @@ package com.sequenceiq.periscope.controller.mapper; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.Provider; @Provider public class BadRequestExceptionMapper extends BaseExceptionMapper { @@ -11,4 +11,4 @@ public class BadRequestExceptionMapper extends BaseExceptionMapper { diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/ConversionExceptionMapper.java b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/ConversionExceptionMapper.java index f08d823c4b2..6c925d3b96a 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/ConversionExceptionMapper.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/ConversionExceptionMapper.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.controller.mapper; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.Provider; import com.sequenceiq.cloudbreak.converter.ConversionException; @@ -12,4 +12,4 @@ public class ConversionExceptionMapper extends BaseExceptionMapper { diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/RuntimeExceptionMapper.java b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/RuntimeExceptionMapper.java index 817986b18ac..e0e925877c1 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/RuntimeExceptionMapper.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/RuntimeExceptionMapper.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.controller.mapper; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.Provider; import com.sequenceiq.cloudbreak.common.exception.ExceptionResponse; @@ -17,4 +17,4 @@ protected Object getEntity(RuntimeException exception) { Status getResponseStatus() { return Status.INTERNAL_SERVER_ERROR; } -} \ No newline at end of file +} diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/SpringAccessDeniedExceptionMapper.java b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/SpringAccessDeniedExceptionMapper.java index 1015f47a894..e81e5c1003c 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/SpringAccessDeniedExceptionMapper.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/SpringAccessDeniedExceptionMapper.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.controller.mapper; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.Provider; import org.springframework.security.access.AccessDeniedException; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/TypeMismatchExceptionMapper.java b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/TypeMismatchExceptionMapper.java index 8104bbf4184..bc6132579d9 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/TypeMismatchExceptionMapper.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/TypeMismatchExceptionMapper.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.controller.mapper; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.Provider; import org.springframework.beans.TypeMismatchException; @@ -12,4 +12,4 @@ public class TypeMismatchExceptionMapper extends BaseExceptionMapper { @@ -10,4 +10,4 @@ public class UnsupportedOperationFailedExceptionMapper extends BaseExceptionMapp Status getResponseStatus() { return Status.BAD_REQUEST; } -} \ No newline at end of file +} diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/WebApplicaitonExceptionMapper.java b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/WebApplicaitonExceptionMapper.java index 334b2916cb5..64b1f8b594a 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/WebApplicaitonExceptionMapper.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/controller/mapper/WebApplicaitonExceptionMapper.java @@ -1,11 +1,11 @@ package com.sequenceiq.periscope.controller.mapper; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/converter/ClusterConverter.java b/autoscale/src/main/java/com/sequenceiq/periscope/converter/ClusterConverter.java index 4b1d76084e0..7d55e87bc65 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/converter/ClusterConverter.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/converter/ClusterConverter.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/converter/DistroXAutoscaleClusterResponseConverter.java b/autoscale/src/main/java/com/sequenceiq/periscope/converter/DistroXAutoscaleClusterResponseConverter.java index 84ffd3bfe29..3534739fc08 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/converter/DistroXAutoscaleClusterResponseConverter.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/converter/DistroXAutoscaleClusterResponseConverter.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/converter/LoadAlertRequestConverter.java b/autoscale/src/main/java/com/sequenceiq/periscope/converter/LoadAlertRequestConverter.java index 2d5b6ee0d60..6c8dfdff5c5 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/converter/LoadAlertRequestConverter.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/converter/LoadAlertRequestConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.converter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/converter/LoadAlertResponseConverter.java b/autoscale/src/main/java/com/sequenceiq/periscope/converter/LoadAlertResponseConverter.java index 6fd4beccdf3..033347f5fab 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/converter/LoadAlertResponseConverter.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/converter/LoadAlertResponseConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.converter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/converter/TimeAlertRequestConverter.java b/autoscale/src/main/java/com/sequenceiq/periscope/converter/TimeAlertRequestConverter.java index 978d5be27fe..9df5b23bd7c 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/converter/TimeAlertRequestConverter.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/converter/TimeAlertRequestConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.converter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/converter/TimeAlertResponseConverter.java b/autoscale/src/main/java/com/sequenceiq/periscope/converter/TimeAlertResponseConverter.java index 0f81c1a9ee3..9caac3f83c6 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/converter/TimeAlertResponseConverter.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/converter/TimeAlertResponseConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.converter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/converter/db/LoadAlertConfigAttributeConverter.java b/autoscale/src/main/java/com/sequenceiq/periscope/converter/db/LoadAlertConfigAttributeConverter.java index 0cd543c4996..26d5c24385e 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/converter/db/LoadAlertConfigAttributeConverter.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/converter/db/LoadAlertConfigAttributeConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.converter.db; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/converter/db/UpdateFailedDetailsConverter.java b/autoscale/src/main/java/com/sequenceiq/periscope/converter/db/UpdateFailedDetailsConverter.java index 60903159f82..5590f942d6c 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/converter/db/UpdateFailedDetailsConverter.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/converter/db/UpdateFailedDetailsConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.converter.db; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/domain/BaseAlert.java b/autoscale/src/main/java/com/sequenceiq/periscope/domain/BaseAlert.java index 7a7a05c74ea..2a331f3fecf 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/domain/BaseAlert.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/domain/BaseAlert.java @@ -2,18 +2,18 @@ import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.periscope.api.model.AlertType; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/domain/ClusterManager.java b/autoscale/src/main/java/com/sequenceiq/periscope/domain/ClusterManager.java index bd8f126495a..b592adac0fa 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/domain/ClusterManager.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/domain/ClusterManager.java @@ -1,12 +1,12 @@ package com.sequenceiq.periscope.domain; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.ClusterManagerVariant; import com.sequenceiq.periscope.converter.ClusterManagerVariantConverter; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/domain/ClusterPertain.java b/autoscale/src/main/java/com/sequenceiq/periscope/domain/ClusterPertain.java index 9677210fce9..8a43df2794a 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/domain/ClusterPertain.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/domain/ClusterPertain.java @@ -1,10 +1,10 @@ package com.sequenceiq.periscope.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; @Entity public class ClusterPertain { diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/domain/PeriscopeJob.java b/autoscale/src/main/java/com/sequenceiq/periscope/domain/PeriscopeJob.java index d30ffe457ed..3651531199a 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/domain/PeriscopeJob.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/domain/PeriscopeJob.java @@ -1,8 +1,8 @@ package com.sequenceiq.periscope.domain; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class PeriscopeJob { diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/domain/PeriscopeNode.java b/autoscale/src/main/java/com/sequenceiq/periscope/domain/PeriscopeNode.java index c66923331d0..4c7dce92bef 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/domain/PeriscopeNode.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/domain/PeriscopeNode.java @@ -2,10 +2,10 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class PeriscopeNode implements Comparable { diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/domain/ScalingActivity.java b/autoscale/src/main/java/com/sequenceiq/periscope/domain/ScalingActivity.java index 54cd5e21509..4fc618cee9b 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/domain/ScalingActivity.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/domain/ScalingActivity.java @@ -2,17 +2,17 @@ import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import com.sequenceiq.periscope.api.model.ActivityStatus; import com.sequenceiq.periscope.converter.db.ActivityStatusAttributeConverter; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/domain/ScalingPolicy.java b/autoscale/src/main/java/com/sequenceiq/periscope/domain/ScalingPolicy.java index e17605368a2..13acb6fc8e9 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/domain/ScalingPolicy.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/domain/ScalingPolicy.java @@ -1,15 +1,15 @@ package com.sequenceiq.periscope.domain; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.periscope.api.model.AdjustmentType; import com.sequenceiq.periscope.converter.AdjustmentTypeConverter; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/domain/SecurityConfig.java b/autoscale/src/main/java/com/sequenceiq/periscope/domain/SecurityConfig.java index e95af008dab..bf800c00bbf 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/domain/SecurityConfig.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/domain/SecurityConfig.java @@ -1,15 +1,15 @@ package com.sequenceiq.periscope.domain; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; @Entity @NamedQueries(@NamedQuery(name = "SecurityConfig.findByClusterId", query = "SELECT s FROM SecurityConfig s WHERE s.cluster.id= :id")) diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/domain/Subscription.java b/autoscale/src/main/java/com/sequenceiq/periscope/domain/Subscription.java index 5e7024d0030..036b9116af5 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/domain/Subscription.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/domain/Subscription.java @@ -1,10 +1,10 @@ package com.sequenceiq.periscope.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; @Entity public class Subscription { diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/filter/AuditFilter.java b/autoscale/src/main/java/com/sequenceiq/periscope/filter/AuditFilter.java index 83722978462..bdb8e01b828 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/filter/AuditFilter.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/filter/AuditFilter.java @@ -8,10 +8,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/filter/CloudbreakUserConfiguratorFilter.java b/autoscale/src/main/java/com/sequenceiq/periscope/filter/CloudbreakUserConfiguratorFilter.java index f6785a76770..cc954ae19d6 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/filter/CloudbreakUserConfiguratorFilter.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/filter/CloudbreakUserConfiguratorFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.filter.OncePerRequestFilter; @@ -35,4 +35,4 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse restRequestThreadLocalService.removeCloudbreakUser(); } } -} \ No newline at end of file +} diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/filter/FilterConfiguration.java b/autoscale/src/main/java/com/sequenceiq/periscope/filter/FilterConfiguration.java index 32cedaba92a..8e1b9df59a2 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/filter/FilterConfiguration.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/filter/FilterConfiguration.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.filter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/init/DefaultSubscriptionService.java b/autoscale/src/main/java/com/sequenceiq/periscope/init/DefaultSubscriptionService.java index 83fba5eb2c5..9763cf98332 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/init/DefaultSubscriptionService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/init/DefaultSubscriptionService.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.init; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/model/json/JsonToString.java b/autoscale/src/main/java/com/sequenceiq/periscope/model/json/JsonToString.java index 5165a1e0342..ef9f8702da5 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/model/json/JsonToString.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/model/json/JsonToString.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.model.json; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; public class JsonToString implements AttributeConverter { @Override diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/MonitorScheduler.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/MonitorScheduler.java index 1cd7c20fafa..475f3002e37 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/MonitorScheduler.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/MonitorScheduler.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.quartz.CronScheduleBuilder; import org.quartz.JobDataMap; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/client/YarnMetricsClient.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/client/YarnMetricsClient.java index fb39f15abab..020164a229e 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/client/YarnMetricsClient.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/client/YarnMetricsClient.java @@ -5,11 +5,11 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.UriBuilder; +import jakarta.inject.Inject; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.UriBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -195,4 +195,4 @@ private InstanceConfig defaultInstanceConfig() { instanceConfig.setMemoryInMb(yarnConfig.getMemoryInMb()); return instanceConfig; } -} \ No newline at end of file +} diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/client/YarnServiceConfigClient.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/client/YarnServiceConfigClient.java index 73ec15f75e6..ae79547932f 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/client/YarnServiceConfigClient.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/client/YarnServiceConfigClient.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Component; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/ClusterStateEvaluator.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/ClusterStateEvaluator.java index e658a972285..a7307d3b0c2 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/ClusterStateEvaluator.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/ClusterStateEvaluator.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.monitor.evaluator; -import javax.annotation.Nonnull; -import javax.inject.Inject; +import jakarta.annotation.Nonnull; +import jakarta.inject.Inject; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/CronTimeEvaluator.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/CronTimeEvaluator.java index 59c6f0dcdca..f3a9329bcc5 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/CronTimeEvaluator.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/CronTimeEvaluator.java @@ -20,8 +20,8 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.inject.Inject; +import jakarta.annotation.Nonnull; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -252,4 +252,4 @@ private String getMachineUserCrnIfApplicable(Cluster cluster) { } return null; } -} \ No newline at end of file +} diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/EvaluatorExecutor.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/EvaluatorExecutor.java index ee0ec41aa90..643e616ecdb 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/EvaluatorExecutor.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/EvaluatorExecutor.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.monitor.evaluator; -import javax.annotation.Nonnull; -import javax.inject.Inject; +import jakarta.annotation.Nonnull; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/cleanup/ActivityCleanupEvaluator.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/cleanup/ActivityCleanupEvaluator.java index 65d458a1517..68fc5cd825d 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/cleanup/ActivityCleanupEvaluator.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/cleanup/ActivityCleanupEvaluator.java @@ -7,8 +7,8 @@ import java.util.Objects; import java.util.Set; -import javax.annotation.Nonnull; -import javax.inject.Inject; +import jakarta.annotation.Nonnull; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/load/YarnLoadEvaluator.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/load/YarnLoadEvaluator.java index cc4cd8621f7..b1106a81260 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/load/YarnLoadEvaluator.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/load/YarnLoadEvaluator.java @@ -5,8 +5,8 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; -import javax.inject.Inject; +import jakarta.annotation.Nonnull; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -181,4 +181,4 @@ private boolean mandatoryAdjustmentRequired(MandatoryScalingAdjustmentParameters return Objects.nonNull(scalingAdjustmentParameters.getUpscaleAdjustment()) || Objects.nonNull(scalingAdjustmentParameters.getDownscaleAdjustment()); } -} \ No newline at end of file +} diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/update/ActivityUpdateEvaluator.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/update/ActivityUpdateEvaluator.java index d40d32a37bc..c2ff29e453a 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/update/ActivityUpdateEvaluator.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/evaluator/update/ActivityUpdateEvaluator.java @@ -19,8 +19,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.Nonnull; -import javax.inject.Inject; +import jakarta.annotation.Nonnull; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/executor/EvaluatorExecutorRegistry.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/executor/EvaluatorExecutorRegistry.java index 944c66c867b..2c5452bf11d 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/executor/EvaluatorExecutorRegistry.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/executor/EvaluatorExecutorRegistry.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/executor/ExecutorServiceWithRegistry.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/executor/ExecutorServiceWithRegistry.java index e1c067a22c9..d0267990628 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/executor/ExecutorServiceWithRegistry.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/executor/ExecutorServiceWithRegistry.java @@ -3,7 +3,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.RejectedExecutionException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/CloudbreakCommunicator.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/CloudbreakCommunicator.java index ca94deb3689..6de35836427 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/CloudbreakCommunicator.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/CloudbreakCommunicator.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ClouderaManagerCommunicator.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ClouderaManagerCommunicator.java index 1c6a222fbf1..bbeafd21ac1 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ClouderaManagerCommunicator.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ClouderaManagerCommunicator.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ClusterDeleteHandler.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ClusterDeleteHandler.java index 5cd994275a7..17bb599931d 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ClusterDeleteHandler.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ClusterDeleteHandler.java @@ -5,7 +5,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ClusterStatusSyncHandler.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ClusterStatusSyncHandler.java index cccb5f66c3c..5b003425bc3 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ClusterStatusSyncHandler.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ClusterStatusSyncHandler.java @@ -8,7 +8,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/FlowCommunicator.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/FlowCommunicator.java index 3c24250f3eb..438a041c071 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/FlowCommunicator.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/FlowCommunicator.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.function.Function; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/FreeIpaCommunicator.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/FreeIpaCommunicator.java index ffa90af0a69..91a1eb830af 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/FreeIpaCommunicator.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/FreeIpaCommunicator.java @@ -3,7 +3,7 @@ import static com.sequenceiq.periscope.domain.MetricType.IPA_USER_SYNC_FAILED; import static com.sequenceiq.periscope.domain.MetricType.IPA_USER_SYNC_INVOCATION; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ScalingHandler.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ScalingHandler.java index 710284d967f..e509b262742 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ScalingHandler.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ScalingHandler.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -76,4 +76,4 @@ public void onApplicationEvent(ScalingEvent event) { } } } -} \ No newline at end of file +} diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ScalingRequest.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ScalingRequest.java index 0b31fbbc8cc..ccafb3a6b36 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ScalingRequest.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/ScalingRequest.java @@ -19,9 +19,9 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/UpdateFailedHandler.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/UpdateFailedHandler.java index 1bdfa596a89..1ae3987f3af 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/UpdateFailedHandler.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/handler/UpdateFailedHandler.java @@ -8,8 +8,8 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; -import javax.inject.Inject; -import javax.ws.rs.ForbiddenException; +import jakarta.inject.Inject; +import jakarta.ws.rs.ForbiddenException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -100,4 +100,4 @@ private void suspendCluster(Cluster cluster) { clusterService.setState(cluster.getId(), ClusterState.SUSPENDED); } } -} \ No newline at end of file +} diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/sender/ScalingEventSender.java b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/sender/ScalingEventSender.java index edf4d6f802e..5ab0918e92a 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/monitor/sender/ScalingEventSender.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/monitor/sender/ScalingEventSender.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/notification/HttpNotificationSender.java b/autoscale/src/main/java/com/sequenceiq/periscope/notification/HttpNotificationSender.java index 2799e1170d4..69d98b5394f 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/notification/HttpNotificationSender.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/notification/HttpNotificationSender.java @@ -2,11 +2,11 @@ import java.time.Instant; -import javax.inject.Inject; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/repository/ClusterPertainRepository.java b/autoscale/src/main/java/com/sequenceiq/periscope/repository/ClusterPertainRepository.java index 6d9bfa609a0..1614f230f49 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/repository/ClusterPertainRepository.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/repository/ClusterPertainRepository.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; @@ -14,4 +14,4 @@ @Transactional(Transactional.TxType.REQUIRED) public interface ClusterPertainRepository extends CrudRepository { Optional findFirstByUserCrn(@Param("userCrn") String userCrn); -} \ No newline at end of file +} diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/repository/HistoryRepository.java b/autoscale/src/main/java/com/sequenceiq/periscope/repository/HistoryRepository.java index f7a9ed9fb03..c7faac6a7e6 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/repository/HistoryRepository.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/repository/HistoryRepository.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.CrudRepository; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/repository/LoadAlertRepository.java b/autoscale/src/main/java/com/sequenceiq/periscope/repository/LoadAlertRepository.java index daab053449d..0d5c8ef2f1d 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/repository/LoadAlertRepository.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/repository/LoadAlertRepository.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.repository; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/repository/PeriscopeJobRepository.java b/autoscale/src/main/java/com/sequenceiq/periscope/repository/PeriscopeJobRepository.java index 8e7ae0c5ac3..da4299694b3 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/repository/PeriscopeJobRepository.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/repository/PeriscopeJobRepository.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.repository; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.repository.CrudRepository; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/repository/PeriscopeNodeRepository.java b/autoscale/src/main/java/com/sequenceiq/periscope/repository/PeriscopeNodeRepository.java index 953dcbf3455..bacb4cbac1e 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/repository/PeriscopeNodeRepository.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/repository/PeriscopeNodeRepository.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/repository/ScalingPolicyRepository.java b/autoscale/src/main/java/com/sequenceiq/periscope/repository/ScalingPolicyRepository.java index 5f5e2734e3c..f2c7908b524 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/repository/ScalingPolicyRepository.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/repository/ScalingPolicyRepository.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/repository/SecurityConfigRepository.java b/autoscale/src/main/java/com/sequenceiq/periscope/repository/SecurityConfigRepository.java index 4584f2514b1..31afaff0703 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/repository/SecurityConfigRepository.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/repository/SecurityConfigRepository.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.repository; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/repository/SubscriptionRepository.java b/autoscale/src/main/java/com/sequenceiq/periscope/repository/SubscriptionRepository.java index 6742936d2f9..e4cc17f8925 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/repository/SubscriptionRepository.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/repository/SubscriptionRepository.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/repository/TimeAlertRepository.java b/autoscale/src/main/java/com/sequenceiq/periscope/repository/TimeAlertRepository.java index 2995c6b93cb..26d4a7ecd79 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/repository/TimeAlertRepository.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/repository/TimeAlertRepository.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/AlertService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/AlertService.java index 1b1a6421b1c..03baf3f2685 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/AlertService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/AlertService.java @@ -3,7 +3,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -172,4 +172,4 @@ public Set getLoadAlerts(Long clusterId) { private String createAlertCrn(String accountId) { return regionAwareCrnGenerator.generateCrnStringWithUuid(CrnResourceDescriptor.ALERT, accountId); } -} \ No newline at end of file +} diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/AltusMachineUserService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/AltusMachineUserService.java index 121cc8c656f..9c675f58dd1 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/AltusMachineUserService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/AltusMachineUserService.java @@ -3,7 +3,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/AuditService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/AuditService.java index daed8af3167..accfdbeed00 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/AuditService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/AuditService.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/AutoscaleRecommendationService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/AutoscaleRecommendationService.java index 9ff9ba8e405..396a157db61 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/AutoscaleRecommendationService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/AutoscaleRecommendationService.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.service; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/CloudbreakVersionService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/CloudbreakVersionService.java index 5ca424e4664..15e4920bd82 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/CloudbreakVersionService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/CloudbreakVersionService.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.service; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/ClusterService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/ClusterService.java index 02c6bc1d0e1..108e4bf55c1 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/ClusterService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/ClusterService.java @@ -13,9 +13,9 @@ import java.util.Set; import java.util.stream.StreamSupport; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/DependentHostGroupsService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/DependentHostGroupsService.java index 6e5fa66592a..18a9cdc9faf 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/DependentHostGroupsService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/DependentHostGroupsService.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/EntitlementValidationService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/EntitlementValidationService.java index 59dc8b42b3b..8bbc23fde95 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/EntitlementValidationService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/EntitlementValidationService.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.Cacheable; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/NodeDeletionService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/NodeDeletionService.java index 0cf72d12bfe..96b7507bb21 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/NodeDeletionService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/NodeDeletionService.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/PeriscopeMetricService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/PeriscopeMetricService.java index be54af7d948..76ca03cdaaf 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/PeriscopeMetricService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/PeriscopeMetricService.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.Set; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/PrometheusAlertTemplateService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/PrometheusAlertTemplateService.java index c2fd5db1672..98eeacccbd0 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/PrometheusAlertTemplateService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/PrometheusAlertTemplateService.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/RegularScalingAdjustmentService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/RegularScalingAdjustmentService.java index be2c4dd5c17..7f83a9f50cb 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/RegularScalingAdjustmentService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/RegularScalingAdjustmentService.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/ScalingActivityService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/ScalingActivityService.java index f1802cf8ed9..948a7d47e62 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/ScalingActivityService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/ScalingActivityService.java @@ -19,7 +19,7 @@ import java.util.Set; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/StopStartScalingAdjustmentService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/StopStartScalingAdjustmentService.java index 3a382bb8401..ea11b9026a5 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/StopStartScalingAdjustmentService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/StopStartScalingAdjustmentService.java @@ -15,7 +15,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/UsageReportingService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/UsageReportingService.java index eb4a3bf4d21..afb88dcc3a6 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/UsageReportingService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/UsageReportingService.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/YarnBasedScalingAdjustmentService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/YarnBasedScalingAdjustmentService.java index 8a1caad99ba..c6ef45b76fd 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/YarnBasedScalingAdjustmentService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/YarnBasedScalingAdjustmentService.java @@ -10,7 +10,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/YarnRecommendationService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/YarnRecommendationService.java index 4fc72fd5656..190a7fcc2f4 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/YarnRecommendationService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/YarnRecommendationService.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/CloudbreakClientConfiguration.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/CloudbreakClientConfiguration.java index b7d82ae4f14..c0938ef1a4a 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/CloudbreakClientConfiguration.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/CloudbreakClientConfiguration.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.service.configuration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/ClusterProxyConfigurationService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/ClusterProxyConfigurationService.java index 022221f9ddc..2298c743dc0 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/ClusterProxyConfigurationService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/ClusterProxyConfigurationService.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/FreeIpaClientConfiguration.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/FreeIpaClientConfiguration.java index c7a04872d1d..2d6338ebcd6 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/FreeIpaClientConfiguration.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/FreeIpaClientConfiguration.java @@ -1,8 +1,8 @@ package com.sequenceiq.periscope.service.configuration; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.client.WebTarget; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.client.WebTarget; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/LimitsConfigurationService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/LimitsConfigurationService.java index 14ddb6adc15..c3c0230ef9a 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/LimitsConfigurationService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/configuration/LimitsConfigurationService.java @@ -3,7 +3,7 @@ import static com.sequenceiq.periscope.cache.LimitsConfigurationCache.LIMITS_CONFIGURATION_CACHE; import static com.sequenceiq.periscope.monitor.evaluator.ScalingConstants.DEFAULT_CLUSTER_MAX_SIZE; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/ha/HeartbeatService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/ha/HeartbeatService.java index e4980e48120..adef300d223 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/ha/HeartbeatService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/ha/HeartbeatService.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.service.ha; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/ha/LeaderElectionService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/ha/LeaderElectionService.java index 47430c26873..e2b0184d6b4 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/ha/LeaderElectionService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/ha/LeaderElectionService.java @@ -14,8 +14,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/ha/PeriscopeNodeService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/ha/PeriscopeNodeService.java index 5a6398e3b9c..8f8af596858 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/ha/PeriscopeNodeService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/ha/PeriscopeNodeService.java @@ -3,7 +3,7 @@ import static com.google.common.base.Strings.isNullOrEmpty; import static java.lang.String.format; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/security/CloudbreakAuthorizationService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/security/CloudbreakAuthorizationService.java index e0a4b299df7..cafbb2760e3 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/security/CloudbreakAuthorizationService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/security/CloudbreakAuthorizationService.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.service.security; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Lazy; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/security/SecurityConfigService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/security/SecurityConfigService.java index 1745dacd759..d223051b4ff 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/security/SecurityConfigService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/security/SecurityConfigService.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/security/TenantBasedPermissionEvaluator.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/security/TenantBasedPermissionEvaluator.java index 02b069b62fc..33b866545e2 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/security/TenantBasedPermissionEvaluator.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/security/TenantBasedPermissionEvaluator.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/security/TlsHttpClientConfigurationService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/security/TlsHttpClientConfigurationService.java index 414700e09a9..dae366ea58b 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/security/TlsHttpClientConfigurationService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/security/TlsHttpClientConfigurationService.java @@ -3,7 +3,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/service/security/TlsSecurityService.java b/autoscale/src/main/java/com/sequenceiq/periscope/service/security/TlsSecurityService.java index 37b6dba29cd..8d9080efae4 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/service/security/TlsSecurityService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/service/security/TlsSecurityService.java @@ -1,7 +1,7 @@ package com.sequenceiq.periscope.service.security; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.bouncycastle.util.encoders.Base64; import org.slf4j.Logger; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/subscription/SubscriptionService.java b/autoscale/src/main/java/com/sequenceiq/periscope/subscription/SubscriptionService.java index 212746f5276..d2eaeec8df0 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/subscription/SubscriptionService.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/subscription/SubscriptionService.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.subscription; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autoscale/src/main/java/com/sequenceiq/periscope/utils/MetricUtils.java b/autoscale/src/main/java/com/sequenceiq/periscope/utils/MetricUtils.java index 25add264d89..43d50609146 100644 --- a/autoscale/src/main/java/com/sequenceiq/periscope/utils/MetricUtils.java +++ b/autoscale/src/main/java/com/sequenceiq/periscope/utils/MetricUtils.java @@ -7,7 +7,7 @@ import java.util.concurrent.ExecutorService; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/component/MetricTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/component/MetricTest.java index c676115738f..1233408e00f 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/component/MetricTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/component/MetricTest.java @@ -23,8 +23,8 @@ import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.persistence.EntityManagerFactory; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; import org.junit.Ignore; import org.junit.Test; @@ -43,7 +43,7 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan.Filter; diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/controller/validation/AlertValidatorTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/controller/validation/AlertValidatorTest.java index 23703f61bd5..865d63d7ee8 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/controller/validation/AlertValidatorTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/controller/validation/AlertValidatorTest.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Set; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; import org.junit.Before; import org.junit.Rule; diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/converter/AdjustmentTypeConverterTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/converter/AdjustmentTypeConverterTest.java index d028ee94088..c069b8102c0 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/converter/AdjustmentTypeConverterTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/converter/AdjustmentTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; import com.sequenceiq.periscope.api.model.AdjustmentType; @@ -16,4 +16,4 @@ public AdjustmentType getDefaultValue() { public AttributeConverter getVictim() { return new AdjustmentTypeConverter(); } -} \ No newline at end of file +} diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/converter/AlertStateConverterTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/converter/AlertStateConverterTest.java index 88974479cea..bc71e531e0c 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/converter/AlertStateConverterTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/converter/AlertStateConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; import com.sequenceiq.periscope.api.model.AlertState; @@ -16,4 +16,4 @@ public AlertState getDefaultValue() { public AttributeConverter getVictim() { return new AlertStateConverter(); } -} \ No newline at end of file +} diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/converter/AlertTypeConverterTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/converter/AlertTypeConverterTest.java index 58c50e067c3..8da4506c86e 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/converter/AlertTypeConverterTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/converter/AlertTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; import com.sequenceiq.periscope.api.model.AlertType; @@ -16,4 +16,4 @@ public AlertType getDefaultValue() { public AttributeConverter getVictim() { return new AlertTypeConverter(); } -} \ No newline at end of file +} diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/converter/ClusterManagerVariantConverterTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/converter/ClusterManagerVariantConverterTest.java index 12863a51a10..78d8f996b43 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/converter/ClusterManagerVariantConverterTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/converter/ClusterManagerVariantConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.ClusterManagerVariant; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public ClusterManagerVariant getDefaultValue() { public AttributeConverter getVictim() { return new ClusterManagerVariantConverter(); } -} \ No newline at end of file +} diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/converter/ClusterStateConverterTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/converter/ClusterStateConverterTest.java index fa126cebf6e..8b8b84d3ddc 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/converter/ClusterStateConverterTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/converter/ClusterStateConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; import com.sequenceiq.periscope.api.model.ClusterState; @@ -16,4 +16,4 @@ public ClusterState getDefaultValue() { public AttributeConverter getVictim() { return new ClusterStateConverter(); } -} \ No newline at end of file +} diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/converter/ScalingStatusConverterTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/converter/ScalingStatusConverterTest.java index 68311697801..3b6777c46a8 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/converter/ScalingStatusConverterTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/converter/ScalingStatusConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.periscope.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; import com.sequenceiq.periscope.api.model.ScalingStatus; @@ -16,4 +16,4 @@ public ScalingStatus getDefaultValue() { public AttributeConverter getVictim() { return new ScalingStatusConverter(); } -} \ No newline at end of file +} diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/endpointtests/DistroXAutoScaleScalingActivityV1EndpointTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/endpointtests/DistroXAutoScaleScalingActivityV1EndpointTest.java index 0083a291bff..566eb44e551 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/endpointtests/DistroXAutoScaleScalingActivityV1EndpointTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/endpointtests/DistroXAutoScaleScalingActivityV1EndpointTest.java @@ -15,8 +15,8 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -24,7 +24,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/filter/AuditFilterTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/filter/AuditFilterTest.java index 58815bfb80e..6b4bcc13414 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/filter/AuditFilterTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/filter/AuditFilterTest.java @@ -12,9 +12,9 @@ import java.util.Arrays; import java.util.Map; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/modul/rejected/RejectedThreadContext.java b/autoscale/src/test/java/com/sequenceiq/periscope/modul/rejected/RejectedThreadContext.java index 63a89d39e3a..8fb45b02398 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/modul/rejected/RejectedThreadContext.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/modul/rejected/RejectedThreadContext.java @@ -3,7 +3,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler; diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/modul/rejected/StackCollectorContext.java b/autoscale/src/test/java/com/sequenceiq/periscope/modul/rejected/StackCollectorContext.java index 26209f91f98..3153e13b26d 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/modul/rejected/StackCollectorContext.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/modul/rejected/StackCollectorContext.java @@ -3,7 +3,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler; diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/monitor/AbstractMonitorTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/monitor/AbstractMonitorTest.java index 1210672c41d..ceaf96611b1 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/monitor/AbstractMonitorTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/monitor/AbstractMonitorTest.java @@ -8,7 +8,7 @@ import java.util.Arrays; import java.util.List; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/monitor/client/YarnMetricsClientTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/monitor/client/YarnMetricsClientTest.java index 62feb686e77..cff82b30e61 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/monitor/client/YarnMetricsClientTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/monitor/client/YarnMetricsClientTest.java @@ -11,7 +11,7 @@ import java.util.Optional; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/monitor/evaluator/EvaluatorExecutorTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/monitor/evaluator/EvaluatorExecutorTest.java index fdeb71192de..946b0568831 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/monitor/evaluator/EvaluatorExecutorTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/monitor/evaluator/EvaluatorExecutorTest.java @@ -5,7 +5,7 @@ import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.verify; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/monitor/handler/UpdateFailedHandlerTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/monitor/handler/UpdateFailedHandlerTest.java index 2f39e63be52..c2c01c4d853 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/monitor/handler/UpdateFailedHandlerTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/monitor/handler/UpdateFailedHandlerTest.java @@ -14,7 +14,7 @@ import java.time.temporal.ChronoUnit; import java.util.stream.IntStream; -import javax.ws.rs.ForbiddenException; +import jakarta.ws.rs.ForbiddenException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/repository/ScalingActivityRepositoryTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/repository/ScalingActivityRepositoryTest.java index c659e0b3019..db0d44b5ddd 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/repository/ScalingActivityRepositoryTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/repository/ScalingActivityRepositoryTest.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -475,4 +475,4 @@ private void saveScalingActivity(Cluster cluster, List activiti underTest.saveAll(activities); } -} \ No newline at end of file +} diff --git a/autoscale/src/test/java/com/sequenceiq/periscope/service/RejectedThreadServiceTest.java b/autoscale/src/test/java/com/sequenceiq/periscope/service/RejectedThreadServiceTest.java index f281e8552f9..a160f76b705 100644 --- a/autoscale/src/test/java/com/sequenceiq/periscope/service/RejectedThreadServiceTest.java +++ b/autoscale/src/test/java/com/sequenceiq/periscope/service/RejectedThreadServiceTest.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/altus/GrpcMinaSshdManagementClient.java b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/altus/GrpcMinaSshdManagementClient.java index 825c7d45f01..28d4b215fae 100644 --- a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/altus/GrpcMinaSshdManagementClient.java +++ b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/altus/GrpcMinaSshdManagementClient.java @@ -9,7 +9,7 @@ import java.util.concurrent.Callable; import java.util.function.Supplier; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/CcmV2Client.java b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/CcmV2Client.java index 7edf772127c..fa341ebd4b1 100644 --- a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/CcmV2Client.java +++ b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/CcmV2Client.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/CcmV2RetryingClient.java b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/CcmV2RetryingClient.java index 9d8001f1206..32e770bd052 100644 --- a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/CcmV2RetryingClient.java +++ b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/CcmV2RetryingClient.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/GrpcCcmV2Client.java b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/GrpcCcmV2Client.java index a6815b46609..dfb1f8ab5f9 100644 --- a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/GrpcCcmV2Client.java +++ b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/GrpcCcmV2Client.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/RetryTemplateFactory.java b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/RetryTemplateFactory.java index e61f9e27fe2..a830fb69186 100644 --- a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/RetryTemplateFactory.java +++ b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/ccmv2/RetryTemplateFactory.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.ccmimpl.ccmv2; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.retry.backoff.FixedBackOffPolicy; import org.springframework.retry.policy.TimeoutRetryPolicy; diff --git a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/cloudinit/DefaultCcmParameterSupplier.java b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/cloudinit/DefaultCcmParameterSupplier.java index 2a80a16f8b8..9c7c3209734 100644 --- a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/cloudinit/DefaultCcmParameterSupplier.java +++ b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/cloudinit/DefaultCcmParameterSupplier.java @@ -6,9 +6,9 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/cloudinit/DefaultCcmV2JumpgateParameterSupplier.java b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/cloudinit/DefaultCcmV2JumpgateParameterSupplier.java index 7683dba2d9f..7ff01989b09 100644 --- a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/cloudinit/DefaultCcmV2JumpgateParameterSupplier.java +++ b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/cloudinit/DefaultCcmV2JumpgateParameterSupplier.java @@ -4,7 +4,7 @@ import java.util.Optional; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/termination/DefaultCcmResourceTerminationListener.java b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/termination/DefaultCcmResourceTerminationListener.java index 6c8457c471e..3721ceecce6 100644 --- a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/termination/DefaultCcmResourceTerminationListener.java +++ b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/termination/DefaultCcmResourceTerminationListener.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.ccmimpl.termination; -import javax.annotation.Nonnull; -import javax.inject.Inject; +import jakarta.annotation.Nonnull; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/termination/DefaultCcmV2AgentTerminationListener.java b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/termination/DefaultCcmV2AgentTerminationListener.java index 0369f145792..bf5d9788572 100644 --- a/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/termination/DefaultCcmV2AgentTerminationListener.java +++ b/ccm-connector/src/main/java/com/sequenceiq/cloudbreak/ccmimpl/termination/DefaultCcmV2AgentTerminationListener.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.ccmimpl.termination; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/client-cm/src/main/java/com/sequenceiq/cloudbreak/cm/client/retry/ClouderaManagerApiFactory.java b/client-cm/src/main/java/com/sequenceiq/cloudbreak/cm/client/retry/ClouderaManagerApiFactory.java index 2641eb489fe..2c9abd05fb7 100644 --- a/client-cm/src/main/java/com/sequenceiq/cloudbreak/cm/client/retry/ClouderaManagerApiFactory.java +++ b/client-cm/src/main/java/com/sequenceiq/cloudbreak/cm/client/retry/ClouderaManagerApiFactory.java @@ -2,7 +2,7 @@ import java.util.function.Function; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/ConsumptionCalculator.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/ConsumptionCalculator.java index 39aaf1dfd34..eecf9212971 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/ConsumptionCalculator.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/ConsumptionCalculator.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.validation.ValidationException; +import jakarta.validation.ValidationException; import com.cloudera.thunderhead.service.metering.events.MeteringEventsProto; import com.sequenceiq.cloudbreak.cloud.model.CloudConsumption; diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/CredentialConnector.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/CredentialConnector.java index 2b7b6e327e9..c5be01f25c4 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/CredentialConnector.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/CredentialConnector.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.sequenceiq.cloudbreak.cloud.context.AuthenticatedContext; import com.sequenceiq.cloudbreak.cloud.context.CloudContext; diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/configuration/PricingConfig.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/configuration/PricingConfig.java index 6cbf7c6c860..8d4ff682f56 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/configuration/PricingConfig.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/configuration/PricingConfig.java @@ -7,7 +7,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/Security.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/Security.java index 3b05f59e73b..69588358ebe 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/Security.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/Security.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/StorageSizeRequest.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/StorageSizeRequest.java index 90b5c11355f..be9bdd00524 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/StorageSizeRequest.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/StorageSizeRequest.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class StorageSizeRequest { diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/nosql/CloudNoSqlTables.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/nosql/CloudNoSqlTables.java index 29f5f949cd0..60c101fba18 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/nosql/CloudNoSqlTables.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/nosql/CloudNoSqlTables.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class CloudNoSqlTables { diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/nosql/NoSqlTableDeleteRequest.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/nosql/NoSqlTableDeleteRequest.java index b6881190536..cee21281e83 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/nosql/NoSqlTableDeleteRequest.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/nosql/NoSqlTableDeleteRequest.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.cloud.model.CloudCredential; import com.sequenceiq.cloudbreak.cloud.model.Platform; diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/nosql/NoSqlTableMetadataRequest.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/nosql/NoSqlTableMetadataRequest.java index e2bd2e4f1c0..a31694e5573 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/nosql/NoSqlTableMetadataRequest.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/nosql/NoSqlTableMetadataRequest.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.cloud.model.CloudCredential; import com.sequenceiq.cloudbreak.cloud.model.Platform; diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ObjectStorageMetadataRequest.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ObjectStorageMetadataRequest.java index cf1869de8d9..9dc284450f5 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ObjectStorageMetadataRequest.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ObjectStorageMetadataRequest.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.cloud.CloudPlatformAware; import com.sequenceiq.cloudbreak.cloud.model.CloudCredential; diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ObjectStoragePathLengthValidator.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ObjectStoragePathLengthValidator.java index ba924144fe3..29468a5e42c 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ObjectStoragePathLengthValidator.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ObjectStoragePathLengthValidator.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.cloud.model.objectstorage; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.Range; diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ObjectStorageValidateRequest.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ObjectStorageValidateRequest.java index 602f44fcdb0..a7aa422e91a 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ObjectStorageValidateRequest.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ObjectStorageValidateRequest.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.cloud.CloudPlatformAware; import com.sequenceiq.cloudbreak.cloud.model.BackupOperationType; diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ValidObjectStoragePathLength.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ValidObjectStoragePathLength.java index b44e0876613..70181c5e5ce 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ValidObjectStoragePathLength.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/objectstorage/ValidObjectStoragePathLength.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Constraint(validatedBy = ObjectStoragePathLengthValidator.class) diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/publickey/PublicKeyDescribeRequest.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/publickey/PublicKeyDescribeRequest.java index 13286a8a291..ed50130ac77 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/publickey/PublicKeyDescribeRequest.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/publickey/PublicKeyDescribeRequest.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.cloud.model.CloudCredential; import com.sequenceiq.cloudbreak.cloud.model.Platform; diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/publickey/PublicKeyRegisterRequest.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/publickey/PublicKeyRegisterRequest.java index 3e9e8fc0d20..8bc7da965f2 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/publickey/PublicKeyRegisterRequest.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/publickey/PublicKeyRegisterRequest.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.cloud.model.CloudCredential; import com.sequenceiq.cloudbreak.cloud.model.Platform; diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/publickey/PublicKeyUnregisterRequest.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/publickey/PublicKeyUnregisterRequest.java index b3a5e380477..e57796d5b49 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/publickey/PublicKeyUnregisterRequest.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/publickey/PublicKeyUnregisterRequest.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.cloud.model.CloudCredential; import com.sequenceiq.cloudbreak.cloud.model.Platform; diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/resourcegroup/CloudResourceGroups.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/resourcegroup/CloudResourceGroups.java index 9e17609e8ba..5d6f1094632 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/resourcegroup/CloudResourceGroups.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/resourcegroup/CloudResourceGroups.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class CloudResourceGroups { diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/common/provider/ProviderPreferencesService.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/common/provider/ProviderPreferencesService.java index 41637c7b84b..502a69cb651 100644 --- a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/common/provider/ProviderPreferencesService.java +++ b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/common/provider/ProviderPreferencesService.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsCloudFormationClient.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsCloudFormationClient.java index 5386e62b83f..470bf9a72a5 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsCloudFormationClient.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsCloudFormationClient.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.aws; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsCloudFormationSetup.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsCloudFormationSetup.java index bb038bd8f0c..7dc78e2e668 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsCloudFormationSetup.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsCloudFormationSetup.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsConnector.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsConnector.java index d677ef76f54..8c04d5c45a1 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsConnector.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsConnector.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsContextService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsContextService.java index 7723047729c..92aa4df9bb0 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsContextService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsContextService.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsImageUpdateService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsImageUpdateService.java index 2b94909ac58..4ca6062153e 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsImageUpdateService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsImageUpdateService.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.NotImplementedException; import org.springframework.stereotype.Service; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsLaunchConfigurationUpdateService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsLaunchConfigurationUpdateService.java index afe3787f091..d2af1c1e4ad 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsLaunchConfigurationUpdateService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsLaunchConfigurationUpdateService.java @@ -5,7 +5,7 @@ import java.util.NoSuchElementException; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsLaunchTemplateUpdateService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsLaunchTemplateUpdateService.java index 227413f0ac5..874f4ff0337 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsLaunchTemplateUpdateService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsLaunchTemplateUpdateService.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsLoadBalancerMetadataCollector.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsLoadBalancerMetadataCollector.java index 84b22c11de0..0ae3425a667 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsLoadBalancerMetadataCollector.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsLoadBalancerMetadataCollector.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsMetadataCollector.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsMetadataCollector.java index c5626d1e77f..99b9beaa1f9 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsMetadataCollector.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsMetadataCollector.java @@ -17,7 +17,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkCfTemplateProvider.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkCfTemplateProvider.java index df9847c7f8f..d8f2d20e6dd 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkCfTemplateProvider.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkCfTemplateProvider.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkConnector.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkConnector.java index 21fae2f6418..57e02dad1c7 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkConnector.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkConnector.java @@ -11,8 +11,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsStackRequestHelper.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsStackRequestHelper.java index 9d7d9733c36..c6d9107d45e 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsStackRequestHelper.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsStackRequestHelper.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Objects; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsStackValidator.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsStackValidator.java index 45514ada1fb..d8ba8c584c0 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsStackValidator.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsStackValidator.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.aws; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,4 +49,4 @@ private void validateStackNameAvailability(AuthenticatedContext ac) { } } } -} \ No newline at end of file +} diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsSyncUserDataService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsSyncUserDataService.java index 97ae81ac9b1..b0cbc38b8ae 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsSyncUserDataService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsSyncUserDataService.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsUserDataService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsUserDataService.java index f256cc46fc8..4b1c75a7899 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsUserDataService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsUserDataService.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/CloudFormationStackUtil.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/CloudFormationStackUtil.java index 4e10ac72394..c90a5336d82 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/CloudFormationStackUtil.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/CloudFormationStackUtil.java @@ -16,7 +16,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Value; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/CloudFormationTemplateBuilder.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/CloudFormationTemplateBuilder.java index dd104104846..a0271ff5ac0 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/CloudFormationTemplateBuilder.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/CloudFormationTemplateBuilder.java @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/LaunchConfigurationHandler.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/LaunchConfigurationHandler.java index 5bc9ccf7a94..3358142958b 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/LaunchConfigurationHandler.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/LaunchConfigurationHandler.java @@ -7,7 +7,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/ResizedRootBlockDeviceMappingProvider.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/ResizedRootBlockDeviceMappingProvider.java index f18fee6c569..0fa56035478 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/ResizedRootBlockDeviceMappingProvider.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/ResizedRootBlockDeviceMappingProvider.java @@ -8,7 +8,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsAutoScalingService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsAutoScalingService.java index c16a9f6f6bf..fdd6529c66e 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsAutoScalingService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsAutoScalingService.java @@ -12,7 +12,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsCloudWatchService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsCloudWatchService.java index 3715da0bbfc..f81530ab087 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsCloudWatchService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsCloudWatchService.java @@ -8,7 +8,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsComputeResourceService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsComputeResourceService.java index 379de7fc20f..3a9a9573d8a 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsComputeResourceService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsComputeResourceService.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsDownscaleService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsDownscaleService.java index f27d54b5196..e963a31e951 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsDownscaleService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsDownscaleService.java @@ -11,7 +11,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsLaunchService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsLaunchService.java index f5a3ba9678a..35c040515f3 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsLaunchService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsLaunchService.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsLoadBalancerLaunchService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsLoadBalancerLaunchService.java index ea5cec114c2..af634925d29 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsLoadBalancerLaunchService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsLoadBalancerLaunchService.java @@ -12,7 +12,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsLaunchService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsLaunchService.java index a8c9fa030a8..26f95cb49e4 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsLaunchService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsLaunchService.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsModifyService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsModifyService.java index 035cdf9a3c5..90bf372cb69 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsModifyService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsModifyService.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.cloud.aws.scheduler.WaiterRunner.run; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsParameterGroupService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsParameterGroupService.java index 94c1a85e48f..d9200de8b66 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsParameterGroupService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsParameterGroupService.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsStartService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsStartService.java index c990b68cfdc..cb8c0faf074 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsStartService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsStartService.java @@ -5,7 +5,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsStatusLookupService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsStatusLookupService.java index 288e2d9fdcf..fce4fcbe660 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsStatusLookupService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsStatusLookupService.java @@ -2,7 +2,7 @@ import java.util.Locale; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsStopService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsStopService.java index 17fc4823878..c035923ef1c 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsStopService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsStopService.java @@ -5,7 +5,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsTerminateService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsTerminateService.java index 442e99c2cd4..83b0d032940 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsTerminateService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsRdsTerminateService.java @@ -6,7 +6,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsResourceConnector.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsResourceConnector.java index 309796a6aa6..9007d85d851 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsResourceConnector.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsResourceConnector.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsTerminateService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsTerminateService.java index cf5d886d970..bb22b87c849 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsTerminateService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsTerminateService.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsUpdateService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsUpdateService.java index 6138707b9cc..2252c182f3a 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsUpdateService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsUpdateService.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.StringUtils; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsUpscaleService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsUpscaleService.java index fa5b5220ca5..7f51aa15019 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsUpscaleService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/AwsUpscaleService.java @@ -12,7 +12,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.ListUtils; import org.slf4j.Logger; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/AwsRdsUpgradeService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/AwsRdsUpgradeService.java index 0e9b68334be..8234d773b61 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/AwsRdsUpgradeService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/AwsRdsUpgradeService.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/AwsRdsUpgradeSteps.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/AwsRdsUpgradeSteps.java index 44b407a7de0..1b746635df5 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/AwsRdsUpgradeSteps.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/AwsRdsUpgradeSteps.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -95,4 +95,4 @@ private CloudResource createParamGroupResource(AuthenticatedContext ac, String d .withAvailabilityZone(ac.getCloudContext().getLocation().getAvailabilityZone().value()) .build(); } -} \ No newline at end of file +} diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/operation/AwsRdsUpgradeOperations.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/operation/AwsRdsUpgradeOperations.java index 92f2f990858..578b0ef355c 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/operation/AwsRdsUpgradeOperations.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/operation/AwsRdsUpgradeOperations.java @@ -3,7 +3,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/operation/AwsRdsUpgradeValidatorService.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/operation/AwsRdsUpgradeValidatorService.java index 85b86cfbef0..2d61f682b0d 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/operation/AwsRdsUpgradeValidatorService.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/operation/AwsRdsUpgradeValidatorService.java @@ -11,7 +11,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -116,4 +116,4 @@ private Set getNotApplicableStates(Map dbArnToInstanceSt .collect(Collectors.toSet()); } -} \ No newline at end of file +} diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/operation/AwsRdsUpgradeWaitOperations.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/operation/AwsRdsUpgradeWaitOperations.java index 06ceebccbdb..ebf8100f4d8 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/operation/AwsRdsUpgradeWaitOperations.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/connector/resource/upgrade/operation/AwsRdsUpgradeWaitOperations.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.cloud.aws.scheduler.WaiterRunner.run; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,4 +49,4 @@ public void waitUntilUpgradeFinishes(AmazonRdsClient rdsClient, DescribeDbInstan run(() -> rdsClient.describeDBInstances(describeDBInstancesRequest), rdsWaiter); LOGGER.debug("Finished waiting on RDS upgrade"); } -} \ No newline at end of file +} diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/mapper/LaunchConfigurationMapper.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/mapper/LaunchConfigurationMapper.java index a9b0d966145..b44ab67d20c 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/mapper/LaunchConfigurationMapper.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/mapper/LaunchConfigurationMapper.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/mapper/LaunchTemplateBlockDeviceMappingToRequestConverter.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/mapper/LaunchTemplateBlockDeviceMappingToRequestConverter.java index c6f3bbb7228..1b8d2d0d3ed 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/mapper/LaunchTemplateBlockDeviceMappingToRequestConverter.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/mapper/LaunchTemplateBlockDeviceMappingToRequestConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.aws.mapper; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/util/AwsCloudFormationErrorMessageProvider.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/util/AwsCloudFormationErrorMessageProvider.java index 8cf732480a1..f838096948f 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/util/AwsCloudFormationErrorMessageProvider.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/util/AwsCloudFormationErrorMessageProvider.java @@ -7,7 +7,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/util/poller/upgrade/UpgradeStartPoller.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/util/poller/upgrade/UpgradeStartPoller.java index 0ffa3b573b9..ea540d8a1d4 100644 --- a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/util/poller/upgrade/UpgradeStartPoller.java +++ b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/util/poller/upgrade/UpgradeStartPoller.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.aws.util.poller.upgrade; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkConnectorTest.java b/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkConnectorTest.java index 4d48e71e308..ff1cabfcb7a 100644 --- a/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkConnectorTest.java +++ b/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkConnectorTest.java @@ -20,7 +20,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsValidatorsTest.java b/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsValidatorsTest.java index fe9430256a8..f3a82a91a5c 100644 --- a/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsValidatorsTest.java +++ b/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsValidatorsTest.java @@ -21,7 +21,7 @@ import java.util.Optional; import java.util.stream.IntStream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DynamicTest; diff --git a/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/component/AwsLaunchTest.java b/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/component/AwsLaunchTest.java index dffec0ca3d9..27d186775c3 100644 --- a/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/component/AwsLaunchTest.java +++ b/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/component/AwsLaunchTest.java @@ -13,7 +13,7 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/component/AwsRepairTest.java b/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/component/AwsRepairTest.java index 7c199df8d3d..4c5fe74a04a 100644 --- a/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/component/AwsRepairTest.java +++ b/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/component/AwsRepairTest.java @@ -27,7 +27,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/component/ComponentTestUtil.java b/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/component/ComponentTestUtil.java index 18ba0a3be70..b1446e9a61f 100644 --- a/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/component/ComponentTestUtil.java +++ b/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/component/ComponentTestUtil.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; import org.springframework.test.context.ActiveProfiles; diff --git a/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/conf/AwsConfigTagValueValidatorRegexpTest.java b/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/conf/AwsConfigTagValueValidatorRegexpTest.java index 2d3483b5ffe..6afd987777a 100644 --- a/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/conf/AwsConfigTagValueValidatorRegexpTest.java +++ b/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/conf/AwsConfigTagValueValidatorRegexpTest.java @@ -4,7 +4,7 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -62,4 +62,4 @@ void testAwsTagValueRegexp(String tagValue, boolean expectedForTagValue, boolean Assertions.assertEquals(expectedForTagValue, tagValueResult); Assertions.assertEquals(expectedForTagKey, tagKeyResult); } -} \ No newline at end of file +} diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsAuthenticator.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsAuthenticator.java index e082ff4c192..277a205ef28 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsAuthenticator.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsAuthenticator.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.aws.common; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsAvailabilityZoneProvider.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsAvailabilityZoneProvider.java index 83d4287c64e..ca55c4de8d1 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsAvailabilityZoneProvider.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsAvailabilityZoneProvider.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsClient.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsClient.java index 9a734ca6722..8f954818144 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsClient.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsClient.java @@ -3,7 +3,7 @@ import static org.apache.commons.lang3.StringUtils.isEmpty; import static org.apache.commons.lang3.StringUtils.isNotEmpty; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.aop.aspectj.annotation.AspectJProxyFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsCredentialConnector.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsCredentialConnector.java index 10a08a4288e..28c56ec7d33 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsCredentialConnector.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsCredentialConnector.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsCredentialVerifier.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsCredentialVerifier.java index 0787dd9ba3c..2e60d400471 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsCredentialVerifier.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsCredentialVerifier.java @@ -12,7 +12,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsDefaultRegionSelector.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsDefaultRegionSelector.java index 965b7f97d5c..18b7e7472b7 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsDefaultRegionSelector.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsDefaultRegionSelector.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsIdentityService.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsIdentityService.java index b8f3efb5665..56886c2ebab 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsIdentityService.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsIdentityService.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.aws.common; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsInstanceConnector.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsInstanceConnector.java index 04f9d38b643..53e5ff4087b 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsInstanceConnector.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsInstanceConnector.java @@ -14,7 +14,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsObjectStorageConnector.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsObjectStorageConnector.java index 2fce3da1d38..f2e0516ffb0 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsObjectStorageConnector.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsObjectStorageConnector.java @@ -2,7 +2,7 @@ import static java.lang.String.format; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsPlatformParameters.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsPlatformParameters.java index 4f6752007bc..2d4378265d9 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsPlatformParameters.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsPlatformParameters.java @@ -13,8 +13,8 @@ import java.util.Map; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsPlatformResources.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsPlatformResources.java index 3fb950f7bf9..b3be53144b4 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsPlatformResources.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsPlatformResources.java @@ -33,8 +33,8 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsSessionCredentialClient.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsSessionCredentialClient.java index 17e50dbb843..c598a34af63 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsSessionCredentialClient.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsSessionCredentialClient.java @@ -6,7 +6,7 @@ import java.time.Instant; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsSetup.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsSetup.java index 463eda661ab..b6128e4c2b6 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsSetup.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsSetup.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsTagValidator.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsTagValidator.java index 5fb2ed68a20..13b0afd1a87 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsTagValidator.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsTagValidator.java @@ -2,8 +2,8 @@ import java.util.regex.Pattern; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/client/AwsApacheClient.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/client/AwsApacheClient.java index 95dc298d422..882e1d75870 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/client/AwsApacheClient.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/client/AwsApacheClient.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.aws.common.client; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/config/AwsConfig.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/config/AwsConfig.java index 2dddbfd4a7c..e3ccca2c3cf 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/config/AwsConfig.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/config/AwsConfig.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsCloudWatchCommonService.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsCloudWatchCommonService.java index d9ef7756c4e..2517d0a1a3c 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsCloudWatchCommonService.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsCloudWatchCommonService.java @@ -3,7 +3,7 @@ import java.util.Date; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsEbsCommonService.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsEbsCommonService.java index bed64cb5861..91b648c5792 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsEbsCommonService.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsEbsCommonService.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsEfsCommonService.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsEfsCommonService.java index f07ffeaaaf0..e0f172ae7d1 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsEfsCommonService.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsEfsCommonService.java @@ -2,7 +2,7 @@ import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsInstanceCommonService.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsInstanceCommonService.java index d0a5474b2cc..30bdd870c29 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsInstanceCommonService.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsInstanceCommonService.java @@ -7,7 +7,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsLoadBalancerCommonService.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsLoadBalancerCommonService.java index bb8b7126c47..0677147e365 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsLoadBalancerCommonService.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsLoadBalancerCommonService.java @@ -7,7 +7,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsModelService.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsModelService.java index 935bad385af..5c78dbd30f5 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsModelService.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsModelService.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsNetworkService.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsNetworkService.java index 74862e87225..13dd016f946 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsNetworkService.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsNetworkService.java @@ -7,7 +7,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.net.util.SubnetUtils; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsResourceVolumeConnector.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsResourceVolumeConnector.java index 8509ac13875..96867172a72 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsResourceVolumeConnector.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/connector/resource/AwsResourceVolumeConnector.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEbsConsumptionCalculator.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEbsConsumptionCalculator.java index bb67f373fb2..5b803fca6b3 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEbsConsumptionCalculator.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEbsConsumptionCalculator.java @@ -4,8 +4,8 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; -import javax.validation.ValidationException; +import jakarta.inject.Inject; +import jakarta.validation.ValidationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEfsConsumptionCalculator.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEfsConsumptionCalculator.java index 7c2178043b7..c0d7e09bae5 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEfsConsumptionCalculator.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEfsConsumptionCalculator.java @@ -3,8 +3,8 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; -import javax.validation.ValidationException; +import jakarta.inject.Inject; +import jakarta.validation.ValidationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsS3ConsumptionCalculator.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsS3ConsumptionCalculator.java index 06ff4ce5015..4c13e4399db 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsS3ConsumptionCalculator.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsS3ConsumptionCalculator.java @@ -4,8 +4,8 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; -import javax.validation.ValidationException; +import jakarta.inject.Inject; +import jakarta.validation.ValidationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/cost/AwsPricingCache.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/cost/AwsPricingCache.java index 02da8df2f90..a2291f9ec66 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/cost/AwsPricingCache.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/cost/AwsPricingCache.java @@ -6,7 +6,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/loadbalancer/LoadBalancerService.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/loadbalancer/LoadBalancerService.java index c9fad457798..fec46450fec 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/loadbalancer/LoadBalancerService.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/loadbalancer/LoadBalancerService.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/mapper/SdkClientExceptionMapper.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/mapper/SdkClientExceptionMapper.java index cdfc8cbf561..3cb05741af4 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/mapper/SdkClientExceptionMapper.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/mapper/SdkClientExceptionMapper.java @@ -4,7 +4,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.aspectj.lang.Signature; import org.springframework.stereotype.Component; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/metrics/AwsMetricPublisher.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/metrics/AwsMetricPublisher.java index 10ac813d1e0..6c6b136876e 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/metrics/AwsMetricPublisher.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/metrics/AwsMetricPublisher.java @@ -8,7 +8,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/poller/PollerUtil.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/poller/PollerUtil.java index 72529a3e8ac..40e2bd22d11 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/poller/PollerUtil.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/poller/PollerUtil.java @@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/VolumeBuilderUtil.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/VolumeBuilderUtil.java index a251ed17963..31ed07814b3 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/VolumeBuilderUtil.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/VolumeBuilderUtil.java @@ -6,7 +6,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AbstractAwsResourceBuilder.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AbstractAwsResourceBuilder.java index 5c434e4ba1b..21df7409cbd 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AbstractAwsResourceBuilder.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AbstractAwsResourceBuilder.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AwsAttachmentResourceBuilder.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AwsAttachmentResourceBuilder.java index a762f22def1..d0aa2058c0d 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AwsAttachmentResourceBuilder.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AwsAttachmentResourceBuilder.java @@ -7,7 +7,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AwsEfsResourceBuilder.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AwsEfsResourceBuilder.java index a54e1e6902f..680ca2fa3cc 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AwsEfsResourceBuilder.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AwsEfsResourceBuilder.java @@ -12,7 +12,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AwsVolumeResourceBuilder.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AwsVolumeResourceBuilder.java index 43da6e4444e..2771acee3fa 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AwsVolumeResourceBuilder.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/resource/volume/AwsVolumeResourceBuilder.java @@ -22,7 +22,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/subnetselector/SubnetFilterStrategyMultiplePreferPrivate.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/subnetselector/SubnetFilterStrategyMultiplePreferPrivate.java index dc4f068a47c..fec905eb77a 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/subnetselector/SubnetFilterStrategyMultiplePreferPrivate.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/subnetselector/SubnetFilterStrategyMultiplePreferPrivate.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/subnetselector/SubnetFilterStrategyMultiplePreferPublic.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/subnetselector/SubnetFilterStrategyMultiplePreferPublic.java index aa04464dbad..2c8403b7191 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/subnetselector/SubnetFilterStrategyMultiplePreferPublic.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/subnetselector/SubnetFilterStrategyMultiplePreferPublic.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/util/AwsEncodedAuthorizationFailureMessageDecoder.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/util/AwsEncodedAuthorizationFailureMessageDecoder.java index c2c61850974..3357e11f650 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/util/AwsEncodedAuthorizationFailureMessageDecoder.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/util/AwsEncodedAuthorizationFailureMessageDecoder.java @@ -3,7 +3,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AbstractAwsSimulatePolicyValidator.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AbstractAwsSimulatePolicyValidator.java index 56b2fadd7c9..22f6c9320c1 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AbstractAwsSimulatePolicyValidator.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AbstractAwsSimulatePolicyValidator.java @@ -10,7 +10,7 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsIDBrokerAssumeRoleValidator.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsIDBrokerAssumeRoleValidator.java index 03f040eacf0..db6908a2d79 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsIDBrokerAssumeRoleValidator.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsIDBrokerAssumeRoleValidator.java @@ -10,7 +10,7 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsIDBrokerMappedRolePermissionValidator.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsIDBrokerMappedRolePermissionValidator.java index a9cc1d3ab84..b0199d21333 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsIDBrokerMappedRolePermissionValidator.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsIDBrokerMappedRolePermissionValidator.java @@ -12,7 +12,7 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsIDBrokerObjectStorageValidator.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsIDBrokerObjectStorageValidator.java index 7502191348f..d28fb932591 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsIDBrokerObjectStorageValidator.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsIDBrokerObjectStorageValidator.java @@ -6,7 +6,7 @@ import java.util.SortedSet; import java.util.TreeSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsInstanceProfileEC2TrustValidator.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsInstanceProfileEC2TrustValidator.java index 3f39b5ef6b0..6bd769be8c5 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsInstanceProfileEC2TrustValidator.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsInstanceProfileEC2TrustValidator.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsLogRolePermissionValidator.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsLogRolePermissionValidator.java index 6a256befaf7..c717b9c3178 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsLogRolePermissionValidator.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsLogRolePermissionValidator.java @@ -7,7 +7,7 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsStorageValidator.java b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsStorageValidator.java index dd0b4a48754..01ecfbc7479 100644 --- a/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsStorageValidator.java +++ b/cloud-aws-common/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsStorageValidator.java @@ -10,7 +10,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsAuthenticatorTest.java b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsAuthenticatorTest.java index 82f028f1a50..bc678284e93 100644 --- a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsAuthenticatorTest.java +++ b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsAuthenticatorTest.java @@ -15,7 +15,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsInstanceConnectorTest.java b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsInstanceConnectorTest.java index 4fbb981b680..211fd9ad7bc 100644 --- a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsInstanceConnectorTest.java +++ b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsInstanceConnectorTest.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DynamicTest; diff --git a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsPlatformResourcesTest.java b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsPlatformResourcesTest.java index 8e738ed3391..4669e659303 100644 --- a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsPlatformResourcesTest.java +++ b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsPlatformResourcesTest.java @@ -25,7 +25,7 @@ import java.util.Optional; import java.util.Set; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsTagValidatorTest.java b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsTagValidatorTest.java index 8ac08c31fb6..8f21b331bda 100644 --- a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsTagValidatorTest.java +++ b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/AwsTagValidatorTest.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DynamicTest; diff --git a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEbsConsumptionCalculatorTest.java b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEbsConsumptionCalculatorTest.java index d6746a51ef3..fee46174a4a 100644 --- a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEbsConsumptionCalculatorTest.java +++ b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEbsConsumptionCalculatorTest.java @@ -12,7 +12,7 @@ import java.util.Optional; import java.util.Set; -import javax.validation.ValidationException; +import jakarta.validation.ValidationException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -155,4 +155,4 @@ static Object[][] scenariosForValidateCloudStorageType() { {null, false}, }; } -} \ No newline at end of file +} diff --git a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEfsConsumptionCalculatorTest.java b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEfsConsumptionCalculatorTest.java index 55ed1218d17..1fe4e3923da 100644 --- a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEfsConsumptionCalculatorTest.java +++ b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsEfsConsumptionCalculatorTest.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Set; -import javax.validation.ValidationException; +import jakarta.validation.ValidationException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsS3ConsumptionCalculatorTest.java b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsS3ConsumptionCalculatorTest.java index ba1fe90cff2..82f00ff8faf 100644 --- a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsS3ConsumptionCalculatorTest.java +++ b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/AwsS3ConsumptionCalculatorTest.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Set; -import javax.validation.ValidationException; +import jakarta.validation.ValidationException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/ConsumptionToStorageHeartbeatConverterTest.java b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/ConsumptionToStorageHeartbeatConverterTest.java index d0db9659f98..7020c62bc27 100644 --- a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/ConsumptionToStorageHeartbeatConverterTest.java +++ b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/consumption/ConsumptionToStorageHeartbeatConverterTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import javax.validation.ValidationException; +import jakarta.validation.ValidationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsStorageValidatorsTest.java b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsStorageValidatorsTest.java index e939d0edeaa..1cd6df61caa 100644 --- a/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsStorageValidatorsTest.java +++ b/cloud-aws-common/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/common/validator/AwsStorageValidatorsTest.java @@ -17,7 +17,7 @@ import java.util.Set; import java.util.stream.IntStream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeConnector.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeConnector.java index 74b2095ca48..6abd821255d 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeConnector.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeConnector.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeResourceConnector.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeResourceConnector.java index 9ad1e67223a..2ca508117a9 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeResourceConnector.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeResourceConnector.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeResourceVolumeConnector.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeResourceVolumeConnector.java index 622060622ba..ab010110afc 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeResourceVolumeConnector.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeResourceVolumeConnector.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/metadata/AwsNativeMetadataCollector.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/metadata/AwsNativeMetadataCollector.java index 947c5c8ae76..77006b6ff1d 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/metadata/AwsNativeMetadataCollector.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/metadata/AwsNativeMetadataCollector.java @@ -13,7 +13,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/AbstractAwsComputeBaseResourceChecker.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/AbstractAwsComputeBaseResourceChecker.java index 81e1ebd6eae..6b1211dc813 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/AbstractAwsComputeBaseResourceChecker.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/AbstractAwsComputeBaseResourceChecker.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/group/AwsSecurityGroupResourceBuilder.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/group/AwsSecurityGroupResourceBuilder.java index cf4f947666c..ee47a2a188b 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/group/AwsSecurityGroupResourceBuilder.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/group/AwsSecurityGroupResourceBuilder.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.cloud.aws.resource.AwsNativeResourceBuilderOrderConstants.NATIVE_SECURITY_GROUP_RESOURCE_BUILDER_ORDER; import static org.slf4j.LoggerFactory.getLogger; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/AwsNativeEIPResourceBuilder.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/AwsNativeEIPResourceBuilder.java index 3f275ae3360..3638c6ae1d3 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/AwsNativeEIPResourceBuilder.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/AwsNativeEIPResourceBuilder.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.stereotype.Service; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/AwsNativeInstanceResourceBuilder.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/AwsNativeInstanceResourceBuilder.java index a3ad41b6bb2..fa469809463 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/AwsNativeInstanceResourceBuilder.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/AwsNativeInstanceResourceBuilder.java @@ -13,7 +13,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/alarm/AwsNativeCloudWatchResourceBuilder.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/alarm/AwsNativeCloudWatchResourceBuilder.java index 6a7576ea6ab..a14a0d6e0db 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/alarm/AwsNativeCloudWatchResourceBuilder.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/alarm/AwsNativeCloudWatchResourceBuilder.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/rootdisk/RootDiskTaggingResourceBuilder.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/rootdisk/RootDiskTaggingResourceBuilder.java index 9d92249614d..7046c071fad 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/rootdisk/RootDiskTaggingResourceBuilder.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/rootdisk/RootDiskTaggingResourceBuilder.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/util/SecurityGroupBuilderUtil.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/util/SecurityGroupBuilderUtil.java index fb6d3192fb9..3a93b26ebac 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/util/SecurityGroupBuilderUtil.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/instance/util/SecurityGroupBuilderUtil.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerLaunchService.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerLaunchService.java index 5f6523aa332..cffb1b391ce 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerLaunchService.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerLaunchService.java @@ -12,7 +12,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerListenerResourceBuilder.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerListenerResourceBuilder.java index ce6b589980f..19c8a04dab1 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerListenerResourceBuilder.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerListenerResourceBuilder.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerResourceBuilder.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerResourceBuilder.java index c0bb940099a..639df7cc8f6 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerResourceBuilder.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerResourceBuilder.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerTargetGroupResourceBuilder.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerTargetGroupResourceBuilder.java index 475b8ebab36..79a3e14e319 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerTargetGroupResourceBuilder.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/resource/loadbalancer/AwsNativeLoadBalancerTargetGroupResourceBuilder.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/validator/AwsGatewaySubnetMultiAzValidator.java b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/validator/AwsGatewaySubnetMultiAzValidator.java index 3778cbfaa30..f8f97ad3f53 100644 --- a/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/validator/AwsGatewaySubnetMultiAzValidator.java +++ b/cloud-aws-native/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/validator/AwsGatewaySubnetMultiAzValidator.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-aws-native/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeMetadataCollectorApiIntegrationTest.java b/cloud-aws-native/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeMetadataCollectorApiIntegrationTest.java index fcfafb88098..e37d3df180e 100644 --- a/cloud-aws-native/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeMetadataCollectorApiIntegrationTest.java +++ b/cloud-aws-native/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNativeMetadataCollectorApiIntegrationTest.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureAuthenticator.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureAuthenticator.java index 5b6b92647a9..983a3c448b9 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureAuthenticator.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureAuthenticator.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.azure; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureAvailabilityZoneConnector.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureAvailabilityZoneConnector.java index e5d337e59ef..4e7ee9f8480 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureAvailabilityZoneConnector.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureAvailabilityZoneConnector.java @@ -7,7 +7,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureCloudResourceService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureCloudResourceService.java index cffa26a2f73..42a05a0d02d 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureCloudResourceService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureCloudResourceService.java @@ -14,7 +14,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureConnector.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureConnector.java index 1b6c4e16b87..498dec845ef 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureConnector.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureConnector.java @@ -3,7 +3,7 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureContextService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureContextService.java index 7b8689258cc..a3c28be6c0f 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureContextService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureContextService.java @@ -8,7 +8,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureCredentialAppCreationCommand.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureCredentialAppCreationCommand.java index 59e584b6d0e..6734206eebe 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureCredentialAppCreationCommand.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureCredentialAppCreationCommand.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureCredentialConnector.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureCredentialConnector.java index 7eb1b2f3a77..3ea2efec58a 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureCredentialConnector.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureCredentialConnector.java @@ -3,7 +3,7 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDatabaseCapabilityService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDatabaseCapabilityService.java index 3f975143279..864d12c67b2 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDatabaseCapabilityService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDatabaseCapabilityService.java @@ -12,7 +12,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDatabaseTemplateBuilder.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDatabaseTemplateBuilder.java index 567a9c62c69..f6ba1feb4b3 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDatabaseTemplateBuilder.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDatabaseTemplateBuilder.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDatabaseTemplateProvider.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDatabaseTemplateProvider.java index f51f9ac93f0..f655c76370c 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDatabaseTemplateProvider.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDatabaseTemplateProvider.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDnsZoneService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDnsZoneService.java index cc4993b328f..b51cbc915e7 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDnsZoneService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureDnsZoneService.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -118,4 +118,4 @@ private Deployment createDnsZonesAndNetworkLinks(AzureClient azureClient, String tags); return azureResourceDeploymentHelperService.deployTemplate(azureClient, parameters); } -} \ No newline at end of file +} diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureEncryptionResources.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureEncryptionResources.java index 5509c24e9af..f30c878da50 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureEncryptionResources.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureEncryptionResources.java @@ -8,7 +8,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureInstanceConnector.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureInstanceConnector.java index 8ee6cb23419..5bed3c1d965 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureInstanceConnector.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureInstanceConnector.java @@ -6,7 +6,7 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureLoadBalancerMetadataCollector.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureLoadBalancerMetadataCollector.java index 0fbf0d9a663..0d2be6b8205 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureLoadBalancerMetadataCollector.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureLoadBalancerMetadataCollector.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureMetadataCollector.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureMetadataCollector.java index 9d096243fcc..878af144e5d 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureMetadataCollector.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureMetadataCollector.java @@ -12,7 +12,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkConnector.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkConnector.java index 097f1739f57..393cc071c89 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkConnector.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkConnector.java @@ -14,8 +14,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkDnsZoneTemplateBuilder.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkDnsZoneTemplateBuilder.java index b71f3afd715..9d8599c5a57 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkDnsZoneTemplateBuilder.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkDnsZoneTemplateBuilder.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkLinkService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkLinkService.java index 756ec1794a0..18e2881d65a 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkLinkService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkLinkService.java @@ -7,7 +7,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkTemplateBuilder.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkTemplateBuilder.java index 2a7ad8eb417..86abac1acff 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkTemplateBuilder.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkTemplateBuilder.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureObjectStorageConnector.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureObjectStorageConnector.java index a2de7666574..565b119efed 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureObjectStorageConnector.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureObjectStorageConnector.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzurePlatformParameters.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzurePlatformParameters.java index e61364c4cad..efa279b9217 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzurePlatformParameters.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzurePlatformParameters.java @@ -17,8 +17,8 @@ import java.util.Optional; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzurePlatformResources.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzurePlatformResources.java index 62566ed817e..5e113914257 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzurePlatformResources.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzurePlatformResources.java @@ -21,8 +21,8 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureResourceConnector.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureResourceConnector.java index 791cfd9ac35..113b02db989 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureResourceConnector.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureResourceConnector.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureResourceDeploymentHelperService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureResourceDeploymentHelperService.java index 846e9e67ed5..737ae0bc39d 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureResourceDeploymentHelperService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureResourceDeploymentHelperService.java @@ -9,7 +9,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureResourcePersistenceHelperService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureResourcePersistenceHelperService.java index d00ce967b3a..96ee07d9308 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureResourcePersistenceHelperService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureResourcePersistenceHelperService.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureSetup.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureSetup.java index 856d296e955..72dc794bfd5 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureSetup.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureSetup.java @@ -7,8 +7,8 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureSingleServerDatabaseTemplateModelBuilder.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureSingleServerDatabaseTemplateModelBuilder.java index 993103eea44..3aa44cea42e 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureSingleServerDatabaseTemplateModelBuilder.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureSingleServerDatabaseTemplateModelBuilder.java @@ -9,7 +9,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStackViewProvider.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStackViewProvider.java index be322320c21..3343d66d564 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStackViewProvider.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStackViewProvider.java @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.apache.commons.net.util.SubnetUtils; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorage.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorage.java index 916dc652843..9023633025f 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorage.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorage.java @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.text.WordUtils; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorageAccountService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorageAccountService.java index 68a9223a884..3c9a2e7ff10 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorageAccountService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorageAccountService.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorageAccountTemplateBuilder.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorageAccountTemplateBuilder.java index 852abab431f..892e2a2f2b3 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorageAccountTemplateBuilder.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorageAccountTemplateBuilder.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorageAccoutTemplateProviderService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorageAccoutTemplateProviderService.java index b96f49bd075..839e02ff7fc 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorageAccoutTemplateProviderService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureStorageAccoutTemplateProviderService.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureTemplateBuilder.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureTemplateBuilder.java index 847298b74b3..7e7a4faf853 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureTemplateBuilder.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureTemplateBuilder.java @@ -10,7 +10,7 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureTerminationHelperService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureTerminationHelperService.java index 25680fbd260..494c02840b6 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureTerminationHelperService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureTerminationHelperService.java @@ -5,7 +5,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureUtils.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureUtils.java index 187197908b0..cbcd334ed4a 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureUtils.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureUtils.java @@ -23,7 +23,7 @@ import java.util.zip.Adler32; import java.util.zip.Checksum; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureVirtualMachineService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureVirtualMachineService.java index 5ceba494c02..f4adb2ea4e3 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureVirtualMachineService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/AzureVirtualMachineService.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/client/AzureClientService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/client/AzureClientService.java index 830853fbae3..3247786160b 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/client/AzureClientService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/client/AzureClientService.java @@ -2,7 +2,7 @@ import java.util.concurrent.ExecutorService; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/client/AzureHttpClientConfigurer.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/client/AzureHttpClientConfigurer.java index 53a77f6e940..921017bf6db 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/client/AzureHttpClientConfigurer.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/client/AzureHttpClientConfigurer.java @@ -2,7 +2,7 @@ import java.util.concurrent.ExecutorService; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/client/AzureListResultFactory.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/client/AzureListResultFactory.java index be8993fb12e..f149384ecde 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/client/AzureListResultFactory.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/client/AzureListResultFactory.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.azure.client; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/connector/resource/AzureComputeResourceService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/connector/resource/AzureComputeResourceService.java index 953e064b99b..6e1d413660b 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/connector/resource/AzureComputeResourceService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/connector/resource/AzureComputeResourceService.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/connector/resource/AzureDatabaseResourceService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/connector/resource/AzureDatabaseResourceService.java index 5949cb4eaef..7bbae1d64a4 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/connector/resource/AzureDatabaseResourceService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/connector/resource/AzureDatabaseResourceService.java @@ -12,7 +12,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/connector/resource/AzureStorageAccountBuilderService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/connector/resource/AzureStorageAccountBuilderService.java index 68c245bedba..18a2d7961f6 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/connector/resource/AzureStorageAccountBuilderService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/connector/resource/AzureStorageAccountBuilderService.java @@ -4,7 +4,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/cost/AzurePricingCache.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/cost/AzurePricingCache.java index d89849d0a36..9419b6dc385 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/cost/AzurePricingCache.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/cost/AzurePricingCache.java @@ -9,12 +9,12 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageFilter.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageFilter.java index 3814afdb809..1276adfb8f9 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageFilter.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageFilter.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageInfoService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageInfoService.java index 4b3bcb36c5a..107f55c7a71 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageInfoService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageInfoService.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.azure.image; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageService.java index 4e71debf0b0..f73b2e6a0de 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageService.java @@ -3,7 +3,7 @@ import java.util.Optional; import java.util.concurrent.TimeoutException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageSetupService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageSetupService.java index 1487ce572c8..92283f59713 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageSetupService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureImageSetupService.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureMarketplaceValidatorService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureMarketplaceValidatorService.java index 4dc322c5daa..8ad7e4fbf02 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureMarketplaceValidatorService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/AzureMarketplaceValidatorService.java @@ -6,7 +6,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/marketplace/AzureImageTermsSignerService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/marketplace/AzureImageTermsSignerService.java index 1efd0cb68ad..c78c5d5be98 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/marketplace/AzureImageTermsSignerService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/marketplace/AzureImageTermsSignerService.java @@ -5,7 +5,7 @@ import java.net.URI; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/marketplace/AzureMarketplaceImageProviderService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/marketplace/AzureMarketplaceImageProviderService.java index 07ac493997c..218e247cfbb 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/marketplace/AzureMarketplaceImageProviderService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/image/marketplace/AzureMarketplaceImageProviderService.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.azure.image.marketplace; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -65,4 +65,4 @@ private AzureMarketplaceImage get(String imageUrn, boolean useAsSourceImage) { public boolean hasMarketplaceFormat(String imageName) { return azureImageFormatValidator.isMarketplaceImageFormat(imageName); } -} \ No newline at end of file +} diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AbstractAzureResourceBuilder.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AbstractAzureResourceBuilder.java index e02be54ffbe..accca49539d 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AbstractAzureResourceBuilder.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AbstractAzureResourceBuilder.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureAttachmentResourceBuilder.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureAttachmentResourceBuilder.java index 99e08a505d6..d72cd367d3b 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureAttachmentResourceBuilder.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureAttachmentResourceBuilder.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureRegionProvider.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureRegionProvider.java index 4670a109852..0fd91c10a44 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureRegionProvider.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureRegionProvider.java @@ -13,8 +13,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureResourceVolumeConnector.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureResourceVolumeConnector.java index 32caf56f25d..8e047073897 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureResourceVolumeConnector.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureResourceVolumeConnector.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureVolumeResourceBuilder.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureVolumeResourceBuilder.java index 18ddde1ea5c..4f0a2188dbc 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureVolumeResourceBuilder.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/resource/AzureVolumeResourceBuilder.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/rest/AzureRestOperationsService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/rest/AzureRestOperationsService.java index 5eb18c86b4b..07f8b5528bd 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/rest/AzureRestOperationsService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/rest/AzureRestOperationsService.java @@ -2,7 +2,7 @@ import java.net.URI; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,4 +59,4 @@ private HttpHeaders getHttpHeaders(String token) { return headers; } -} \ No newline at end of file +} diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/subnet/selector/AzureSubnetSelectorService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/subnet/selector/AzureSubnetSelectorService.java index 9389783f5eb..f9ef0508ac8 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/subnet/selector/AzureSubnetSelectorService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/subnet/selector/AzureSubnetSelectorService.java @@ -6,7 +6,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/AzurePollTaskFactory.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/AzurePollTaskFactory.java index da5a73492dd..3c28ec4a967 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/AzurePollTaskFactory.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/AzurePollTaskFactory.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.azure.task; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/diskencryptionset/DiskEncryptionSetCreationPoller.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/diskencryptionset/DiskEncryptionSetCreationPoller.java index 42e49588f48..82226957329 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/diskencryptionset/DiskEncryptionSetCreationPoller.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/diskencryptionset/DiskEncryptionSetCreationPoller.java @@ -2,7 +2,7 @@ import static java.util.Objects.requireNonNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/dnszone/AzureDnsZoneCreationPoller.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/dnszone/AzureDnsZoneCreationPoller.java index 19027451284..1efae192b07 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/dnszone/AzureDnsZoneCreationPoller.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/dnszone/AzureDnsZoneCreationPoller.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.azure.task.dnszone; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/image/AzureManagedImageCreationCheckerTask.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/image/AzureManagedImageCreationCheckerTask.java index a816d1646a8..70acb582013 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/image/AzureManagedImageCreationCheckerTask.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/image/AzureManagedImageCreationCheckerTask.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/image/AzureManagedImageCreationPoller.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/image/AzureManagedImageCreationPoller.java index 8f59b3083c6..44638fdee08 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/image/AzureManagedImageCreationPoller.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/task/image/AzureManagedImageCreationPoller.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.azure.task.image; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/template/AzureTemplateDeploymentService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/template/AzureTemplateDeploymentService.java index c895bd4186b..6b5de114423 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/template/AzureTemplateDeploymentService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/template/AzureTemplateDeploymentService.java @@ -3,7 +3,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/template/AzureTransientDeploymentService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/template/AzureTransientDeploymentService.java index 811fcc0e382..d578d043d5a 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/template/AzureTransientDeploymentService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/template/AzureTransientDeploymentService.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/upscale/AzureScaleUtilService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/upscale/AzureScaleUtilService.java index 12770b9806c..20dff39c9b8 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/upscale/AzureScaleUtilService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/upscale/AzureScaleUtilService.java @@ -7,7 +7,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/upscale/AzureUpscaleService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/upscale/AzureUpscaleService.java index 016d686051c..9659ff96a62 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/upscale/AzureUpscaleService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/upscale/AzureUpscaleService.java @@ -11,7 +11,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.ListUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/upscale/AzureVerticalScaleService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/upscale/AzureVerticalScaleService.java index a59d7bf899e..5ba369d5f7d 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/upscale/AzureVerticalScaleService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/upscale/AzureVerticalScaleService.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureAcceleratedNetworkValidator.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureAcceleratedNetworkValidator.java index 6f511753d6d..a9956422923 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureAcceleratedNetworkValidator.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureAcceleratedNetworkValidator.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureFileSystemValidator.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureFileSystemValidator.java index 62108d45187..12594e81c20 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureFileSystemValidator.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureFileSystemValidator.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.azure.validator; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureFlexibleServerPermissionValidator.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureFlexibleServerPermissionValidator.java index d1616582f13..771b58b8ce8 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureFlexibleServerPermissionValidator.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureFlexibleServerPermissionValidator.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureIDBrokerObjectStorageValidator.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureIDBrokerObjectStorageValidator.java index 789b5ae6afd..cc780889474 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureIDBrokerObjectStorageValidator.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureIDBrokerObjectStorageValidator.java @@ -20,7 +20,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureImageFormatValidator.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureImageFormatValidator.java index 5ffd84a4758..2245041ebdd 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureImageFormatValidator.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureImageFormatValidator.java @@ -5,7 +5,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureStorageValidator.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureStorageValidator.java index 8b939e40dc9..ca421a32088 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureStorageValidator.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureStorageValidator.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.azure.validator; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureSubnetValidator.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureSubnetValidator.java index 5394c77bab4..33634e347e6 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureSubnetValidator.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureSubnetValidator.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.azure.validator; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureTagValidator.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureTagValidator.java index 82c4e1faf91..d33d7f7ba6e 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureTagValidator.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureTagValidator.java @@ -2,8 +2,8 @@ import java.util.regex.Pattern; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/privatedns/AzureExistingPrivateDnsZoneValidatorService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/privatedns/AzureExistingPrivateDnsZoneValidatorService.java index c23d6f69c19..5b72340a10d 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/privatedns/AzureExistingPrivateDnsZoneValidatorService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/privatedns/AzureExistingPrivateDnsZoneValidatorService.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,4 +48,4 @@ public ValidationResultBuilder validate(AzureClient azureClient, String networkR return resultBuilder; } -} \ No newline at end of file +} diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/privatedns/AzureNewPrivateDnsZoneValidatorService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/privatedns/AzureNewPrivateDnsZoneValidatorService.java index eb7526867fc..1c616bbe3cf 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/privatedns/AzureNewPrivateDnsZoneValidatorService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/privatedns/AzureNewPrivateDnsZoneValidatorService.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/privatedns/AzurePrivateDnsZoneValidatorService.java b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/privatedns/AzurePrivateDnsZoneValidatorService.java index a259ff67c7b..848a76e86d1 100644 --- a/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/privatedns/AzurePrivateDnsZoneValidatorService.java +++ b/cloud-azure/src/main/java/com/sequenceiq/cloudbreak/cloud/azure/validator/privatedns/AzurePrivateDnsZoneValidatorService.java @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -99,4 +99,4 @@ private void addValidationError(String validationMessage, ValidationResultBuilde resultBuilder.error(validationMessage); } -} \ No newline at end of file +} diff --git a/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkConnectorTest.java b/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkConnectorTest.java index 04a1e674b54..41c281d66e5 100644 --- a/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkConnectorTest.java +++ b/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/AzureNetworkConnectorTest.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/AzurePlatformResourcesTest.java b/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/AzurePlatformResourcesTest.java index 336f737e859..28fd617881e 100644 --- a/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/AzurePlatformResourcesTest.java +++ b/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/AzurePlatformResourcesTest.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/AzureUtilsTest.java b/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/AzureUtilsTest.java index 12d5a33079c..f2ab9839514 100644 --- a/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/AzureUtilsTest.java +++ b/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/AzureUtilsTest.java @@ -25,7 +25,7 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.assertj.core.api.Assertions; import org.assertj.core.api.SoftAssertions; diff --git a/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/cost/AzurePricingCacheTest.java b/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/cost/AzurePricingCacheTest.java index 32fcc91181c..5fe1da30fc8 100644 --- a/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/cost/AzurePricingCacheTest.java +++ b/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/cost/AzurePricingCacheTest.java @@ -25,7 +25,7 @@ import com.sequenceiq.cloudbreak.cloud.service.CloudParameterService; @ExtendWith(MockitoExtension.class) -public class AzurePricingCacheTest { +class AzurePricingCacheTest { private static final String REGION = "region"; diff --git a/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/task/AzurePollTaskFactoryIntegrationTest.java b/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/task/AzurePollTaskFactoryIntegrationTest.java index a20dd856f0f..e20931924a5 100644 --- a/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/task/AzurePollTaskFactoryIntegrationTest.java +++ b/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/task/AzurePollTaskFactoryIntegrationTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -60,4 +60,4 @@ void diskEncryptionSetCreationCheckerTaskTest() { static class TestAppContext { } -} \ No newline at end of file +} diff --git a/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureTagValidatorTest.java b/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureTagValidatorTest.java index e5e1f4c004e..c6af062a4e8 100644 --- a/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureTagValidatorTest.java +++ b/cloud-azure/src/test/java/com/sequenceiq/cloudbreak/cloud/azure/validator/AzureTagValidatorTest.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.concurrent.ExecutorService; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DynamicTest; diff --git a/cloud-common/src/main/java/com/sequenceiq/cloudbreak/auth/service/url/UrlAccessValidationService.java b/cloud-common/src/main/java/com/sequenceiq/cloudbreak/auth/service/url/UrlAccessValidationService.java index 22f5e39df5c..c4adb99fc6c 100644 --- a/cloud-common/src/main/java/com/sequenceiq/cloudbreak/auth/service/url/UrlAccessValidationService.java +++ b/cloud-common/src/main/java/com/sequenceiq/cloudbreak/auth/service/url/UrlAccessValidationService.java @@ -1,10 +1,10 @@ package com.sequenceiq.cloudbreak.auth.service.url; -import javax.annotation.PostConstruct; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-common/src/main/java/com/sequenceiq/cloudbreak/common/cache/CachingConfig.java b/cloud-common/src/main/java/com/sequenceiq/cloudbreak/common/cache/CachingConfig.java index af93dc8b4a5..f4dd0d0f0d2 100644 --- a/cloud-common/src/main/java/com/sequenceiq/cloudbreak/common/cache/CachingConfig.java +++ b/cloud-common/src/main/java/com/sequenceiq/cloudbreak/common/cache/CachingConfig.java @@ -7,8 +7,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; @@ -86,4 +86,4 @@ public Object generate(Object target, Method method, Object... params) { } } -} \ No newline at end of file +} diff --git a/cloud-common/src/main/java/com/sequenceiq/cloudbreak/controller/UserContextControllerAdvice.java b/cloud-common/src/main/java/com/sequenceiq/cloudbreak/controller/UserContextControllerAdvice.java index d578ab3730e..22b7efd0b7d 100644 --- a/cloud-common/src/main/java/com/sequenceiq/cloudbreak/controller/UserContextControllerAdvice.java +++ b/cloud-common/src/main/java/com/sequenceiq/cloudbreak/controller/UserContextControllerAdvice.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ModelAttribute; diff --git a/cloud-common/src/main/java/com/sequenceiq/cloudbreak/polling/nginx/NginxCertListenerTask.java b/cloud-common/src/main/java/com/sequenceiq/cloudbreak/polling/nginx/NginxCertListenerTask.java index 7359851d096..8a20c5d3767 100644 --- a/cloud-common/src/main/java/com/sequenceiq/cloudbreak/polling/nginx/NginxCertListenerTask.java +++ b/cloud-common/src/main/java/com/sequenceiq/cloudbreak/polling/nginx/NginxCertListenerTask.java @@ -2,8 +2,8 @@ import java.security.cert.X509Certificate; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-common/src/main/java/com/sequenceiq/cloudbreak/polling/nginx/NginxPollerObject.java b/cloud-common/src/main/java/com/sequenceiq/cloudbreak/polling/nginx/NginxPollerObject.java index d1b95d28775..177726b22b2 100644 --- a/cloud-common/src/main/java/com/sequenceiq/cloudbreak/polling/nginx/NginxPollerObject.java +++ b/cloud-common/src/main/java/com/sequenceiq/cloudbreak/polling/nginx/NginxPollerObject.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.polling.nginx; -import javax.ws.rs.client.Client; +import jakarta.ws.rs.client.Client; import com.sequenceiq.cloudbreak.client.CertificateTrustManager.SavingX509TrustManager; diff --git a/cloud-common/src/main/java/com/sequenceiq/cloudbreak/util/FreeMarkerTemplateUtils.java b/cloud-common/src/main/java/com/sequenceiq/cloudbreak/util/FreeMarkerTemplateUtils.java index 2b40b29f212..5d589b4ecf5 100644 --- a/cloud-common/src/main/java/com/sequenceiq/cloudbreak/util/FreeMarkerTemplateUtils.java +++ b/cloud-common/src/main/java/com/sequenceiq/cloudbreak/util/FreeMarkerTemplateUtils.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.io.StringWriter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpCloudSubnetProvider.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpCloudSubnetProvider.java index 505e272cdd2..8795fc41f47 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpCloudSubnetProvider.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpCloudSubnetProvider.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpConnector.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpConnector.java index 9584966a043..d18f71979a8 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpConnector.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpConnector.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpCredentialConnector.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpCredentialConnector.java index 9dbf9e5174d..706a56f3e37 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpCredentialConnector.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpCredentialConnector.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.util.Optional; -import javax.annotation.Nonnull; -import javax.inject.Inject; +import jakarta.annotation.Nonnull; +import jakarta.inject.Inject; import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpIdentityService.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpIdentityService.java index 461be322b36..c582cba85de 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpIdentityService.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpIdentityService.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.gcp; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpInstanceConnector.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpInstanceConnector.java index 891ab6a7490..820f5d329c0 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpInstanceConnector.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpInstanceConnector.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.http.HttpStatus; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpInstanceProvider.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpInstanceProvider.java index 7905632855d..bde1d5b2cc4 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpInstanceProvider.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpInstanceProvider.java @@ -5,7 +5,7 @@ import java.util.Date; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpMetadataCollector.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpMetadataCollector.java index 8e5e2f85c37..450a76e1c93 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpMetadataCollector.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpMetadataCollector.java @@ -12,7 +12,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpNetworkConnector.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpNetworkConnector.java index 1b76b6616b9..446b04438aa 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpNetworkConnector.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpNetworkConnector.java @@ -17,7 +17,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpNetworkInterfaceProvider.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpNetworkInterfaceProvider.java index e13579fa64f..7bbe67a10cd 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpNetworkInterfaceProvider.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpNetworkInterfaceProvider.java @@ -6,7 +6,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpObjectStorageConnector.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpObjectStorageConnector.java index 0f254eddcc0..32ea9f43056 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpObjectStorageConnector.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpObjectStorageConnector.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.gcp; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpPlatformParameters.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpPlatformParameters.java index 26e1b289294..6f3a62beb12 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpPlatformParameters.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpPlatformParameters.java @@ -13,8 +13,8 @@ import java.util.Map; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpPlatformResources.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpPlatformResources.java index a4a789b12ab..a1fb3279201 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpPlatformResources.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpPlatformResources.java @@ -24,8 +24,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpResourceConnector.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpResourceConnector.java index 7118028d4dd..31caa6b58d0 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpResourceConnector.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpResourceConnector.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpTagValidator.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpTagValidator.java index 5596cc42a75..736e5818daa 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpTagValidator.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpTagValidator.java @@ -2,8 +2,8 @@ import java.util.regex.Pattern; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpCloudKMSFactory.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpCloudKMSFactory.java index c969ee8d921..bf9f29dc519 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpCloudKMSFactory.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpCloudKMSFactory.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.security.GeneralSecurityException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,4 +40,4 @@ public CloudKMS buildCloudKMS(CloudCredential cloudCredential) throws GeneralSec .setApplicationName(cloudCredential.getName()) .build(); } -} \ No newline at end of file +} diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpComputeFactory.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpComputeFactory.java index 966c295b6dd..0090694e98d 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpComputeFactory.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpComputeFactory.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.gcp.client; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,4 +38,4 @@ public Compute buildCompute(CloudCredential cloudCredential) { throw new CredentialVerificationException("Error occurred while building Google Compute access.", e); } } -} \ No newline at end of file +} diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpCredentialFactory.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpCredentialFactory.java index fc020da5c5c..9f9117f27c6 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpCredentialFactory.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpCredentialFactory.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.codec.binary.Base64; import org.springframework.stereotype.Service; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpIamFactory.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpIamFactory.java index 15502281521..8146d039083 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpIamFactory.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpIamFactory.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.gcp.client; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,4 +38,4 @@ public Iam buildIam(CloudCredential gcpCredential) { throw new CredentialVerificationException("Error occurred while building Google Compute access.", e); } } -} \ No newline at end of file +} diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpSQLAdminFactory.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpSQLAdminFactory.java index d8173e021a8..37859ac0756 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpSQLAdminFactory.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpSQLAdminFactory.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.gcp.client; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,4 +37,4 @@ public SQLAdmin buildSQLAdmin(CloudCredential gcpCredential, String name) { } return null; } -} \ No newline at end of file +} diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpServiceFactory.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpServiceFactory.java index 37806e3136d..f8abc3c2493 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpServiceFactory.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpServiceFactory.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Locale; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpStorageFactory.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpStorageFactory.java index 098e95955eb..98b6411492a 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpStorageFactory.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/client/GcpStorageFactory.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.gcp.client; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,4 +41,4 @@ public Storage buildStorage(CloudCredential gcpCredential, String name) { } return null; } -} \ No newline at end of file +} diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpAttachedDiskResourceBuilder.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpAttachedDiskResourceBuilder.java index 28c82d39a50..f809d35571b 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpAttachedDiskResourceBuilder.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpAttachedDiskResourceBuilder.java @@ -11,7 +11,7 @@ import java.util.concurrent.Future; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpDiskResourceBuilder.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpDiskResourceBuilder.java index b51d6c260ce..7d0c9bdcd60 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpDiskResourceBuilder.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpDiskResourceBuilder.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpInstanceResourceBuilder.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpInstanceResourceBuilder.java index 79e3c490b61..0591ef45057 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpInstanceResourceBuilder.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpInstanceResourceBuilder.java @@ -14,7 +14,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpReservedIpResourceBuilder.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpReservedIpResourceBuilder.java index 31051a11472..ccb37fc25db 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpReservedIpResourceBuilder.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/compute/GcpReservedIpResourceBuilder.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/context/GcpContextBuilder.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/context/GcpContextBuilder.java index 8819703e392..6784ef004c4 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/context/GcpContextBuilder.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/context/GcpContextBuilder.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.gcp.context; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/loadbalancer/GcpBackendServiceResourceBuilder.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/loadbalancer/GcpBackendServiceResourceBuilder.java index 7a28db9dd55..69d93e0d2fa 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/loadbalancer/GcpBackendServiceResourceBuilder.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/loadbalancer/GcpBackendServiceResourceBuilder.java @@ -9,7 +9,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/loadbalancer/GcpForwardingRuleResourceBuilder.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/loadbalancer/GcpForwardingRuleResourceBuilder.java index 24764d64353..4208f2d6273 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/loadbalancer/GcpForwardingRuleResourceBuilder.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/loadbalancer/GcpForwardingRuleResourceBuilder.java @@ -8,7 +8,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/loadbalancer/GcpLoadBalancingIpResourceBuilder.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/loadbalancer/GcpLoadBalancingIpResourceBuilder.java index 057e8eb32dd..79aa72df568 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/loadbalancer/GcpLoadBalancingIpResourceBuilder.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/loadbalancer/GcpLoadBalancingIpResourceBuilder.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpFirewallInResourceBuilder.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpFirewallInResourceBuilder.java index cfafc69a979..7032a6c08a8 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpFirewallInResourceBuilder.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpFirewallInResourceBuilder.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpFirewallInternalResourceBuilder.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpFirewallInternalResourceBuilder.java index d0d4054f882..71a99138044 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpFirewallInternalResourceBuilder.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpFirewallInternalResourceBuilder.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpNetworkResourceBuilder.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpNetworkResourceBuilder.java index a718d249d8f..b286cd13b74 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpNetworkResourceBuilder.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpNetworkResourceBuilder.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.gcp.network; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpSubnetResourceBuilder.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpSubnetResourceBuilder.java index c1e24e4a2e2..d2b10a244c7 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpSubnetResourceBuilder.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/network/GcpSubnetResourceBuilder.java @@ -3,7 +3,7 @@ import static com.sequenceiq.common.api.type.ResourceType.GCP_SUBNET; import static org.apache.commons.lang3.StringUtils.isNotEmpty; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/poller/GcpDatabasePollerProvider.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/poller/GcpDatabasePollerProvider.java index 9513b1824d5..bab0f1c5967 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/poller/GcpDatabasePollerProvider.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/poller/GcpDatabasePollerProvider.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/CustomGcpDiskEncryptionCreatorService.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/CustomGcpDiskEncryptionCreatorService.java index 58ae08c522e..452ee3cd524 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/CustomGcpDiskEncryptionCreatorService.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/CustomGcpDiskEncryptionCreatorService.java @@ -23,11 +23,12 @@ import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status.Family; + +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status.Family; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/CustomGcpDiskEncryptionService.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/CustomGcpDiskEncryptionService.java index 4700e659eba..74f14fd7aba 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/CustomGcpDiskEncryptionService.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/CustomGcpDiskEncryptionService.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/AbstractGcpComputeBaseResourceChecker.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/AbstractGcpComputeBaseResourceChecker.java index 6ee5293b59c..c4b33f55fab 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/AbstractGcpComputeBaseResourceChecker.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/AbstractGcpComputeBaseResourceChecker.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/GcpComputeResourceChecker.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/GcpComputeResourceChecker.java index 7f92dc01d92..c2501117471 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/GcpComputeResourceChecker.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/GcpComputeResourceChecker.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.io.InterruptedIOException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.slf4j.Logger; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/GcpDatabaseResourceChecker.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/GcpDatabaseResourceChecker.java index 374140002f7..4f2c77867f2 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/GcpDatabaseResourceChecker.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/GcpDatabaseResourceChecker.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.io.InterruptedIOException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/setup/GcpBucketRegisterService.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/setup/GcpBucketRegisterService.java index 864eb416b11..b444e949612 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/setup/GcpBucketRegisterService.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/setup/GcpBucketRegisterService.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.slf4j.Logger; @@ -86,4 +86,4 @@ private boolean bucketExist(Storage storage, String bucketName) { return existingBucket; } -} \ No newline at end of file +} diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/setup/GcpImageRegisterService.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/setup/GcpImageRegisterService.java index b966057aae2..bbbee41eede 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/setup/GcpImageRegisterService.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/setup/GcpImageRegisterService.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.slf4j.Logger; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/setup/GcpProvisionSetup.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/setup/GcpProvisionSetup.java index d350ca0fcdd..73ad9029ac9 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/setup/GcpProvisionSetup.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/setup/GcpProvisionSetup.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/AbstractGcpDatabaseServerStartStopService.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/AbstractGcpDatabaseServerStartStopService.java index 769da854f67..1d185307d61 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/AbstractGcpDatabaseServerStartStopService.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/AbstractGcpDatabaseServerStartStopService.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerCertificateService.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerCertificateService.java index b162be66c5c..d72f0b634a9 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerCertificateService.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerCertificateService.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerCheckService.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerCheckService.java index 6604950e866..665f6cdd67d 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerCheckService.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerCheckService.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerLaunchService.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerLaunchService.java index 3a47c6a4f26..c5b62e88f74 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerLaunchService.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerLaunchService.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerTerminateService.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerTerminateService.java index 5edab54a01f..9686e401777 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerTerminateService.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerTerminateService.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerUpdateService.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerUpdateService.java index b0c5def9c9d..8f4fc379653 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerUpdateService.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerUpdateService.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.gcp.sql; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerUpgradeService.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerUpgradeService.java index 5efd183b036..88d9b9f8ff6 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerUpgradeService.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/sql/GcpDatabaseServerUpgradeService.java @@ -5,7 +5,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; diff --git a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/validator/GcpServiceAccountObjectStorageValidator.java b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/validator/GcpServiceAccountObjectStorageValidator.java index a5db08c86a1..09c69b22c81 100644 --- a/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/validator/GcpServiceAccountObjectStorageValidator.java +++ b/cloud-gcp/src/main/java/com/sequenceiq/cloudbreak/cloud/gcp/validator/GcpServiceAccountObjectStorageValidator.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpCredentialConnectorTest.java b/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpCredentialConnectorTest.java index 29a612b09e2..d4a5d010e4a 100644 --- a/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpCredentialConnectorTest.java +++ b/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpCredentialConnectorTest.java @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; import org.apache.commons.codec.binary.Base64; import org.hamcrest.core.IsInstanceOf; diff --git a/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpTagValidatorTest.java b/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpTagValidatorTest.java index c5cc93277ca..8ecc4fb51ba 100644 --- a/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpTagValidatorTest.java +++ b/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpTagValidatorTest.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DynamicTest; diff --git a/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/AbstractGcpBaseResourceCheckerTest.java b/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/AbstractGcpBaseResourceCheckerTest.java index 4d03bba33cb..f10f136db88 100644 --- a/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/AbstractGcpBaseResourceCheckerTest.java +++ b/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/service/checker/AbstractGcpBaseResourceCheckerTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.gcp.service.checker; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -11,7 +11,7 @@ import java.io.IOException; import java.util.stream.Stream; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockConnector.java b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockConnector.java index dcc6702776a..76f5623ae94 100644 --- a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockConnector.java +++ b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockConnector.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockInstanceConnector.java b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockInstanceConnector.java index 5986b6f6f3b..7f539480ba5 100644 --- a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockInstanceConnector.java +++ b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockInstanceConnector.java @@ -7,11 +7,11 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.ResponseProcessingException; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.ResponseProcessingException; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockMetadataCollector.java b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockMetadataCollector.java index de97de2efce..18dc232dffb 100644 --- a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockMetadataCollector.java +++ b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockMetadataCollector.java @@ -4,9 +4,9 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockNetworkConnector.java b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockNetworkConnector.java index bb194e8a511..00f1fc17f6b 100644 --- a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockNetworkConnector.java +++ b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockNetworkConnector.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockPlatformParameters.java b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockPlatformParameters.java index 13182d31f4a..8e720d69b22 100644 --- a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockPlatformParameters.java +++ b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockPlatformParameters.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockPlatformResources.java b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockPlatformResources.java index bd677163dfa..6507357a693 100644 --- a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockPlatformResources.java +++ b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockPlatformResources.java @@ -17,8 +17,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.Cacheable; diff --git a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockPublicKeyConnector.java b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockPublicKeyConnector.java index 123f9afecba..f97a5b7b366 100644 --- a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockPublicKeyConnector.java +++ b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockPublicKeyConnector.java @@ -2,10 +2,10 @@ import java.util.Map; -import javax.inject.Inject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Service; diff --git a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockResourceConnector.java b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockResourceConnector.java index aac1cc9ad9a..35f6f879686 100644 --- a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockResourceConnector.java +++ b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockResourceConnector.java @@ -14,10 +14,10 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockUrlFactory.java b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockUrlFactory.java index c3fdf8bca5d..4646b79732e 100644 --- a/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockUrlFactory.java +++ b/cloud-mock/src/main/java/com/sequenceiq/cloudbreak/cloud/mock/MockUrlFactory.java @@ -1,10 +1,10 @@ package com.sequenceiq.cloudbreak.cloud.mock; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor-api/src/main/java/com/sequenceiq/cloudbreak/cloud/configuration/CloudReactorInitializer.java b/cloud-reactor-api/src/main/java/com/sequenceiq/cloudbreak/cloud/configuration/CloudReactorInitializer.java index b3ce06ce42a..cb30234266a 100644 --- a/cloud-reactor-api/src/main/java/com/sequenceiq/cloudbreak/cloud/configuration/CloudReactorInitializer.java +++ b/cloud-reactor-api/src/main/java/com/sequenceiq/cloudbreak/cloud/configuration/CloudReactorInitializer.java @@ -2,8 +2,8 @@ import java.util.function.Consumer; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CDPServicePolicyVerificationHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CDPServicePolicyVerificationHandler.java index 559a2a012bb..df4fae6bbf3 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CDPServicePolicyVerificationHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CDPServicePolicyVerificationHandler.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CheckImageHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CheckImageHandler.java index aab3af186f9..c5ba13c89ca 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CheckImageHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CheckImageHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CheckPlatformVariantHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CheckPlatformVariantHandler.java index 1e7d8386452..8f4f8ebaa46 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CheckPlatformVariantHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CheckPlatformVariantHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CollectLoadBalancerMetadataHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CollectLoadBalancerMetadataHandler.java index 3dca6de2c4f..785c24f127e 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CollectLoadBalancerMetadataHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CollectLoadBalancerMetadataHandler.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CollectMetadataHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CollectMetadataHandler.java index e7e1871899d..334c4777285 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CollectMetadataHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CollectMetadataHandler.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CreateCredentialHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CreateCredentialHandler.java index de7f98fc3e8..b9383c892b5 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CreateCredentialHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CreateCredentialHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CredentialPrerequisitesHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CredentialPrerequisitesHandler.java index 9d9ec14acd7..99e66a700c5 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CredentialPrerequisitesHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CredentialPrerequisitesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CredentialVerificationHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CredentialVerificationHandler.java index 65b7f64de57..a0772d84bc6 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CredentialVerificationHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/CredentialVerificationHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DelayedStartStackHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DelayedStartStackHandler.java index d183033d134..7b90b30d58e 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DelayedStartStackHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DelayedStartStackHandler.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DelayedStopStackHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DelayedStopStackHandler.java index c600c149c64..9614869222d 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DelayedStopStackHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DelayedStopStackHandler.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DownscaleStackCollectResourcesHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DownscaleStackCollectResourcesHandler.java index 2b79553f2cc..b4e08f67f1e 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DownscaleStackCollectResourcesHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DownscaleStackCollectResourcesHandler.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DownscaleStackHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DownscaleStackHandler.java index 7785a880b23..49bdaddd7f6 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DownscaleStackHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/DownscaleStackHandler.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetDiskTypesHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetDiskTypesHandler.java index 6b0b8586fa1..87f6dd2fc6f 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetDiskTypesHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetDiskTypesHandler.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Map.Entry; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformAccessConfigsHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformAccessConfigsHandler.java index c38f454a12c..480c27f03a3 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformAccessConfigsHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformAccessConfigsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformDatabaseCapabilitiesHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformDatabaseCapabilitiesHandler.java index d87afc58caf..6830dadc268 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformDatabaseCapabilitiesHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformDatabaseCapabilitiesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformEncryptionKeysHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformEncryptionKeysHandler.java index aa6b6820958..dd81d2d178c 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformEncryptionKeysHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformEncryptionKeysHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformGatewaysHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformGatewaysHandler.java index 8ba8bb19be1..8ddd7d0d6eb 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformGatewaysHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformGatewaysHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformInstanceGroupParametersHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformInstanceGroupParametersHandler.java index 4906bac71ad..d1129d8721b 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformInstanceGroupParametersHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformInstanceGroupParametersHandler.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformIpPoolsHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformIpPoolsHandler.java index e40d024692d..6d33e1cc8f2 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformIpPoolsHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformIpPoolsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformNetworksHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformNetworksHandler.java index 1f31f0d5684..0d7dcf3a43f 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformNetworksHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformNetworksHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformNoSqlTablesHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformNoSqlTablesHandler.java index eddf040897e..d4b5b7c5761 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformNoSqlTablesHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformNoSqlTablesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformOrchestratorsHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformOrchestratorsHandler.java index 34772419998..57eb5a42909 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformOrchestratorsHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformOrchestratorsHandler.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Map.Entry; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformPrivateDnsZonesHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformPrivateDnsZonesHandler.java index 79034d125af..0ebd8909b9b 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformPrivateDnsZonesHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformPrivateDnsZonesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,4 +46,4 @@ public void accept(Event event) { } } -} \ No newline at end of file +} diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformResourceGroupsHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformResourceGroupsHandler.java index 07901ef2241..5e927434530 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformResourceGroupsHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformResourceGroupsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformSecurityGroupsHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformSecurityGroupsHandler.java index 1b931359c03..ad471414993 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformSecurityGroupsHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformSecurityGroupsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformSshKeysHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformSshKeysHandler.java index 5dc9c37843a..e94645c41ec 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformSshKeysHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformSshKeysHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformVariantsHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformVariantsHandler.java index 4793bdc4476..00fa321a08f 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformVariantsHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformVariantsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformVmTypesHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformVmTypesHandler.java index acd8051b08c..524961174ef 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformVmTypesHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetPlatformVmTypesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetRegionsV2Handler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetRegionsV2Handler.java index 6240d83bd14..fe63054ce79 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetRegionsV2Handler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetRegionsV2Handler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetSSHFingerprintsHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetSSHFingerprintsHandler.java index 14e2c5bed15..75c699188d4 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetSSHFingerprintsHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetSSHFingerprintsHandler.java @@ -5,7 +5,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetStackParamValidationHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetStackParamValidationHandler.java index a26ed73ab10..39116130ecd 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetStackParamValidationHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetStackParamValidationHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetTlsInfoHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetTlsInfoHandler.java index 03f9ce473c6..9e4099f60f0 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetTlsInfoHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetTlsInfoHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetVirtualMachineRecommendationsHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetVirtualMachineRecommendationsHandler.java index c7c812cea98..375641b25cb 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetVirtualMachineRecommendationsHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/GetVirtualMachineRecommendationsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/InstanceStateHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/InstanceStateHandler.java index 6ae67c0560d..788ecef7979 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/InstanceStateHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/InstanceStateHandler.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/InstanceStateQuery.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/InstanceStateQuery.java index 730626c8136..e3d45903a83 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/InstanceStateQuery.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/InstanceStateQuery.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/LaunchLoadBalancerHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/LaunchLoadBalancerHandler.java index c796459ca65..68b36b7b441 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/LaunchLoadBalancerHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/LaunchLoadBalancerHandler.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/LaunchStackHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/LaunchStackHandler.java index 9131ae8639b..0f7cb3fb5f6 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/LaunchStackHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/LaunchStackHandler.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ParametersValidationHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ParametersValidationHandler.java index c5b98e47ff0..78143ba78a6 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ParametersValidationHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ParametersValidationHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/PlatformParameterHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/PlatformParameterHandler.java index 8e1d5f2dd2a..ae02130b89d 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/PlatformParameterHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/PlatformParameterHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/PlatformParametersHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/PlatformParametersHandler.java index 5314a862995..a03a1c6eed9 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/PlatformParametersHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/PlatformParametersHandler.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Map.Entry; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/PrepareImageHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/PrepareImageHandler.java index 88cc0b3cf61..f13bd325985 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/PrepareImageHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/PrepareImageHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ProvisionSetupHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ProvisionSetupHandler.java index 926fdb17708..d2dd243eb5d 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ProvisionSetupHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ProvisionSetupHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ProvisionValidationHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ProvisionValidationHandler.java index eedb7416a0c..a2b7a0fee34 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ProvisionValidationHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ProvisionValidationHandler.java @@ -3,7 +3,7 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/RebootInstanceHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/RebootInstanceHandler.java index 70724e15480..ed54370e8a7 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/RebootInstanceHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/RebootInstanceHandler.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/RemoveInstanceHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/RemoveInstanceHandler.java index 8a953d91575..ec3f49b5ff8 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/RemoveInstanceHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/RemoveInstanceHandler.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ResourceDefinitionHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ResourceDefinitionHandler.java index d1bb81d104a..005bbe23f93 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ResourceDefinitionHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ResourceDefinitionHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ResourcePersistenceHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ResourcePersistenceHandler.java index 3db74ea17ff..2b94ab8a475 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ResourcePersistenceHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ResourcePersistenceHandler.java @@ -2,7 +2,7 @@ import java.util.function.Consumer; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ResourceRetrievalHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ResourceRetrievalHandler.java index 3d04ab781b7..dc2d5756d6a 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ResourceRetrievalHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/ResourceRetrievalHandler.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.function.Consumer; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StartStackHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StartStackHandler.java index e8c08624021..d00cf7654c3 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StartStackHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StartStackHandler.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StopStackHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StopStackHandler.java index b3b8ca9c24a..dc573670e5a 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StopStackHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StopStackHandler.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StopStartDownscaleStopInstancesHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StopStartDownscaleStopInstancesHandler.java index 134cd58de22..2978378f3dd 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StopStartDownscaleStopInstancesHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StopStartDownscaleStopInstancesHandler.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StopStartUpscaleStartInstancesHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StopStartUpscaleStartInstancesHandler.java index 39cd1fbdc72..949b42a684b 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StopStartUpscaleStartInstancesHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/StopStartUpscaleStartInstancesHandler.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/TemplateHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/TemplateHandler.java index aad940a850e..f41cd6afee6 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/TemplateHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/TemplateHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/TerminateStackHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/TerminateStackHandler.java index e478aeda3c3..84e0ccbd209 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/TerminateStackHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/TerminateStackHandler.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/UpdateImageHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/UpdateImageHandler.java index 4ae462109bd..4e63dabf4af 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/UpdateImageHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/UpdateImageHandler.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/UpscaleValidationHandler.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/UpscaleValidationHandler.java index 9b0851cb8b0..df72dd11af9 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/UpscaleValidationHandler.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/UpscaleValidationHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/service/LoadBalancerMetadataService.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/service/LoadBalancerMetadataService.java index 6637b33f449..afda7f50331 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/service/LoadBalancerMetadataService.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/handler/service/LoadBalancerMetadataService.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/init/CloudPlatformConnectors.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/init/CloudPlatformConnectors.java index 9802ec1a4c1..cbd63cd4ecb 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/init/CloudPlatformConnectors.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/init/CloudPlatformConnectors.java @@ -8,8 +8,8 @@ import java.util.Map; import java.util.Map.Entry; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/init/CloudPlatformInitializer.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/init/CloudPlatformInitializer.java index 45d329c774f..bc8f2b1287a 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/init/CloudPlatformInitializer.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/init/CloudPlatformInitializer.java @@ -4,9 +4,9 @@ import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.annotation.Resource; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/notification/ResourceNotifier.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/notification/ResourceNotifier.java index e95bfad0c9b..859e706dde7 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/notification/ResourceNotifier.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/notification/ResourceNotifier.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/notification/ResourcePersistenceRetriever.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/notification/ResourcePersistenceRetriever.java index abab1b928e8..1263b59002b 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/notification/ResourcePersistenceRetriever.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/notification/ResourcePersistenceRetriever.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/service/CloudParameterCache.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/service/CloudParameterCache.java index d19597513d8..66a9a688b0f 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/service/CloudParameterCache.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/service/CloudParameterCache.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.function.Supplier; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/service/CloudParameterService.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/service/CloudParameterService.java index c397b94fb13..411683dcd0a 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/service/CloudParameterService.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/service/CloudParameterService.java @@ -3,8 +3,8 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/task/PollBooleanStateTask.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/task/PollBooleanStateTask.java index afdad69b2c2..5f3e1ade4a1 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/task/PollBooleanStateTask.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/task/PollBooleanStateTask.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.cloud.task; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.sequenceiq.cloudbreak.cloud.context.AuthenticatedContext; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/task/PollResourcesStateTask.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/task/PollResourcesStateTask.java index 11be8aed35c..3b6fafb19ea 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/task/PollResourcesStateTask.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/task/PollResourcesStateTask.java @@ -3,7 +3,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/task/PollTaskFactory.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/task/PollTaskFactory.java index a3614ca8f2a..20c58ea2605 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/task/PollTaskFactory.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/task/PollTaskFactory.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; diff --git a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/transform/CloudResourceHelper.java b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/transform/CloudResourceHelper.java index 12e89fd26e9..ee6169b3ab5 100644 --- a/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/transform/CloudResourceHelper.java +++ b/cloud-reactor/src/main/java/com/sequenceiq/cloudbreak/cloud/transform/CloudResourceHelper.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-reactor/src/test/java/com/sequenceiq/cloudbreak/cloud/handler/AbstractComponentTest.java b/cloud-reactor/src/test/java/com/sequenceiq/cloudbreak/cloud/handler/AbstractComponentTest.java index 5d9c5f5470c..7890a0dd597 100644 --- a/cloud-reactor/src/test/java/com/sequenceiq/cloudbreak/cloud/handler/AbstractComponentTest.java +++ b/cloud-reactor/src/test/java/com/sequenceiq/cloudbreak/cloud/handler/AbstractComponentTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cloud.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/cloud-reactor/src/test/java/com/sequenceiq/cloudbreak/cloud/handler/GetSSHFingerprintsComponentTest.java b/cloud-reactor/src/test/java/com/sequenceiq/cloudbreak/cloud/handler/GetSSHFingerprintsComponentTest.java index 464f00261f7..ae0a9aa4253 100644 --- a/cloud-reactor/src/test/java/com/sequenceiq/cloudbreak/cloud/handler/GetSSHFingerprintsComponentTest.java +++ b/cloud-reactor/src/test/java/com/sequenceiq/cloudbreak/cloud/handler/GetSSHFingerprintsComponentTest.java @@ -4,7 +4,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.Test; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/cloud-reactor/src/test/java/com/sequenceiq/cloudbreak/cloud/handler/testcontext/TestApplicationContext.java b/cloud-reactor/src/test/java/com/sequenceiq/cloudbreak/cloud/handler/testcontext/TestApplicationContext.java index b96db45489f..f039ab4f50b 100644 --- a/cloud-reactor/src/test/java/com/sequenceiq/cloudbreak/cloud/handler/testcontext/TestApplicationContext.java +++ b/cloud-reactor/src/test/java/com/sequenceiq/cloudbreak/cloud/handler/testcontext/TestApplicationContext.java @@ -9,8 +9,8 @@ import java.util.HashMap; import java.util.concurrent.ScheduledThreadPoolExecutor; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/AbstractInstanceConnector.java b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/AbstractInstanceConnector.java index 7652e8cda82..d1f3f807177 100644 --- a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/AbstractInstanceConnector.java +++ b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/AbstractInstanceConnector.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.sequenceiq.cloudbreak.cloud.InstanceConnector; import com.sequenceiq.cloudbreak.cloud.context.AuthenticatedContext; diff --git a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/AbstractResourceConnector.java b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/AbstractResourceConnector.java index b8a7b344bb4..ab69447e98c 100644 --- a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/AbstractResourceConnector.java +++ b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/AbstractResourceConnector.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/ComputeResourceBuilder.java b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/ComputeResourceBuilder.java index 9f59dc4429b..e2a915ec8c7 100644 --- a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/ComputeResourceBuilder.java +++ b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/ComputeResourceBuilder.java @@ -50,7 +50,7 @@ public interface ComputeResourceBuilder extend * will be provided to the {@link #build(ResourceBuilderContext, long, AuthenticatedContext, Group, List, CloudStack)} method to actually create these * resources on the cloud provider. In case the resource creation fails it will be rolled back using the resource name as a reference. To provide * resource names implement the {@link com.sequenceiq.cloudbreak.cloud.service.ResourceNameService} interface and inject it to the implementation - * using {@link javax.inject.Inject}. + * using {@link jakarta.inject.Inject}. * * @param context Generic context object passed along with the flow to all methods. It is created by the {@link ResourceContextBuilder}. * @param privateId Each compute resource is grouped by a private id used by Cloudbreak only. It is generally advised to include the private id @@ -155,4 +155,4 @@ default boolean isInstanceBuilder() { return false; } -} \ No newline at end of file +} diff --git a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/LoadBalancerResourceBuilder.java b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/LoadBalancerResourceBuilder.java index 1a0ad66b524..55922aea45f 100644 --- a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/LoadBalancerResourceBuilder.java +++ b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/LoadBalancerResourceBuilder.java @@ -39,7 +39,7 @@ public interface LoadBalancerResourceBuilder e * will be provided to the {@link #build(ResourceBuilderContext, AuthenticatedContext, CloudLoadBalancer, CloudStack)} method to actually create these * resources on the cloud provider. In case the resource creation fails it will be rolled back using the resource name as a reference. To provide * resource names implement the {@link com.sequenceiq.cloudbreak.cloud.service.ResourceNameService} interface and inject it to the implementation - * using {@link javax.inject.Inject}. + * using {@link jakarta.inject.Inject}. * * @param context Generic context object passed along with the flow to all methods. It is created by the {@link ResourceContextBuilder}. * @param auth Authenticated context is provided to be able to send the requests to the cloud provider. diff --git a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/compute/CloudFailureHandler.java b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/compute/CloudFailureHandler.java index 43a009c1250..6c104e2cc52 100644 --- a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/compute/CloudFailureHandler.java +++ b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/compute/CloudFailureHandler.java @@ -9,7 +9,7 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/compute/ComputeResourceService.java b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/compute/ComputeResourceService.java index 35939169339..df3f3ab6f04 100644 --- a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/compute/ComputeResourceService.java +++ b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/compute/ComputeResourceService.java @@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/compute/ResourceActionFactory.java b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/compute/ResourceActionFactory.java index 92772ce5025..0f92d8bd2f3 100644 --- a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/compute/ResourceActionFactory.java +++ b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/compute/ResourceActionFactory.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/group/GroupResourceService.java b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/group/GroupResourceService.java index 2827123ac2a..3941cb9beb0 100644 --- a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/group/GroupResourceService.java +++ b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/group/GroupResourceService.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/init/ContextBuilders.java b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/init/ContextBuilders.java index 41e8b98fa9f..11a1df1b7d5 100644 --- a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/init/ContextBuilders.java +++ b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/init/ContextBuilders.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/init/ResourceBuilders.java b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/init/ResourceBuilders.java index db4e72e7299..8565fc00728 100644 --- a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/init/ResourceBuilders.java +++ b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/init/ResourceBuilders.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/loadbalancer/LoadBalancerResourceService.java b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/loadbalancer/LoadBalancerResourceService.java index c37ce27b55d..8d256747081 100644 --- a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/loadbalancer/LoadBalancerResourceService.java +++ b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/loadbalancer/LoadBalancerResourceService.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/network/NetworkResourceService.java b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/network/NetworkResourceService.java index f656062ce91..f74e0f54a21 100644 --- a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/network/NetworkResourceService.java +++ b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/network/NetworkResourceService.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/task/ResourcePollTaskFactory.java b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/task/ResourcePollTaskFactory.java index 25d16e9bd3f..327aea65f25 100644 --- a/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/task/ResourcePollTaskFactory.java +++ b/cloud-template/src/main/java/com/sequenceiq/cloudbreak/cloud/template/task/ResourcePollTaskFactory.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; diff --git a/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnConnector.java b/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnConnector.java index 1e16fbd9ada..4ba457eafb3 100644 --- a/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnConnector.java +++ b/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnConnector.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnMetadataCollector.java b/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnMetadataCollector.java index 9a0a29c03a7..1647f08ca58 100644 --- a/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnMetadataCollector.java +++ b/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnMetadataCollector.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Queue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnPlatformParameters.java b/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnPlatformParameters.java index 18cda518e99..841288835fc 100644 --- a/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnPlatformParameters.java +++ b/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnPlatformParameters.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnPlatformResources.java b/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnPlatformResources.java index 1d498a8f469..4050a0bef11 100644 --- a/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnPlatformResources.java +++ b/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnPlatformResources.java @@ -10,8 +10,8 @@ import java.util.HashSet; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnResourceConnector.java b/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnResourceConnector.java index 58c15bd6aa6..f8496451f43 100644 --- a/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnResourceConnector.java +++ b/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/YarnResourceConnector.java @@ -12,7 +12,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/client/YarnHttpClient.java b/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/client/YarnHttpClient.java index fe73787981b..d77e7b9df5f 100644 --- a/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/client/YarnHttpClient.java +++ b/cloud-yarn/src/main/java/com/sequenceiq/cloudbreak/cloud/yarn/client/YarnHttpClient.java @@ -2,7 +2,7 @@ import java.net.MalformedURLException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster-api/src/main/java/com/sequenceiq/cloudbreak/cluster/api/ClusterCommissionService.java b/cluster-api/src/main/java/com/sequenceiq/cloudbreak/cluster/api/ClusterCommissionService.java index 73606d5ef1d..e468ce07e70 100644 --- a/cluster-api/src/main/java/com/sequenceiq/cloudbreak/cluster/api/ClusterCommissionService.java +++ b/cluster-api/src/main/java/com/sequenceiq/cloudbreak/cluster/api/ClusterCommissionService.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.sequenceiq.cloudbreak.domain.stack.cluster.host.HostGroup; import com.sequenceiq.cloudbreak.domain.stack.instance.InstanceMetaData; diff --git a/cluster-api/src/main/java/com/sequenceiq/cloudbreak/cluster/api/ClusterDecomissionService.java b/cluster-api/src/main/java/com/sequenceiq/cloudbreak/cluster/api/ClusterDecomissionService.java index 9157468eabe..b8f358dfe51 100644 --- a/cluster-api/src/main/java/com/sequenceiq/cloudbreak/cluster/api/ClusterDecomissionService.java +++ b/cluster-api/src/main/java/com/sequenceiq/cloudbreak/cluster/api/ClusterDecomissionService.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.sequenceiq.cloudbreak.cluster.service.ClusterClientInitException; import com.sequenceiq.cloudbreak.dto.StackDtoDelegate; diff --git a/cluster-api/src/main/java/com/sequenceiq/cloudbreak/cluster/service/ClusterComponentConfigProvider.java b/cluster-api/src/main/java/com/sequenceiq/cloudbreak/cluster/service/ClusterComponentConfigProvider.java index 7d74d55f51f..4e611e984c4 100644 --- a/cluster-api/src/main/java/com/sequenceiq/cloudbreak/cluster/service/ClusterComponentConfigProvider.java +++ b/cluster-api/src/main/java/com/sequenceiq/cloudbreak/cluster/service/ClusterComponentConfigProvider.java @@ -13,7 +13,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.commons.codec.binary.Base64; import org.hibernate.envers.AuditReader; diff --git a/cluster-api/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterCommandRepository.java b/cluster-api/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterCommandRepository.java index 81d84157484..2cebf4dbbf9 100644 --- a/cluster-api/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterCommandRepository.java +++ b/cluster-api/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterCommandRepository.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; diff --git a/cluster-api/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterComponentHistoryRepository.java b/cluster-api/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterComponentHistoryRepository.java index b28c69f68f0..e5bbd0a8798 100644 --- a/cluster-api/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterComponentHistoryRepository.java +++ b/cluster-api/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterComponentHistoryRepository.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.repository; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; @@ -19,4 +19,4 @@ public interface ClusterComponentHistoryRepository extends CrudRepository findComponentsByClusterIdComponentTypeName(@Param("cluster @Query("DELETE FROM ClusterComponent cv WHERE cv.cluster.id = :clusterId AND cv.componentType = :componentType") void deleteComponentByClusterIdAndComponentType(@Param("clusterId") Long clusterId, @Param("componentType") ComponentType componentType); -} \ No newline at end of file +} diff --git a/cluster-api/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterComponentViewRepository.java b/cluster-api/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterComponentViewRepository.java index d92e75736af..636e7712bd2 100644 --- a/cluster-api/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterComponentViewRepository.java +++ b/cluster-api/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterComponentViewRepository.java @@ -3,8 +3,8 @@ import java.util.Collection; import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; diff --git a/cluster-api/src/test/java/com/sequenceiq/cloudbreak/cluster/service/ClusterComponentConfigProviderTest.java b/cluster-api/src/test/java/com/sequenceiq/cloudbreak/cluster/service/ClusterComponentConfigProviderTest.java index 5900628877b..17a8a873756 100644 --- a/cluster-api/src/test/java/com/sequenceiq/cloudbreak/cluster/service/ClusterComponentConfigProviderTest.java +++ b/cluster-api/src/test/java/com/sequenceiq/cloudbreak/cluster/service/ClusterComponentConfigProviderTest.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; @@ -132,4 +132,4 @@ private void setupInvokeAuditReaderInTransaction(MockedStatic config) { }); return apiConfigList; } -} \ No newline at end of file +} diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerConnector.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerConnector.java index e920811c59a..a3172dea3cf 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerConnector.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerConnector.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cm; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Scope; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDatabusService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDatabusService.java index a56cf99ebf5..1c9b8bafba4 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDatabusService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDatabusService.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -111,4 +111,4 @@ private String getWAMachineUserName(StackDtoDelegate stack) { } return String.format(DATABUS_CRN_PATTERN, machineUserSuffix); } -} \ No newline at end of file +} diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDecomissioner.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDecomissioner.java index 4f731c5eef4..97660d08633 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDecomissioner.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDecomissioner.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDeregisterService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDeregisterService.java index fefb51cec53..65577b2a44e 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDeregisterService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDeregisterService.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDiagnosticsService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDiagnosticsService.java index 7ee7cff3d17..7bac19a6d35 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDiagnosticsService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerDiagnosticsService.java @@ -2,8 +2,8 @@ import java.math.BigDecimal; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.joda.time.DateTime; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerExternalAccountService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerExternalAccountService.java index a8f7b0f6dc8..18793a7d477 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerExternalAccountService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerExternalAccountService.java @@ -4,7 +4,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerFedRAMPService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerFedRAMPService.java index 1714804ff08..e8798f84dcd 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerFedRAMPService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerFedRAMPService.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.stereotype.Service; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerKerberosService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerKerberosService.java index 4dd3759a9b8..1383b5a5b2b 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerKerberosService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerKerberosService.java @@ -5,7 +5,7 @@ import java.math.BigDecimal; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerLdapService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerLdapService.java index 96d04b38496..eaf3910d544 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerLdapService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerLdapService.java @@ -3,7 +3,7 @@ import java.util.Optional; import java.util.function.Predicate; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerLicenseService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerLicenseService.java index 349b60c7df5..56f5b9d01a1 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerLicenseService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerLicenseService.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cm; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerMgmtLaunchService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerMgmtLaunchService.java index d4dfe13e5b9..2ab7d50c2ae 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerMgmtLaunchService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerMgmtLaunchService.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerMgmtSetupService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerMgmtSetupService.java index ff100cba73c..46446b0b163 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerMgmtSetupService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerMgmtSetupService.java @@ -9,7 +9,7 @@ import java.util.function.Consumer; import java.util.function.Predicate; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerMgmtTelemetryService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerMgmtTelemetryService.java index 62d37fb975b..0060ae7e580 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerMgmtTelemetryService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerMgmtTelemetryService.java @@ -10,7 +10,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerModificationService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerModificationService.java index 2d0b6e40ebe..efc66f3ffdd 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerModificationService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerModificationService.java @@ -26,8 +26,8 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerParcelDecommissionService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerParcelDecommissionService.java index 0f51710d095..7244eab9985 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerParcelDecommissionService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerParcelDecommissionService.java @@ -3,7 +3,7 @@ import java.util.Map.Entry; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerParcelManagementService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerParcelManagementService.java index 916548d21c0..dd5d0392100 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerParcelManagementService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerParcelManagementService.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerPreCreationService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerPreCreationService.java index b92da645eb9..c53dea5a57b 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerPreCreationService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerPreCreationService.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerRestartService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerRestartService.java index e404ce6990c..72240892524 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerRestartService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerRestartService.java @@ -11,7 +11,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerRoleRefreshService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerRoleRefreshService.java index bd7454e9457..47aad91ca6d 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerRoleRefreshService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerRoleRefreshService.java @@ -5,7 +5,7 @@ import java.util.function.Consumer; import java.util.function.Predicate; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerSecurityService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerSecurityService.java index 84295589861..735a2a017f7 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerSecurityService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerSecurityService.java @@ -7,7 +7,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerSetupService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerSetupService.java index ef83dd0de12..21a6db973d6 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerSetupService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerSetupService.java @@ -16,8 +16,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpStatus; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerSupportSetupService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerSupportSetupService.java index c5935d8f904..0c91ff1dd2b 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerSupportSetupService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerSupportSetupService.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.cm; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerUpgradeService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerUpgradeService.java index 79221ae498d..1752c5d2cdb 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerUpgradeService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerUpgradeService.java @@ -3,7 +3,7 @@ import java.math.BigDecimal; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerYarnSetupService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerYarnSetupService.java index d92ea387a8f..b2a119d371c 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerYarnSetupService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/ClouderaManagerYarnSetupService.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.slf4j.Logger; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/config/CmMgmtServiceConfigLocationService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/config/CmMgmtServiceConfigLocationService.java index 602d0923c6d..39d416cd18b 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/config/CmMgmtServiceConfigLocationService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/config/CmMgmtServiceConfigLocationService.java @@ -3,7 +3,7 @@ import java.util.Arrays; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/config/CmMgmtServiceConfigMemoryService.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/config/CmMgmtServiceConfigMemoryService.java index ef53fc365c8..06b080950c0 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/config/CmMgmtServiceConfigMemoryService.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/config/CmMgmtServiceConfigMemoryService.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; diff --git a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/polling/ClouderaManagerPollingServiceProvider.java b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/polling/ClouderaManagerPollingServiceProvider.java index a4b59a58b90..9a6a1c87ef8 100644 --- a/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/polling/ClouderaManagerPollingServiceProvider.java +++ b/cluster-cm/src/main/java/com/sequenceiq/cloudbreak/cm/polling/ClouderaManagerPollingServiceProvider.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; diff --git a/cluster-dns-connector/src/main/java/com/sequenceiq/cloudbreak/certificate/service/CertificateCreationService.java b/cluster-dns-connector/src/main/java/com/sequenceiq/cloudbreak/certificate/service/CertificateCreationService.java index 1fb9f4650e1..55461915d16 100644 --- a/cluster-dns-connector/src/main/java/com/sequenceiq/cloudbreak/certificate/service/CertificateCreationService.java +++ b/cluster-dns-connector/src/main/java/com/sequenceiq/cloudbreak/certificate/service/CertificateCreationService.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.bouncycastle.pkcs.PKCS10CertificationRequest; import org.slf4j.Logger; diff --git a/cluster-dns-connector/src/main/java/com/sequenceiq/cloudbreak/certificate/service/DnsManagementService.java b/cluster-dns-connector/src/main/java/com/sequenceiq/cloudbreak/certificate/service/DnsManagementService.java index abc4243e19c..494eb5c56f5 100644 --- a/cluster-dns-connector/src/main/java/com/sequenceiq/cloudbreak/certificate/service/DnsManagementService.java +++ b/cluster-dns-connector/src/main/java/com/sequenceiq/cloudbreak/certificate/service/DnsManagementService.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/cluster-dns-connector/src/main/java/com/sequenceiq/cloudbreak/client/GrpcClusterDnsClient.java b/cluster-dns-connector/src/main/java/com/sequenceiq/cloudbreak/client/GrpcClusterDnsClient.java index f6e0e4a9115..31cca9c13f1 100644 --- a/cluster-dns-connector/src/main/java/com/sequenceiq/cloudbreak/client/GrpcClusterDnsClient.java +++ b/cluster-dns-connector/src/main/java/com/sequenceiq/cloudbreak/client/GrpcClusterDnsClient.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster-proxy/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyConfiguration.java b/cluster-proxy/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyConfiguration.java index b049cf871c8..5ccfcbede02 100644 --- a/cluster-proxy/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyConfiguration.java +++ b/cluster-proxy/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyConfiguration.java @@ -3,7 +3,7 @@ import java.net.MalformedURLException; import java.net.URL; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cluster-proxy/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyEnablementService.java b/cluster-proxy/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyEnablementService.java index 5860bf9640e..95a4a928700 100644 --- a/cluster-proxy/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyEnablementService.java +++ b/cluster-proxy/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyEnablementService.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/cluster-proxy/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyRegistrationClient.java b/cluster-proxy/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyRegistrationClient.java index 6786a7bb4bb..4bc36921a5e 100644 --- a/cluster-proxy/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyRegistrationClient.java +++ b/cluster-proxy/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyRegistrationClient.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.clusterproxy; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/backup/base/BackupBase.java b/common-model/src/main/java/com/sequenceiq/common/api/backup/base/BackupBase.java index c413301c0f4..ba26efc35b7 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/backup/base/BackupBase.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/backup/base/BackupBase.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/backup/model/BackupCloudwatchParams.java b/common-model/src/main/java/com/sequenceiq/common/api/backup/model/BackupCloudwatchParams.java index f36c36c1d9e..0ed42b2c63c 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/backup/model/BackupCloudwatchParams.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/backup/model/BackupCloudwatchParams.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/CloudStorageBase.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/CloudStorageBase.java index 780677b1897..7544aab7eba 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/CloudStorageBase.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/CloudStorageBase.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -66,4 +66,4 @@ public CloudStorageBase copy(CloudStorageBase other) { this.accountMapping = other.accountMapping; return this; } -} \ No newline at end of file +} diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/CloudStorageV1Base.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/CloudStorageV1Base.java index c16a7a3a547..9d983c916d8 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/CloudStorageV1Base.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/CloudStorageV1Base.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.common.api.cloudstorage.old.AdlsCloudStorageV1Parameters; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/AdlsCloudStorageV1Parameters.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/AdlsCloudStorageV1Parameters.java index 19ab7ea2bea..ab4080b8ca3 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/AdlsCloudStorageV1Parameters.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/AdlsCloudStorageV1Parameters.java @@ -1,6 +1,6 @@ package com.sequenceiq.common.api.cloudstorage.old; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -70,4 +70,4 @@ public FileSystemType getType() { return FileSystemType.ADLS; } -} \ No newline at end of file +} diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/EfsCloudStorageV1Parameters.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/EfsCloudStorageV1Parameters.java index 03be726c018..f4069e51da6 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/EfsCloudStorageV1Parameters.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/EfsCloudStorageV1Parameters.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.common.api.cloudstorage.old.validation.ValidS3CloudStorageParameters; import com.sequenceiq.common.model.FileSystemAwareCloudStorage; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/GcsCloudStorageV1Parameters.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/GcsCloudStorageV1Parameters.java index 6a75533ec26..650adcb3f70 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/GcsCloudStorageV1Parameters.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/GcsCloudStorageV1Parameters.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.common.api.cloudstorage.old.validation.ValidGcsCloudStorageParameters; import com.sequenceiq.common.model.FileSystemAwareCloudStorage; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/S3CloudStorageV1Parameters.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/S3CloudStorageV1Parameters.java index 9fc68c27045..92986810217 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/S3CloudStorageV1Parameters.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/S3CloudStorageV1Parameters.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.common.api.cloudstorage.old.validation.ValidS3CloudStorageParameters; import com.sequenceiq.common.model.FileSystemAwareCloudStorage; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/WasbCloudStorageV1Parameters.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/WasbCloudStorageV1Parameters.java index 0dc2875b43b..29574077acb 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/WasbCloudStorageV1Parameters.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/WasbCloudStorageV1Parameters.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.common.api.cloudstorage.old.validation.ValidWasbCloudStorageParameters; import com.sequenceiq.common.model.FileSystemAwareCloudStorage; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/AdlsCloudStorageParametersValidator.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/AdlsCloudStorageParametersValidator.java index 87e840ac525..3068637cd26 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/AdlsCloudStorageParametersValidator.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/AdlsCloudStorageParametersValidator.java @@ -2,8 +2,8 @@ import java.util.regex.Pattern; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/AdlsGen2CloudStorageParametersValidator.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/AdlsGen2CloudStorageParametersValidator.java index 87e682ffa12..0aefbcfa08a 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/AdlsGen2CloudStorageParametersValidator.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/AdlsGen2CloudStorageParametersValidator.java @@ -3,8 +3,8 @@ import java.util.Objects; import java.util.regex.Pattern; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/GcsCloudStorageParametersValidator.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/GcsCloudStorageParametersValidator.java index b0c3fb9f782..53cf90e0230 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/GcsCloudStorageParametersValidator.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/GcsCloudStorageParametersValidator.java @@ -1,7 +1,7 @@ package com.sequenceiq.common.api.cloudstorage.old.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.sequenceiq.common.api.cloudstorage.old.GcsCloudStorageV1Parameters; import com.sequenceiq.common.api.util.ValidatorUtil; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/S3CloudStorageParametersValidator.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/S3CloudStorageParametersValidator.java index dbe9414f5b5..af2133e84df 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/S3CloudStorageParametersValidator.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/S3CloudStorageParametersValidator.java @@ -1,7 +1,7 @@ package com.sequenceiq.common.api.cloudstorage.old.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.sequenceiq.common.api.cloudstorage.old.S3CloudStorageV1Parameters; import com.sequenceiq.common.api.util.ValidatorUtil; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidAdlsCloudStorageParameters.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidAdlsCloudStorageParameters.java index 01b92656977..378c6752a5f 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidAdlsCloudStorageParameters.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidAdlsCloudStorageParameters.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Target(ElementType.TYPE) diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidAdlsGen2CloudStorageParameters.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidAdlsGen2CloudStorageParameters.java index 4adf5df5fa0..572c10773ea 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidAdlsGen2CloudStorageParameters.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidAdlsGen2CloudStorageParameters.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Target(ElementType.TYPE) diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidGcsCloudStorageParameters.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidGcsCloudStorageParameters.java index 15bc1df6c2d..28c4a26c245 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidGcsCloudStorageParameters.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidGcsCloudStorageParameters.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Target(ElementType.TYPE) diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidS3CloudStorageParameters.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidS3CloudStorageParameters.java index a2b5fa25cd8..d72dad4df5b 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidS3CloudStorageParameters.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidS3CloudStorageParameters.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Target(ElementType.TYPE) diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidWasbCloudStorageParameters.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidWasbCloudStorageParameters.java index b84a15b66e2..09323f7b1f1 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidWasbCloudStorageParameters.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/ValidWasbCloudStorageParameters.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Target(ElementType.TYPE) diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/WasbCloudStorageParametersValidator.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/WasbCloudStorageParametersValidator.java index f126744fc29..5a8cf700bb3 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/WasbCloudStorageParametersValidator.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/old/validation/WasbCloudStorageParametersValidator.java @@ -2,8 +2,8 @@ import java.util.regex.Pattern; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/validation/CloudStorageValidator.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/validation/CloudStorageValidator.java index aa316538a48..aa795bf534b 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/validation/CloudStorageValidator.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/validation/CloudStorageValidator.java @@ -4,8 +4,8 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.sequenceiq.common.api.cloudstorage.CloudStorageV1Base; import com.sequenceiq.common.api.cloudstorage.old.EfsCloudStorageV1Parameters; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/validation/ValidCloudStorage.java b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/validation/ValidCloudStorage.java index 95f152a01f8..6056f5b8e95 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/validation/ValidCloudStorage.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/cloudstorage/validation/ValidCloudStorage.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Target(ElementType.TYPE) diff --git a/common-model/src/main/java/com/sequenceiq/common/api/diagnostics/BaseCmDiagnosticsCollectionRequest.java b/common-model/src/main/java/com/sequenceiq/common/api/diagnostics/BaseCmDiagnosticsCollectionRequest.java index 24d96e53652..4f9943c65af 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/diagnostics/BaseCmDiagnosticsCollectionRequest.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/diagnostics/BaseCmDiagnosticsCollectionRequest.java @@ -6,7 +6,7 @@ import java.util.Date; import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/diagnostics/BaseDiagnosticsCollectionRequest.java b/common-model/src/main/java/com/sequenceiq/common/api/diagnostics/BaseDiagnosticsCollectionRequest.java index 14b125de34c..663adca98d4 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/diagnostics/BaseDiagnosticsCollectionRequest.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/diagnostics/BaseDiagnosticsCollectionRequest.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Set; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/telemetry/base/LoggingBase.java b/common-model/src/main/java/com/sequenceiq/common/api/telemetry/base/LoggingBase.java index 2a052e12e58..4fba93373f0 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/telemetry/base/LoggingBase.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/telemetry/base/LoggingBase.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/telemetry/model/AnonymizationRule.java b/common-model/src/main/java/com/sequenceiq/common/api/telemetry/model/AnonymizationRule.java index 4aeb96bacce..08795d31df1 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/telemetry/model/AnonymizationRule.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/telemetry/model/AnonymizationRule.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/telemetry/model/CloudwatchParams.java b/common-model/src/main/java/com/sequenceiq/common/api/telemetry/model/CloudwatchParams.java index 1eac261cb56..51e9afffce8 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/telemetry/model/CloudwatchParams.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/telemetry/model/CloudwatchParams.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/telemetry/model/VmLog.java b/common-model/src/main/java/com/sequenceiq/common/api/telemetry/model/VmLog.java index 2638b0798fb..4cd7ef7994f 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/telemetry/model/VmLog.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/telemetry/model/VmLog.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/telemetry/validation/LoggingRequestValidator.java b/common-model/src/main/java/com/sequenceiq/common/api/telemetry/validation/LoggingRequestValidator.java index bedc4d5b59e..5021b938c12 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/telemetry/validation/LoggingRequestValidator.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/telemetry/validation/LoggingRequestValidator.java @@ -3,8 +3,8 @@ import java.nio.file.InvalidPathException; import java.nio.file.Paths; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/telemetry/validation/ValidLoggingRequest.java b/common-model/src/main/java/com/sequenceiq/common/api/telemetry/validation/ValidLoggingRequest.java index f5dee10fe7f..686e5a7d65b 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/telemetry/validation/ValidLoggingRequest.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/telemetry/validation/ValidLoggingRequest.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Target(ElementType.TYPE) diff --git a/common-model/src/main/java/com/sequenceiq/common/api/type/FeatureSetting.java b/common-model/src/main/java/com/sequenceiq/common/api/type/FeatureSetting.java index 630e178c541..d44429aa746 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/type/FeatureSetting.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/type/FeatureSetting.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/common-model/src/main/java/com/sequenceiq/common/api/util/ValidatorUtil.java b/common-model/src/main/java/com/sequenceiq/common/api/util/ValidatorUtil.java index 976c2a4af64..afda39966ee 100644 --- a/common-model/src/main/java/com/sequenceiq/common/api/util/ValidatorUtil.java +++ b/common-model/src/main/java/com/sequenceiq/common/api/util/ValidatorUtil.java @@ -1,6 +1,6 @@ package com.sequenceiq.common.api.util; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; public class ValidatorUtil { diff --git a/common-model/src/test/java/com/sequenceiq/common/api/cloudstorage/old/validation/AdlsGen2CloudStorageParametersValidatorTest.java b/common-model/src/test/java/com/sequenceiq/common/api/cloudstorage/old/validation/AdlsGen2CloudStorageParametersValidatorTest.java index 8f690c1cabe..c2c74503242 100644 --- a/common-model/src/test/java/com/sequenceiq/common/api/cloudstorage/old/validation/AdlsGen2CloudStorageParametersValidatorTest.java +++ b/common-model/src/test/java/com/sequenceiq/common/api/cloudstorage/old/validation/AdlsGen2CloudStorageParametersValidatorTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.common.api.cloudstorage.old.validation; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/common-model/src/test/java/com/sequenceiq/common/api/telemetry/validation/LoggingRequestValidatorTest.java b/common-model/src/test/java/com/sequenceiq/common/api/telemetry/validation/LoggingRequestValidatorTest.java index af15c07fc36..195d6d66ed9 100644 --- a/common-model/src/test/java/com/sequenceiq/common/api/telemetry/validation/LoggingRequestValidatorTest.java +++ b/common-model/src/test/java/com/sequenceiq/common/api/telemetry/validation/LoggingRequestValidatorTest.java @@ -7,7 +7,7 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -116,4 +116,4 @@ public void testValidateValidBasePathUri() { // THEN assertTrue(result); } -} \ No newline at end of file +} diff --git a/common-model/src/test/java/com/sequenceiq/common/api/util/ContextMockUtil.java b/common-model/src/test/java/com/sequenceiq/common/api/util/ContextMockUtil.java index ec999170a4e..d7fc798277a 100644 --- a/common-model/src/test/java/com/sequenceiq/common/api/util/ContextMockUtil.java +++ b/common-model/src/test/java/com/sequenceiq/common/api/util/ContextMockUtil.java @@ -4,7 +4,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; public class ContextMockUtil { diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/_patch/glassfish/HttpUrlConnector.java b/common/src/main/java/com/sequenceiq/cloudbreak/_patch/glassfish/HttpUrlConnector.java index 1d0673a9159..241267562fa 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/_patch/glassfish/HttpUrlConnector.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/_patch/glassfish/HttpUrlConnector.java @@ -50,10 +50,11 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLSocketFactory; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; + +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.ClientRequest; @@ -564,4 +565,4 @@ public String getName() { return "HttpUrlConnection " + AccessController.doPrivileged(PropertiesHelper.getSystemProperty("java.version")); } } -// CHECKSTYLE:ON \ No newline at end of file +// CHECKSTYLE:ON diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/auth/CrnFilter.java b/common/src/main/java/com/sequenceiq/cloudbreak/auth/CrnFilter.java index a5617754dd2..5032f3f1f82 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/auth/CrnFilter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/auth/CrnFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/auth/PaywallAccessChecker.java b/common/src/main/java/com/sequenceiq/cloudbreak/auth/PaywallAccessChecker.java index 9d5ea41c868..bf2ebd0125c 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/auth/PaywallAccessChecker.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/auth/PaywallAccessChecker.java @@ -1,11 +1,11 @@ package com.sequenceiq.cloudbreak.auth; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; import org.slf4j.Logger; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/auth/ServletRunnable.java b/common/src/main/java/com/sequenceiq/cloudbreak/auth/ServletRunnable.java index 561e8773ffa..e5482018553 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/auth/ServletRunnable.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/auth/ServletRunnable.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; @FunctionalInterface public interface ServletRunnable { diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/auth/ThreadBasedUserCrnProvider.java b/common/src/main/java/com/sequenceiq/cloudbreak/auth/ThreadBasedUserCrnProvider.java index 470e8fd6a51..c003d57a294 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/auth/ThreadBasedUserCrnProvider.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/auth/ThreadBasedUserCrnProvider.java @@ -9,8 +9,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.annotation.Nullable; -import javax.servlet.ServletException; +import jakarta.annotation.Nullable; +import jakarta.servlet.ServletException; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/auth/crn/Crn.java b/common/src/main/java/com/sequenceiq/cloudbreak/auth/crn/Crn.java index ec9c14205b1..041b85d73f5 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/auth/crn/Crn.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/auth/crn/Crn.java @@ -11,7 +11,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CCMV1KeyRemapper.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CCMV1KeyRemapper.java index 547e21d7ef7..22c02e27a54 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CCMV1KeyRemapper.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CCMV1KeyRemapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.ccm.cloudinit; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.sequenceiq.cloudbreak.ccm.exception.CcmException; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmParameterSupplier.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmParameterSupplier.java index b375e756008..dfefa2010c9 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmParameterSupplier.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmParameterSupplier.java @@ -3,8 +3,8 @@ import java.util.Map; import java.util.Optional; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.sequenceiq.cloudbreak.ccm.endpoint.KnownServiceIdentifier; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmParameters.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmParameters.java index 52fab6722da..cff4065e4a8 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmParameters.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmParameters.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.sequenceiq.common.api.type.InstanceGroupType; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmV2JumpgateParameters.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmV2JumpgateParameters.java index 3caae6c595a..4316fd5efaf 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmV2JumpgateParameters.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmV2JumpgateParameters.java @@ -4,8 +4,8 @@ import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.common.api.type.InstanceGroupType; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmV2Parameters.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmV2Parameters.java index 19dd1c4eeee..b7013711521 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmV2Parameters.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/CcmV2Parameters.java @@ -4,8 +4,8 @@ import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultCcmParameters.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultCcmParameters.java index 83eaac4b181..2f321f60ac4 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultCcmParameters.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultCcmParameters.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.google.common.collect.ImmutableList; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultCcmV2JumpgateParameters.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultCcmV2JumpgateParameters.java index 0c11ccfd2ce..d4806357725 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultCcmV2JumpgateParameters.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultCcmV2JumpgateParameters.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; public class DefaultCcmV2JumpgateParameters extends DefaultCcmV2Parameters implements CcmV2JumpgateParameters { diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultCcmV2Parameters.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultCcmV2Parameters.java index b7d03c5988d..9a959fd5c65 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultCcmV2Parameters.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultCcmV2Parameters.java @@ -6,7 +6,7 @@ import java.io.Serializable; import java.util.Map; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.commons.lang3.StringUtils; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultInstanceParameters.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultInstanceParameters.java index 640927fd449..a490f552b44 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultInstanceParameters.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultInstanceParameters.java @@ -4,8 +4,8 @@ import java.util.Objects; import java.util.Optional; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Default {@link InstanceParameters} implementation. diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultServerParameters.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultServerParameters.java index 21e08287c3e..39f85fd0336 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultServerParameters.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultServerParameters.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.sequenceiq.cloudbreak.ccm.endpoint.ServiceEndpoint; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultTunnelParameters.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultTunnelParameters.java index ff93b475bd8..df0c8209514 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultTunnelParameters.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/DefaultTunnelParameters.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.sequenceiq.cloudbreak.ccm.endpoint.KnownServiceIdentifier; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/InstanceParameters.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/InstanceParameters.java index 190907580c8..5f7384ba991 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/InstanceParameters.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/InstanceParameters.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Optional; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.google.common.io.BaseEncoding; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/ServerParameters.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/ServerParameters.java index 62feed46f0d..42309de71dc 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/ServerParameters.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/ServerParameters.java @@ -3,7 +3,7 @@ import java.nio.charset.StandardCharsets; import java.util.Map; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.google.common.io.BaseEncoding; import com.sequenceiq.cloudbreak.ccm.endpoint.ServiceEndpoint; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/TunnelParameters.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/TunnelParameters.java index a6525b5ea2f..89cc13efee2 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/TunnelParameters.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/cloudinit/TunnelParameters.java @@ -3,7 +3,7 @@ import java.util.Locale; import java.util.Map; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.sequenceiq.cloudbreak.ccm.endpoint.KnownServiceIdentifier; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/AbstractServiceFamily.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/AbstractServiceFamily.java index 35eaf5b593e..e6f47b4425d 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/AbstractServiceFamily.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/AbstractServiceFamily.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Abstract service family implementation. diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/BaseServiceEndpoint.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/BaseServiceEndpoint.java index 8f802b9bc55..1794e7ab1de 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/BaseServiceEndpoint.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/BaseServiceEndpoint.java @@ -6,8 +6,8 @@ import java.util.Objects; import java.util.Optional; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Base class for service endpoint implementations. diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/DirectServiceEndpointFinder.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/DirectServiceEndpointFinder.java index 39ce6c7607b..88631338050 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/DirectServiceEndpointFinder.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/DirectServiceEndpointFinder.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * An endpoint finder that returns an endpoint based on a direct connection to the target instance on the diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/HttpsServiceEndpoint.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/HttpsServiceEndpoint.java index 5b2cc16aa86..880bb893a4d 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/HttpsServiceEndpoint.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/HttpsServiceEndpoint.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.ccm.endpoint; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * HTTPS endpoint. diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceEndpoint.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceEndpoint.java index 1f02dbf00a7..c0844abcb84 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceEndpoint.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceEndpoint.java @@ -4,8 +4,8 @@ import java.net.URI; import java.util.Optional; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Represents a service endpoint. diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceEndpointFinder.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceEndpointFinder.java index addaffda117..e4a0e257631 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceEndpointFinder.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceEndpointFinder.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.ccm.endpoint; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Lookup service for service endpoints. diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceEndpointRequest.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceEndpointRequest.java index 200e613ba9b..4e2d08aad7b 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceEndpointRequest.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceEndpointRequest.java @@ -3,8 +3,8 @@ import java.time.ZonedDateTime; import java.util.Optional; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Request for looking up service endpoints. diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceFamilies.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceFamilies.java index 32b55751cb2..726d0ab903e 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceFamilies.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceFamilies.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.ccm.endpoint; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Provides utilities for dealing with service families. diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceFamily.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceFamily.java index 58cb678cc95..6c8dece0f0d 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceFamily.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/ServiceFamily.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Represents a family of services. diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/TargetInstance.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/TargetInstance.java index 5f16bd14570..cb60c35f7f9 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/TargetInstance.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/endpoint/TargetInstance.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Represents a target instance where a service is running. diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/termination/CcmResourceTerminationListener.java b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/termination/CcmResourceTerminationListener.java index ddb1d696976..13704b2b1af 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/ccm/termination/CcmResourceTerminationListener.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/ccm/termination/CcmResourceTerminationListener.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.ccm.termination; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Listener for CCM resource termination events. diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/client/DisableProxyAuthFeature.java b/common/src/main/java/com/sequenceiq/cloudbreak/client/DisableProxyAuthFeature.java index 5fe7bc0bc83..5ca64a585be 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/client/DisableProxyAuthFeature.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/client/DisableProxyAuthFeature.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.client; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.FeatureContext; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.FeatureContext; public class DisableProxyAuthFeature implements Feature { @Override diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/client/DisableProxyAuthFilter.java b/common/src/main/java/com/sequenceiq/cloudbreak/client/DisableProxyAuthFilter.java index 41e8aa396be..d9a1197475b 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/client/DisableProxyAuthFilter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/client/DisableProxyAuthFilter.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.client; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.MultivaluedMap; public class DisableProxyAuthFilter implements ClientRequestFilter { @Override diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/client/RequestIdProviderFeature.java b/common/src/main/java/com/sequenceiq/cloudbreak/client/RequestIdProviderFeature.java index 727887c962d..a72b7e36bc0 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/client/RequestIdProviderFeature.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/client/RequestIdProviderFeature.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.client; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.FeatureContext; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.FeatureContext; public class RequestIdProviderFeature implements Feature { diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/client/RequestIdProviderFilter.java b/common/src/main/java/com/sequenceiq/cloudbreak/client/RequestIdProviderFilter.java index 3d013f25e91..9961cdf1780 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/client/RequestIdProviderFilter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/client/RequestIdProviderFilter.java @@ -4,8 +4,8 @@ import java.io.IOException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; import com.sequenceiq.cloudbreak.logger.MDCBuilder; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/client/RestClientFactory.java b/common/src/main/java/com/sequenceiq/cloudbreak/client/RestClientFactory.java index 84631abbfb9..fbc01e0d5e7 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/client/RestClientFactory.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/client/RestClientFactory.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.client; -import javax.ws.rs.client.Client; +import jakarta.ws.rs.client.Client; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/client/RestClientUtil.java b/common/src/main/java/com/sequenceiq/cloudbreak/client/RestClientUtil.java index ff220a02d69..f68ee21ea6d 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/client/RestClientUtil.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/client/RestClientUtil.java @@ -5,8 +5,9 @@ import java.util.concurrent.ConcurrentHashMap; import javax.net.ssl.SSLContext; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; import org.apache.commons.lang3.StringUtils; import org.apache.http.ssl.SSLContexts; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/client/RpcListener.java b/common/src/main/java/com/sequenceiq/cloudbreak/client/RpcListener.java index 5951539aeb9..a8e6f43f7b0 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/client/RpcListener.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/client/RpcListener.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.client; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public interface RpcListener { void onBeforeResponseProcessed(Response response) throws Exception; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/client/SetProxyTimeoutFeature.java b/common/src/main/java/com/sequenceiq/cloudbreak/client/SetProxyTimeoutFeature.java index 666e38eb297..fb4ad77c4db 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/client/SetProxyTimeoutFeature.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/client/SetProxyTimeoutFeature.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.client; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.FeatureContext; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.FeatureContext; public class SetProxyTimeoutFeature implements Feature { diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/client/SetProxyTimeoutFilter.java b/common/src/main/java/com/sequenceiq/cloudbreak/client/SetProxyTimeoutFilter.java index 9b23714ce8b..5c6381fe9a1 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/client/SetProxyTimeoutFilter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/client/SetProxyTimeoutFilter.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.client; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.MultivaluedMap; public class SetProxyTimeoutFilter implements ClientRequestFilter { diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyWebApplicationException.java b/common/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyWebApplicationException.java index 03038be6cae..067acebf833 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyWebApplicationException.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/clusterproxy/ClusterProxyWebApplicationException.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.clusterproxy; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.WebApplicationException; public class ClusterProxyWebApplicationException extends WebApplicationException { diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/co2/CO2CostCalculatorService.java b/common/src/main/java/com/sequenceiq/cloudbreak/co2/CO2CostCalculatorService.java index e6784f61e99..22abedffdf5 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/co2/CO2CostCalculatorService.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/co2/CO2CostCalculatorService.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/co2/CO2EmissionFactorConfig.java b/common/src/main/java/com/sequenceiq/cloudbreak/co2/CO2EmissionFactorConfig.java index f560fff5a5b..9d53bdd1829 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/co2/CO2EmissionFactorConfig.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/co2/CO2EmissionFactorConfig.java @@ -7,7 +7,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/common/archive/AbstractArchivistService.java b/common/src/main/java/com/sequenceiq/cloudbreak/common/archive/AbstractArchivistService.java index 56eae2f17fa..ebbf4037c3d 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/common/archive/AbstractArchivistService.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/common/archive/AbstractArchivistService.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/common/dal/repository/AccountAwareResourceRepository.java b/common/src/main/java/com/sequenceiq/cloudbreak/common/dal/repository/AccountAwareResourceRepository.java index 9665ab9da1c..ac5008cc71a 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/common/dal/repository/AccountAwareResourceRepository.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/common/dal/repository/AccountAwareResourceRepository.java @@ -6,8 +6,8 @@ import java.util.Optional; import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.NoRepositoryBean; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/common/database/JpaPropertiesFacory.java b/common/src/main/java/com/sequenceiq/cloudbreak/common/database/JpaPropertiesFactory.java similarity index 96% rename from common/src/main/java/com/sequenceiq/cloudbreak/common/database/JpaPropertiesFacory.java rename to common/src/main/java/com/sequenceiq/cloudbreak/common/database/JpaPropertiesFactory.java index 1034f67fb12..264a4bd396a 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/common/database/JpaPropertiesFacory.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/common/database/JpaPropertiesFactory.java @@ -10,11 +10,11 @@ import com.sequenceiq.cloudbreak.common.tx.HibernateStatementStatisticsLogger; import com.sequenceiq.cloudbreak.common.tx.HibernateTransactionInterceptor; -public class JpaPropertiesFacory { +public class JpaPropertiesFactory { - private static final Logger LOGGER = LoggerFactory.getLogger(JpaPropertiesFacory.class); + private static final Logger LOGGER = LoggerFactory.getLogger(JpaPropertiesFactory.class); - private JpaPropertiesFacory() { + private JpaPropertiesFactory() { } public static Properties create(String hbm2ddlStrategy, boolean debug, String dbSchemaName, CircuitBreakerType circuitBreakerType, diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/common/database/StringSetToStringConverter.java b/common/src/main/java/com/sequenceiq/cloudbreak/common/database/StringSetToStringConverter.java index 81113e553ca..02cbf6ed198 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/common/database/StringSetToStringConverter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/common/database/StringSetToStringConverter.java @@ -4,7 +4,7 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/common/exception/WebApplicationExceptionHandler.java b/common/src/main/java/com/sequenceiq/cloudbreak/common/exception/WebApplicationExceptionHandler.java index 13b84c63edf..fbc88e294d0 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/common/exception/WebApplicationExceptionHandler.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/common/exception/WebApplicationExceptionHandler.java @@ -1,10 +1,10 @@ package com.sequenceiq.cloudbreak.common.exception; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response.Status.Family; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response.Status.Family; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/common/exception/WebApplicationExceptionMessageExtractor.java b/common/src/main/java/com/sequenceiq/cloudbreak/common/exception/WebApplicationExceptionMessageExtractor.java index 21d355e123a..5bde6320db2 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/common/exception/WebApplicationExceptionMessageExtractor.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/common/exception/WebApplicationExceptionMessageExtractor.java @@ -2,8 +2,8 @@ import java.io.IOException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/common/json/JsonToString.java b/common/src/main/java/com/sequenceiq/cloudbreak/common/json/JsonToString.java index e853f0f6d1c..be28cbc933b 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/common/json/JsonToString.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/common/json/JsonToString.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.common.json; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; public class JsonToString implements AttributeConverter { @Override diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/common/mappable/ProviderParameterCalculator.java b/common/src/main/java/com/sequenceiq/cloudbreak/common/mappable/ProviderParameterCalculator.java index 5151d3aabbd..41d8c98e0ce 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/common/mappable/ProviderParameterCalculator.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/common/mappable/ProviderParameterCalculator.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/common/metrics/RequestHeaderMetricFilter.java b/common/src/main/java/com/sequenceiq/cloudbreak/common/metrics/RequestHeaderMetricFilter.java index 71210d0b64e..990b79736f0 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/common/metrics/RequestHeaderMetricFilter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/common/metrics/RequestHeaderMetricFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/common/service/LockService.java b/common/src/main/java/com/sequenceiq/cloudbreak/common/service/LockService.java index ba3372f26f4..11369e1b3e2 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/common/service/LockService.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/common/service/LockService.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/common/service/TransactionMetricsService.java b/common/src/main/java/com/sequenceiq/cloudbreak/common/service/TransactionMetricsService.java index 0fffcec7837..48204dfd525 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/common/service/TransactionMetricsService.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/common/service/TransactionMetricsService.java @@ -4,7 +4,7 @@ import java.util.LinkedHashSet; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/common/service/TransactionService.java b/common/src/main/java/com/sequenceiq/cloudbreak/common/service/TransactionService.java index 5f54a8c4755..a41421353d5 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/common/service/TransactionService.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/common/service/TransactionService.java @@ -2,8 +2,8 @@ import java.util.function.Supplier; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/common/service/account/AbstractAccountAwareResourceService.java b/common/src/main/java/com/sequenceiq/cloudbreak/common/service/account/AbstractAccountAwareResourceService.java index 74051758c6d..6af4f117095 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/common/service/account/AbstractAccountAwareResourceService.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/common/service/account/AbstractAccountAwareResourceService.java @@ -5,10 +5,10 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.validation.constraints.NotEmpty; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotFoundException; +import jakarta.annotation.Nonnull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotFoundException; import org.hibernate.exception.ConstraintViolationException; import org.slf4j.Logger; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/converter/DefaultEnumConverter.java b/common/src/main/java/com/sequenceiq/cloudbreak/converter/DefaultEnumConverter.java index bd432d69c62..d4c1be4f72a 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/converter/DefaultEnumConverter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/converter/DefaultEnumConverter.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/converter/TunnelConverter.java b/common/src/main/java/com/sequenceiq/cloudbreak/converter/TunnelConverter.java index dcddf65dae1..edbcbc42907 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/converter/TunnelConverter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/converter/TunnelConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/cost/cloudera/ClouderaCostCache.java b/common/src/main/java/com/sequenceiq/cloudbreak/cost/cloudera/ClouderaCostCache.java index 849e1180367..77a2679b26f 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/cost/cloudera/ClouderaCostCache.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/cost/cloudera/ClouderaCostCache.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/database/RoutingDataSource.java b/common/src/main/java/com/sequenceiq/cloudbreak/database/RoutingDataSource.java index fa8ece98a0a..9d909f0296c 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/database/RoutingDataSource.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/database/RoutingDataSource.java @@ -6,10 +6,11 @@ import java.util.Locale; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.inject.Inject; import javax.sql.DataSource; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; + import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/exception/ErrorResponseHandler.java b/common/src/main/java/com/sequenceiq/cloudbreak/exception/ErrorResponseHandler.java index c627ee149e8..e69f6c2b16c 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/exception/ErrorResponseHandler.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/exception/ErrorResponseHandler.java @@ -7,11 +7,11 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/exception/ExceptionHandlerFilter.java b/common/src/main/java/com/sequenceiq/cloudbreak/exception/ExceptionHandlerFilter.java index 589bb9ada79..dc129488e43 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/exception/ExceptionHandlerFilter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/exception/ExceptionHandlerFilter.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/BaseExceptionMapper.java b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/BaseExceptionMapper.java index b929aede314..09cb8487f3e 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/BaseExceptionMapper.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/BaseExceptionMapper.java @@ -6,8 +6,8 @@ import static ch.qos.logback.classic.Level.INFO_INT; import static ch.qos.logback.classic.Level.WARN_INT; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/ConstraintViolationExceptionMapper.java b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/ConstraintViolationExceptionMapper.java index be143f8b7cc..a0ee6ee3de9 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/ConstraintViolationExceptionMapper.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/ConstraintViolationExceptionMapper.java @@ -4,9 +4,9 @@ import java.util.List; import java.util.stream.Collectors; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.core.Response; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; @@ -46,4 +46,4 @@ protected Object getPayload(ConstraintViolationException exception) { }); return validationResults; } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/CrnParseExceptionMapper.java b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/CrnParseExceptionMapper.java index 889c060cb58..7e40a397edd 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/CrnParseExceptionMapper.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/CrnParseExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.exception.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/DefaultExceptionMapper.java b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/DefaultExceptionMapper.java index 81109bf0db4..c0866043374 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/DefaultExceptionMapper.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/DefaultExceptionMapper.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.exception.mapper; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.Provider; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/FlowsAlreadyRunningExceptionMapper.java b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/FlowsAlreadyRunningExceptionMapper.java index 8a65618beed..81768a91f5a 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/FlowsAlreadyRunningExceptionMapper.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/FlowsAlreadyRunningExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.exception.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/HttpRequestMethodNotSupportedExceptionMapper.java b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/HttpRequestMethodNotSupportedExceptionMapper.java index 9a9c263c891..35b00f17a2b 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/HttpRequestMethodNotSupportedExceptionMapper.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/HttpRequestMethodNotSupportedExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.exception.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; import org.springframework.web.HttpRequestMethodNotSupportedException; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/InsufficientAuthenticationExceptionMapper.java b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/InsufficientAuthenticationExceptionMapper.java index 417c782a693..ca51e3fc597 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/InsufficientAuthenticationExceptionMapper.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/InsufficientAuthenticationExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.exception.mapper; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.springframework.security.authentication.InsufficientAuthenticationException; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/StatusRuntimeExceptionMapper.java b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/StatusRuntimeExceptionMapper.java index 0f55efcdefa..740c465e159 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/StatusRuntimeExceptionMapper.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/exception/mapper/StatusRuntimeExceptionMapper.java @@ -2,7 +2,7 @@ import static io.grpc.Status.Code.DEADLINE_EXCEEDED; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/filter/CommonFilterConfiguration.java b/common/src/main/java/com/sequenceiq/cloudbreak/filter/CommonFilterConfiguration.java index eb4af66bf5c..eced89f23ae 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/filter/CommonFilterConfiguration.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/filter/CommonFilterConfiguration.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.filter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/health/HikariStateHealthIndicator.java b/common/src/main/java/com/sequenceiq/cloudbreak/health/HikariStateHealthIndicator.java index a6058b94de0..28b402bc3ee 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/health/HikariStateHealthIndicator.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/health/HikariStateHealthIndicator.java @@ -4,9 +4,10 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; import javax.sql.DataSource; +import jakarta.inject.Inject; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -93,4 +94,4 @@ private synchronized boolean isDumpNeeded() { } return createDump; } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/jerseyclient/RetryAndMetricsJerseyClientAspect.java b/common/src/main/java/com/sequenceiq/cloudbreak/jerseyclient/RetryAndMetricsJerseyClientAspect.java index 97ec2c4820c..41993bccfff 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/jerseyclient/RetryAndMetricsJerseyClientAspect.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/jerseyclient/RetryAndMetricsJerseyClientAspect.java @@ -2,8 +2,8 @@ import static com.sequenceiq.cloudbreak.quartz.configuration.SchedulerFactoryConfig.QUARTZ_EXECUTOR_THREAD_NAME_PREFIX; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/jerseyclient/retry/JerseyClientRetryPolicy.java b/common/src/main/java/com/sequenceiq/cloudbreak/jerseyclient/retry/JerseyClientRetryPolicy.java index 043a8513d48..f82fc26eaad 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/jerseyclient/retry/JerseyClientRetryPolicy.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/jerseyclient/retry/JerseyClientRetryPolicy.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.jerseyclient.retry; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/jerseyclient/retry/JerseyClientRetryTemplateConfig.java b/common/src/main/java/com/sequenceiq/cloudbreak/jerseyclient/retry/JerseyClientRetryTemplateConfig.java index 17970594bcd..633c33e2a0a 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/jerseyclient/retry/JerseyClientRetryTemplateConfig.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/jerseyclient/retry/JerseyClientRetryTemplateConfig.java @@ -2,7 +2,7 @@ import java.time.Duration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/jvm/JvmInfoProvider.java b/common/src/main/java/com/sequenceiq/cloudbreak/jvm/JvmInfoProvider.java index ce4d6ec3da7..933161cf475 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/jvm/JvmInfoProvider.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/jvm/JvmInfoProvider.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/jvm/NativeMemoryMetricConfigurator.java b/common/src/main/java/com/sequenceiq/cloudbreak/jvm/NativeMemoryMetricConfigurator.java index 3bf5abbbbaa..447814c87f0 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/jvm/NativeMemoryMetricConfigurator.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/jvm/NativeMemoryMetricConfigurator.java @@ -10,8 +10,8 @@ import java.util.Map; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.apache.commons.lang3.SystemUtils; import org.slf4j.Logger; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/logger/MDCContextFilter.java b/common/src/main/java/com/sequenceiq/cloudbreak/logger/MDCContextFilter.java index e04f90e8371..618053548be 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/logger/MDCContextFilter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/logger/MDCContextFilter.java @@ -4,10 +4,10 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/logger/MDCRequestIdOnlyFilter.java b/common/src/main/java/com/sequenceiq/cloudbreak/logger/MDCRequestIdOnlyFilter.java index 84ca6b70114..dc9e46c4e61 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/logger/MDCRequestIdOnlyFilter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/logger/MDCRequestIdOnlyFilter.java @@ -9,11 +9,11 @@ import java.util.Map; import java.util.UUID; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/logger/RestLoggerFilter.java b/common/src/main/java/com/sequenceiq/cloudbreak/logger/RestLoggerFilter.java index 995031d8234..9c18b5a9930 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/logger/RestLoggerFilter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/logger/RestLoggerFilter.java @@ -7,10 +7,10 @@ import java.util.Date; import java.util.TimeZone; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -112,4 +112,4 @@ private String appendLine(RestLoggerField key, String value) { } return ""; } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/message/CloudbreakMessagesService.java b/common/src/main/java/com/sequenceiq/cloudbreak/message/CloudbreakMessagesService.java index 054b03305ec..33a29e5dc6c 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/message/CloudbreakMessagesService.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/message/CloudbreakMessagesService.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.Locale; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.MessageSource; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/message/StackStatusMessageTransformator.java b/common/src/main/java/com/sequenceiq/cloudbreak/message/StackStatusMessageTransformator.java index e703acb2355..c22da25512f 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/message/StackStatusMessageTransformator.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/message/StackStatusMessageTransformator.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Optional; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/proxy/ApplicationProxyConfig.java b/common/src/main/java/com/sequenceiq/cloudbreak/proxy/ApplicationProxyConfig.java index a1bb674e92f..b21ec660ea6 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/proxy/ApplicationProxyConfig.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/proxy/ApplicationProxyConfig.java @@ -6,7 +6,7 @@ import java.net.PasswordAuthentication; import java.util.Objects; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/MdcQuartzJob.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/MdcQuartzJob.java index 0cb17c1a41e..1716ebeb790 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/MdcQuartzJob.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/MdcQuartzJob.java @@ -4,7 +4,7 @@ import java.util.Optional; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/cleanup/service/UMSCleanupJobService.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/cleanup/service/UMSCleanupJobService.java index 3ff1533099f..0f11fdbea11 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/cleanup/service/UMSCleanupJobService.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/cleanup/service/UMSCleanupJobService.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.quartz.cleanup.service; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.CronScheduleBuilder; import org.quartz.JobBuilder; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/QuartzConfig.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/QuartzConfig.java index 4f43aba1daa..5b210742d78 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/QuartzConfig.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/QuartzConfig.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.quartz.configuration; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.quartz.SchedulerException; import org.springframework.context.annotation.Configuration; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/QuartzJobInitializer.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/QuartzJobInitializer.java index c5e6e5014ea..c1f5a9afa39 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/QuartzJobInitializer.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/QuartzJobInitializer.java @@ -4,7 +4,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/QuartzJobInitializerService.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/QuartzJobInitializerService.java index f97a978b32d..ca0965961db 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/QuartzJobInitializerService.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/QuartzJobInitializerService.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/SchedulerFactoryConfig.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/SchedulerFactoryConfig.java index 40e658420d0..a19ea221da4 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/SchedulerFactoryConfig.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/SchedulerFactoryConfig.java @@ -2,9 +2,10 @@ import java.util.concurrent.ExecutorService; -import javax.inject.Inject; import javax.sql.DataSource; +import jakarta.inject.Inject; + import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/TransactionalScheduler.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/TransactionalScheduler.java index e0a563c3d69..b72f1cba60f 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/TransactionalScheduler.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/configuration/TransactionalScheduler.java @@ -4,7 +4,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.JobDetail; import org.quartz.JobKey; @@ -81,4 +81,4 @@ public Set getJobKeys(GroupMatcher groupMatcher) throws Schedule protected Scheduler getScheduler() { return scheduler; } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/GroupNameToJobCountFunction.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/GroupNameToJobCountFunction.java index 8cbf9c3aec0..36b88a484ab 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/GroupNameToJobCountFunction.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/GroupNameToJobCountFunction.java @@ -3,7 +3,7 @@ import java.util.Set; import java.util.function.ToDoubleFunction; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.JobKey; import org.quartz.SchedulerException; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/JobCountMetricConfigurator.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/JobCountMetricConfigurator.java index 06d5242abde..97188a14a5d 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/JobCountMetricConfigurator.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/JobCountMetricConfigurator.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/JobMetricsListener.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/JobMetricsListener.java index 7d45360af6a..a5ab9007b1c 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/JobMetricsListener.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/JobMetricsListener.java @@ -5,7 +5,7 @@ import java.time.Duration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/SchedulerMetricsListener.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/SchedulerMetricsListener.java index 885fdfbce7c..3d147930ab4 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/SchedulerMetricsListener.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/SchedulerMetricsListener.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.quartz.metric; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.SchedulerException; import org.quartz.listeners.SchedulerListenerSupport; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/TriggerMetricsListener.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/TriggerMetricsListener.java index 7d6d767ff84..7ea6ce1d62c 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/TriggerMetricsListener.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/metric/TriggerMetricsListener.java @@ -7,7 +7,7 @@ import java.time.Instant; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.JobExecutionContext; import org.quartz.Trigger; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/saltstatuschecker/SaltStatusCheckerConfig.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/saltstatuschecker/SaltStatusCheckerConfig.java index d1f3730af8d..c404251aa5e 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/saltstatuschecker/SaltStatusCheckerConfig.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/saltstatuschecker/SaltStatusCheckerConfig.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.quartz.saltstatuschecker; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/saltstatuschecker/SaltStatusCheckerJobService.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/saltstatuschecker/SaltStatusCheckerJobService.java index 3f1b8cfb86d..3691803b436 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/saltstatuschecker/SaltStatusCheckerJobService.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/saltstatuschecker/SaltStatusCheckerJobService.java @@ -5,7 +5,7 @@ import java.util.Date; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.JobBuilder; import org.quartz.JobDetail; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/statuschecker/StatusCheckerConfig.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/statuschecker/StatusCheckerConfig.java index 57e2c2424ee..c81f85ba83f 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/statuschecker/StatusCheckerConfig.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/statuschecker/StatusCheckerConfig.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.quartz.statuschecker; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/statuschecker/service/StatusCheckerJobService.java b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/statuschecker/service/StatusCheckerJobService.java index a35b2fc154e..e4bfddd241d 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/quartz/statuschecker/service/StatusCheckerJobService.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/quartz/statuschecker/service/StatusCheckerJobService.java @@ -7,7 +7,7 @@ import java.util.Date; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.JobBuilder; import org.quartz.JobDataMap; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/service/LoggerRetryListener.java b/common/src/main/java/com/sequenceiq/cloudbreak/service/LoggerRetryListener.java index 86fe366af14..cb7d304d3c8 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/service/LoggerRetryListener.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/service/LoggerRetryListener.java @@ -4,11 +4,11 @@ import org.slf4j.LoggerFactory; import org.springframework.retry.RetryCallback; import org.springframework.retry.RetryContext; -import org.springframework.retry.listener.RetryListenerSupport; +import org.springframework.retry.RetryListener; import org.springframework.stereotype.Component; @Component -public class LoggerRetryListener extends RetryListenerSupport { +public class LoggerRetryListener implements RetryListener { private static final Logger LOGGER = LoggerFactory.getLogger(LoggerRetryListener.class); diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/service/executor/DelayedExecutorService.java b/common/src/main/java/com/sequenceiq/cloudbreak/service/executor/DelayedExecutorService.java index 88190e1ca6c..b242d2b03fe 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/service/executor/DelayedExecutorService.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/service/executor/DelayedExecutorService.java @@ -9,7 +9,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/service/openapi/OpenApiController.java b/common/src/main/java/com/sequenceiq/cloudbreak/service/openapi/OpenApiController.java index f8e285fe83d..a05e8e41bef 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/service/openapi/OpenApiController.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/service/openapi/OpenApiController.java @@ -1,14 +1,14 @@ package com.sequenceiq.cloudbreak.service.openapi; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import io.swagger.v3.jaxrs2.integration.resources.BaseOpenApiResource; import io.swagger.v3.oas.annotations.Operation; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/TelemetryRepoConfigurationHolder.java b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/TelemetryRepoConfigurationHolder.java index ea53d32c3ba..11d08583909 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/TelemetryRepoConfigurationHolder.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/TelemetryRepoConfigurationHolder.java @@ -2,7 +2,7 @@ import static com.sequenceiq.common.model.OsType.RHEL8; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/VmLogsService.java b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/VmLogsService.java index 6e31a885220..afb0b46af01 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/VmLogsService.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/VmLogsService.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.util.List; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/converter/CmDiagnosticsDataToParameterConverter.java b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/converter/CmDiagnosticsDataToParameterConverter.java index b1869c0de6d..3609f3192df 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/converter/CmDiagnosticsDataToParameterConverter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/converter/CmDiagnosticsDataToParameterConverter.java @@ -2,7 +2,7 @@ import java.nio.file.Paths; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/converter/DiagnosticCloudStorageConverter.java b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/converter/DiagnosticCloudStorageConverter.java index 0262a9cdb5c..31260fd202e 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/converter/DiagnosticCloudStorageConverter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/converter/DiagnosticCloudStorageConverter.java @@ -2,7 +2,7 @@ import java.nio.file.Paths; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/converter/DiagnosticsDataToParameterConverter.java b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/converter/DiagnosticsDataToParameterConverter.java index 01b68fe9e9c..2f1706ba783 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/converter/DiagnosticsDataToParameterConverter.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/converter/DiagnosticsDataToParameterConverter.java @@ -3,7 +3,7 @@ import java.util.HashSet; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/metering/MeteringConsumptionConfiguration.java b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/metering/MeteringConsumptionConfiguration.java index a03f0e35e0a..d8231d28f1a 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/metering/MeteringConsumptionConfiguration.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/metering/MeteringConsumptionConfiguration.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.telemetry.metering; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/monitoring/MonitoringUrlResolver.java b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/monitoring/MonitoringUrlResolver.java index 9f61749fad4..e871efc3711 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/monitoring/MonitoringUrlResolver.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/telemetry/monitoring/MonitoringUrlResolver.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.telemetry.monitoring; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/util/JaxRSUtil.java b/common/src/main/java/com/sequenceiq/cloudbreak/util/JaxRSUtil.java index ea4a4a4e4f2..5cc83b40912 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/util/JaxRSUtil.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/util/JaxRSUtil.java @@ -5,10 +5,10 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status.Family; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/validation/AbstractCrnValidator.java b/common/src/main/java/com/sequenceiq/cloudbreak/validation/AbstractCrnValidator.java index fa507e72ae0..1200c1d0177 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/validation/AbstractCrnValidator.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/validation/AbstractCrnValidator.java @@ -4,8 +4,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.tuple.Pair; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/validation/Choice.java b/common/src/main/java/com/sequenceiq/cloudbreak/validation/Choice.java index 3640cb1f5e1..1b49029e660 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/validation/Choice.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/validation/Choice.java @@ -5,10 +5,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; import org.apache.commons.lang3.ArrayUtils; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/validation/MutuallyExclusiveNotNull.java b/common/src/main/java/com/sequenceiq/cloudbreak/validation/MutuallyExclusiveNotNull.java index 7ca7453244c..4b8eccc7735 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/validation/MutuallyExclusiveNotNull.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/validation/MutuallyExclusiveNotNull.java @@ -6,10 +6,10 @@ import java.lang.annotation.Target; import java.lang.reflect.Field; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; @@ -105,4 +105,4 @@ Field getInheritedDeclaredField(Class fromClass, String fieldName) throws NoS throw new NoSuchFieldException(fieldName); } } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/validation/SubnetValidator.java b/common/src/main/java/com/sequenceiq/cloudbreak/validation/SubnetValidator.java index ff49719cb98..e73f2358ff8 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/validation/SubnetValidator.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/validation/SubnetValidator.java @@ -2,8 +2,8 @@ import java.util.Arrays; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.net.util.SubnetUtils; import org.apache.commons.net.util.SubnetUtils.SubnetInfo; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidCrn.java b/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidCrn.java index dda8234c5d0..732e15d6f61 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidCrn.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidCrn.java @@ -11,8 +11,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import com.sequenceiq.cloudbreak.auth.crn.CrnResourceDescriptor; diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidEnvironmentName.java b/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidEnvironmentName.java index cd90d586d35..4d7257549d1 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidEnvironmentName.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidEnvironmentName.java @@ -5,8 +5,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) @@ -21,4 +21,4 @@ String message() default "The environments's name must contain lowercase alphanu Class[] payload() default {}; -} \ No newline at end of file +} diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidEnvironmentNameValidator.java b/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidEnvironmentNameValidator.java index 195f41994d4..d504c9ce326 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidEnvironmentNameValidator.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidEnvironmentNameValidator.java @@ -3,8 +3,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class ValidEnvironmentNameValidator implements ConstraintValidator { @@ -16,4 +16,4 @@ public boolean isValid(String value, ConstraintValidatorContext context) { Matcher matcher = pattern.matcher(value); return matcher.matches(); } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidSubnet.java b/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidSubnet.java index f277074aeda..f32c3d939b2 100644 --- a/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidSubnet.java +++ b/common/src/main/java/com/sequenceiq/cloudbreak/validation/ValidSubnet.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Constraint(validatedBy = SubnetValidator.class) diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/auth/PaywallAccessCheckerTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/auth/PaywallAccessCheckerTest.java index d0f7b0dc0a7..d123bd1332a 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/auth/PaywallAccessCheckerTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/auth/PaywallAccessCheckerTest.java @@ -7,12 +7,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; import org.junit.jupiter.api.AfterEach; @@ -83,4 +83,4 @@ public void testCantReachPaywall() { BadRequestException exception = Assertions.assertThrows(BadRequestException.class, () -> underTest.checkPaywallAccess(license, PAYWALL_URL)); assertEquals(ERROR_MSG, exception.getMessage()); } -} \ No newline at end of file +} diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/auth/ReflectionUtilTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/auth/ReflectionUtilTest.java index 48cee2da7b9..21e8b325918 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/auth/ReflectionUtilTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/auth/ReflectionUtilTest.java @@ -8,7 +8,7 @@ import java.lang.reflect.Method; import java.sql.SQLException; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/common/exception/WebApplicationExceptionMessageExtractorTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/common/exception/WebApplicationExceptionMessageExtractorTest.java index e17e1bae637..3b1d1298c68 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/common/exception/WebApplicationExceptionMessageExtractorTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/common/exception/WebApplicationExceptionMessageExtractorTest.java @@ -7,8 +7,8 @@ import java.util.Map; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.Test; @@ -75,4 +75,4 @@ void testGetErrorMessageWhenWebApplicationExceptionInvalidJsonFallbackToErrorRes String errorMessage = underTest.getErrorMessage(new WebApplicationException("error", response)); assertEquals("invalid", errorMessage); } -} \ No newline at end of file +} diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/converter/AdjustmentTypeConverterTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/converter/AdjustmentTypeConverterTest.java index 4a33e534323..4df1ece8d81 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/converter/AdjustmentTypeConverterTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/converter/AdjustmentTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.common.api.type.AdjustmentType; @@ -15,4 +15,4 @@ public AdjustmentType getDefaultValue() { public AttributeConverter getVictim() { return new AdjustmentTypeConverter(); } -} \ No newline at end of file +} diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/converter/CommonStatusConverterTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/converter/CommonStatusConverterTest.java index f95710bc8d6..9e0e15784b8 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/converter/CommonStatusConverterTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/converter/CommonStatusConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.common.api.type.CommonStatus; @@ -15,4 +15,4 @@ public CommonStatus getDefaultValue() { public AttributeConverter getVictim() { return new CommonStatusConverter(); } -} \ No newline at end of file +} diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/converter/DefaultEnumConverterBaseTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/converter/DefaultEnumConverterBaseTest.java index 7b85b8dc876..2a539d2f3c5 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/converter/DefaultEnumConverterBaseTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/converter/DefaultEnumConverterBaseTest.java @@ -5,7 +5,7 @@ import java.util.EnumSet; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/converter/FileSystemTypeConverterTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/converter/FileSystemTypeConverterTest.java index a7df37235d7..505ef263586 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/converter/FileSystemTypeConverterTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/converter/FileSystemTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.common.model.FileSystemType; @@ -15,4 +15,4 @@ public FileSystemType getDefaultValue() { public AttributeConverter getVictim() { return new FileSystemTypeConverter(); } -} \ No newline at end of file +} diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/converter/ImageTypeConverterTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/converter/ImageTypeConverterTest.java index fb547d9aabf..85fccfcc815 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/converter/ImageTypeConverterTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/converter/ImageTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.common.api.type.ImageType; @@ -15,4 +15,4 @@ public ImageType getDefaultValue() { public AttributeConverter getVictim() { return new ImageTypeConverter(); } -} \ No newline at end of file +} diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/converter/InstanceGroupTypeConverterTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/converter/InstanceGroupTypeConverterTest.java index 91b6d7af145..90f4ea69647 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/converter/InstanceGroupTypeConverterTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/converter/InstanceGroupTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.common.api.type.InstanceGroupType; @@ -15,4 +15,4 @@ public InstanceGroupType getDefaultValue() { public AttributeConverter getVictim() { return new InstanceGroupTypeConverter(); } -} \ No newline at end of file +} diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/converter/OutboundInternetTrafficConverterTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/converter/OutboundInternetTrafficConverterTest.java index d64ff14083f..c76a34efbac 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/converter/OutboundInternetTrafficConverterTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/converter/OutboundInternetTrafficConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.common.api.type.OutboundInternetTraffic; @@ -15,4 +15,4 @@ public OutboundInternetTraffic getDefaultValue() { public AttributeConverter getVictim() { return new OutboundInternetTrafficConverter(); } -} \ No newline at end of file +} diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/converter/ResourceTypeConverterTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/converter/ResourceTypeConverterTest.java index a6f385b2625..3834b59addd 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/converter/ResourceTypeConverterTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/converter/ResourceTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.common.api.type.ResourceType; @@ -15,4 +15,4 @@ public ResourceType getDefaultValue() { public AttributeConverter getVictim() { return new ResourceTypeConverter(); } -} \ No newline at end of file +} diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/event/ResourceEventIntegrationTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/event/ResourceEventIntegrationTest.java index 972ad62b836..ca793f26180 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/event/ResourceEventIntegrationTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/event/ResourceEventIntegrationTest.java @@ -4,8 +4,8 @@ import java.util.Locale; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/exception/ExceptionHandlerFilterTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/exception/ExceptionHandlerFilterTest.java index 3053b32651f..5d252d91d16 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/exception/ExceptionHandlerFilterTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/exception/ExceptionHandlerFilterTest.java @@ -9,10 +9,10 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/exception/mapper/ConstraintViolationExceptionMapperTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/exception/mapper/ConstraintViolationExceptionMapperTest.java index 4bad7757fc3..ba9492a539a 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/exception/mapper/ConstraintViolationExceptionMapperTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/exception/mapper/ConstraintViolationExceptionMapperTest.java @@ -7,9 +7,9 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.core.Response; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.core.Response; import org.hibernate.validator.internal.engine.path.PathImpl; import org.junit.jupiter.api.Assertions; diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/logger/MDCRequestIdOnlyFilterTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/logger/MDCRequestIdOnlyFilterTest.java index 6e8d399a9f1..1284742d14e 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/logger/MDCRequestIdOnlyFilterTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/logger/MDCRequestIdOnlyFilterTest.java @@ -10,10 +10,10 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -70,4 +70,4 @@ void generateRequestIdWhenMissing() throws ServletException, IOException { verify(request, times(2)).getHeader(REQUEST_ID_HEADER); assertTrue(UuidUtil.isValid(wrapperArgumentCaptor.getValue().getHeader(REQUEST_ID_HEADER))); } -} \ No newline at end of file +} diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/logger/RestLoggerFilterTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/logger/RestLoggerFilterTest.java index 5fb33b5d855..7f7412d9ff8 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/logger/RestLoggerFilterTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/logger/RestLoggerFilterTest.java @@ -9,10 +9,10 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -75,4 +75,4 @@ void doFilterUnsupportedEncoding() throws ServletException, IOException { verify(logger, times(1)).debug(any()); verify(logger).debug(contains("We were not able to encode the content")); } -} \ No newline at end of file +} diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/util/ConstraintValidationModificationChecker.java b/common/src/test/java/com/sequenceiq/cloudbreak/util/ConstraintValidationModificationChecker.java index fb81689eaef..ac68dc44130 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/util/ConstraintValidationModificationChecker.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/util/ConstraintValidationModificationChecker.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.hibernate.validator.constraintvalidation.HibernateConstraintValidatorContext; import org.reflections.Reflections; diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/util/UnusedInjectChecker.java b/common/src/test/java/com/sequenceiq/cloudbreak/util/UnusedInjectChecker.java index f5f895cba9b..1723d15c3bb 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/util/UnusedInjectChecker.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/util/UnusedInjectChecker.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.reflections.Reflections; import org.reflections.scanners.MemberUsageScanner; diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/validation/ChoiceValidatorTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/validation/ChoiceValidatorTest.java index 8988289a2b8..90a79196277 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/validation/ChoiceValidatorTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/validation/ChoiceValidatorTest.java @@ -5,10 +5,10 @@ import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/validation/CrnCollectionValidatorTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/validation/CrnCollectionValidatorTest.java index 34463c39eb2..b7222a1be94 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/validation/CrnCollectionValidatorTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/validation/CrnCollectionValidatorTest.java @@ -8,8 +8,8 @@ import java.lang.annotation.Annotation; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/validation/CrnValidatorTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/validation/CrnValidatorTest.java index 26b370535bd..258d7f64136 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/validation/CrnValidatorTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/validation/CrnValidatorTest.java @@ -9,8 +9,8 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/validation/MutuallyExclusiveNotNullValidatorTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/validation/MutuallyExclusiveNotNullValidatorTest.java index 0f6dd32cd85..0f3f65be993 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/validation/MutuallyExclusiveNotNullValidatorTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/validation/MutuallyExclusiveNotNullValidatorTest.java @@ -5,10 +5,10 @@ import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/com/sequenceiq/cloudbreak/validation/ValidEnvironmentNameValidatorTest.java b/common/src/test/java/com/sequenceiq/cloudbreak/validation/ValidEnvironmentNameValidatorTest.java index 78c53fec0b3..92a27c00cbe 100644 --- a/common/src/test/java/com/sequenceiq/cloudbreak/validation/ValidEnvironmentNameValidatorTest.java +++ b/common/src/test/java/com/sequenceiq/cloudbreak/validation/ValidEnvironmentNameValidatorTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -32,4 +32,4 @@ public void testEnvironmentNameValidation() { assertFalse(underTest.isValid("apple-tree-pear-", context)); } -} \ No newline at end of file +} diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/audits/AuditEventV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/audits/AuditEventV4Endpoint.java index 71c682bc209..3b57e53e00c 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/audits/AuditEventV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/audits/AuditEventV4Endpoint.java @@ -1,13 +1,13 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.audits; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.sequenceiq.cloudbreak.api.endpoint.v4.audits.responses.AuditEventV4Response; import com.sequenceiq.cloudbreak.api.endpoint.v4.audits.responses.AuditEventV4Responses; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/autoscales/AutoscaleV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/autoscales/AutoscaleV4Endpoint.java index f02cf81da74..736e8e26883 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/autoscales/AutoscaleV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/autoscales/AutoscaleV4Endpoint.java @@ -1,22 +1,22 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.autoscales; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import java.util.List; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.springframework.web.bind.annotation.RequestBody; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/autoscales/request/InstanceGroupAdjustmentV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/autoscales/request/InstanceGroupAdjustmentV4Request.java index ad375cece97..156d52b0b61 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/autoscales/request/InstanceGroupAdjustmentV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/autoscales/request/InstanceGroupAdjustmentV4Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.autoscales.request; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request.network.NetworkScaleV4Request; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/BlueprintUtilV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/BlueprintUtilV4Endpoint.java index 5750f109ba3..f69e51ed828 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/BlueprintUtilV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/BlueprintUtilV4Endpoint.java @@ -2,15 +2,15 @@ import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.blueprint.responses.BlueprintServicesV4Response; import com.sequenceiq.cloudbreak.api.endpoint.v4.blueprint.responses.GeneratedCmTemplateV4Response; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/BlueprintV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/BlueprintV4Base.java index 81292bb6814..8ecfeadefe9 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/BlueprintV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/BlueprintV4Base.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/BlueprintV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/BlueprintV4Endpoint.java index bcf96fb1bca..f56125306bd 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/BlueprintV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/BlueprintV4Endpoint.java @@ -4,18 +4,18 @@ import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.blueprint.requests.BlueprintV4Request; import com.sequenceiq.cloudbreak.api.endpoint.v4.blueprint.responses.BlueprintV4Response; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/requests/BlueprintV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/requests/BlueprintV4Request.java index 0ab8b42e14d..ab3de881126 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/requests/BlueprintV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/requests/BlueprintV4Request.java @@ -3,8 +3,8 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/responses/BlueprintV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/responses/BlueprintV4Response.java index 068f56e3978..4f80fc89d79 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/responses/BlueprintV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/responses/BlueprintV4Response.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.blueprint.responses; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/responses/BlueprintV4ViewResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/responses/BlueprintV4ViewResponse.java index c6afa1b6f6a..3043564e34e 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/responses/BlueprintV4ViewResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/blueprint/responses/BlueprintV4ViewResponse.java @@ -3,9 +3,9 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.BlueprintBasedUpgradeOption; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.CompactViewV4Response; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/clustertemplate/ClusterTemplateV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/clustertemplate/ClusterTemplateV4Base.java index 539d948ffe4..87917989ee3 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/clustertemplate/ClusterTemplateV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/clustertemplate/ClusterTemplateV4Base.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.clustertemplate; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/clustertemplate/ClusterTemplateV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/clustertemplate/ClusterTemplateV4Endpoint.java index 4f9f4d8873e..37bdc36f115 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/clustertemplate/ClusterTemplateV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/clustertemplate/ClusterTemplateV4Endpoint.java @@ -4,16 +4,16 @@ import java.util.Set; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.clustertemplate.requests.ClusterTemplateV4Request; import com.sequenceiq.cloudbreak.api.endpoint.v4.clustertemplate.responses.ClusterTemplateV4Response; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/clustertemplate/responses/ClusterTemplateV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/clustertemplate/responses/ClusterTemplateV4Response.java index 20e8ad3f565..597b725c0e4 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/clustertemplate/responses/ClusterTemplateV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/clustertemplate/responses/ClusterTemplateV4Response.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.clustertemplate.responses; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/co2/ClusterCO2V4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/co2/ClusterCO2V4Endpoint.java index 9109a702625..b296604cc90 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/co2/ClusterCO2V4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/co2/ClusterCO2V4Endpoint.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.co2.requests.ClusterCO2V4Request; import com.sequenceiq.cloudbreak.common.co2.RealTimeCO2Response; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/common/CompactViewV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/common/CompactViewV4Response.java index 6a64e01025b..0b4c0f8213e 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/common/CompactViewV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/common/CompactViewV4Response.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.common; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/common/EnvironmentNames.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/common/EnvironmentNames.java index 535026aa136..f4a21a6a39b 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/common/EnvironmentNames.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/common/EnvironmentNames.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/connector/responses/TagSpecificationsV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/connector/responses/TagSpecificationsV4Response.java index 82210cf4722..5c00fe9fb0b 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/connector/responses/TagSpecificationsV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/connector/responses/TagSpecificationsV4Response.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.ConnectorModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/cost/ClusterCostV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/cost/ClusterCostV4Endpoint.java index 367ccb96abf..3ed0ec57637 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/cost/ClusterCostV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/cost/ClusterCostV4Endpoint.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.cost.requests.ClusterCostV4Request; import com.sequenceiq.cloudbreak.common.cost.RealTimeCostResponse; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/CustomImageCatalogV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/CustomImageCatalogV4Endpoint.java index 5fec09aa29c..67c62c3c652 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/CustomImageCatalogV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/CustomImageCatalogV4Endpoint.java @@ -11,18 +11,18 @@ import static com.sequenceiq.cloudbreak.doc.OperationDescriptions.CustomImageCatalogOpDescription.GET_BY_NAME_IN_CATALOG; import static com.sequenceiq.cloudbreak.doc.OperationDescriptions.CustomImageCatalogOpDescription.LIST; import static com.sequenceiq.cloudbreak.doc.OperationDescriptions.CustomImageCatalogOpDescription.UPDATE_IN_CATALOG; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import com.sequenceiq.cloudbreak.api.endpoint.v4.customimage.request.CustomImageCatalogV4CreateImageRequest; import com.sequenceiq.cloudbreak.api.endpoint.v4.customimage.request.CustomImageCatalogV4CreateRequest; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4CreateImageRequest.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4CreateImageRequest.java index 9b0d790fdbd..57bd4d599dd 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4CreateImageRequest.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4CreateImageRequest.java @@ -8,9 +8,9 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.validation.customimage.UniqueRegion; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4CreateRequest.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4CreateRequest.java index 6d77fad7a63..d2e93aada8a 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4CreateRequest.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4CreateRequest.java @@ -3,9 +3,9 @@ import static com.sequenceiq.cloudbreak.doc.ModelDescriptions.CustomImageCatalogDescription.DESCRIPTION; import static com.sequenceiq.cloudbreak.doc.ModelDescriptions.CustomImageCatalogDescription.NAME; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4UpdateImageRequest.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4UpdateImageRequest.java index 04318041112..58c67aacdae 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4UpdateImageRequest.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4UpdateImageRequest.java @@ -7,9 +7,9 @@ import java.util.Set; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.validation.customimage.UniqueRegion; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4VmImageRequest.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4VmImageRequest.java index ac21c419036..b7ae03aa309 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4VmImageRequest.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/request/CustomImageCatalogV4VmImageRequest.java @@ -3,8 +3,8 @@ import static com.sequenceiq.cloudbreak.doc.ModelDescriptions.VmImageDescription.IMAGE_REFERENCE; import static com.sequenceiq.cloudbreak.doc.ModelDescriptions.VmImageDescription.REGION; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.common.model.JsonEntity; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4CreateImageResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4CreateImageResponse.java index 1ed2a0c5d57..99f1d89e680 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4CreateImageResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4CreateImageResponse.java @@ -3,7 +3,7 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4CreateResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4CreateResponse.java index b552d2c905a..df2b814188a 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4CreateResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4CreateResponse.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.customimage.response; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4DeleteImageResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4DeleteImageResponse.java index b001a890514..fdaefefe786 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4DeleteImageResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4DeleteImageResponse.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.customimage.response; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4GetImageResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4GetImageResponse.java index 2f2f426d129..7177b22869c 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4GetImageResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4GetImageResponse.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Set; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4GetResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4GetResponse.java index a73847663fd..def9052dc1d 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4GetResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4GetResponse.java @@ -3,7 +3,7 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4ListResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4ListResponse.java index 75395db4d4a..332efebf1ee 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4ListResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4ListResponse.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; import com.google.common.collect.Sets; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4UpdateImageResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4UpdateImageResponse.java index 50fcd8df093..115eae6a135 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4UpdateImageResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4UpdateImageResponse.java @@ -3,7 +3,7 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4VmImageResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4VmImageResponse.java index ad1ded7e1fe..638dee06f19 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4VmImageResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/customimage/response/CustomImageCatalogV4VmImageResponse.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.customimage.response; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/DatabaseConfigV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/DatabaseConfigV4Endpoint.java index 4a02bda3a85..e3ae73694e0 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/DatabaseConfigV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/DatabaseConfigV4Endpoint.java @@ -1,11 +1,11 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.database; -import javax.validation.constraints.NotNull; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.springframework.validation.annotation.Validated; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/DatabaseV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/DatabaseV4Endpoint.java index bc3bdc9c396..83f62633117 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/DatabaseV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/DatabaseV4Endpoint.java @@ -2,17 +2,17 @@ import java.util.Set; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.database.requests.DatabaseV4Request; import com.sequenceiq.cloudbreak.api.endpoint.v4.database.responses.DatabaseV4Response; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/base/DatabaseV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/base/DatabaseV4Base.java index 131665a76b8..cf87f23c24e 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/base/DatabaseV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/base/DatabaseV4Base.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.database.base; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseRequestParameters.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseRequestParameters.java index fcf454a3cb6..4496fdae053 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseRequestParameters.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseRequestParameters.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.database.requests; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.Database; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseTestV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseTestV4Request.java index d5ba106243f..bc5b56d8baf 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseTestV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseTestV4Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.database.requests; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.Database; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseV4BuildRequest.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseV4BuildRequest.java index 331fca1104e..5f05468f2ea 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseV4BuildRequest.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseV4BuildRequest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.database.requests; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.Database; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseV4Request.java index f3c19dd72c1..e29cf115031 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/requests/DatabaseV4Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.database.requests; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.api.endpoint.v4.database.base.DatabaseV4Base; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/responses/DatabaseTestV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/responses/DatabaseTestV4Response.java index a6591ef4490..93dd931909f 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/responses/DatabaseTestV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/database/responses/DatabaseTestV4Response.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.database.responses; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.Database; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/diagnostics/DiagnosticsV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/diagnostics/DiagnosticsV4Endpoint.java index 57bb9db857c..052c9ed0f48 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/diagnostics/DiagnosticsV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/diagnostics/DiagnosticsV4Endpoint.java @@ -2,14 +2,14 @@ import java.util.List; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.diagnostics.docs.DiagnosticsOperationDescriptions; import com.sequenceiq.cloudbreak.api.endpoint.v4.diagnostics.model.CmDiagnosticsCollectionRequest; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/diagnostics/model/CmDiagnosticsCollectionRequest.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/diagnostics/model/CmDiagnosticsCollectionRequest.java index b0040e007dd..66facde46bb 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/diagnostics/model/CmDiagnosticsCollectionRequest.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/diagnostics/model/CmDiagnosticsCollectionRequest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.diagnostics.model; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/diagnostics/model/DiagnosticsCollectionRequest.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/diagnostics/model/DiagnosticsCollectionRequest.java index 2b38f404412..c8026747eac 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/diagnostics/model/DiagnosticsCollectionRequest.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/diagnostics/model/DiagnosticsCollectionRequest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.diagnostics.model; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/events/EventV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/events/EventV4Endpoint.java index bd1aee59fd3..1e9671838c1 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/events/EventV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/events/EventV4Endpoint.java @@ -2,15 +2,15 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.springframework.data.domain.Page; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/filesystems/FileSystemV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/filesystems/FileSystemV4Endpoint.java index b512854c8b7..5d7684a7363 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/filesystems/FileSystemV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/filesystems/FileSystemV4Endpoint.java @@ -1,14 +1,14 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.filesystems; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.filesystems.responses.FileSystemParameterV4Responses; import com.sequenceiq.cloudbreak.auth.security.internal.AccountId; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/ImageCatalogV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/ImageCatalogV4Endpoint.java index 66908c5210c..789ffbaa084 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/ImageCatalogV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/ImageCatalogV4Endpoint.java @@ -4,18 +4,18 @@ import java.util.Set; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.imagecatalog.requests.ImageCatalogV4Request; import com.sequenceiq.cloudbreak.api.endpoint.v4.imagecatalog.requests.ImageRecommendationV4Request; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/base/ImageCatalogV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/base/ImageCatalogV4Base.java index a370fb73c49..d5c57d6dddc 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/base/ImageCatalogV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/base/ImageCatalogV4Base.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.imagecatalog.base; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.sequenceiq.cloudbreak.doc.ModelDescriptions; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.ImageCatalogDescription; @@ -77,4 +77,4 @@ public String getUrl() { public void setUrl(String url) { this.url = url; } -} \ No newline at end of file +} diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/requests/ImageEntryV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/requests/ImageEntryV4Request.java index 6deccd78f1a..77ab2bddd57 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/requests/ImageEntryV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/requests/ImageEntryV4Request.java @@ -3,9 +3,9 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/requests/ImageRecommendationV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/requests/ImageRecommendationV4Request.java index 5206a3fe4cf..97610352364 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/requests/ImageRecommendationV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/requests/ImageRecommendationV4Request.java @@ -4,7 +4,7 @@ import static com.sequenceiq.cloudbreak.doc.ModelDescriptions.StackModelDescription.IMAGE_SETTINGS; import static com.sequenceiq.cloudbreak.doc.ModelDescriptions.StackModelDescription.REGION; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request.image.ImageSettingsV4Request; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/requests/UpdateImageCatalogV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/requests/UpdateImageCatalogV4Request.java index 8876f7dfbd3..e717f300cfc 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/requests/UpdateImageCatalogV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/requests/UpdateImageCatalogV4Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.imagecatalog.requests; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.api.endpoint.v4.imagecatalog.base.ImageCatalogV4Base; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageBasicInfoV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageBasicInfoV4Response.java index 73cfb255c4d..c0921526a42 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageBasicInfoV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageBasicInfoV4Response.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.imagecatalog.responses; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageCatalogV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageCatalogV4Response.java index 1c3a22a167b..8cb3cd633e3 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageCatalogV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageCatalogV4Response.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.imagecatalog.responses; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageCatalogV4Responses.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageCatalogV4Responses.java index 779c27ac615..c17138269f0 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageCatalogV4Responses.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageCatalogV4Responses.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageV4Response.java index d735c4594ab..8a1a35f05ef 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImageV4Response.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImagesV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImagesV4Response.java index 594d025cb93..2ecebe727fd 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImagesV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/ImagesV4Response.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Set; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.common.model.JsonEntity; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/RuntimeVersionsV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/RuntimeVersionsV4Response.java index d7218923dbb..1ce2d89bbc9 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/RuntimeVersionsV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/imagecatalog/responses/RuntimeVersionsV4Response.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/info/CloudbreakInfoV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/info/CloudbreakInfoV4Endpoint.java index 133c791281e..fab0fea8bf6 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/info/CloudbreakInfoV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/info/CloudbreakInfoV4Endpoint.java @@ -1,10 +1,10 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.info; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.info.responses.CloudbreakInfoResponse; import com.sequenceiq.cloudbreak.doc.ControllerDescription; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/operation/OperationV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/operation/OperationV4Endpoint.java index 57132d2902a..f1a4ea86f19 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/operation/OperationV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/operation/OperationV4Endpoint.java @@ -3,14 +3,14 @@ import static com.sequenceiq.cloudbreak.api.endpoint.v4.operation.docs.OperationOpDescriptions.GET_OPERATIONS; import static com.sequenceiq.cloudbreak.api.endpoint.v4.operation.docs.OperationOpDescriptions.NOTES; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.jerseyclient.RetryAndMetrics; import com.sequenceiq.flow.api.model.operation.OperationView; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/progress/ProgressV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/progress/ProgressV4Endpoint.java index 7be361c7226..c3a30e007d3 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/progress/ProgressV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/progress/ProgressV4Endpoint.java @@ -6,12 +6,12 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.jerseyclient.RetryAndMetrics; import com.sequenceiq.flow.api.model.FlowProgressResponse; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/providerservices/CloudProviderServicesV4Endopint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/providerservices/CloudProviderServicesV4Endopint.java index 7347c5b8525..9f552c6250e 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/providerservices/CloudProviderServicesV4Endopint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/providerservices/CloudProviderServicesV4Endopint.java @@ -1,12 +1,12 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.providerservices; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.cloud.model.nosql.NoSqlTableDeleteRequest; import com.sequenceiq.cloudbreak.cloud.model.nosql.NoSqlTableDeleteResponse; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/recipes/RecipeV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/recipes/RecipeV4Base.java index 3cc0886becb..4b56f4d8cfe 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/recipes/RecipeV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/recipes/RecipeV4Base.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.recipes; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.sequenceiq.cloudbreak.api.endpoint.v4.recipes.requests.RecipeV4Type; import com.sequenceiq.cloudbreak.doc.ModelDescriptions; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/recipes/RecipeV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/recipes/RecipeV4Endpoint.java index 7cba8282bf9..ae3cbf62075 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/recipes/RecipeV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/recipes/RecipeV4Endpoint.java @@ -2,17 +2,17 @@ import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.recipes.requests.RecipeV4Request; import com.sequenceiq.cloudbreak.api.endpoint.v4.recipes.responses.RecipeV4Response; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/recipes/responses/RecipeViewV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/recipes/responses/RecipeViewV4Response.java index 8d64b46508b..a255af95216 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/recipes/responses/RecipeViewV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/recipes/responses/RecipeViewV4Response.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.recipes.responses; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.CompactViewV4Response; import com.sequenceiq.cloudbreak.api.endpoint.v4.recipes.requests.RecipeV4Type; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/rotation/requests/StackV4SecretRotationRequest.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/rotation/requests/StackV4SecretRotationRequest.java index 28b87ccf38b..3761b9c247c 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/rotation/requests/StackV4SecretRotationRequest.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/rotation/requests/StackV4SecretRotationRequest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.rotation.requests; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.auth.crn.CrnResourceDescriptor; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/DatalakeV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/DatalakeV4Endpoint.java index 0fd073bb15d..e507f55cec0 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/DatalakeV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/DatalakeV4Endpoint.java @@ -2,12 +2,12 @@ import static com.sequenceiq.cloudbreak.doc.OperationDescriptions.StackOpDescription.LIST_BY_WORKSPACE; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.response.StackViewV4Responses; import com.sequenceiq.cloudbreak.doc.Notes; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/DiskUpdateEndpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/DiskUpdateEndpoint.java index f837114d7a2..34ee39e1c14 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/DiskUpdateEndpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/DiskUpdateEndpoint.java @@ -1,14 +1,14 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request.DiskModificationRequest; import com.sequenceiq.flow.api.model.FlowIdentifier; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/StackV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/StackV4Endpoint.java index 00ea8b67a99..248c6ee80cb 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/StackV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/StackV4Endpoint.java @@ -70,20 +70,20 @@ import java.util.List; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.authorization.annotation.ResourceName; import com.sequenceiq.cloudbreak.api.endpoint.v4.rotation.requests.StackV4SecretRotationRequest; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/DatabaseBase.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/DatabaseBase.java index 64b45bf1a26..7554f1c03d4 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/DatabaseBase.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/DatabaseBase.java @@ -4,8 +4,8 @@ import java.io.Serializable; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request.database.DatabaseAvailabilityType; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/HostGroupV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/HostGroupV4Base.java index 4c7457efd06..b35ae5637fd 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/HostGroupV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/HostGroupV4Base.java @@ -3,7 +3,7 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/InstanceGroupV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/InstanceGroupV4Base.java index b98ed2940ea..6f88ffe1c7b 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/InstanceGroupV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/InstanceGroupV4Base.java @@ -1,10 +1,10 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base; -import javax.validation.Valid; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.parameter.instancegroup.AwsInstanceGroupV4Parameters; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/InstanceTemplateV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/InstanceTemplateV4Base.java index df247dede5f..152c3cc3938 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/InstanceTemplateV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/InstanceTemplateV4Base.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/RefreshClusterRecipeV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/RefreshClusterRecipeV4Base.java index 91aca548a0d..d1386ee3f17 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/RefreshClusterRecipeV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/RefreshClusterRecipeV4Base.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.common.model.JsonEntity; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/StackAuthenticationV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/StackAuthenticationV4Base.java index 761c40dfe62..e48f44e99c6 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/StackAuthenticationV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/StackAuthenticationV4Base.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.StackAuthenticationBase; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/StackV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/StackV4Base.java index c801a228ec4..4c39b18e195 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/StackV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/StackV4Base.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.parameter.stack.AwsStackV4Parameters; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/StorageLocationV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/StorageLocationV4Base.java index 00e5eebf41e..8df995a691b 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/StorageLocationV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/StorageLocationV4Base.java @@ -3,7 +3,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.common.model.JsonEntity; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/parameter/template/AwsInstanceTemplateV4Parameters.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/parameter/template/AwsInstanceTemplateV4Parameters.java index db69a1e56a1..b7cd3ae6137 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/parameter/template/AwsInstanceTemplateV4Parameters.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/parameter/template/AwsInstanceTemplateV4Parameters.java @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.Optional; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/parameter/template/AwsInstanceTemplateV4SpotParameters.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/parameter/template/AwsInstanceTemplateV4SpotParameters.java index 03c18740262..057cf4c268f 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/parameter/template/AwsInstanceTemplateV4SpotParameters.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/parameter/template/AwsInstanceTemplateV4SpotParameters.java @@ -1,9 +1,9 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.parameter.template; -import javax.validation.constraints.DecimalMin; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/parameter/template/AwsPlacementGroupV4Parameters.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/parameter/template/AwsPlacementGroupV4Parameters.java index 339bf5209e9..5167f034868 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/parameter/template/AwsPlacementGroupV4Parameters.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/base/parameter/template/AwsPlacementGroupV4Parameters.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.parameter.template; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/ChangeImageCatalogV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/ChangeImageCatalogV4Request.java index 1edc43c4678..2ac14e1b8f4 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/ChangeImageCatalogV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/ChangeImageCatalogV4Request.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.sequenceiq.cloudbreak.doc.ModelDescriptions; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/ClusterRepairNodesV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/ClusterRepairNodesV4Request.java index f6f3d99258e..ce088a3497a 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/ClusterRepairNodesV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/ClusterRepairNodesV4Request.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.StringJoiner; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.RepairClusterNodeRequest; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/ClusterRepairV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/ClusterRepairV4Request.java index 504b197bbf1..059402efe71 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/ClusterRepairV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/ClusterRepairV4Request.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.StringJoiner; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.RepairClusterRequest; import com.sequenceiq.cloudbreak.validation.MutuallyExclusiveNotNull; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/DiskModificationRequest.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/DiskModificationRequest.java index 47174d2f7d8..1820552c966 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/DiskModificationRequest.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/DiskModificationRequest.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.cloud.model.Volume; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/DiskUpdateRequest.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/DiskUpdateRequest.java index 46275e857f3..d447525716b 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/DiskUpdateRequest.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/DiskUpdateRequest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.hibernate.validator.constraints.Range; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/HostGroupAdjustmentV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/HostGroupAdjustmentV4Request.java index 39d3d5e806e..d66213f778e 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/HostGroupAdjustmentV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/HostGroupAdjustmentV4Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.HostGroupAdjustmentModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/HostGroupV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/HostGroupV4Request.java index 812e752be18..2a2698e62f0 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/HostGroupV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/HostGroupV4Request.java @@ -3,7 +3,7 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.api.endpoint.v4.recipes.requests.RecipeV4Request; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/OneOfEnum.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/OneOfEnum.java index 151ee970ce2..b71f042bc99 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/OneOfEnum.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/OneOfEnum.java @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target({FIELD, PARAMETER}) @Retention(RUNTIME) diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/OneOfEnumValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/OneOfEnumValidator.java index 409cdc3b0ea..e0d1e91a382 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/OneOfEnumValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/OneOfEnumValidator.java @@ -5,8 +5,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class OneOfEnumValidator implements ConstraintValidator { private Set acceptedValues; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackAddVolumesRequest.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackAddVolumesRequest.java index cb50b0d46fd..255fdd670e6 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackAddVolumesRequest.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackAddVolumesRequest.java @@ -2,7 +2,7 @@ import java.util.StringJoiner; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.common.model.JsonEntity; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackDeleteVolumesRequest.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackDeleteVolumesRequest.java index a3202c4045f..d96909afd81 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackDeleteVolumesRequest.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackDeleteVolumesRequest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackImageChangeV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackImageChangeV4Request.java index cf2ab3f047b..d9df5451f00 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackImageChangeV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackImageChangeV4Request.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.StackModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackScaleV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackScaleV4Request.java index 350d18b83c5..048608184c8 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackScaleV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackScaleV4Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackV4Request.java index 9580b5a62c3..d988b2ced60 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackV4Request.java @@ -7,10 +7,10 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackVerticalScaleV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackVerticalScaleV4Request.java index 437b5a6cede..8de12a915dd 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackVerticalScaleV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackVerticalScaleV4Request.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/UserNamePasswordV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/UserNamePasswordV4Request.java index 4231e291848..53c4ecedc5b 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/UserNamePasswordV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/UserNamePasswordV4Request.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.UserNamePasswordModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/ClusterV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/ClusterV4Request.java index 7b3fb94fe8d..b4f368852c3 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/ClusterV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/ClusterV4Request.java @@ -3,9 +3,9 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/cm/ClouderaManagerV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/cm/ClouderaManagerV4Request.java index d6e026e51a1..1dff145d476 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/cm/ClouderaManagerV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/cm/ClouderaManagerV4Request.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/cm/product/ClouderaManagerProductV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/cm/product/ClouderaManagerProductV4Request.java index 7c43c651da7..c9890097b43 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/cm/product/ClouderaManagerProductV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/cm/product/ClouderaManagerProductV4Request.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/repository/RepositoryV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/repository/RepositoryV4Request.java index b3d99023f9d..3ddd7636073 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/repository/RepositoryV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/repository/RepositoryV4Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request.cluster.repository; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/sharedservice/SharedServiceV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/sharedservice/SharedServiceV4Request.java index df35d2b6400..fdb6cc619c9 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/sharedservice/SharedServiceV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/sharedservice/SharedServiceV4Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request.cluster.sharedservice; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/storage/CloudStorageV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/storage/CloudStorageV4Request.java index d1b70419364..b679809cbd2 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/storage/CloudStorageV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/storage/CloudStorageV4Request.java @@ -3,7 +3,7 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/environment/placement/PlacementSettingsV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/environment/placement/PlacementSettingsV4Request.java index 3c467f70310..c7589dbe64e 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/environment/placement/PlacementSettingsV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/environment/placement/PlacementSettingsV4Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request.environment.placement; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/instancegroup/InstanceGroupV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/instancegroup/InstanceGroupV4Request.java index a599f942aeb..68821c84421 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/instancegroup/InstanceGroupV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/instancegroup/InstanceGroupV4Request.java @@ -3,8 +3,8 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/instancegroup/securitygroup/SecurityGroupV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/instancegroup/securitygroup/SecurityGroupV4Request.java index 4a43c807b4c..4ff595beb8f 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/instancegroup/securitygroup/SecurityGroupV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/instancegroup/securitygroup/SecurityGroupV4Request.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Set; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/AutoscaleStackV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/AutoscaleStackV4Response.java index 2e5410f9e88..dd40925a26d 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/AutoscaleStackV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/AutoscaleStackV4Response.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.response; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.StackType; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/PlacementSettingsV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/PlacementSettingsV4Response.java index 1d1ef3363d4..a34a85dd5d6 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/PlacementSettingsV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/PlacementSettingsV4Response.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.response; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/StackV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/StackV4Response.java index 6a24b1ca94a..b73df56bb3e 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/StackV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/StackV4Response.java @@ -8,8 +8,8 @@ import java.util.Optional; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/clouderamanager/ClouderaManagerProductV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/clouderamanager/ClouderaManagerProductV4Response.java index d128f2256ae..56fba5b4ede 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/clouderamanager/ClouderaManagerProductV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/clouderamanager/ClouderaManagerProductV4Response.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.StringJoiner; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/clouderamanager/ClouderaManagerV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/clouderamanager/ClouderaManagerV4Response.java index 65f1d88452e..0d275a31bba 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/clouderamanager/ClouderaManagerV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/clouderamanager/ClouderaManagerV4Response.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.StringJoiner; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/clouderamanager/RepositoryV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/clouderamanager/RepositoryV4Response.java index 1c3685f2086..0584c90b85a 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/clouderamanager/RepositoryV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/clouderamanager/RepositoryV4Response.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.response.cluster.clouderamanager; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/CloudStorageV1Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/CloudStorageV1Response.java index 8836da362a6..7a3f3ff6fff 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/CloudStorageV1Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/CloudStorageV1Response.java @@ -3,8 +3,8 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/azure/AdlsCloudStorageParametersV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/azure/AdlsCloudStorageParametersV4Response.java index 9f8a0dee304..458a639861c 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/azure/AdlsCloudStorageParametersV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/azure/AdlsCloudStorageParametersV4Response.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.response.cluster.storage.azure; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -70,4 +70,4 @@ public FileSystemType getType() { return FileSystemType.ADLS; } -} \ No newline at end of file +} diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/azure/AdlsGen2CloudStorageParametersV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/azure/AdlsGen2CloudStorageParametersV4Response.java index c1a5f2c87c2..22ed4b42953 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/azure/AdlsGen2CloudStorageParametersV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/azure/AdlsGen2CloudStorageParametersV4Response.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.response.cluster.storage.CloudStorageParametersV4Response; import com.sequenceiq.common.api.cloudstorage.old.validation.ValidAdlsGen2CloudStorageParameters; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/azure/WasbCloudStorageParametersV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/azure/WasbCloudStorageParametersV4Response.java index 3c3182554fa..4aa8fcce949 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/azure/WasbCloudStorageParametersV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/azure/WasbCloudStorageParametersV4Response.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.response.cluster.storage.CloudStorageParametersV4Response; import com.sequenceiq.common.api.cloudstorage.old.validation.ValidWasbCloudStorageParameters; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/gcs/GcsCloudStorageParametersV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/gcs/GcsCloudStorageParametersV4Response.java index 8900d77535a..51a18ffe644 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/gcs/GcsCloudStorageParametersV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/gcs/GcsCloudStorageParametersV4Response.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.response.cluster.storage.CloudStorageParametersV4Response; import com.sequenceiq.common.api.cloudstorage.old.validation.ValidGcsCloudStorageParameters; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/s3/S3CloudStorageParametersV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/s3/S3CloudStorageParametersV4Response.java index 885949c2eb3..0355b5cf539 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/s3/S3CloudStorageParametersV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/cluster/storage/s3/S3CloudStorageParametersV4Response.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.response.cluster.storage.CloudStorageParametersV4Response; import com.sequenceiq.common.api.cloudstorage.old.validation.ValidS3CloudStorageParameters; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/hardware/HardwareInfoV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/hardware/HardwareInfoV4Response.java index 73de76ee9f1..7c0535bd33e 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/hardware/HardwareInfoV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/hardware/HardwareInfoV4Response.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.StringJoiner; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.InstanceMetadataType; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/imagecatalog/GenerateImageCatalogV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/imagecatalog/GenerateImageCatalogV4Response.java index fe242622e06..884336bb963 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/imagecatalog/GenerateImageCatalogV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/imagecatalog/GenerateImageCatalogV4Response.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.response.imagecatalog; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.cloud.model.catalog.CloudbreakImageCatalogV3; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/instancegroup/securitygroup/SecurityGroupV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/instancegroup/securitygroup/SecurityGroupV4Response.java index 8fa46cefdae..10c0d8e1907 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/instancegroup/securitygroup/SecurityGroupV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/instancegroup/securitygroup/SecurityGroupV4Response.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Set; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AwsLoadBalancerResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AwsLoadBalancerResponse.java index 4136cff748e..831817b6c02 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AwsLoadBalancerResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AwsLoadBalancerResponse.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.StackModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AwsTargetGroupResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AwsTargetGroupResponse.java index 82b9d53f87e..eb85c46bd1d 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AwsTargetGroupResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AwsTargetGroupResponse.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.StackModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AzureLoadBalancerResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AzureLoadBalancerResponse.java index 758620f34c2..974aa0dcced 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AzureLoadBalancerResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AzureLoadBalancerResponse.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.StackModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AzureTargetGroupResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AzureTargetGroupResponse.java index 342c33651fe..26bda111090 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AzureTargetGroupResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/AzureTargetGroupResponse.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.StackModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/GcpLoadBalancerResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/GcpLoadBalancerResponse.java index 9065ce90c01..61d38b66e14 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/GcpLoadBalancerResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/GcpLoadBalancerResponse.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.StackModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/GcpTargetGroupResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/GcpTargetGroupResponse.java index df5d37a9aaf..005f4a1975a 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/GcpTargetGroupResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/GcpTargetGroupResponse.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.StackModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/LoadBalancerResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/LoadBalancerResponse.java index 44ff44d7017..4b3be81f933 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/LoadBalancerResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/LoadBalancerResponse.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/TargetGroupResponse.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/TargetGroupResponse.java index 9c4b694d302..078cbaac908 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/TargetGroupResponse.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/response/loadbalancer/TargetGroupResponse.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Set; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/views/CredentialViewV4Response.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/views/CredentialViewV4Response.java index a99cdcf018c..bca6e9badee 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/views/CredentialViewV4Response.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/views/CredentialViewV4Response.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.views; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/UserProfileV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/UserProfileV4Endpoint.java index afa070428e8..74a6c74d1b0 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/UserProfileV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/UserProfileV4Endpoint.java @@ -1,13 +1,13 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.userprofile; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.userprofile.requests.ShowTerminatedClustersPreferencesV4Request; import com.sequenceiq.cloudbreak.api.endpoint.v4.userprofile.responses.ShowTerminatedClusterPreferencesV4Response; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/requests/DurationV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/requests/DurationV4Base.java index 9c67b4b5776..6c0c056f6ea 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/requests/DurationV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/requests/DurationV4Base.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.userprofile.requests; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; public class DurationV4Base { diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/requests/ShowTerminatedClustersPreferencesV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/requests/ShowTerminatedClustersPreferencesV4Request.java index 51269b7400a..d50076edb21 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/requests/ShowTerminatedClustersPreferencesV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/requests/ShowTerminatedClustersPreferencesV4Request.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.userprofile.requests; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.common.model.JsonEntity; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/requests/UserProfileV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/requests/UserProfileV4Request.java index 53f5a451cf5..bd786339ce0 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/requests/UserProfileV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/userprofile/requests/UserProfileV4Request.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.userprofile.requests; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.common.model.JsonEntity; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/UtilV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/UtilV4Endpoint.java index 451cbbb2b49..ae96cf2faf6 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/UtilV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/UtilV4Endpoint.java @@ -2,15 +2,15 @@ import static com.sequenceiq.common.api.util.versionchecker.VersionCheckerModelDescription.CHECK_CLIENT_VERSION; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.sequenceiq.cloudbreak.api.endpoint.v4.util.requests.RenewCertificateV4Request; import com.sequenceiq.cloudbreak.api.endpoint.v4.util.requests.RepoConfigValidationV4Request; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/WorkspaceAwareUtilV4Endpoint.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/WorkspaceAwareUtilV4Endpoint.java index b4efc4ec14f..f56ae10acad 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/WorkspaceAwareUtilV4Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/WorkspaceAwareUtilV4Endpoint.java @@ -1,12 +1,12 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.util; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.util.responses.ExposedServiceV4Responses; import com.sequenceiq.cloudbreak.doc.ControllerDescription; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/base/SecurityRuleV4Base.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/base/SecurityRuleV4Base.java index 0363ec7257e..bd08e93f6fa 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/base/SecurityRuleV4Base.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/base/SecurityRuleV4Base.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.Pattern; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.SecurityRuleModelDescription; import com.sequenceiq.cloudbreak.validation.SubnetType; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/requests/RenewCertificateV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/requests/RenewCertificateV4Request.java index a1181624265..c74a83a582a 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/requests/RenewCertificateV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/requests/RenewCertificateV4Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.util.requests; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/requests/StructuredParametersQueryV4Request.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/requests/StructuredParametersQueryV4Request.java index 6f1f6e15cb5..2e52222e0d6 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/requests/StructuredParametersQueryV4Request.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/requests/StructuredParametersQueryV4Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.util.requests; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/helper/HttpHelper.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/helper/HttpHelper.java index ba9c04d1d18..cf1b188496d 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/helper/HttpHelper.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/helper/HttpHelper.java @@ -1,10 +1,10 @@ package com.sequenceiq.cloudbreak.api.helper; -import javax.inject.Inject; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status.Family; -import javax.ws.rs.core.Response.StatusType; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/service/ExposedServiceCollector.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/service/ExposedServiceCollector.java index 9510c61a5a1..f74fa7c62d3 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/api/service/ExposedServiceCollector.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/api/service/ExposedServiceCollector.java @@ -9,8 +9,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.apache.commons.collections4.MultiValuedMap; import org.apache.commons.collections4.multimap.HashSetValuedHashMap; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/client/CloudbreakApiKeyEndpoints.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/client/CloudbreakApiKeyEndpoints.java index 5da4285e4a5..1fe9dee7da8 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/client/CloudbreakApiKeyEndpoints.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/client/CloudbreakApiKeyEndpoints.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.client; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import com.sequenceiq.authorization.info.AuthorizationUtilEndpoint; import com.sequenceiq.cloudbreak.api.endpoint.v4.CustomConfigurationsV4Endpoint; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/client/CloudbreakServiceCrnEndpoints.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/client/CloudbreakServiceCrnEndpoints.java index afec7404b3e..106c86f010d 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/client/CloudbreakServiceCrnEndpoints.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/client/CloudbreakServiceCrnEndpoints.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.client; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import com.sequenceiq.authorization.info.AuthorizationUtilEndpoint; import com.sequenceiq.cloudbreak.api.endpoint.v4.CustomConfigurationsV4Endpoint; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/client/internal/CloudbreakApiClientConfig.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/client/internal/CloudbreakApiClientConfig.java index bbd733321d3..085a582a997 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/client/internal/CloudbreakApiClientConfig.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/client/internal/CloudbreakApiClientConfig.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.client.internal; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.context.annotation.Bean; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/Base64Validator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/Base64Validator.java index 38b447f3f94..ab35f6d1fa7 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/Base64Validator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/Base64Validator.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.codec.binary.Base64; import org.springframework.util.StringUtils; @@ -16,4 +16,4 @@ public void initialize(ValidBase64 constraintAnnotation) { public boolean isValid(String value, ConstraintValidatorContext context) { return !StringUtils.hasLength(value) || Base64.isBase64(value); } -} \ No newline at end of file +} diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DatabaseVendorValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DatabaseVendorValidator.java index be9dadeeb2c..7467f5b6e41 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DatabaseVendorValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DatabaseVendorValidator.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.DatabaseVendor; import com.sequenceiq.common.api.util.ValidatorUtil; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DatalakeCrn.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DatalakeCrn.java index fc3e5b070a4..db51490b8b2 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DatalakeCrn.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DatalakeCrn.java @@ -11,8 +11,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Constraint(validatedBy = DatalakeCrnValidator.class) diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DatalakeCrnValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DatalakeCrnValidator.java index 8c53c5d47f0..faafb61afc7 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DatalakeCrnValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DatalakeCrnValidator.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.sequenceiq.cloudbreak.auth.crn.Crn; import com.sequenceiq.common.api.util.ValidatorUtil; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DeprecatedValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DeprecatedValidator.java index 388759a0c50..7d37622ab73 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DeprecatedValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/DeprecatedValidator.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/EnvironmentCrnValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/EnvironmentCrnValidator.java index ff6e52f4a3d..b4e1c27c85c 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/EnvironmentCrnValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/EnvironmentCrnValidator.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.google.common.base.Strings; import com.sequenceiq.cloudbreak.auth.crn.Crn; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ExactlyOneNonNullValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ExactlyOneNonNullValidator.java index 78bef8ea413..f51c0831a97 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ExactlyOneNonNullValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ExactlyOneNonNullValidator.java @@ -3,8 +3,8 @@ import java.lang.reflect.Field; import java.util.Arrays; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.springframework.util.ReflectionUtils; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/GeneralSettingsValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/GeneralSettingsValidator.java index 9a0259ed7ca..6d9f49143cc 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/GeneralSettingsValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/GeneralSettingsValidator.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.springframework.util.StringUtils; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/HttpContentSizeValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/HttpContentSizeValidator.java index dcedd2298a7..b3cd6062af4 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/HttpContentSizeValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/HttpContentSizeValidator.java @@ -1,10 +1,10 @@ package com.sequenceiq.cloudbreak.validation; -import javax.inject.Inject; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.ws.rs.core.Response.Status.Family; -import javax.ws.rs.core.Response.StatusType; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.tuple.Pair; @@ -63,4 +63,4 @@ public boolean isValid(String value, ConstraintValidatorContext context) { } return false; } -} \ No newline at end of file +} diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ImageCatalogValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ImageCatalogValidator.java index d4fff2c94f2..a1e1ed3a4bf 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ImageCatalogValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ImageCatalogValidator.java @@ -2,11 +2,11 @@ import java.util.Map; -import javax.inject.Inject; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.ws.rs.core.Response.Status.Family; -import javax.ws.rs.core.Response.StatusType; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/JdbcConnectionUrlValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/JdbcConnectionUrlValidator.java index 8e979fffc01..81360f32fbb 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/JdbcConnectionUrlValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/JdbcConnectionUrlValidator.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.sequenceiq.cloudbreak.common.database.DatabaseCommon; import com.sequenceiq.common.api.util.ValidatorUtil; diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/JsonValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/JsonValidator.java index ab95052a658..df5f3acd076 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/JsonValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/JsonValidator.java @@ -2,8 +2,8 @@ import java.io.IOException; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,4 +35,4 @@ public boolean isValid(String value, ConstraintValidatorContext context) { } return false; } -} \ No newline at end of file +} diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/StackNameFormatValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/StackNameFormatValidator.java index a60a40e20a4..c6d311b3eb9 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/StackNameFormatValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/StackNameFormatValidator.java @@ -3,8 +3,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import io.netty.util.internal.StringUtil; @@ -20,4 +20,4 @@ public boolean isValid(String value, ConstraintValidatorContext context) { } return false; } -} \ No newline at end of file +} diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/StackNameLengthValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/StackNameLengthValidator.java index fe1ad8188f8..6001fec5b1b 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/StackNameLengthValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/StackNameLengthValidator.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.Range; @@ -15,4 +15,4 @@ public class StackNameLengthValidator implements ConstraintValidator[] payload() default { }; -} \ No newline at end of file +} diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ValidUpgradeRequest.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ValidUpgradeRequest.java index fcd65a52ca5..c8f38a393c8 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ValidUpgradeRequest.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ValidUpgradeRequest.java @@ -5,8 +5,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @@ -21,4 +21,4 @@ String message() default "Invalid upgrade request: " Class[] payload() default { }; -} \ No newline at end of file +} diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ValidUrl.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ValidUrl.java index 2b9ff15af98..e702795315a 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ValidUrl.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/ValidUrl.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Target(ElementType.FIELD) diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/customimage/UniqueRegion.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/customimage/UniqueRegion.java index 31c84cef817..a97c98cffc2 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/customimage/UniqueRegion.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/customimage/UniqueRegion.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Target({ ElementType.FIELD }) diff --git a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/customimage/UniqueRegionValidator.java b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/customimage/UniqueRegionValidator.java index fb7ea620d1e..e7284442ac8 100644 --- a/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/customimage/UniqueRegionValidator.java +++ b/core-api/src/main/java/com/sequenceiq/cloudbreak/validation/customimage/UniqueRegionValidator.java @@ -3,8 +3,8 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.sequenceiq.cloudbreak.api.endpoint.v4.customimage.request.CustomImageCatalogV4VmImageRequest; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXCO2V1Endpoint.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXCO2V1Endpoint.java index 0160af4db27..f790f1b376f 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXCO2V1Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXCO2V1Endpoint.java @@ -2,11 +2,11 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.auth.crn.CrnResourceDescriptor; import com.sequenceiq.cloudbreak.common.co2.RealTimeCO2Response; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXCostV1Endpoint.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXCostV1Endpoint.java index 9255b21d1a3..7dbea2a7285 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXCostV1Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXCostV1Endpoint.java @@ -2,11 +2,11 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.auth.crn.CrnResourceDescriptor; import com.sequenceiq.cloudbreak.common.cost.RealTimeCostResponse; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXDatabaseServerV1Endpoint.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXDatabaseServerV1Endpoint.java index 134379f4312..28f1c6c5367 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXDatabaseServerV1Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXDatabaseServerV1Endpoint.java @@ -2,12 +2,12 @@ import static com.sequenceiq.distrox.api.v1.distrox.doc.DistroXOpDescription.GET_DATABASE_SERVER_BY_CLUSTER_CRN; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.springframework.validation.annotation.Validated; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXInternalV1Endpoint.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXInternalV1Endpoint.java index ca984540300..f5d8b9a4289 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXInternalV1Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXInternalV1Endpoint.java @@ -5,13 +5,13 @@ import static com.sequenceiq.distrox.api.v1.distrox.doc.DistroXOpDescription.GET_BY_CRN_INTERNAL; import static com.sequenceiq.distrox.api.v1.distrox.doc.DistroXOpDescription.RENEW_CERTIFICATE_INTERNAL; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request.StatusCrnsV4Request; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.response.StackInstancesV4Responses; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXUpgradeV1Endpoint.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXUpgradeV1Endpoint.java index 387c8362264..a381e47d383 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXUpgradeV1Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXUpgradeV1Endpoint.java @@ -1,15 +1,15 @@ package com.sequenceiq.distrox.api.v1.distrox.endpoint; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.springframework.validation.annotation.Validated; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXV1Endpoint.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXV1Endpoint.java index ca9c4cf2053..8a895d1f4b6 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXV1Endpoint.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXV1Endpoint.java @@ -57,20 +57,20 @@ import java.util.List; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request.CertificatesRotationV4Request; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request.ChangeImageCatalogV4Request; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXV1EventEndpoint.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXV1EventEndpoint.java index 59de015c3db..0049c4212ba 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXV1EventEndpoint.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXV1EventEndpoint.java @@ -4,14 +4,14 @@ import java.util.List; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.auth.crn.CrnResourceDescriptor; import com.sequenceiq.cloudbreak.doc.Notes; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXV1RotationEndpoint.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXV1RotationEndpoint.java index b7299b39f52..684380e719d 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXV1RotationEndpoint.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/endpoint/DistroXV1RotationEndpoint.java @@ -5,16 +5,16 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.sequenceiq.cloudbreak.auth.crn.CrnResourceDescriptor; import com.sequenceiq.cloudbreak.auth.security.internal.InitiatorUserCrn; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXChildResourceMarkingRequest.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXChildResourceMarkingRequest.java index 471c5a5ab97..fb32b4fe9fc 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXChildResourceMarkingRequest.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXChildResourceMarkingRequest.java @@ -1,6 +1,6 @@ package com.sequenceiq.distrox.api.v1.distrox.model; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.auth.crn.CrnResourceDescriptor; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXGenerateImageCatalogV1Response.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXGenerateImageCatalogV1Response.java index 903b9d8335c..9f8411e8896 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXGenerateImageCatalogV1Response.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXGenerateImageCatalogV1Response.java @@ -1,6 +1,6 @@ package com.sequenceiq.distrox.api.v1.distrox.model; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXImageChangeV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXImageChangeV1Request.java index e6deaf4fdbf..d88503c3533 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXImageChangeV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXImageChangeV1Request.java @@ -1,7 +1,7 @@ package com.sequenceiq.distrox.api.v1.distrox.model; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.StackModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXRepairNodesV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXRepairNodesV1Request.java index 14246105d30..9dc580a5935 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXRepairNodesV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXRepairNodesV1Request.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.RepairClusterNodeRequest; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXRepairV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXRepairV1Request.java index aaf53579800..30b30238552 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXRepairV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXRepairV1Request.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.RepairClusterRequest; import com.sequenceiq.cloudbreak.validation.MutuallyExclusiveNotNull; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXScaleV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXScaleV1Request.java index b88526a8c22..aab0958ba47 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXScaleV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXScaleV1Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.distrox.api.v1.distrox.model; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.InstanceGroupAdjustmentModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXSecretRotationRequest.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXSecretRotationRequest.java index c396a07c6fc..3e19d40644a 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXSecretRotationRequest.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXSecretRotationRequest.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.auth.crn.CrnResourceDescriptor; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXSecretTypeResponse.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXSecretTypeResponse.java index 72fcfab83b6..d02c0908a48 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXSecretTypeResponse.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXSecretTypeResponse.java @@ -1,6 +1,6 @@ package com.sequenceiq.distrox.api.v1.distrox.model; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXV1Base.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXV1Base.java index aa45459942d..2026811d783 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXV1Base.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXV1Base.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.StackModelDescription; import com.sequenceiq.cloudbreak.validation.ValidStackNameFormat; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXV1Request.java index cf6f2ec911b..8388e4a263b 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXV1Request.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXVerticalScaleV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXVerticalScaleV1Request.java index 69c7b885f9a..cc01a5f695d 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXVerticalScaleV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/DistroXVerticalScaleV1Request.java @@ -1,7 +1,7 @@ package com.sequenceiq.distrox.api.v1.distrox.model; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.InstanceGroupModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/DistroXClusterV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/DistroXClusterV1Request.java index 53a156f3e0e..688f3c6c797 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/DistroXClusterV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/DistroXClusterV1Request.java @@ -5,11 +5,11 @@ import java.util.List; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/cm/ClouderaManagerV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/cm/ClouderaManagerV1Request.java index fd3c604c1eb..c12c7aaec37 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/cm/ClouderaManagerV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/cm/ClouderaManagerV1Request.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/cm/product/ClouderaManagerProductV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/cm/product/ClouderaManagerProductV1Request.java index 338497e9c89..ad233274144 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/cm/product/ClouderaManagerProductV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/cm/product/ClouderaManagerProductV1Request.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/repository/RepositoryV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/repository/RepositoryV1Request.java index e0a11060aef..1fff6fd0286 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/repository/RepositoryV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/cluster/repository/RepositoryV1Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.distrox.api.v1.distrox.model.cluster.repository; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/database/DistroXDatabaseBase.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/database/DistroXDatabaseBase.java index 5102fbd77ec..d7462441dcb 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/database/DistroXDatabaseBase.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/database/DistroXDatabaseBase.java @@ -2,8 +2,8 @@ import static com.sequenceiq.cloudbreak.common.database.DatabaseCommon.POSTGRES_VERSION_REGEX; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; public abstract class DistroXDatabaseBase { diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/diagnostics/model/CmDiagnosticsCollectionV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/diagnostics/model/CmDiagnosticsCollectionV1Request.java index 3c9c745ec5d..d0a68ecd8f0 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/diagnostics/model/CmDiagnosticsCollectionV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/diagnostics/model/CmDiagnosticsCollectionV1Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.distrox.api.v1.distrox.model.diagnostics.model; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/diagnostics/model/DiagnosticsCollectionV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/diagnostics/model/DiagnosticsCollectionV1Request.java index 6e5d7711b11..1f8311f0774 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/diagnostics/model/DiagnosticsCollectionV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/diagnostics/model/DiagnosticsCollectionV1Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.distrox.api.v1.distrox.model.diagnostics.model; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/InstanceGroupV1Base.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/InstanceGroupV1Base.java index 79e80c0873a..edc7d39e972 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/InstanceGroupV1Base.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/InstanceGroupV1Base.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.validation.Valid; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.RecoveryMode; import com.sequenceiq.cloudbreak.doc.ModelDescriptions.HostGroupModelDescription; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/InstanceGroupV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/InstanceGroupV1Request.java index a5336dcae27..3daf14d9e8b 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/InstanceGroupV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/InstanceGroupV1Request.java @@ -3,8 +3,8 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/AwsInstanceTemplateV1Parameters.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/AwsInstanceTemplateV1Parameters.java index 4ed1c8db79b..aec3fbd8aee 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/AwsInstanceTemplateV1Parameters.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/AwsInstanceTemplateV1Parameters.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/AwsInstanceTemplateV1SpotParameters.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/AwsInstanceTemplateV1SpotParameters.java index dbb52fd1b22..4734cde9779 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/AwsInstanceTemplateV1SpotParameters.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/AwsInstanceTemplateV1SpotParameters.java @@ -2,10 +2,10 @@ import java.io.Serializable; -import javax.validation.constraints.DecimalMin; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/AwsPlacementGroupV1Parameters.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/AwsPlacementGroupV1Parameters.java index 6a9d48c91bd..fcd9f2d3fb5 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/AwsPlacementGroupV1Parameters.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/AwsPlacementGroupV1Parameters.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/InstanceTemplateV1Base.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/InstanceTemplateV1Base.java index 621877130b3..bb5866765ac 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/InstanceTemplateV1Base.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/instancegroup/template/InstanceTemplateV1Base.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/sharedservice/SdxV1Request.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/sharedservice/SdxV1Request.java index e4500910908..91d77e45abe 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/sharedservice/SdxV1Request.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/sharedservice/SdxV1Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.distrox.api.v1.distrox.model.sharedservice; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/upgrade/DistroXUpgradeRequestValidator.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/upgrade/DistroXUpgradeRequestValidator.java index fc6d58cdba6..bd84ad0b593 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/upgrade/DistroXUpgradeRequestValidator.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/upgrade/DistroXUpgradeRequestValidator.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; diff --git a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/upgrade/ValidUpgradeRequest.java b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/upgrade/ValidUpgradeRequest.java index 767a9e17428..27f50e23d6d 100644 --- a/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/upgrade/ValidUpgradeRequest.java +++ b/core-api/src/main/java/com/sequenceiq/distrox/api/v1/distrox/model/upgrade/ValidUpgradeRequest.java @@ -5,8 +5,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @@ -21,4 +21,4 @@ String message() default "Invalid upgrade request: " Class[] payload() default { }; -} \ No newline at end of file +} diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/BlueprintRequestTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/BlueprintRequestTest.java index cbe913fdd93..6d12631dd1b 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/BlueprintRequestTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/BlueprintRequestTest.java @@ -3,7 +3,7 @@ import java.util.Arrays; import java.util.Set; -import javax.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolation; import org.apache.commons.lang3.StringUtils; import org.hibernate.validator.HibernateValidator; diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackV4RequestCompatibilityTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackV4RequestCompatibilityTest.java index 835fa2ea5ce..c74a6a6625c 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackV4RequestCompatibilityTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/StackV4RequestCompatibilityTest.java @@ -5,10 +5,10 @@ import java.io.IOException; import java.util.Set; -import javax.validation.Configuration; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; +import jakarta.validation.Configuration; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator; import org.junit.Before; @@ -43,4 +43,4 @@ public void testApiCompatibility2dot4() throws IOException { } assertEquals(0L, violations.size()); } -} \ No newline at end of file +} diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/ClusterV4RequestTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/ClusterV4RequestTest.java index bf3010aaaad..a63d565dbb9 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/ClusterV4RequestTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/api/endpoint/v4/stacks/request/cluster/ClusterV4RequestTest.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Set; -import javax.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolation; import org.hibernate.validator.HibernateValidator; import org.junit.Before; @@ -121,4 +121,4 @@ private boolean isMissingNumbers(Collection violation.getMessage().contains("password should contain at least one number")); } -} \ No newline at end of file +} diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/OnFailureActionConverterTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/OnFailureActionConverterTest.java index 270a4815873..fa2271987e4 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/OnFailureActionConverterTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/api/endpoint/v4/util/OnFailureActionConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.api.endpoint.v4.util; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.OnFailureAction; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public OnFailureAction getDefaultValue() { public AttributeConverter getVictim() { return new OnFailureActionConverter(); } -} \ No newline at end of file +} diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/api/model/imagecatalog/ImageCatalogV4BaseTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/api/model/imagecatalog/ImageCatalogV4BaseTest.java index faf8595191e..1e42e6f8a71 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/api/model/imagecatalog/ImageCatalogV4BaseTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/api/model/imagecatalog/ImageCatalogV4BaseTest.java @@ -11,11 +11,11 @@ import java.util.Set; -import javax.validation.ConstraintValidatorContext; -import javax.validation.ConstraintViolation; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.core.Response.Status.Family; -import javax.ws.rs.core.Response.StatusType; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintViolation; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.jupiter.api.BeforeEach; diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/api/model/imagecatalog/ValidatorTestHelper.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/api/model/imagecatalog/ValidatorTestHelper.java index f1a61c29c59..85f0db4f030 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/api/model/imagecatalog/ValidatorTestHelper.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/api/model/imagecatalog/ValidatorTestHelper.java @@ -4,8 +4,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/AbstractValidatorTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/AbstractValidatorTest.java index 4a96442f106..c18fe7da2d3 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/AbstractValidatorTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/AbstractValidatorTest.java @@ -6,12 +6,12 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintTarget; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder; -import javax.validation.Payload; -import javax.validation.metadata.ConstraintDescriptor; -import javax.validation.metadata.ValidateUnwrappedValue; +import jakarta.validation.ConstraintTarget; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder; +import jakarta.validation.Payload; +import jakarta.validation.metadata.ConstraintDescriptor; +import jakarta.validation.metadata.ValidateUnwrappedValue; import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorContextImpl; import org.hibernate.validator.internal.engine.path.PathImpl; diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/CustomSubnetValidatorTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/CustomSubnetValidatorTest.java index 7dfb3df68a1..09808a2d3ae 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/CustomSubnetValidatorTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/CustomSubnetValidatorTest.java @@ -2,7 +2,7 @@ import static org.mockito.Mockito.when; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.junit.Assert; import org.junit.Before; @@ -93,4 +93,4 @@ public void validIpWillReturnTrue() { public void anywhereWillReturnTrue() { Assert.assertTrue(underTest.isValid("0.0.0.0/0", constraintValidatorContext)); } -} \ No newline at end of file +} diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/JsonValidatorTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/JsonValidatorTest.java index d898d9bc09c..90668205e1b 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/JsonValidatorTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/JsonValidatorTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.validation; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.junit.Assert; import org.junit.Before; @@ -49,4 +49,4 @@ public void testJsonValue() { public void testInvalidJsonValue() { Assert.assertFalse(underTest.isValid(".", constraintValidatorContext)); } -} \ No newline at end of file +} diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/RfcCompliantSubnetValidatorTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/RfcCompliantSubnetValidatorTest.java index a1fb0e9a6cf..f1ba5b2abf6 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/RfcCompliantSubnetValidatorTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/controller/validation/RfcCompliantSubnetValidatorTest.java @@ -2,7 +2,7 @@ import static org.mockito.Mockito.when; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.junit.Assert; import org.junit.Before; @@ -84,4 +84,4 @@ public void anywhereWillReturnFalse() { Assert.assertFalse(underTest.isValid("0.0.0.0/0", constraintValidatorContext)); } -} \ No newline at end of file +} diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/ContextMockUtil.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/ContextMockUtil.java index 9d2cf3acc79..f4da57eff44 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/ContextMockUtil.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/ContextMockUtil.java @@ -4,7 +4,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; public class ContextMockUtil { diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/DatabaseVendorValidatorTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/DatabaseVendorValidatorTest.java index 3f53a446130..58ae0447e8b 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/DatabaseVendorValidatorTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/DatabaseVendorValidatorTest.java @@ -9,7 +9,7 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.junit.Before; import org.junit.Test; diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/DeprecatedValidatorTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/DeprecatedValidatorTest.java index 6e73a8d4fb5..8b03d3b2e75 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/DeprecatedValidatorTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/DeprecatedValidatorTest.java @@ -10,7 +10,7 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.openMocks; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.junit.Before; import org.junit.Test; @@ -60,4 +60,4 @@ public void shouldValidationFailIfAnyStringIsSubmitted() { assertFalse(underTest.isValid("abcd", context)); verify(context, atLeastOnce()).buildConstraintViolationWithTemplate(any(String.class)); } -} \ No newline at end of file +} diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/ExactlyOneNonNullValidatorTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/ExactlyOneNonNullValidatorTest.java index 22532d13ef1..d23004617f9 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/ExactlyOneNonNullValidatorTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/ExactlyOneNonNullValidatorTest.java @@ -9,7 +9,7 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.junit.Before; import org.junit.Test; diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/HttpContentSizeValidatorTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/HttpContentSizeValidatorTest.java index 4f90f2909f6..a9d9bce8ab6 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/HttpContentSizeValidatorTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/HttpContentSizeValidatorTest.java @@ -8,10 +8,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import javax.validation.ConstraintValidatorContext; -import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder; -import javax.ws.rs.core.Response.Status.Family; -import javax.ws.rs.core.Response.StatusType; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder; +import jakarta.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.jupiter.api.Test; diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/JdbcConnectionUrlValidatorTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/JdbcConnectionUrlValidatorTest.java index 79ce1f71bed..d6731dbd098 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/JdbcConnectionUrlValidatorTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/JdbcConnectionUrlValidatorTest.java @@ -9,7 +9,7 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.junit.Before; import org.junit.Test; diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/StackNameFormatValidatorTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/StackNameFormatValidatorTest.java index 787ae38d31c..8ea0e18573b 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/StackNameFormatValidatorTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/StackNameFormatValidatorTest.java @@ -4,7 +4,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/StackNameLengthValidatorTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/StackNameLengthValidatorTest.java index 9bd0b06dfa7..1297b4b854d 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/StackNameLengthValidatorTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/StackNameLengthValidatorTest.java @@ -4,7 +4,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/StorageIdentityValidatorTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/StorageIdentityValidatorTest.java index b7c10d36225..546c8b02e28 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/StorageIdentityValidatorTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/StorageIdentityValidatorTest.java @@ -1,14 +1,14 @@ package com.sequenceiq.cloudbreak.validation; -import static javax.validation.Validation.buildDefaultValidatorFactory; +import static jakarta.validation.Validation.buildDefaultValidatorFactory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -72,4 +72,4 @@ void testCloudStorageValidation() { Set> constraintViolations = validator.validate(storage); assertTrue(constraintViolations.isEmpty()); } -} \ No newline at end of file +} diff --git a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/UrlValidatorTest.java b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/UrlValidatorTest.java index d03b036eda9..8bd4d7ad2a5 100644 --- a/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/UrlValidatorTest.java +++ b/core-api/src/test/java/com/sequenceiq/cloudbreak/validation/UrlValidatorTest.java @@ -9,7 +9,7 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.junit.Before; import org.junit.Test; diff --git a/core-common/src/main/java/com/sequenceiq/cloudbreak/recipe/RecipeCrnListProviderService.java b/core-common/src/main/java/com/sequenceiq/cloudbreak/recipe/RecipeCrnListProviderService.java index 8f6f8e22d9c..a0c3185a06a 100644 --- a/core-common/src/main/java/com/sequenceiq/cloudbreak/recipe/RecipeCrnListProviderService.java +++ b/core-common/src/main/java/com/sequenceiq/cloudbreak/recipe/RecipeCrnListProviderService.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Blueprint.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Blueprint.java index cb88a9134e3..37026e975e5 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Blueprint.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Blueprint.java @@ -1,15 +1,15 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.ResourceStatus; import com.sequenceiq.cloudbreak.common.json.Json; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Container.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Container.java index 0f1d995ba18..7bcb958396a 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Container.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Container.java @@ -1,11 +1,11 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.domain.stack.cluster.Cluster; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/CustomImage.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/CustomImage.java index e8a534b77d6..a924d0bd801 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/CustomImage.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/CustomImage.java @@ -3,20 +3,20 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import com.sequenceiq.cloudbreak.converter.ImageTypeConverter; import com.sequenceiq.common.api.type.ImageType; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/DurationToLongConverter.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/DurationToLongConverter.java index 69405177da1..32506a91bd2 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/DurationToLongConverter.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/DurationToLongConverter.java @@ -2,7 +2,7 @@ import java.time.Duration; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.springframework.stereotype.Component; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/FailurePolicy.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/FailurePolicy.java index ed96acc5315..5027a187002 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/FailurePolicy.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/FailurePolicy.java @@ -1,11 +1,11 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.converter.AdjustmentTypeConverter; import com.sequenceiq.common.api.type.AdjustmentType; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/FileSystem.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/FileSystem.java index 7758b22e135..19f39fca6ed 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/FileSystem.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/FileSystem.java @@ -1,15 +1,15 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import com.sequenceiq.cloudbreak.common.json.Json; import com.sequenceiq.cloudbreak.common.json.JsonToString; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/ImageCatalog.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/ImageCatalog.java index 4d187090ea2..cb4d1708dc7 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/ImageCatalog.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/ImageCatalog.java @@ -3,18 +3,18 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import com.sequenceiq.cloudbreak.workspace.model.Workspace; import com.sequenceiq.cloudbreak.workspace.model.WorkspaceAwareResource; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Network.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Network.java index 06c70d022c5..11ad29306a3 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Network.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Network.java @@ -5,16 +5,16 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Orchestrator.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Orchestrator.java index 08b774a4d21..4e0d52bb212 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Orchestrator.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Orchestrator.java @@ -1,12 +1,12 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.common.json.Json; import com.sequenceiq.cloudbreak.common.json.JsonToString; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/RDSConfig.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/RDSConfig.java index 70bdcba677f..e19b79916e0 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/RDSConfig.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/RDSConfig.java @@ -3,17 +3,17 @@ import java.util.Objects; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.Where; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Recipe.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Recipe.java index f72f8e71e66..c9d0b95de76 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Recipe.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Recipe.java @@ -3,18 +3,18 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.Where; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Resource.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Resource.java index 69721bbcbeb..b4141bfb866 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Resource.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Resource.java @@ -1,15 +1,15 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.common.json.Json; import com.sequenceiq.cloudbreak.common.json.JsonToString; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Revision.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Revision.java index fb985a8f5ac..fdbe4608020 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Revision.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Revision.java @@ -3,14 +3,14 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import org.hibernate.envers.RevisionEntity; import org.hibernate.envers.RevisionNumber; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SaltSecurityConfig.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SaltSecurityConfig.java index 861a441a573..4137ac28fa4 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SaltSecurityConfig.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SaltSecurityConfig.java @@ -1,14 +1,14 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.service.secret.SecretValue; import com.sequenceiq.cloudbreak.service.secret.domain.Secret; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SecurityConfig.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SecurityConfig.java index 82cf2adc6a2..7d1b5c8b2c6 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SecurityConfig.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SecurityConfig.java @@ -1,16 +1,16 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.domain.stack.Stack; import com.sequenceiq.cloudbreak.service.secret.SecretValue; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SecurityGroup.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SecurityGroup.java index cce754ba34c..16b63fc7fcd 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SecurityGroup.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SecurityGroup.java @@ -3,20 +3,20 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.ResourceStatus; import com.sequenceiq.cloudbreak.domain.converter.ResourceStatusConverter; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SecurityRule.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SecurityRule.java index a3d01627b04..bddda7c9967 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SecurityRule.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/SecurityRule.java @@ -1,11 +1,11 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; @Entity public class SecurityRule implements ProvisionEntity { diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/ShowTerminatedClustersPreferences.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/ShowTerminatedClustersPreferences.java index bfc7e1a0fa1..3ee19150cd4 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/ShowTerminatedClustersPreferences.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/ShowTerminatedClustersPreferences.java @@ -2,14 +2,14 @@ import java.time.Duration; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.validation.constraints.NotNull; @Entity public class ShowTerminatedClustersPreferences { diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/StackAuthentication.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/StackAuthentication.java index 497b8ca0b2c..79b64c1b582 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/StackAuthentication.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/StackAuthentication.java @@ -1,11 +1,11 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; @Entity public class StackAuthentication implements ProvisionEntity { @@ -57,4 +57,4 @@ public String getLoginUserName() { public void setLoginUserName(String loginUserName) { this.loginUserName = loginUserName; } -} \ No newline at end of file +} diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/StructuredEventEntity.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/StructuredEventEntity.java index 3530eea64e5..7b4fb61779d 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/StructuredEventEntity.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/StructuredEventEntity.java @@ -1,15 +1,15 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.common.json.Json; import com.sequenceiq.cloudbreak.common.json.JsonToString; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Template.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Template.java index cff68de4a00..f59dddc8c04 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Template.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Template.java @@ -2,19 +2,19 @@ import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.ResourceStatus; import com.sequenceiq.cloudbreak.common.json.Json; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Topology.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Topology.java index c26123efcb7..f263087bbab 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Topology.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Topology.java @@ -3,17 +3,17 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.Where; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/TopologyRecord.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/TopologyRecord.java index 6e7f3da9cf8..0e3af3272b2 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/TopologyRecord.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/TopologyRecord.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class TopologyRecord implements Serializable { diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/UserProfile.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/UserProfile.java index cf3577dd4d2..c1df49d1e90 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/UserProfile.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/UserProfile.java @@ -1,16 +1,16 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import com.sequenceiq.cloudbreak.service.secret.SecretValue; import com.sequenceiq.cloudbreak.service.secret.domain.Secret; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Userdata.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Userdata.java index 49b2e1a703c..a4cf4421cfd 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Userdata.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Userdata.java @@ -2,14 +2,14 @@ import java.util.Objects; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.common.dal.model.AccountIdAwareResource; import com.sequenceiq.cloudbreak.domain.stack.Stack; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/VmImage.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/VmImage.java index 6f51c4ad5dd..c82cc9003d3 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/VmImage.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/VmImage.java @@ -1,15 +1,15 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; @Entity @Table(uniqueConstraints = @UniqueConstraint(columnNames = {"customimage_id", "region"})) diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/VolumeTemplate.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/VolumeTemplate.java index 4b969d1a246..de1b2fa2525 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/VolumeTemplate.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/VolumeTemplate.java @@ -1,12 +1,12 @@ package com.sequenceiq.cloudbreak.domain; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.domain.converter.VolumeUsageTypeConverter; import com.sequenceiq.cloudbreak.workspace.model.Workspace; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/AdlsGen2Identity.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/AdlsGen2Identity.java index 2f53faf371f..dfaf20541a3 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/AdlsGen2Identity.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/AdlsGen2Identity.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.common.model.FileSystemAwareCloudStorage; import com.sequenceiq.common.model.FileSystemType; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/EfsIdentity.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/EfsIdentity.java index b785b67d14a..6ce187d7763 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/EfsIdentity.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/EfsIdentity.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.common.model.FileSystemAwareCloudStorage; import com.sequenceiq.common.model.FileSystemType; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/GcsIdentity.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/GcsIdentity.java index c6fa33a2a2c..ecc3c5bfb98 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/GcsIdentity.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/GcsIdentity.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.common.model.FileSystemAwareCloudStorage; import com.sequenceiq.common.model.FileSystemType; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/S3Identity.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/S3Identity.java index 13e532143f6..1c9b5b1b20e 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/S3Identity.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/S3Identity.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.common.model.FileSystemAwareCloudStorage; import com.sequenceiq.common.model.FileSystemType; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/WasbIdentity.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/WasbIdentity.java index c03c6c61a14..a71f415d0c3 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/WasbIdentity.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/cloudstorage/WasbIdentity.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.sequenceiq.common.model.FileSystemAwareCloudStorage; import com.sequenceiq.common.model.FileSystemType; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/Component.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/Component.java index 18cf9468f03..eef87e39c8c 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/Component.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/Component.java @@ -3,14 +3,14 @@ import static com.sequenceiq.cloudbreak.common.anonymizer.AnonymizerUtil.anonymize; import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; import org.hibernate.envers.AuditTable; import org.hibernate.envers.Audited; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/Database.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/Database.java index eb5fd16e10c..5f9171b43e8 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/Database.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/Database.java @@ -4,14 +4,14 @@ import java.util.Map; import java.util.Optional; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request.database.DatabaseAvailabilityType; import com.sequenceiq.cloudbreak.common.json.Json; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/Stack.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/Stack.java index 8bcbfd2a206..e5527a1bf08 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/Stack.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/Stack.java @@ -31,25 +31,25 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; +import jakarta.validation.constraints.NotNull; import org.apache.commons.lang3.StringUtils; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackParameters.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackParameters.java index 69262fa1b6b..2426dbb561a 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackParameters.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackParameters.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; @Entity @Table(name = "stack_parameters") diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackParametersId.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackParametersId.java index 780a40e5e4c..db0eac70e78 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackParametersId.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackParametersId.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.persistence.Column; +import jakarta.persistence.Column; public class StackParametersId implements Serializable { @Column(name = "stack_id") diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackPatch.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackPatch.java index 24c7f6e65da..04cacead7cd 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackPatch.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackPatch.java @@ -1,15 +1,15 @@ package com.sequenceiq.cloudbreak.domain.stack; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.UniqueConstraint; import com.sequenceiq.cloudbreak.domain.ProvisionEntity; import com.sequenceiq.cloudbreak.domain.converter.StackPatchStatusConverter; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackStatus.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackStatus.java index 731ac13d72c..aa616fe314f 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackStatus.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/StackStatus.java @@ -2,16 +2,16 @@ import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.DetailedStackStatus; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/Cluster.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/Cluster.java index 72b71a3d8f7..f3460c25393 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/Cluster.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/Cluster.java @@ -7,21 +7,21 @@ import java.util.Objects; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.ExecutorType; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterCommand.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterCommand.java index a29ac0c898d..196f5d145e9 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterCommand.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterCommand.java @@ -4,13 +4,13 @@ import java.util.Date; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.domain.converter.ClusterCommandTypeConverter; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterComponent.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterComponent.java index a6be5b447f4..92d37f2051e 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterComponent.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterComponent.java @@ -2,18 +2,18 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedAttributeNode; -import javax.persistence.NamedEntityGraph; -import javax.persistence.NamedSubgraph; -import javax.persistence.SequenceGenerator; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedAttributeNode; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.NamedSubgraph; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Transient; import org.hibernate.envers.AuditTable; import org.hibernate.envers.Audited; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterComponentHistory.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterComponentHistory.java index 2184c2a3175..545ad71e6a6 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterComponentHistory.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterComponentHistory.java @@ -1,10 +1,10 @@ package com.sequenceiq.cloudbreak.domain.stack.cluster; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.common.type.ComponentType; import com.sequenceiq.cloudbreak.domain.ProvisionEntity; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterTemplate.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterTemplate.java index 77294a611ca..9944145aead 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterTemplate.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/ClusterTemplate.java @@ -2,17 +2,17 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import com.sequenceiq.cloudbreak.api.endpoint.v4.clustertemplate.ClusterTemplateV4Type; import com.sequenceiq.cloudbreak.api.endpoint.v4.clustertemplate.DatalakeRequired; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/IdBroker.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/IdBroker.java index 09ae2450cde..f82cb458bcc 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/IdBroker.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/IdBroker.java @@ -2,14 +2,14 @@ import java.util.Optional; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.domain.ProvisionEntity; import com.sequenceiq.cloudbreak.service.secret.SecretValue; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/gateway/Gateway.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/gateway/Gateway.java index e0089119432..00a264e8071 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/gateway/Gateway.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/gateway/Gateway.java @@ -5,18 +5,18 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.GatewayType; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.SSOType; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/gateway/GatewayTopology.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/gateway/GatewayTopology.java index ef884420b2e..2632bcb21ad 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/gateway/GatewayTopology.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/gateway/GatewayTopology.java @@ -1,14 +1,14 @@ package com.sequenceiq.cloudbreak.domain.stack.cluster.gateway; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.common.json.Json; import com.sequenceiq.cloudbreak.common.json.JsonToString; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/host/GeneratedRecipe.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/host/GeneratedRecipe.java index c1eaa7b4327..e778d1c7ef0 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/host/GeneratedRecipe.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/host/GeneratedRecipe.java @@ -1,13 +1,13 @@ package com.sequenceiq.cloudbreak.domain.stack.cluster.host; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.domain.ProvisionEntity; import com.sequenceiq.cloudbreak.domain.Recipe; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/host/HostGroup.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/host/HostGroup.java index 5d88859b2e8..c766df462e5 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/host/HostGroup.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/cluster/host/HostGroup.java @@ -3,22 +3,22 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.NamedAttributeNode; -import javax.persistence.NamedEntityGraph; -import javax.persistence.NamedEntityGraphs; -import javax.persistence.NamedSubgraph; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedAttributeNode; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.NamedEntityGraphs; +import jakarta.persistence.NamedSubgraph; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.RecoveryMode; import com.sequenceiq.cloudbreak.domain.ProvisionEntity; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/ArchivedInstanceMetaData.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/ArchivedInstanceMetaData.java index 350c46aa497..76f91d46daf 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/ArchivedInstanceMetaData.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/ArchivedInstanceMetaData.java @@ -2,12 +2,12 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.InstanceLifeCycle; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.InstanceMetadataType; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/AvailabilityZone.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/AvailabilityZone.java index b23f1fbc255..07e4fdcbdcf 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/AvailabilityZone.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/AvailabilityZone.java @@ -1,13 +1,13 @@ package com.sequenceiq.cloudbreak.domain.stack.instance; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.domain.ProvisionEntity; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/InstanceGroup.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/InstanceGroup.java index b2f5b595294..946faba8c7c 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/InstanceGroup.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/InstanceGroup.java @@ -8,21 +8,21 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.NamedAttributeNode; -import javax.persistence.NamedEntityGraph; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedAttributeNode; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; import org.apache.commons.lang3.StringUtils; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/InstanceMetaData.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/InstanceMetaData.java index 3e27a77fed5..f2f8d4093ed 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/InstanceMetaData.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/InstanceMetaData.java @@ -3,19 +3,19 @@ import java.util.Objects; import java.util.StringJoiner; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedAttributeNode; -import javax.persistence.NamedEntityGraph; -import javax.persistence.NamedEntityGraphs; -import javax.persistence.NamedSubgraph; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedAttributeNode; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.NamedEntityGraphs; +import jakarta.persistence.NamedSubgraph; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.InstanceLifeCycle; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.InstanceMetadataType; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/network/InstanceGroupNetwork.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/network/InstanceGroupNetwork.java index ba4d7d7960a..e34482d9287 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/network/InstanceGroupNetwork.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/instance/network/InstanceGroupNetwork.java @@ -1,13 +1,13 @@ package com.sequenceiq.cloudbreak.domain.stack.instance.network; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.common.json.Json; import com.sequenceiq.cloudbreak.common.json.JsonToString; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/loadbalancer/LoadBalancer.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/loadbalancer/LoadBalancer.java index 6e30ada86e9..915a5f7f42e 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/loadbalancer/LoadBalancer.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/loadbalancer/LoadBalancer.java @@ -4,16 +4,16 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.common.json.Json; import com.sequenceiq.cloudbreak.common.json.JsonToString; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/loadbalancer/TargetGroup.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/loadbalancer/TargetGroup.java index 485a28d9d2f..96f293a20e3 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/loadbalancer/TargetGroup.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/stack/loadbalancer/TargetGroup.java @@ -4,15 +4,15 @@ import java.util.Objects; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.SequenceGenerator; import com.sequenceiq.cloudbreak.common.json.Json; import com.sequenceiq.cloudbreak.common.json.JsonToString; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/BlueprintView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/BlueprintView.java index f0fcd322fee..63f7e151553 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/BlueprintView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/BlueprintView.java @@ -1,9 +1,9 @@ package com.sequenceiq.cloudbreak.domain.view; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.ResourceStatus; import com.sequenceiq.cloudbreak.common.json.Json; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterApiView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterApiView.java index 24b4683896f..e5a85f7f604 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterApiView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterApiView.java @@ -3,13 +3,13 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status; import com.sequenceiq.cloudbreak.converter.CertExpirationStateConverter; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterComponentView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterComponentView.java index 8a0bbd31c0b..15d68ff0e51 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterComponentView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterComponentView.java @@ -1,10 +1,10 @@ package com.sequenceiq.cloudbreak.domain.view; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.common.json.Json; import com.sequenceiq.cloudbreak.common.json.JsonToString; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateClusterApiView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateClusterApiView.java index c63c816e00d..9f5c9e01159 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateClusterApiView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateClusterApiView.java @@ -1,10 +1,10 @@ package com.sequenceiq.cloudbreak.domain.view; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateInstanceGroupView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateInstanceGroupView.java index d496b904b7e..27bc147539a 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateInstanceGroupView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateInstanceGroupView.java @@ -1,10 +1,10 @@ package com.sequenceiq.cloudbreak.domain.view; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.domain.ProvisionEntity; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateStackApiView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateStackApiView.java index d51f6d67ea6..20a63992a1e 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateStackApiView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateStackApiView.java @@ -3,13 +3,13 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.StackType; import com.sequenceiq.cloudbreak.domain.converter.StackTypeConverter; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateView.java index 49f390f0ba1..51f32ea82c2 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterTemplateView.java @@ -1,9 +1,9 @@ package com.sequenceiq.cloudbreak.domain.view; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.api.endpoint.v4.clustertemplate.ClusterTemplateV4Type; import com.sequenceiq.cloudbreak.api.endpoint.v4.clustertemplate.DatalakeRequired; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterView.java index 21d7c0e77eb..9fbd9d8321b 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/ClusterView.java @@ -1,10 +1,10 @@ package com.sequenceiq.cloudbreak.domain.view; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status; import com.sequenceiq.cloudbreak.domain.converter.StatusConverter; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/CompactView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/CompactView.java index 1fa948b4a30..9c6cc3397e5 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/CompactView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/CompactView.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.domain.view; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import com.sequenceiq.cloudbreak.domain.ProvisionEntity; import com.sequenceiq.cloudbreak.workspace.model.Workspace; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/HostGroupView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/HostGroupView.java index d2fe67c8c7c..26e02c92660 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/HostGroupView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/HostGroupView.java @@ -1,11 +1,11 @@ package com.sequenceiq.cloudbreak.domain.view; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.domain.ProvisionEntity; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/InstanceGroupView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/InstanceGroupView.java index 27152187659..4d0f36c5819 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/InstanceGroupView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/InstanceGroupView.java @@ -4,15 +4,15 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.common.json.Json; import com.sequenceiq.cloudbreak.common.json.JsonToString; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/InstanceMetaDataView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/InstanceMetaDataView.java index 75f2df5b39e..4b4fc61b3e8 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/InstanceMetaDataView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/InstanceMetaDataView.java @@ -1,11 +1,11 @@ package com.sequenceiq.cloudbreak.domain.view; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.InstanceLifeCycle; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.InstanceMetadataType; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/OrchestratorView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/OrchestratorView.java index 405fb7569b3..f79ee16084a 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/OrchestratorView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/OrchestratorView.java @@ -1,9 +1,9 @@ package com.sequenceiq.cloudbreak.domain.view; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.domain.ProvisionEntity; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/RecipeView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/RecipeView.java index eed7b03cb84..55a7173b039 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/RecipeView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/RecipeView.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.domain.view; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.annotations.Where; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/StackApiView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/StackApiView.java index af95f6febd7..f6c994a36c9 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/StackApiView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/StackApiView.java @@ -3,16 +3,16 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.StackType; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/StackStatusView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/StackStatusView.java index e1cbc87fd73..dd96c8e1914 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/StackStatusView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/StackStatusView.java @@ -1,9 +1,9 @@ package com.sequenceiq.cloudbreak.domain.view; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status; import com.sequenceiq.cloudbreak.domain.ProvisionEntity; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/StackView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/StackView.java index 7ef31c5d04a..be73b1f7d89 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/StackView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/StackView.java @@ -2,11 +2,11 @@ import static com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status.AVAILABLE; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.StackType; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status; diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/UserView.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/UserView.java index d5ea18f215c..ad5e6f95e99 100644 --- a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/UserView.java +++ b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/view/UserView.java @@ -1,9 +1,9 @@ package com.sequenceiq.cloudbreak.domain.view; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import com.sequenceiq.cloudbreak.domain.ProvisionEntity; diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/EntityTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/EntityTest.java index 70cc7f6d6c2..6faad3f65df 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/EntityTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/EntityTest.java @@ -3,7 +3,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.commons.lang3.reflect.FieldUtils; import org.junit.Assert; diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ClusterCommandTypeConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ClusterCommandTypeConverterTest.java index c98790df7ac..e212d27de49 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ClusterCommandTypeConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ClusterCommandTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; import com.sequenceiq.cloudbreak.domain.stack.cluster.ClusterCommandType; @@ -16,4 +16,4 @@ public ClusterCommandType getDefaultValue() { public AttributeConverter getVictim() { return new ClusterCommandTypeConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ComponentTypeConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ComponentTypeConverterTest.java index 00fdc5b143c..3f7162b9228 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ComponentTypeConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ComponentTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.common.type.ComponentType; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public ComponentType getDefaultValue() { public AttributeConverter getVictim() { return new ComponentTypeConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ConfigStrategyConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ConfigStrategyConverterTest.java index 3ed385d9ef4..b5228743934 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ConfigStrategyConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ConfigStrategyConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.ConfigStrategy; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public ConfigStrategy getDefaultValue() { public AttributeConverter getVictim() { return new ConfigStrategyConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/DatabaseAvailabilityTypeConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/DatabaseAvailabilityTypeConverterTest.java index b9d287014e7..eb5b52e8da9 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/DatabaseAvailabilityTypeConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/DatabaseAvailabilityTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.request.database.DatabaseAvailabilityType; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public DatabaseAvailabilityType getDefaultValue() { public AttributeConverter getVictim() { return new DatabaseAvailabilityTypeConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ExecutorTypeConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ExecutorTypeConverterTest.java index fa01d93ad90..23f501061f3 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ExecutorTypeConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/ExecutorTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.ExecutorType; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public ExecutorType getDefaultValue() { public AttributeConverter getVictim() { return new ExecutorTypeConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/GatewayTypeConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/GatewayTypeConverterTest.java index 6271d2adffd..1bbc541aaa3 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/GatewayTypeConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/GatewayTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.GatewayType; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public GatewayType getDefaultValue() { public AttributeConverter getVictim() { return new GatewayTypeConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/InstanceLifeCycleConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/InstanceLifeCycleConverterTest.java index 56a6c205e1d..3164739feac 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/InstanceLifeCycleConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/InstanceLifeCycleConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.InstanceLifeCycle; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public InstanceLifeCycle getDefaultValue() { public AttributeConverter getVictim() { return new InstanceLifeCycleConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/InstanceMetadataTypeConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/InstanceMetadataTypeConverterTest.java index 8f196b257c1..3fd58b8f4bd 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/InstanceMetadataTypeConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/InstanceMetadataTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.InstanceMetadataType; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public InstanceMetadataType getDefaultValue() { public AttributeConverter getVictim() { return new InstanceMetadataTypeConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RdsSslModeConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RdsSslModeConverterTest.java index 106a6f6ed30..4e671f043b6 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RdsSslModeConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RdsSslModeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; import com.sequenceiq.cloudbreak.domain.RdsSslMode; @@ -17,4 +17,4 @@ public AttributeConverter getVictim() { return new RdsSslModeConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RecipeTypeConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RecipeTypeConverterTest.java index ef9eb545460..e3318db911a 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RecipeTypeConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RecipeTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.common.model.recipe.RecipeType; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public RecipeType getDefaultValue() { public AttributeConverter getVictim() { return new RecipeTypeConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RecipeV4TypeConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RecipeV4TypeConverterTest.java index 466dd9fc66c..dddcb648d9e 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RecipeV4TypeConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RecipeV4TypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.api.endpoint.v4.recipes.requests.RecipeV4Type; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public RecipeV4Type getDefaultValue() { public AttributeConverter getVictim() { return new RecipeV4TypeConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RecoveryModeConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RecoveryModeConverterTest.java index da5401e7673..ec086a04d99 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RecoveryModeConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/RecoveryModeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.RecoveryMode; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public RecoveryMode getDefaultValue() { public AttributeConverter getVictim() { return new RecoveryModeConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/SSOTypeConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/SSOTypeConverterTest.java index 0dc48c38576..9280763d5c2 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/SSOTypeConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/SSOTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.api.endpoint.v4.stacks.base.SSOType; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public SSOType getDefaultValue() { public AttributeConverter getVictim() { return new SSOTypeConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/StackTypeConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/StackTypeConverterTest.java index 197638e198e..1cc91e27b06 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/StackTypeConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/StackTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.StackType; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; @@ -16,4 +16,4 @@ public StackType getDefaultValue() { public AttributeConverter getVictim() { return new StackTypeConverter(); } -} \ No newline at end of file +} diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/StructuredEventTypeConverterTest.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/StructuredEventTypeConverterTest.java index e46ca38005d..923a5ade020 100644 --- a/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/StructuredEventTypeConverterTest.java +++ b/core-model/src/test/java/com/sequenceiq/cloudbreak/domain/converter/StructuredEventTypeConverterTest.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.domain.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.sequenceiq.cloudbreak.converter.DefaultEnumConverterBaseTest; import com.sequenceiq.cloudbreak.structuredevent.event.StructuredEventType; @@ -16,4 +16,4 @@ public StructuredEventType getDefaultValue() { public AttributeConverter getVictim() { return new StructuredEventTypeConverter(); } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/aspect/StackUnderOperationAspects.java b/core/src/main/java/com/sequenceiq/cloudbreak/aspect/StackUnderOperationAspects.java index 2c6f019a447..d91a704da14 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/aspect/StackUnderOperationAspects.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/aspect/StackUnderOperationAspects.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.aspect; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Pointcut; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/audit/flow/datalake/DatalakeFlowAuditEventNameConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/audit/flow/datalake/DatalakeFlowAuditEventNameConverter.java index 2199ab5d859..f2c89d187f9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/audit/flow/datalake/DatalakeFlowAuditEventNameConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/audit/flow/datalake/DatalakeFlowAuditEventNameConverter.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/datalake/DatalakeRestResourceAuditEventConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/datalake/DatalakeRestResourceAuditEventConverter.java index 1c3b35dbf7d..9f9b0a00c7c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/datalake/DatalakeRestResourceAuditEventConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/datalake/DatalakeRestResourceAuditEventConverter.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/recipe/BlueprintsRestResourceAuditEventConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/recipe/BlueprintsRestResourceAuditEventConverter.java index 7fd7bd82dbb..24f3340364c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/recipe/BlueprintsRestResourceAuditEventConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/recipe/BlueprintsRestResourceAuditEventConverter.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/recipe/ClusterTemplatesRestResourceAuditEventConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/recipe/ClusterTemplatesRestResourceAuditEventConverter.java index ddefedc6c0f..66fda088f78 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/recipe/ClusterTemplatesRestResourceAuditEventConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/recipe/ClusterTemplatesRestResourceAuditEventConverter.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/recipe/RecipesRestResourceAuditEventConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/recipe/RecipesRestResourceAuditEventConverter.java index 51a9abf01dd..ab0c8f5546d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/recipe/RecipesRestResourceAuditEventConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/audit/rest/recipe/RecipesRestResourceAuditEventConverter.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/authorization/ImageCatalogFiltering.java b/core/src/main/java/com/sequenceiq/cloudbreak/authorization/ImageCatalogFiltering.java index 021e976bf60..97248219338 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/authorization/ImageCatalogFiltering.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/authorization/ImageCatalogFiltering.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/authorization/RecipeFiltering.java b/core/src/main/java/com/sequenceiq/cloudbreak/authorization/RecipeFiltering.java index 3cabe3ccb38..758cff1e847 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/authorization/RecipeFiltering.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/authorization/RecipeFiltering.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/cloud/model/component/ImageBasedDefaultCDHEntries.java b/core/src/main/java/com/sequenceiq/cloudbreak/cloud/model/component/ImageBasedDefaultCDHEntries.java index 3355dbce203..9c6ec0b9f88 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/cloud/model/component/ImageBasedDefaultCDHEntries.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/cloud/model/component/ImageBasedDefaultCDHEntries.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/ConclusionCheckerFactory.java b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/ConclusionCheckerFactory.java index 95f99df0f27..ab3b8b8f99a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/ConclusionCheckerFactory.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/ConclusionCheckerFactory.java @@ -5,8 +5,8 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/ConclusionCheckerService.java b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/ConclusionCheckerService.java index 5d5aea4bd16..299e12406f0 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/ConclusionCheckerService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/ConclusionCheckerService.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/InfoCollectorConclusionStep.java b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/InfoCollectorConclusionStep.java index 02ca6607d46..58173991f67 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/InfoCollectorConclusionStep.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/InfoCollectorConclusionStep.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Queue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/NetworkCheckerConclusionStep.java b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/NetworkCheckerConclusionStep.java index aba3ef5a3b0..b9197fc916a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/NetworkCheckerConclusionStep.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/NetworkCheckerConclusionStep.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/NodeServicesCheckerConclusionStep.java b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/NodeServicesCheckerConclusionStep.java index 200416f3375..473d2124bad 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/NodeServicesCheckerConclusionStep.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/NodeServicesCheckerConclusionStep.java @@ -6,7 +6,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/SaltCheckerConclusionStep.java b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/SaltCheckerConclusionStep.java index 77be3214510..3d66d931ba7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/SaltCheckerConclusionStep.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/SaltCheckerConclusionStep.java @@ -14,7 +14,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/VmStatusCheckerConclusionStep.java b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/VmStatusCheckerConclusionStep.java index c0a8b516e68..ee35e8e9904 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/VmStatusCheckerConclusionStep.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conclusion/step/VmStatusCheckerConclusionStep.java @@ -13,7 +13,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conf/AppConfig.java b/core/src/main/java/com/sequenceiq/cloudbreak/conf/AppConfig.java index 3d18ff439e1..d6df96143c5 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conf/AppConfig.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conf/AppConfig.java @@ -12,14 +12,14 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Named; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.ws.rs.client.Client; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.ws.rs.client.Client; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conf/DatabaseConfig.java b/core/src/main/java/com/sequenceiq/cloudbreak/conf/DatabaseConfig.java index 6efe95f6323..aa2562d01fe 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conf/DatabaseConfig.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conf/DatabaseConfig.java @@ -5,8 +5,8 @@ import java.sql.SQLException; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -22,7 +22,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import com.sequenceiq.cloudbreak.common.database.BatchProperties; -import com.sequenceiq.cloudbreak.common.database.JpaPropertiesFacory; +import com.sequenceiq.cloudbreak.common.database.JpaPropertiesFactory; import com.sequenceiq.cloudbreak.common.tx.CircuitBreakerType; import com.sequenceiq.cloudbreak.database.MultiDataSourceConfig; import com.sequenceiq.cloudbreak.util.DatabaseUtil; @@ -124,7 +124,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory() throws SQLE entityManagerFactory.setDataSource(dataSource()); entityManagerFactory.setJpaVendorAdapter(jpaVendorAdapter()); - entityManagerFactory.setJpaProperties(JpaPropertiesFacory.create(hbm2ddlStrategy, debug, dbSchemaName, circuitBreakerType, createBatchProperties(), + entityManagerFactory.setJpaProperties(JpaPropertiesFactory.create(hbm2ddlStrategy, debug, dbSchemaName, circuitBreakerType, createBatchProperties(), enableTransactionInterceptor)); entityManagerFactory.afterPropertiesSet(); return entityManagerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conf/EmbeddedDatabaseConfig.java b/core/src/main/java/com/sequenceiq/cloudbreak/conf/EmbeddedDatabaseConfig.java index 7d38bb36ab4..21536267340 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conf/EmbeddedDatabaseConfig.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conf/EmbeddedDatabaseConfig.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.StringJoiner; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conf/EnvironmentInternalClientConfiguration.java b/core/src/main/java/com/sequenceiq/cloudbreak/conf/EnvironmentInternalClientConfiguration.java index ae2c4bb35bf..e79f9f5f920 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conf/EnvironmentInternalClientConfiguration.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conf/EnvironmentInternalClientConfiguration.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.conf; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conf/EventBusMetricConfig.java b/core/src/main/java/com/sequenceiq/cloudbreak/conf/EventBusMetricConfig.java index b620a187324..1567e901d64 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conf/EventBusMetricConfig.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conf/EventBusMetricConfig.java @@ -2,8 +2,8 @@ import java.util.concurrent.ExecutorService; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conf/ExternalDatabaseConfig.java b/core/src/main/java/com/sequenceiq/cloudbreak/conf/ExternalDatabaseConfig.java index 3c755694d59..5ffbcdaf1b8 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conf/ExternalDatabaseConfig.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conf/ExternalDatabaseConfig.java @@ -8,8 +8,8 @@ import java.util.Optional; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conf/LimitConfiguration.java b/core/src/main/java/com/sequenceiq/cloudbreak/conf/LimitConfiguration.java index 0f6459afc68..0538ca78c31 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conf/LimitConfiguration.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conf/LimitConfiguration.java @@ -4,7 +4,7 @@ import java.util.Map.Entry; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conf/ScheduleConfig.java b/core/src/main/java/com/sequenceiq/cloudbreak/conf/ScheduleConfig.java index 5b63063848b..dea5a51df93 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conf/ScheduleConfig.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conf/ScheduleConfig.java @@ -2,7 +2,7 @@ import java.util.concurrent.ExecutorService; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conf/UpgradeImageFilterConfig.java b/core/src/main/java/com/sequenceiq/cloudbreak/conf/UpgradeImageFilterConfig.java index 2fe10b3d5af..7e1f804bafd 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conf/UpgradeImageFilterConfig.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conf/UpgradeImageFilterConfig.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/conf/UpgradeMatrixConfig.java b/core/src/main/java/com/sequenceiq/cloudbreak/conf/UpgradeMatrixConfig.java index 11e8c4e76d5..1e90204ed2c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/conf/UpgradeMatrixConfig.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/conf/UpgradeMatrixConfig.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/EndpointConfig.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/EndpointConfig.java index 7a45280faf4..dce8d518b25 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/EndpointConfig.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/EndpointConfig.java @@ -5,10 +5,10 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.ext.ExceptionMapper; import org.glassfish.jersey.server.ResourceConfig; import org.springframework.beans.factory.annotation.Value; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/StackCreatorService.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/StackCreatorService.java index c9e1f5e15b2..9bf36efd041 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/StackCreatorService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/StackCreatorService.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/AccessDeniedExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/AccessDeniedExceptionMapper.java index deee611fce6..17c57503833 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/AccessDeniedExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/AccessDeniedExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.security.access.AccessDeniedException; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/AmazonServiceExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/AmazonServiceExceptionMapper.java index d05ea560d68..b199455b158 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/AmazonServiceExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/AmazonServiceExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/AuthenticationCredentialsNotFoundExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/AuthenticationCredentialsNotFoundExceptionMapper.java index ee7195e2a56..a27e9bf9da8 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/AuthenticationCredentialsNotFoundExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/AuthenticationCredentialsNotFoundExceptionMapper.java @@ -2,7 +2,7 @@ import static ch.qos.logback.classic.Level.INFO; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/BadRequestExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/BadRequestExceptionMapper.java index d75684c27f3..05e7d1ecba9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/BadRequestExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/BadRequestExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; @@ -19,4 +19,4 @@ public Class getExceptionType() { return BadRequestException.class; } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/BlueprintValidationExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/BlueprintValidationExceptionMapper.java index c51157800b9..f29c6dfa41e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/BlueprintValidationExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/BlueprintValidationExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CloudbreakApiExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CloudbreakApiExceptionMapper.java index 4b7be27dd99..7c649379f8f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CloudbreakApiExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CloudbreakApiExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CloudbreakImageCatalogExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CloudbreakImageCatalogExceptionMapper.java index 58c3fc424b1..e873375d4da 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CloudbreakImageCatalogExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CloudbreakImageCatalogExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; @@ -18,4 +18,4 @@ public Status getResponseStatus(CloudbreakImageCatalogException exception) { public Class getExceptionType() { return CloudbreakImageCatalogException.class; } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CloudbreakServerExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CloudbreakServerExceptionMapper.java index 15760033eb5..3a5114f731d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CloudbreakServerExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CloudbreakServerExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CommonNotFoundExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CommonNotFoundExceptionMapper.java index 51336cd2ccc..22104a89b00 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CommonNotFoundExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/CommonNotFoundExceptionMapper.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/ConversionExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/ConversionExceptionMapper.java index 53996256091..2f86a5766d8 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/ConversionExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/ConversionExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; @@ -19,4 +19,4 @@ public Class getExceptionType() { return ConversionException.class; } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/ConversionFailedExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/ConversionFailedExceptionMapper.java index acde8c8baf3..f51700aabb2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/ConversionFailedExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/ConversionFailedExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.core.convert.ConversionFailedException; import org.springframework.stereotype.Component; @@ -17,4 +17,4 @@ public Status getResponseStatus(ConversionFailedException exception) { public Class getExceptionType() { return ConversionFailedException.class; } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/DataIntegrityViolationExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/DataIntegrityViolationExceptionMapper.java index 09f7119c85d..1cf2e393d19 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/DataIntegrityViolationExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/DataIntegrityViolationExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/DuplicatedKeyValueExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/DuplicatedKeyValueExceptionMapper.java index 683512c3a03..95d0b804f4b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/DuplicatedKeyValueExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/DuplicatedKeyValueExceptionMapper.java @@ -4,7 +4,7 @@ import java.util.Locale; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/EntityNotFoundExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/EntityNotFoundExceptionMapper.java index 1b5fbb262d9..990e87744fa 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/EntityNotFoundExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/EntityNotFoundExceptionMapper.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.persistence.EntityNotFoundException; -import javax.ws.rs.core.Response.Status; +import jakarta.persistence.EntityNotFoundException; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/GetCloudParameterExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/GetCloudParameterExceptionMapper.java index ceb3fb526ca..c6ab4e8e79d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/GetCloudParameterExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/GetCloudParameterExceptionMapper.java @@ -1,8 +1,8 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/HibernateConstraintViolationExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/HibernateConstraintViolationExceptionMapper.java index 011ad33be13..afba2b0d5e6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/HibernateConstraintViolationExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/HibernateConstraintViolationExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.hibernate.exception.ConstraintViolationException; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/HttpMediaTypeNotSupportedExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/HttpMediaTypeNotSupportedExceptionMapper.java index 719e26abbfe..79f9d18d290 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/HttpMediaTypeNotSupportedExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/HttpMediaTypeNotSupportedExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; import org.springframework.web.HttpMediaTypeNotSupportedException; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/HttpMessageNotReadableExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/HttpMessageNotReadableExceptionMapper.java index f453d32f76a..edd09cdd133 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/HttpMessageNotReadableExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/HttpMessageNotReadableExceptionMapper.java @@ -2,7 +2,7 @@ import static ch.qos.logback.classic.Level.INFO; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.stereotype.Component; @@ -28,4 +28,4 @@ public Status getResponseStatus(HttpMessageNotReadableException exception) { public Class getExceptionType() { return HttpMessageNotReadableException.class; } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/IllegalArgumentExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/IllegalArgumentExceptionMapper.java index 27d59411e4c..03b4589530f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/IllegalArgumentExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/IllegalArgumentExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/IllegalStateExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/IllegalStateExceptionMapper.java index c556232b837..d31367c000e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/IllegalStateExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/IllegalStateExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/JaxRsNotFoundExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/JaxRsNotFoundExceptionMapper.java index b808585fc27..2975300f6fa 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/JaxRsNotFoundExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/JaxRsNotFoundExceptionMapper.java @@ -1,9 +1,9 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/MethodArgumentNotValidExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/MethodArgumentNotValidExceptionMapper.java index f825fbb4a88..22bc3056cff 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/MethodArgumentNotValidExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/MethodArgumentNotValidExceptionMapper.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.messaging.handler.annotation.support.MethodArgumentNotValidException; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/MissingParameterExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/MissingParameterExceptionMapper.java index 3e75a04addf..24e8c7b2e7e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/MissingParameterExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/MissingParameterExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/SendNotificationExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/SendNotificationExceptionMapper.java index acca6017a19..c412caa9947 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/SendNotificationExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/SendNotificationExceptionMapper.java @@ -4,8 +4,8 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/TerminationFailedExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/TerminationFailedExceptionMapper.java index d99fda55340..052f08401f7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/TerminationFailedExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/TerminationFailedExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/TransactionRuntimeExecutionExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/TransactionRuntimeExecutionExceptionMapper.java index 3fb0c3b7733..249bbafa2dc 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/TransactionRuntimeExecutionExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/TransactionRuntimeExecutionExceptionMapper.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; @@ -58,4 +58,4 @@ protected boolean logException(TransactionRuntimeExecutionException exception) { } return logException; } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/TypeMismatchExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/TypeMismatchExceptionMapper.java index 0d7f09226c3..9d0ca948642 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/TypeMismatchExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/TypeMismatchExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.beans.TypeMismatchException; import org.springframework.stereotype.Component; @@ -19,4 +19,4 @@ public Status getResponseStatus(TypeMismatchException exception) { public Class getExceptionType() { return TypeMismatchException.class; } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/UnknownHostExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/UnknownHostExceptionMapper.java index c1baf6d4902..1daca0c0506 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/UnknownHostExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/UnknownHostExceptionMapper.java @@ -2,7 +2,7 @@ import java.net.UnknownHostException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/UnsupportedOperationFailedExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/UnsupportedOperationFailedExceptionMapper.java index 615dff7395d..9dc371b956f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/UnsupportedOperationFailedExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/UnsupportedOperationFailedExceptionMapper.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.springframework.stereotype.Component; @@ -18,4 +18,4 @@ public Status getResponseStatus(UnsupportedOperationException exception) { public Class getExceptionType() { return UnsupportedOperationException.class; } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/WebApplicationExceptionMapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/WebApplicationExceptionMapper.java index b5c70b9c97b..2a3eaa5ba06 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/WebApplicationExceptionMapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/mapper/WebApplicationExceptionMapper.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.controller.mapper; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/AuditEventV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/AuditEventV4Controller.java index 1b3f1821e83..6e19c3028fd 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/AuditEventV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/AuditEventV4Controller.java @@ -5,9 +5,9 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import javax.inject.Inject; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/AutoscaleV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/AutoscaleV4Controller.java index 484fafd2192..f565325890f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/AutoscaleV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/AutoscaleV4Controller.java @@ -7,11 +7,11 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/BlueprintUtilV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/BlueprintUtilV4Controller.java index 1611cf95da3..17487d5b67c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/BlueprintUtilV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/BlueprintUtilV4Controller.java @@ -2,10 +2,10 @@ import java.util.Set; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; -import javax.validation.constraints.NotEmpty; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; +import jakarta.validation.constraints.NotEmpty; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/BlueprintV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/BlueprintV4Controller.java index a8f23b2fe0d..b8860ad2044 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/BlueprintV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/BlueprintV4Controller.java @@ -3,11 +3,11 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CloudProviderServicesV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CloudProviderServicesV4Controller.java index 14cbf9d9227..d9f53b47960 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CloudProviderServicesV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CloudProviderServicesV4Controller.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.v4; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CloudbreakInfoV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CloudbreakInfoV4Controller.java index feed99ce1b9..e1f1f1a55cc 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CloudbreakInfoV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CloudbreakInfoV4Controller.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.v4; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.boot.actuate.info.InfoEndpoint; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ClusterCO2V4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ClusterCO2V4Controller.java index 49db36cf3d3..54cbd71a680 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ClusterCO2V4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ClusterCO2V4Controller.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ClusterCostV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ClusterCostV4Controller.java index ccbba5a0905..0180c249151 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ClusterCostV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ClusterCostV4Controller.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ClusterTemplateV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ClusterTemplateV4Controller.java index c56ef8e40c6..542c092ecd9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ClusterTemplateV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ClusterTemplateV4Controller.java @@ -9,10 +9,10 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; -import javax.validation.Valid; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; +import jakarta.validation.Valid; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CustomConfigurationsV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CustomConfigurationsV4Controller.java index ac376279d3d..b5ca31db40c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CustomConfigurationsV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CustomConfigurationsV4Controller.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CustomImageCatalogV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CustomImageCatalogV4Controller.java index cab279f03b0..38a1147f8ca 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CustomImageCatalogV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CustomImageCatalogV4Controller.java @@ -3,9 +3,9 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.validation.Valid; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.validation.Valid; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DatabaseConfigV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DatabaseConfigV4Controller.java index d22f398302b..d053d73b254 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DatabaseConfigV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DatabaseConfigV4Controller.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.v4; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DatabaseV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DatabaseV4Controller.java index 84e6f17f90a..eb2285633e1 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DatabaseV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DatabaseV4Controller.java @@ -3,9 +3,9 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.stereotype.Controller; @@ -96,4 +96,4 @@ public DatabaseV4Request getRequest(Long workspaceId, String name) { RDSConfig database = databaseService.getByNameForWorkspaceId(name, threadLocalService.getRequestedWorkspaceId()); return rdsConfigToDatabaseV4RequestConverter.convert(database); } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DatalakeV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DatalakeV4Controller.java index 935ed91d24d..c1a2422128e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DatalakeV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DatalakeV4Controller.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Lazy; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DiagnosticsV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DiagnosticsV4Controller.java index 709e66f6f2d..8f06268550f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DiagnosticsV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DiagnosticsV4Controller.java @@ -5,8 +5,8 @@ import java.util.List; -import javax.inject.Inject; -import javax.validation.Valid; +import jakarta.inject.Inject; +import jakarta.validation.Valid; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DiskUpdateController.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DiskUpdateController.java index ee125ee3fd1..1a852a9e97d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DiskUpdateController.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/DiskUpdateController.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/EventV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/EventV4Controller.java index bfe66171557..8ab489979c1 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/EventV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/EventV4Controller.java @@ -7,11 +7,11 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/FileSystemV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/FileSystemV4Controller.java index 8de2a90d130..c772a065fa1 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/FileSystemV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/FileSystemV4Controller.java @@ -3,8 +3,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.validation.constraints.NotNull; +import jakarta.inject.Inject; +import jakarta.validation.constraints.NotNull; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ImageCatalogV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ImageCatalogV4Controller.java index 695a364783c..847e27d72fb 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ImageCatalogV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ImageCatalogV4Controller.java @@ -9,9 +9,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.stereotype.Controller; import org.springframework.util.StringUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/NotificationController.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/NotificationController.java index 3f5670d2763..c380992e9ed 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/NotificationController.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/NotificationController.java @@ -5,7 +5,7 @@ import java.util.Date; import java.util.function.Consumer; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.sequenceiq.cloudbreak.api.endpoint.v4.events.responses.CloudbreakEventV4Response; import com.sequenceiq.cloudbreak.common.type.ResourceEvent; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ProgressV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ProgressV4Controller.java index bddb275a094..7bf8f445250 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ProgressV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/ProgressV4Controller.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/RecipesV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/RecipesV4Controller.java index 652dd5b102e..d89111973be 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/RecipesV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/RecipesV4Controller.java @@ -3,11 +3,11 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/StackV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/StackV4Controller.java index 81f483b697b..c5ab7349fd0 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/StackV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/StackV4Controller.java @@ -7,10 +7,10 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/UserProfileV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/UserProfileV4Controller.java index d7bc0f6e091..9f509c8842e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/UserProfileV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/UserProfileV4Controller.java @@ -1,9 +1,9 @@ package com.sequenceiq.cloudbreak.controller.v4; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; -import javax.validation.Valid; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; +import jakarta.validation.Valid; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/UtilV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/UtilV4Controller.java index f6bcab3e857..ff173440156 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/UtilV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/UtilV4Controller.java @@ -3,8 +3,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Response; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/WorkspaceAwareUtilV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/WorkspaceAwareUtilV4Controller.java index 2db20f61653..1c63e7bea34 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/WorkspaceAwareUtilV4Controller.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/WorkspaceAwareUtilV4Controller.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.v4; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Controller; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/ParametersValidator.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/ParametersValidator.java index 2081f46b48c..0992ad28333 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/ParametersValidator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/ParametersValidator.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/RecommendImageService.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/RecommendImageService.java index ee230031adb..fb5834b3c04 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/RecommendImageService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/RecommendImageService.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/RecommendedImageValidator.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/RecommendedImageValidator.java index 3841cfac863..13eb71bdd07 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/RecommendedImageValidator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/RecommendedImageValidator.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/datalake/DataLakeValidator.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/datalake/DataLakeValidator.java index 45234296e3d..ecdd2e5c009 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/datalake/DataLakeValidator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/datalake/DataLakeValidator.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.validation.datalake; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/diagnostics/DiagnosticsCollectionValidator.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/diagnostics/DiagnosticsCollectionValidator.java index e8e390643e0..95003062e18 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/diagnostics/DiagnosticsCollectionValidator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/diagnostics/DiagnosticsCollectionValidator.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.controller.validation.diagnostics; -import javax.ws.rs.ServiceUnavailableException; +import jakarta.ws.rs.ServiceUnavailableException; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/environment/ClusterCreationEnvironmentValidator.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/environment/ClusterCreationEnvironmentValidator.java index ef630acd6e7..ac7a088afed 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/environment/ClusterCreationEnvironmentValidator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/environment/ClusterCreationEnvironmentValidator.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/loadbalancer/EndpointGatewayNetworkValidator.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/loadbalancer/EndpointGatewayNetworkValidator.java index cd397b35148..09efb1d0d3d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/loadbalancer/EndpointGatewayNetworkValidator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/loadbalancer/EndpointGatewayNetworkValidator.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/network/MultiAzValidator.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/network/MultiAzValidator.java index 60f5b73148f..801b03c97b3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/network/MultiAzValidator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/network/MultiAzValidator.java @@ -8,8 +8,8 @@ import java.util.List; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/rds/RdsConfigValidator.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/rds/RdsConfigValidator.java index 6e834273ed7..3237ec97677 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/rds/RdsConfigValidator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/rds/RdsConfigValidator.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.TreeSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/stack/StackRuntimeVersionValidator.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/stack/StackRuntimeVersionValidator.java index 1bc4b21e060..cb1621709f1 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/stack/StackRuntimeVersionValidator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/stack/StackRuntimeVersionValidator.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/stack/StackValidator.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/stack/StackValidator.java index 911327781f2..4f1c636cf45 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/stack/StackValidator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/stack/StackValidator.java @@ -9,7 +9,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/stack/cluster/gateway/ExposedServiceListValidator.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/stack/cluster/gateway/ExposedServiceListValidator.java index ef6f01b9ad8..7f79dbc946d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/stack/cluster/gateway/ExposedServiceListValidator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/stack/cluster/gateway/ExposedServiceListValidator.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/EmptyVolumeSetFilter.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/EmptyVolumeSetFilter.java index 2fea286f15f..f644dc148d1 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/EmptyVolumeSetFilter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/EmptyVolumeSetFilter.java @@ -3,7 +3,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/TemplateValidatorAndUpdater.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/TemplateValidatorAndUpdater.java index cacca4d0319..5ed30b0e77a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/TemplateValidatorAndUpdater.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/TemplateValidatorAndUpdater.java @@ -11,8 +11,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.apache.commons.lang3.BooleanUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/azure/HostEncryptionProvider.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/azure/HostEncryptionProvider.java index cdf8da8efb7..8c50c2b1a33 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/azure/HostEncryptionProvider.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/azure/HostEncryptionProvider.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/azure/ResourceDiskPropertyCalculator.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/azure/ResourceDiskPropertyCalculator.java index 3579df4ecfa..8ffcbe8fd24 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/azure/ResourceDiskPropertyCalculator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/controller/validation/template/azure/ResourceDiskPropertyCalculator.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/StackToTemplatePreparationObjectConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/StackToTemplatePreparationObjectConverter.java index 223b9553e4a..a0d125a4d2b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/StackToTemplatePreparationObjectConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/StackToTemplatePreparationObjectConverter.java @@ -15,7 +15,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/SupportedExternalDatabaseServiceEntryToSupportedExternalDatabaseServiceEntryResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/SupportedExternalDatabaseServiceEntryToSupportedExternalDatabaseServiceEntryResponseConverter.java index 03cc4855532..ecf653a0f91 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/SupportedExternalDatabaseServiceEntryToSupportedExternalDatabaseServiceEntryResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/SupportedExternalDatabaseServiceEntryToSupportedExternalDatabaseServiceEntryResponseConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/UpdateImageCatalogRequestToImageCatalogConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/UpdateImageCatalogRequestToImageCatalogConverter.java index 7da8ae59ac6..abdcb2f4513 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/UpdateImageCatalogRequestToImageCatalogConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/UpdateImageCatalogRequestToImageCatalogConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/CloudFileSystemViewProvider.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/CloudFileSystemViewProvider.java index 4343426704b..4e6f5e5fc7a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/CloudFileSystemViewProvider.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/CloudFileSystemViewProvider.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/CredentialToExtendedCloudCredentialConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/CredentialToExtendedCloudCredentialConverter.java index 992f220008d..728505d1e39 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/CredentialToExtendedCloudCredentialConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/CredentialToExtendedCloudCredentialConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.spi; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/InstanceMetaDataToCloudInstanceConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/InstanceMetaDataToCloudInstanceConverter.java index b34f8eb377b..300c1a9d010 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/InstanceMetaDataToCloudInstanceConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/InstanceMetaDataToCloudInstanceConverter.java @@ -12,7 +12,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/ResourceToCloudResourceConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/ResourceToCloudResourceConverter.java index 659d916314a..a0986538398 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/ResourceToCloudResourceConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/ResourceToCloudResourceConverter.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/StackToCloudStackConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/StackToCloudStackConverter.java index 8ad2340f774..f8ca74ccce5 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/StackToCloudStackConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/spi/StackToCloudStackConverter.java @@ -27,7 +27,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/stack/AutoscaleStackToAutoscaleStackResponseJsonConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/stack/AutoscaleStackToAutoscaleStackResponseJsonConverter.java index d8640e15a59..1d6d1126da3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/stack/AutoscaleStackToAutoscaleStackResponseJsonConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/stack/AutoscaleStackToAutoscaleStackResponseJsonConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.stack; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/util/GatewayConvertUtil.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/util/GatewayConvertUtil.java index 11efc9145de..1a5ee3d2876 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/util/GatewayConvertUtil.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/util/GatewayConvertUtil.java @@ -3,7 +3,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/audit/StructuredEventEntityToAuditEventV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/audit/StructuredEventEntityToAuditEventV4ResponseConverter.java index 5b8743af035..c114f71b266 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/audit/StructuredEventEntityToAuditEventV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/audit/StructuredEventEntityToAuditEventV4ResponseConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.audit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/blueprint/BlueprintV4RequestToBlueprintConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/blueprint/BlueprintV4RequestToBlueprintConverter.java index 73af5bb91fd..333b2df25b7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/blueprint/BlueprintV4RequestToBlueprintConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/blueprint/BlueprintV4RequestToBlueprintConverter.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.util.Map; -import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/ClusterTemplateToClusterTemplateV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/ClusterTemplateToClusterTemplateV4ResponseConverter.java index cb914ef205a..0b6e01f322a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/ClusterTemplateToClusterTemplateV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/ClusterTemplateToClusterTemplateV4ResponseConverter.java @@ -5,7 +5,7 @@ import java.io.IOException; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/ClusterTemplateToDefaultClusterTemplateV4Request.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/ClusterTemplateToDefaultClusterTemplateV4Request.java index 984ffbd552a..f90987c87c2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/ClusterTemplateToDefaultClusterTemplateV4Request.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/ClusterTemplateToDefaultClusterTemplateV4Request.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.clustertemplate; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/DefaultClusterTemplateV4RequestToClusterTemplateConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/DefaultClusterTemplateV4RequestToClusterTemplateConverter.java index 5a3cf0822cc..89db2fd26ef 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/DefaultClusterTemplateV4RequestToClusterTemplateConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/DefaultClusterTemplateV4RequestToClusterTemplateConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.clustertemplate; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/PlatformRecommendationToPlatformRecommendationV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/PlatformRecommendationToPlatformRecommendationV4ResponseConverter.java index 8eda1129aea..e184264cb85 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/PlatformRecommendationToPlatformRecommendationV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/clustertemplate/PlatformRecommendationToPlatformRecommendationV4ResponseConverter.java @@ -8,7 +8,7 @@ import java.util.TreeMap; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/customimage/CustomImageToCustomImageCatalogV4GetImageResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/customimage/CustomImageToCustomImageCatalogV4GetImageResponseConverter.java index 046d1085306..82394ab3152 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/customimage/CustomImageToCustomImageCatalogV4GetImageResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/customimage/CustomImageToCustomImageCatalogV4GetImageResponseConverter.java @@ -3,7 +3,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/customimage/ImageCatalogToCustomImageCatalogV4GetResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/customimage/ImageCatalogToCustomImageCatalogV4GetResponseConverter.java index 81299cfd827..adda1c7f461 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/customimage/ImageCatalogToCustomImageCatalogV4GetResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/customimage/ImageCatalogToCustomImageCatalogV4GetResponseConverter.java @@ -2,7 +2,7 @@ import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/database/DatabaseV4RequestToRDSConfigConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/database/DatabaseV4RequestToRDSConfigConverter.java index b071afca341..4b6ddfa4e7f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/database/DatabaseV4RequestToRDSConfigConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/database/DatabaseV4RequestToRDSConfigConverter.java @@ -2,7 +2,7 @@ import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,4 +51,4 @@ public RDSConfig convert(DatabaseV4Request source) { return rdsConfig; } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/database/RDSConfigToDatabaseV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/database/RDSConfigToDatabaseV4ResponseConverter.java index 04ad0e27e4e..55b4432b03f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/database/RDSConfigToDatabaseV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/database/RDSConfigToDatabaseV4ResponseConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.database; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/diagnostics/FlowLogsToListDiagnosticsCollectionResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/diagnostics/FlowLogsToListDiagnosticsCollectionResponseConverter.java index 80340d75467..99cc5aa00d1 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/diagnostics/FlowLogsToListDiagnosticsCollectionResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/diagnostics/FlowLogsToListDiagnosticsCollectionResponseConverter.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/environment/network/AzureEnvironmentNetworkConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/environment/network/AzureEnvironmentNetworkConverter.java index bf44fee2fda..37ae03b5313 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/environment/network/AzureEnvironmentNetworkConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/environment/network/AzureEnvironmentNetworkConverter.java @@ -9,7 +9,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/environment/network/EnvironmentBaseNetworkConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/environment/network/EnvironmentBaseNetworkConverter.java index 10f5eda083e..b04722e9887 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/environment/network/EnvironmentBaseNetworkConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/environment/network/EnvironmentBaseNetworkConverter.java @@ -8,8 +8,8 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/environment/network/SubnetSelector.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/environment/network/SubnetSelector.java index 71db865498b..e174dd546e9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/environment/network/SubnetSelector.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/environment/network/SubnetSelector.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/imagecatalog/ImageCatalogToImageCatalogV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/imagecatalog/ImageCatalogToImageCatalogV4ResponseConverter.java index 76bd6eb3c5b..8af85056535 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/imagecatalog/ImageCatalogToImageCatalogV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/imagecatalog/ImageCatalogToImageCatalogV4ResponseConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.imagecatalog; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/imagecatalog/ImageCatalogToImageCatalogV4ShortResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/imagecatalog/ImageCatalogToImageCatalogV4ShortResponseConverter.java index 7f7b4fa69fc..3ecd3cd3a5a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/imagecatalog/ImageCatalogToImageCatalogV4ShortResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/imagecatalog/ImageCatalogToImageCatalogV4ShortResponseConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.imagecatalog; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/imagecatalog/ImagesToImagesV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/imagecatalog/ImagesToImagesV4ResponseConverter.java index e4f06ab441c..1355341dbde 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/imagecatalog/ImagesToImagesV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/imagecatalog/ImagesToImagesV4ResponseConverter.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/recipes/RecipeToRecipeV4RequestConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/recipes/RecipeToRecipeV4RequestConverter.java index 6c3f0c5c838..91daea157ad 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/recipes/RecipeToRecipeV4RequestConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/recipes/RecipeToRecipeV4RequestConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.recipes; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/recipes/RecipeToRecipeV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/recipes/RecipeToRecipeV4ResponseConverter.java index 2d5c56a7311..085d16edd92 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/recipes/RecipeToRecipeV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/recipes/RecipeToRecipeV4ResponseConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.recipes; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/DatabaseRequestToDatabaseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/DatabaseRequestToDatabaseConverter.java index bee2e9c0087..b66e1cb7a31 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/DatabaseRequestToDatabaseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/DatabaseRequestToDatabaseConverter.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/ImageToStackImageV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/ImageToStackImageV4ResponseConverter.java index 44838f91664..fb22798dd92 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/ImageToStackImageV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/ImageToStackImageV4ResponseConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.stacks; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackScaleV4RequestToUpdateClusterV4RequestConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackScaleV4RequestToUpdateClusterV4RequestConverter.java index 7222981e255..c536df7ffb0 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackScaleV4RequestToUpdateClusterV4RequestConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackScaleV4RequestToUpdateClusterV4RequestConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.stacks; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackScaleV4RequestToUpdateStackV4RequestConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackScaleV4RequestToUpdateStackV4RequestConverter.java index 7f7d725d394..81973703f52 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackScaleV4RequestToUpdateStackV4RequestConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackScaleV4RequestToUpdateStackV4RequestConverter.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackToAutoscaleStackV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackToAutoscaleStackV4ResponseConverter.java index e70d9abe232..62ddeba58e8 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackToAutoscaleStackV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackToAutoscaleStackV4ResponseConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.stacks; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackToDependentHostGroupV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackToDependentHostGroupV4ResponseConverter.java index 416e25c642c..76de4df0adb 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackToDependentHostGroupV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackToDependentHostGroupV4ResponseConverter.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackToStackV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackToStackV4ResponseConverter.java index 18d2929f595..f95fbff1b78 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackToStackV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackToStackV4ResponseConverter.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.NotImplementedException; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackV4RequestToStackConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackV4RequestToStackConverter.java index 297f1584480..9d3ba80941b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackV4RequestToStackConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackV4RequestToStackConverter.java @@ -18,7 +18,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackV4RequestToTemplatePreparationObjectConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackV4RequestToTemplatePreparationObjectConverter.java index f546359dfec..da8ee6075e4 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackV4RequestToTemplatePreparationObjectConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/StackV4RequestToTemplatePreparationObjectConverter.java @@ -12,7 +12,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/ClusterToClusterV4RequestConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/ClusterToClusterV4RequestConverter.java index 7a8d6bc8cdd..c7abe4f0fcc 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/ClusterToClusterV4RequestConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/ClusterToClusterV4RequestConverter.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/GatewayToGatewayV4RequestConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/GatewayToGatewayV4RequestConverter.java index 73652c4aa69..fbbac0670b3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/GatewayToGatewayV4RequestConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/GatewayToGatewayV4RequestConverter.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/InstanceGroupToInstanceGroupV4RequestConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/InstanceGroupToInstanceGroupV4RequestConverter.java index 1840e3db3e6..65ba19f7475 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/InstanceGroupToInstanceGroupV4RequestConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/InstanceGroupToInstanceGroupV4RequestConverter.java @@ -2,7 +2,7 @@ import java.util.HashSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/NetworkToNetworkV4RequestConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/NetworkToNetworkV4RequestConverter.java index c25bfe41cf1..aba57f6eda1 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/NetworkToNetworkV4RequestConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/NetworkToNetworkV4RequestConverter.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.util.MapUtil.cleanMap; import static com.sequenceiq.cloudbreak.util.NullUtil.throwIfNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/SecurityGroupToSecurityGroupV4RequestConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/SecurityGroupToSecurityGroupV4RequestConverter.java index 87e9d20d906..de641768608 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/SecurityGroupToSecurityGroupV4RequestConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/SecurityGroupToSecurityGroupV4RequestConverter.java @@ -2,8 +2,8 @@ import java.util.ArrayList; -import javax.annotation.Nonnull; -import javax.inject.Inject; +import jakarta.annotation.Nonnull; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/StackToStackV4RequestConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/StackToStackV4RequestConverter.java index 46055901bc7..a4858786681 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/StackToStackV4RequestConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/StackToStackV4RequestConverter.java @@ -11,7 +11,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/TemplateToInstanceTemplateV4RequestConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/TemplateToInstanceTemplateV4RequestConverter.java index eb69817e50d..b5bb726a987 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/TemplateToInstanceTemplateV4RequestConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cli/TemplateToInstanceTemplateV4RequestConverter.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/CloudStorageConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/CloudStorageConverter.java index 70176938f63..e75c99cb711 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/CloudStorageConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/CloudStorageConverter.java @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/ClusterToClusterV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/ClusterToClusterV4ResponseConverter.java index 274fff8e81d..3660e6b8f46 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/ClusterToClusterV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/ClusterToClusterV4ResponseConverter.java @@ -13,7 +13,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/ClusterV4RequestToClusterConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/ClusterV4RequestToClusterConverter.java index 7798680b41a..84dd886c805 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/ClusterV4RequestToClusterConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/ClusterV4RequestToClusterConverter.java @@ -12,7 +12,7 @@ import java.util.Set; import java.util.function.Function; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/clouderamanager/RepositoryInfoToClouderaManagerInfoV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/clouderamanager/RepositoryInfoToClouderaManagerInfoV4ResponseConverter.java index f9a2595c5fa..9e957dd58cd 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/clouderamanager/RepositoryInfoToClouderaManagerInfoV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/clouderamanager/RepositoryInfoToClouderaManagerInfoV4ResponseConverter.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/GatewayToGatewayV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/GatewayToGatewayV4ResponseConverter.java index 17acfcf46bb..a1853e34f31 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/GatewayToGatewayV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/GatewayToGatewayV4ResponseConverter.java @@ -2,7 +2,7 @@ import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/GatewayV4RequestToGatewayConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/GatewayV4RequestToGatewayConverter.java index 01fa6443ddd..cf037a1b923 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/GatewayV4RequestToGatewayConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/GatewayV4RequestToGatewayConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.stacks.cluster.gateway; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/StackV4RequestToGatewayConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/StackV4RequestToGatewayConverter.java index fdcc27c1422..548c50a735e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/StackV4RequestToGatewayConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/StackV4RequestToGatewayConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.stacks.cluster.gateway; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/topology/GatewayTopologyV4RequestToExposedServicesConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/topology/GatewayTopologyV4RequestToExposedServicesConverter.java index b14e8b5e67e..5dbac3b31dd 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/topology/GatewayTopologyV4RequestToExposedServicesConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/topology/GatewayTopologyV4RequestToExposedServicesConverter.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/topology/GatewayTopologyV4RequestToGatewayTopologyConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/topology/GatewayTopologyV4RequestToGatewayTopologyConverter.java index c446af02d84..bafad30f306 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/topology/GatewayTopologyV4RequestToGatewayTopologyConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/cluster/gateway/topology/GatewayTopologyV4RequestToGatewayTopologyConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.stacks.cluster.gateway.topology; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/InstanceGroupToInstanceGroupV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/InstanceGroupToInstanceGroupV4ResponseConverter.java index c36a54c5f50..8c1298e2c35 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/InstanceGroupToInstanceGroupV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/InstanceGroupToInstanceGroupV4ResponseConverter.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/InstanceGroupV4RequestToHostGroupConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/InstanceGroupV4RequestToHostGroupConverter.java index 70e2781cb32..8ad7bcab925 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/InstanceGroupV4RequestToHostGroupConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/InstanceGroupV4RequestToHostGroupConverter.java @@ -3,7 +3,7 @@ import java.util.Locale; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/InstanceGroupV4RequestToInstanceGroupConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/InstanceGroupV4RequestToInstanceGroupConverter.java index 3bc4f86ad02..49492bcdaa0 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/InstanceGroupV4RequestToInstanceGroupConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/InstanceGroupV4RequestToInstanceGroupConverter.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/network/InstanceGroupNetworkToInstanceGroupNetworkV4RequestConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/network/InstanceGroupNetworkToInstanceGroupNetworkV4RequestConverter.java index a86f1675e29..64def133993 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/network/InstanceGroupNetworkToInstanceGroupNetworkV4RequestConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/network/InstanceGroupNetworkToInstanceGroupNetworkV4RequestConverter.java @@ -4,7 +4,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/network/InstanceGroupNetworkToInstanceGroupNetworkV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/network/InstanceGroupNetworkToInstanceGroupNetworkV4ResponseConverter.java index 1b4ac2c55e7..67e3c8e87e6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/network/InstanceGroupNetworkToInstanceGroupNetworkV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/network/InstanceGroupNetworkToInstanceGroupNetworkV4ResponseConverter.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/network/InstanceGroupNetworkV4RequestToInstanceGroupNetworkConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/network/InstanceGroupNetworkV4RequestToInstanceGroupNetworkConverter.java index 16d1c479aae..2b9c0cf7906 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/network/InstanceGroupNetworkV4RequestToInstanceGroupNetworkConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/network/InstanceGroupNetworkV4RequestToInstanceGroupNetworkConverter.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.function.Function; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/securitygroup/SecurityGroupToSecurityGroupResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/securitygroup/SecurityGroupToSecurityGroupResponseConverter.java index a5cdab52bb1..e35bea4d6dc 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/securitygroup/SecurityGroupToSecurityGroupResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/securitygroup/SecurityGroupToSecurityGroupResponseConverter.java @@ -2,7 +2,7 @@ import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/securitygroup/SecurityGroupV4RequestToSecurityGroupConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/securitygroup/SecurityGroupV4RequestToSecurityGroupConverter.java index c16c7e1ef51..385d4913aae 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/securitygroup/SecurityGroupV4RequestToSecurityGroupConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/securitygroup/SecurityGroupV4RequestToSecurityGroupConverter.java @@ -5,8 +5,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.inject.Inject; +import jakarta.annotation.Nonnull; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/template/InstanceTemplateV4RequestToTemplateConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/template/InstanceTemplateV4RequestToTemplateConverter.java index d8eecd3bfe4..a6acd1a1435 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/template/InstanceTemplateV4RequestToTemplateConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/template/InstanceTemplateV4RequestToTemplateConverter.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.function.Function; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/template/TemplateToInstanceTemplateV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/template/TemplateToInstanceTemplateV4ResponseConverter.java index f84d9eb10c5..3895c7b6258 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/template/TemplateToInstanceTemplateV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/instancegroup/template/TemplateToInstanceTemplateV4ResponseConverter.java @@ -6,7 +6,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/loadbalancer/LoadBalancerToLoadBalancerResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/loadbalancer/LoadBalancerToLoadBalancerResponseConverter.java index a08ac7c8537..7201a542fca 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/loadbalancer/LoadBalancerToLoadBalancerResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/loadbalancer/LoadBalancerToLoadBalancerResponseConverter.java @@ -7,7 +7,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/network/NetworkToNetworkV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/network/NetworkToNetworkV4ResponseConverter.java index 9b555167bac..98944a67069 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/network/NetworkToNetworkV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/network/NetworkToNetworkV4ResponseConverter.java @@ -11,8 +11,8 @@ import java.util.Map; import java.util.Optional; -import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/network/NetworkV4RequestToNetworkConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/network/NetworkV4RequestToNetworkConverter.java index 723fc34b679..41e977c64d7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/network/NetworkV4RequestToNetworkConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/network/NetworkV4RequestToNetworkConverter.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/view/ClusterApiViewToClusterViewV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/view/ClusterApiViewToClusterViewV4ResponseConverter.java index 84893324baa..dccf6157bee 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/view/ClusterApiViewToClusterViewV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/view/ClusterApiViewToClusterViewV4ResponseConverter.java @@ -3,7 +3,7 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/view/StackApiViewToStackViewV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/view/StackApiViewToStackViewV4ResponseConverter.java index b3a229a3f7e..b2754e86625 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/view/StackApiViewToStackViewV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/stacks/view/StackApiViewToStackViewV4ResponseConverter.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.converter.v4.stacks.view; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/userprofiles/ShowTerminatedClusterConfigToShowTerminatedClusterPreferencesV4ResponseConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/userprofiles/ShowTerminatedClusterConfigToShowTerminatedClusterPreferencesV4ResponseConverter.java index eee53e4a078..44cffad90ed 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/userprofiles/ShowTerminatedClusterConfigToShowTerminatedClusterPreferencesV4ResponseConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/userprofiles/ShowTerminatedClusterConfigToShowTerminatedClusterPreferencesV4ResponseConverter.java @@ -2,7 +2,7 @@ import java.time.Duration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/userprofiles/ShowTerminatedClustersPreferencesV4RequestToShowTerminatedClustersPreferencesConverter.java b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/userprofiles/ShowTerminatedClustersPreferencesV4RequestToShowTerminatedClustersPreferencesConverter.java index cfa9078f232..0195962df6d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/userprofiles/ShowTerminatedClustersPreferencesV4RequestToShowTerminatedClustersPreferencesConverter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/converter/v4/userprofiles/ShowTerminatedClustersPreferencesV4RequestToShowTerminatedClustersPreferencesConverter.java @@ -2,7 +2,7 @@ import java.time.Duration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterBootstrapper.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterBootstrapper.java index d08d42d3788..2fe5df7e339 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterBootstrapper.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterBootstrapper.java @@ -16,7 +16,7 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterBootstrapperErrorHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterBootstrapperErrorHandler.java index 24b2b932f95..d7c4bee685b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterBootstrapperErrorHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterBootstrapperErrorHandler.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterNodeNameGenerator.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterNodeNameGenerator.java index dd97f76976c..a509290199f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterNodeNameGenerator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterNodeNameGenerator.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicLong; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterServiceRunner.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterServiceRunner.java index e06941bb5bd..15759f6329a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterServiceRunner.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/ClusterServiceRunner.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.Objects; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/container/ContainerOrchestratorResolver.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/container/ContainerOrchestratorResolver.java index 844b0cbe638..baaa76acbff 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/container/ContainerOrchestratorResolver.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/container/ContainerOrchestratorResolver.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/container/postgres/EmbeddedDatabaseConfigProvider.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/container/postgres/EmbeddedDatabaseConfigProvider.java index 5c41a1bbd05..8c8b4702eed 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/container/postgres/EmbeddedDatabaseConfigProvider.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/container/postgres/EmbeddedDatabaseConfigProvider.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/container/postgres/PostgresConfigService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/container/postgres/PostgresConfigService.java index a0179de920d..ed2fc00e0e6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/container/postgres/PostgresConfigService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/container/postgres/PostgresConfigService.java @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/ClusterHostServiceRunner.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/ClusterHostServiceRunner.java index 56c201e8003..223db141fbf 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/ClusterHostServiceRunner.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/ClusterHostServiceRunner.java @@ -31,8 +31,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.inject.Inject; +import jakarta.annotation.Nonnull; +import jakarta.inject.Inject; import org.apache.commons.collections4.MapUtils; import org.apache.http.conn.util.InetAddressUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/GrainPropertiesService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/GrainPropertiesService.java index 182ce88b5b0..40f35a2d843 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/GrainPropertiesService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/GrainPropertiesService.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.MapUtils; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/SssdConfigProvider.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/SssdConfigProvider.java index a282f4c3e9b..3b0667bd8c6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/SssdConfigProvider.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/SssdConfigProvider.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/decorator/CsdParcelDecorator.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/decorator/CsdParcelDecorator.java index b59297a4859..f003017dadc 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/decorator/CsdParcelDecorator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/decorator/CsdParcelDecorator.java @@ -9,7 +9,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/decorator/NameserverPillarDecorator.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/decorator/NameserverPillarDecorator.java index 9d32de03756..9a7eab12c6d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/decorator/NameserverPillarDecorator.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/bootstrap/service/host/decorator/NameserverPillarDecorator.java @@ -8,7 +8,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.conn.util.InetAddressUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/AmbariClusterResetService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/AmbariClusterResetService.java index 4f7b7afff2d..3827fc61be9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/AmbariClusterResetService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/AmbariClusterResetService.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterBuilderService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterBuilderService.java index abfd9d65060..78550d3cb0c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterBuilderService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterBuilderService.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerDefaultConfigAdjuster.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerDefaultConfigAdjuster.java index 2bad3387f8d..161844122da 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerDefaultConfigAdjuster.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerDefaultConfigAdjuster.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerUpgradeManagementService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerUpgradeManagementService.java index be5e41c7506..976b493f874 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerUpgradeManagementService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerUpgradeManagementService.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerUpgradeService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerUpgradeService.java index 3f871295655..5122be881a7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerUpgradeService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerUpgradeService.java @@ -9,7 +9,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerUpscaleService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerUpscaleService.java index 8a2b13fe572..b4abfefa7a5 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerUpscaleService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterManagerUpscaleService.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; @@ -143,4 +143,4 @@ private Set collectFailedInstanceIds(StackView stack, ExtendedPollingResul } return failedInstanceIds; } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterUpscaleService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterUpscaleService.java index 584c841452c..298ff3394db 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterUpscaleService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/cluster/ClusterUpscaleService.java @@ -10,7 +10,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/AbstractStackAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/AbstractStackAction.java index 883416b03ae..effac082492 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/AbstractStackAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/AbstractStackAction.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import com.sequenceiq.cloudbreak.common.event.Payload; import com.sequenceiq.cloudbreak.service.metrics.CloudbreakMetricService; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/CloudbreakFlowInformation.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/CloudbreakFlowInformation.java index 3fbfc1ce487..2948d646efe 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/CloudbreakFlowInformation.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/CloudbreakFlowInformation.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/StackStatusFinalizer.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/StackStatusFinalizer.java index 8f794958b44..0c0a6aac469 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/StackStatusFinalizer.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/StackStatusFinalizer.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/StackStatusFinalizerAbstractFlowConfig.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/StackStatusFinalizerAbstractFlowConfig.java index 58745fc642e..ff75c362568 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/StackStatusFinalizerAbstractFlowConfig.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/StackStatusFinalizerAbstractFlowConfig.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.sequenceiq.flow.core.FlowEvent; import com.sequenceiq.flow.core.FlowState; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/BackupDatalakeDatabaseFlowEventChainFactory.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/BackupDatalakeDatabaseFlowEventChainFactory.java index 606dce4c861..e21e70419f2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/BackupDatalakeDatabaseFlowEventChainFactory.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/BackupDatalakeDatabaseFlowEventChainFactory.java @@ -11,7 +11,7 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/ClusterRepairFlowEventChainFactory.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/ClusterRepairFlowEventChainFactory.java index c98b6fa3b12..32251a86bb6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/ClusterRepairFlowEventChainFactory.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/ClusterRepairFlowEventChainFactory.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentLinkedDeque; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/DownscaleFlowEventChainFactory.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/DownscaleFlowEventChainFactory.java index c9972caee7f..a34b4d24213 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/DownscaleFlowEventChainFactory.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/DownscaleFlowEventChainFactory.java @@ -10,7 +10,7 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/MultiHostgroupDownscaleFlowEventChainFactory.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/MultiHostgroupDownscaleFlowEventChainFactory.java index 00afa079a93..bd37076f767 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/MultiHostgroupDownscaleFlowEventChainFactory.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/MultiHostgroupDownscaleFlowEventChainFactory.java @@ -11,7 +11,7 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/OSUpgradeByUpgradeSetsFlowEventChainFactory.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/OSUpgradeByUpgradeSetsFlowEventChainFactory.java index c0ac12b8cec..4d4f6361d70 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/OSUpgradeByUpgradeSetsFlowEventChainFactory.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/OSUpgradeByUpgradeSetsFlowEventChainFactory.java @@ -12,7 +12,7 @@ import java.util.concurrent.ConcurrentLinkedDeque; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/RescheduleStatusCheckChainFactory.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/RescheduleStatusCheckChainFactory.java index 08785e1f4ef..6945f5d7678 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/RescheduleStatusCheckChainFactory.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/RescheduleStatusCheckChainFactory.java @@ -2,7 +2,7 @@ import java.util.concurrent.ConcurrentLinkedDeque; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/StackRepairFlowEventChainFactory.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/StackRepairFlowEventChainFactory.java index 89d8e488a5f..5aa8e928823 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/StackRepairFlowEventChainFactory.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/StackRepairFlowEventChainFactory.java @@ -5,7 +5,7 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedDeque; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/StopStartDownscaleFlowEventChainFactory.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/StopStartDownscaleFlowEventChainFactory.java index a7a1b411bf8..f3fd43e17c4 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/StopStartDownscaleFlowEventChainFactory.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/StopStartDownscaleFlowEventChainFactory.java @@ -11,7 +11,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/StopStartUpscaleFlowEventChainFactory.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/StopStartUpscaleFlowEventChainFactory.java index de75d64edc1..a540740d9dc 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/StopStartUpscaleFlowEventChainFactory.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/StopStartUpscaleFlowEventChainFactory.java @@ -10,7 +10,7 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/UpgradeDatalakeFlowEventChainFactory.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/UpgradeDatalakeFlowEventChainFactory.java index 2014718f71d..d47973e62d9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/UpgradeDatalakeFlowEventChainFactory.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/UpgradeDatalakeFlowEventChainFactory.java @@ -9,7 +9,7 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/UpgradeDistroxFlowEventChainFactory.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/UpgradeDistroxFlowEventChainFactory.java index 4be824c1d10..da7d169e32b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/UpgradeDistroxFlowEventChainFactory.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/UpgradeDistroxFlowEventChainFactory.java @@ -18,7 +18,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/UpscaleFlowEventChainFactory.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/UpscaleFlowEventChainFactory.java index 00e578d4970..881e83b58fd 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/UpscaleFlowEventChainFactory.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/chain/UpscaleFlowEventChainFactory.java @@ -16,7 +16,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Value; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/AbstractClusterAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/AbstractClusterAction.java index c9fc04e2a67..c879a64a619 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/AbstractClusterAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/AbstractClusterAction.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ClusterPollingCheckerService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ClusterPollingCheckerService.java index d91092c2103..4aa337267f2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ClusterPollingCheckerService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ClusterPollingCheckerService.java @@ -2,7 +2,7 @@ import static com.google.common.base.Preconditions.checkArgument; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/AbstractAddVolumesAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/AbstractAddVolumesAction.java index 955f2edb75a..eddb5e3f876 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/AbstractAddVolumesAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/AbstractAddVolumesAction.java @@ -6,7 +6,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/AddVolumesActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/AddVolumesActions.java index a43eb9b93d1..5be8ca78ad3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/AddVolumesActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/AddVolumesActions.java @@ -17,7 +17,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesCMConfigFinishedEvent.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesCMConfigFinishedEvent.java index 02ca0ea33d2..26dc0577481 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesCMConfigFinishedEvent.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesCMConfigFinishedEvent.java @@ -4,7 +4,7 @@ import java.util.StringJoiner; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -71,4 +71,4 @@ public String toString() { .add("CloudVolumeUsageType=" + cloudVolumeUsageType) .toString(); } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesCMConfigHandlerEvent.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesCMConfigHandlerEvent.java index 838f09e8743..4d5f07951c6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesCMConfigHandlerEvent.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesCMConfigHandlerEvent.java @@ -4,7 +4,7 @@ import java.util.StringJoiner; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -71,4 +71,4 @@ public String toString() { .add("CloudVolumeUsageType=" + cloudVolumeUsageType) .toString(); } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesHandlerEvent.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesHandlerEvent.java index 98191d64296..f51125ca14d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesHandlerEvent.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesHandlerEvent.java @@ -4,7 +4,7 @@ import java.util.StringJoiner; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesOrchestrationHandlerEvent.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesOrchestrationHandlerEvent.java index 2ee8a77335c..5bb29ae68f4 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesOrchestrationHandlerEvent.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/event/AddVolumesOrchestrationHandlerEvent.java @@ -4,7 +4,7 @@ import java.util.StringJoiner; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/handler/AddVolumesCMConfigHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/handler/AddVolumesCMConfigHandler.java index 439036abb44..7a6b3ac5838 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/handler/AddVolumesCMConfigHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/addvolumes/handler/AddVolumesCMConfigHandler.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/AbstractUpgradeCcmAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/AbstractUpgradeCcmAction.java index bd39a218ea2..5723ef2b182 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/AbstractUpgradeCcmAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/AbstractUpgradeCcmAction.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/CcmUpgradeFlowTriggerCondition.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/CcmUpgradeFlowTriggerCondition.java index 2b8dae6ed57..54081e1789b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/CcmUpgradeFlowTriggerCondition.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/CcmUpgradeFlowTriggerCondition.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.cluster.ccm.upgrade; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/UpgradeCcmActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/UpgradeCcmActions.java index 56afafdf50c..c3764fb7e6b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/UpgradeCcmActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/UpgradeCcmActions.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/UpgradeCcmService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/UpgradeCcmService.java index f8a0bb2cc05..729e8310e60 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/UpgradeCcmService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/ccm/upgrade/UpgradeCcmService.java @@ -7,7 +7,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrenew/ClusterCertificateRenewActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrenew/ClusterCertificateRenewActions.java index d839ecb3bbd..592a3bb0ba4 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrenew/ClusterCertificateRenewActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrenew/ClusterCertificateRenewActions.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -91,4 +91,4 @@ protected Selectable createRequest(StackFailureContext context) { } }; } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrenew/ClusterCertificateRenewService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrenew/ClusterCertificateRenewService.java index 1df7b08f169..2c8ccf9f10f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrenew/ClusterCertificateRenewService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrenew/ClusterCertificateRenewService.java @@ -4,7 +4,7 @@ import static com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status.UPDATE_FAILED; import static com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status.UPDATE_IN_PROGRESS; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrenew/ClusterCertificateRenewTriggerCondition.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrenew/ClusterCertificateRenewTriggerCondition.java index 3acca3a02e1..12269f58208 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrenew/ClusterCertificateRenewTriggerCondition.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrenew/ClusterCertificateRenewTriggerCondition.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.cluster.certrenew; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrotate/ClusterCertificatesRotationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrotate/ClusterCertificatesRotationActions.java index e695ed97043..37fce3ed57e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrotate/ClusterCertificatesRotationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrotate/ClusterCertificatesRotationActions.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrotate/ClusterCertificatesRotationService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrotate/ClusterCertificatesRotationService.java index 39ca97357e5..e5e2300b7fc 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrotate/ClusterCertificatesRotationService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/certrotate/ClusterCertificatesRotationService.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.cluster.certrotate; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/cmsync/AbstractCmSyncAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/cmsync/AbstractCmSyncAction.java index 3b88f663888..56a3ee4afd0 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/cmsync/AbstractCmSyncAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/cmsync/AbstractCmSyncAction.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/cmsync/CmSyncActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/cmsync/CmSyncActions.java index 6cee6170592..18b0ac19678 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/cmsync/CmSyncActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/cmsync/CmSyncActions.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/cmsync/handler/CmSyncHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/cmsync/handler/CmSyncHandler.java index 69bc4abaeb7..1db1081a21d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/cmsync/handler/CmSyncHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/cmsync/handler/CmSyncHandler.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/config/update/PillarConfigUpdateActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/config/update/PillarConfigUpdateActions.java index 8ec7ce766be..1fbc931016e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/config/update/PillarConfigUpdateActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/config/update/PillarConfigUpdateActions.java @@ -4,7 +4,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/config/update/PillarConfigUpdateService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/config/update/PillarConfigUpdateService.java index 2486860251b..dd79759925d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/config/update/PillarConfigUpdateService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/config/update/PillarConfigUpdateService.java @@ -7,7 +7,7 @@ import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_PILLAR_CONFIG_UPDATE_FINISHED; import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_PILLAR_CONFIG_UPDATE_STARTED; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/config/update/handler/PillarConfigUpdateHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/config/update/handler/PillarConfigUpdateHandler.java index d2cf0bcd8f3..178aa32a472 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/config/update/handler/PillarConfigUpdateHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/config/update/handler/PillarConfigUpdateHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.cluster.config.update.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/dr/BackupRestoreStatusService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/dr/BackupRestoreStatusService.java index 21f7a7eab7e..076eec75f49 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/dr/BackupRestoreStatusService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/dr/BackupRestoreStatusService.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/dr/backup/DatabaseBackupActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/dr/backup/DatabaseBackupActions.java index 8d0eee41143..684eea612c8 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/dr/backup/DatabaseBackupActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/dr/backup/DatabaseBackupActions.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/dr/restore/DatabaseRestoreActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/dr/restore/DatabaseRestoreActions.java index 6fc2096905b..356c30807ce 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/dr/restore/DatabaseRestoreActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/dr/restore/DatabaseRestoreActions.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/metrics/datasizes/DetermineDatalakeDataSizesActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/metrics/datasizes/DetermineDatalakeDataSizesActions.java index 8c276a978f0..b8ec852112a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/metrics/datasizes/DetermineDatalakeDataSizesActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/metrics/datasizes/DetermineDatalakeDataSizesActions.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/recovery/bringup/DatalakeRecoveryBringupActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/recovery/bringup/DatalakeRecoveryBringupActions.java index 21e1d26dac1..6ca59b63600 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/recovery/bringup/DatalakeRecoveryBringupActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/recovery/bringup/DatalakeRecoveryBringupActions.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/recovery/bringup/DatalakeRecoveryBringupService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/recovery/bringup/DatalakeRecoveryBringupService.java index fce6ad40a28..3c92b91f473 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/recovery/bringup/DatalakeRecoveryBringupService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/recovery/bringup/DatalakeRecoveryBringupService.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.event.ResourceEvent.DATALAKE_RECOVERY_BRINGUP_FAILED; import static com.sequenceiq.cloudbreak.event.ResourceEvent.DATALAKE_RECOVERY_BRINGUP_FINISHED; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/scale/handler/ClusterServicesRestartWaitHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/scale/handler/ClusterServicesRestartWaitHandler.java index 60b4214bb56..f1c507b8a0d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/scale/handler/ClusterServicesRestartWaitHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/scale/handler/ClusterServicesRestartWaitHandler.java @@ -4,7 +4,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.cluster.datalake.scale.ServicesRollingRestartEvent.SERVICES_ROLLING_RESTART_FINISHED_EVENT; import static com.sequenceiq.cloudbreak.core.flow2.cluster.datalake.scale.ServicesRollingRestartEvent.SERVICES_ROLLING_RESTART_IN_PROGRESS_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/AbstractClusterUpgradeAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/AbstractClusterUpgradeAction.java index 24704ed9ff2..d8fd55bee0f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/AbstractClusterUpgradeAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/AbstractClusterUpgradeAction.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.sequenceiq.cloudbreak.cloud.model.Image; import com.sequenceiq.cloudbreak.common.event.Payload; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/ClusterUpgradeActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/ClusterUpgradeActions.java index 412a6178762..94c9990010b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/ClusterUpgradeActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/ClusterUpgradeActions.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/ClusterUpgradeService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/ClusterUpgradeService.java index cd39d1de0eb..e6e734ce544 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/ClusterUpgradeService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/ClusterUpgradeService.java @@ -13,7 +13,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/AbstractClusterUpgradePreparationAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/AbstractClusterUpgradePreparationAction.java index 5db938fc366..633bcbe78db 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/AbstractClusterUpgradePreparationAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/AbstractClusterUpgradePreparationAction.java @@ -6,7 +6,7 @@ import java.util.Collections; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/ClusterUpgradePreparationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/ClusterUpgradePreparationActions.java index 1f51888d820..94f3b00bb12 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/ClusterUpgradePreparationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/ClusterUpgradePreparationActions.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/handler/ClusterUpgradeParcelDistributionHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/handler/ClusterUpgradeParcelDistributionHandler.java index 14e1064e7eb..ebbe27454b9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/handler/ClusterUpgradeParcelDistributionHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/handler/ClusterUpgradeParcelDistributionHandler.java @@ -5,7 +5,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/handler/ClusterUpgradeParcelDownloadHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/handler/ClusterUpgradeParcelDownloadHandler.java index c84ea2e81f5..f9fd2d19817 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/handler/ClusterUpgradeParcelDownloadHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/handler/ClusterUpgradeParcelDownloadHandler.java @@ -5,7 +5,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/handler/ClusterUpgradeParcelSettingsPreparationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/handler/ClusterUpgradeParcelSettingsPreparationHandler.java index f633642fd83..a0e009e0b8f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/handler/ClusterUpgradeParcelSettingsPreparationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/preparation/handler/ClusterUpgradeParcelSettingsPreparationHandler.java @@ -5,7 +5,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/AbstractClusterUpgradeValidationAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/AbstractClusterUpgradeValidationAction.java index ee0c338485c..7ae06f3289f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/AbstractClusterUpgradeValidationAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/AbstractClusterUpgradeValidationAction.java @@ -6,7 +6,7 @@ import java.util.Collections; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/ClusterUpgradeValidationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/ClusterUpgradeValidationActions.java index ede03201488..81d0daaba2b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/ClusterUpgradeValidationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/ClusterUpgradeValidationActions.java @@ -15,7 +15,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/CloudProviderUpdateCheckHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/CloudProviderUpdateCheckHandler.java index ab1f3bf79f0..51d2e9ca0e4 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/CloudProviderUpdateCheckHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/CloudProviderUpdateCheckHandler.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.cluster.datalake.upgrade.validation.event.ClusterUpgradeValidationHandlerSelectors.VALIDATE_CLOUDPROVIDER_UPDATE; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeDiskSpaceValidationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeDiskSpaceValidationHandler.java index e9f4a191a42..56228aa6272 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeDiskSpaceValidationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeDiskSpaceValidationHandler.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.cluster.datalake.upgrade.validation.event.ClusterUpgradeValidationHandlerSelectors.VALIDATE_DISK_SPACE_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeExistingUpgradeCommandValidationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeExistingUpgradeCommandValidationHandler.java index 05c9f9bb325..fa6a01ba23f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeExistingUpgradeCommandValidationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeExistingUpgradeCommandValidationHandler.java @@ -4,7 +4,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeFreeIpaStatusValidationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeFreeIpaStatusValidationHandler.java index fc60595541c..b0c05fb2c50 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeFreeIpaStatusValidationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeFreeIpaStatusValidationHandler.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.cluster.datalake.upgrade.validation.event.ClusterUpgradeValidationHandlerSelectors.VALIDATE_FREEIPA_STATUS_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeImageValidationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeImageValidationHandler.java index 34b6edb2c9d..08928e37fac 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeImageValidationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeImageValidationHandler.java @@ -6,8 +6,8 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.Inject; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeS3guardValidationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeS3guardValidationHandler.java index 8d6e3b23bb7..681bee67fbc 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeS3guardValidationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeS3guardValidationHandler.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.cluster.datalake.upgrade.validation.event.ClusterUpgradeValidationHandlerSelectors.VALIDATE_S3GUARD_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,4 +65,4 @@ protected Selectable doAccept(HandlerEvent return new ClusterUpgradeS3guardValidationFinishedEvent(request.getResourceId(), request.getImageId()); } } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeServiceValidationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeServiceValidationHandler.java index 4b33ad6ea0d..0e17f479b4f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeServiceValidationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/datalake/upgrade/validation/handler/ClusterUpgradeServiceValidationHandler.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/DeleteVolumesActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/DeleteVolumesActions.java index a9beb240c36..c8e5b81a61d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/DeleteVolumesActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/DeleteVolumesActions.java @@ -10,7 +10,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/DeleteVolumesService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/DeleteVolumesService.java index 84dc7ced604..eb1ee2d6288 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/DeleteVolumesService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/DeleteVolumesService.java @@ -16,7 +16,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesCMConfigHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesCMConfigHandler.java index 50c059e01fc..0702a7683ea 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesCMConfigHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesCMConfigHandler.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesHandler.java index bc7706b6d5c..5d883eaca97 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesHandler.java @@ -8,7 +8,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesUnmountHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesUnmountHandler.java index 646b5deedd3..cdb6088f9d4 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesUnmountHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesUnmountHandler.java @@ -3,7 +3,7 @@ import java.util.HashSet; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesValidationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesValidationHandler.java index f4df552ccea..994b4c118de 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesValidationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/deletevolumes/handler/DeleteVolumesValidationHandler.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/disk/resize/DiskResizeActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/disk/resize/DiskResizeActions.java index c9f4cc68a26..e052a4916bb 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/disk/resize/DiskResizeActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/disk/resize/DiskResizeActions.java @@ -12,7 +12,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/disk/resize/DiskResizeHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/disk/resize/DiskResizeHandler.java index 0552a6abbb2..91a2c2331b3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/disk/resize/DiskResizeHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/disk/resize/DiskResizeHandler.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/downscale/ClusterDownscaleActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/downscale/ClusterDownscaleActions.java index 18b05429d36..d6567232c79 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/downscale/ClusterDownscaleActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/downscale/ClusterDownscaleActions.java @@ -11,7 +11,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/downscale/ClusterDownscaleFlowTriggerCondition.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/downscale/ClusterDownscaleFlowTriggerCondition.java index 642416c9653..7bd70200441 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/downscale/ClusterDownscaleFlowTriggerCondition.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/downscale/ClusterDownscaleFlowTriggerCondition.java @@ -3,7 +3,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/downscale/ClusterDownscaleService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/downscale/ClusterDownscaleService.java index c90dd6d0579..2d84a05c26c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/downscale/ClusterDownscaleService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/downscale/ClusterDownscaleService.java @@ -17,8 +17,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.annotation.Nullable; +import jakarta.inject.Inject; import org.apache.commons.collections4.MapUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/maintenance/AbstractMaintenanceModeValidationAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/maintenance/AbstractMaintenanceModeValidationAction.java index be7109e596a..27725836725 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/maintenance/AbstractMaintenanceModeValidationAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/maintenance/AbstractMaintenanceModeValidationAction.java @@ -6,7 +6,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/maintenance/MaintenanceModeValidationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/maintenance/MaintenanceModeValidationActions.java index d13c117c35c..ff586c20487 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/maintenance/MaintenanceModeValidationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/maintenance/MaintenanceModeValidationActions.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/maintenance/MaintenanceModeValidationService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/maintenance/MaintenanceModeValidationService.java index 867818c001c..4158abd3ea9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/maintenance/MaintenanceModeValidationService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/maintenance/MaintenanceModeValidationService.java @@ -13,7 +13,7 @@ import java.util.Map; import java.util.Objects; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -173,4 +173,4 @@ protected enum WarningType { IMAGE_INCOMPATIBILITY_WARNING } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/modifyproxy/ModifyProxyConfigStatusService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/modifyproxy/ModifyProxyConfigStatusService.java index 3dc6e368217..feb69868821 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/modifyproxy/ModifyProxyConfigStatusService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/modifyproxy/ModifyProxyConfigStatusService.java @@ -7,7 +7,7 @@ import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_MODIFY_PROXY_CONFIG_SALT_STATE; import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_MODIFY_PROXY_CONFIG_SUCCESS; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/modifyproxy/action/ModifyProxyConfigAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/modifyproxy/action/ModifyProxyConfigAction.java index 4c13e43f5b6..f1b5426ed47 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/modifyproxy/action/ModifyProxyConfigAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/modifyproxy/action/ModifyProxyConfigAction.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/AbstractClusterCreationAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/AbstractClusterCreationAction.java index 380494bc86a..f9f068a8e55 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/AbstractClusterCreationAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/AbstractClusterCreationAction.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/ClusterCreationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/ClusterCreationActions.java index f295d6afbbe..2bc9d1aa803 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/ClusterCreationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/ClusterCreationActions.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/ClusterCreationFlowTriggerCondition.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/ClusterCreationFlowTriggerCondition.java index bb745d279b1..f0c9e9666c7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/ClusterCreationFlowTriggerCondition.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/ClusterCreationFlowTriggerCondition.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.cluster.provision; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/service/CloudStorageValidationService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/service/CloudStorageValidationService.java index c5361b74a7c..ae59b70b8e4 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/service/CloudStorageValidationService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/service/CloudStorageValidationService.java @@ -6,7 +6,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/service/ClusterCreationService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/service/ClusterCreationService.java index 8bd3a871987..5b771cf203f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/service/ClusterCreationService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/service/ClusterCreationService.java @@ -11,7 +11,7 @@ import static com.sequenceiq.cloudbreak.event.ResourceEvent.STACK_GATEWAY_CERTIFICATE_CREATE_SKIPPED; import static com.sequenceiq.cloudbreak.event.ResourceEvent.STACK_INFRASTRUCTURE_BOOTSTRAP; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/service/ClusterProxyService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/service/ClusterProxyService.java index 7b2deead720..7d06bf738e8 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/service/ClusterProxyService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/provision/service/ClusterProxyService.java @@ -12,7 +12,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/AbstractUpgradeRdsAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/AbstractUpgradeRdsAction.java index 11b37ce85cf..ffcbf765a29 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/AbstractUpgradeRdsAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/AbstractUpgradeRdsAction.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/RdsUpgradeFlowTriggerCondition.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/RdsUpgradeFlowTriggerCondition.java index 0758178334b..0af556166e1 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/RdsUpgradeFlowTriggerCondition.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/RdsUpgradeFlowTriggerCondition.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.cluster.rds.upgrade; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/UpgradeRdsActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/UpgradeRdsActions.java index 4ba3570d5bc..e8bb3565451 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/UpgradeRdsActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/UpgradeRdsActions.java @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/UpgradeRdsService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/UpgradeRdsService.java index 2f2d99c724a..0958a87e77b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/UpgradeRdsService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/UpgradeRdsService.java @@ -6,7 +6,7 @@ import java.util.Objects; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/embedded/AbstractUpgradeEmbeddedDBPreparationAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/embedded/AbstractUpgradeEmbeddedDBPreparationAction.java index 2fbab7539df..633e67290d8 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/embedded/AbstractUpgradeEmbeddedDBPreparationAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/embedded/AbstractUpgradeEmbeddedDBPreparationAction.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/embedded/UpgradeEmbeddedDBPreparationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/embedded/UpgradeEmbeddedDBPreparationActions.java index 0bc36505133..8b9f0f1f89b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/embedded/UpgradeEmbeddedDBPreparationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/embedded/UpgradeEmbeddedDBPreparationActions.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/embedded/UpgradeEmbeddedDBPreparationService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/embedded/UpgradeEmbeddedDBPreparationService.java index 8598ab0bc2d..d63fe39335a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/embedded/UpgradeEmbeddedDBPreparationService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/embedded/UpgradeEmbeddedDBPreparationService.java @@ -6,7 +6,7 @@ import java.util.Objects; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/validation/AbstractValidateRdsUpgradeAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/validation/AbstractValidateRdsUpgradeAction.java index 0da02e1bad6..46f6d2c4056 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/validation/AbstractValidateRdsUpgradeAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/validation/AbstractValidateRdsUpgradeAction.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/validation/ValidateRdsUpgradeActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/validation/ValidateRdsUpgradeActions.java index 117986a7702..b249d0272a9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/validation/ValidateRdsUpgradeActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/validation/ValidateRdsUpgradeActions.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -116,4 +116,4 @@ protected Selectable createRequest(StackFailureContext context) { } }; } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/validation/ValidateRdsUpgradeService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/validation/ValidateRdsUpgradeService.java index 32b46a015d9..41b624ec160 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/validation/ValidateRdsUpgradeService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/rds/upgrade/validation/ValidateRdsUpgradeService.java @@ -6,7 +6,7 @@ import java.util.Objects; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/repair/master/ha/ChangePrimaryGatewayActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/repair/master/ha/ChangePrimaryGatewayActions.java index 28f4514ef94..19be42caf82 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/repair/master/ha/ChangePrimaryGatewayActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/repair/master/ha/ChangePrimaryGatewayActions.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/repair/master/ha/ChangePrimaryGatewayService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/repair/master/ha/ChangePrimaryGatewayService.java index e55fde6f8b9..ac7844dd606 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/repair/master/ha/ChangePrimaryGatewayService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/repair/master/ha/ChangePrimaryGatewayService.java @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/reset/AbstractClusterResetAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/reset/AbstractClusterResetAction.java index 79a73b44d96..cb3b0a9eb37 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/reset/AbstractClusterResetAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/reset/AbstractClusterResetAction.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/reset/ClusterResetActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/reset/ClusterResetActions.java index 74106f25d6f..a936ff2d9ea 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/reset/ClusterResetActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/reset/ClusterResetActions.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/reset/ClusterResetService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/reset/ClusterResetService.java index 4c1c2a7fb96..4e8319a2189 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/reset/ClusterResetService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/reset/ClusterResetService.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_CREATE_FAILED; import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_RESET; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/rotatepassword/RotateSaltPasswordAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/rotatepassword/RotateSaltPasswordAction.java index 424b0ae6527..57e0e210f2c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/rotatepassword/RotateSaltPasswordAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/rotatepassword/RotateSaltPasswordAction.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/rotatepassword/RotateSaltPasswordActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/rotatepassword/RotateSaltPasswordActions.java index 863af89cc5b..2a038a354fe 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/rotatepassword/RotateSaltPasswordActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/rotatepassword/RotateSaltPasswordActions.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/update/SaltUpdateActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/update/SaltUpdateActions.java index 212890fe6bf..be39a4fb529 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/update/SaltUpdateActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/update/SaltUpdateActions.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/update/SaltUpdateService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/update/SaltUpdateService.java index ac9571b40ca..493f86a9750 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/update/SaltUpdateService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/salt/update/SaltUpdateService.java @@ -12,7 +12,7 @@ import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_SALT_UPDATE_STARTED; import static com.sequenceiq.cloudbreak.event.ResourceEvent.STACK_INFRASTRUCTURE_BOOTSTRAP; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/services/restart/ClusterServicesRestartActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/services/restart/ClusterServicesRestartActions.java index 7a6c6161cb1..2c245a97c2a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/services/restart/ClusterServicesRestartActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/services/restart/ClusterServicesRestartActions.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/start/ClusterStartActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/start/ClusterStartActions.java index fb6ee52a4f9..1e22b89cc5a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/start/ClusterStartActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/start/ClusterStartActions.java @@ -4,7 +4,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/start/ClusterStartFlowTriggerCondition.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/start/ClusterStartFlowTriggerCondition.java index dc08ed18ca2..54ed7c01d36 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/start/ClusterStartFlowTriggerCondition.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/start/ClusterStartFlowTriggerCondition.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.cluster.start; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/start/ClusterStartService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/start/ClusterStartService.java index 78d7026ebbf..dc0a9ce3200 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/start/ClusterStartService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/start/ClusterStartService.java @@ -7,7 +7,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stop/ClusterStopActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stop/ClusterStopActions.java index ee8f73a26a3..a160fd6e8ba 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stop/ClusterStopActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stop/ClusterStopActions.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stop/ClusterStopService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stop/ClusterStopService.java index f231c23db3b..ee2194a8d6c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stop/ClusterStopService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stop/ClusterStopService.java @@ -6,7 +6,7 @@ import java.time.Duration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartds/StopStartDownscaleActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartds/StopStartDownscaleActions.java index b6e35424437..e16e12d48ae 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartds/StopStartDownscaleActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartds/StopStartDownscaleActions.java @@ -16,7 +16,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartds/StopStartDownscaleFlowService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartds/StopStartDownscaleFlowService.java index 28857308904..b1457bd7eb1 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartds/StopStartDownscaleFlowService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartds/StopStartDownscaleFlowService.java @@ -19,7 +19,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartus/StopStartUpscaleActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartus/StopStartUpscaleActions.java index 735b0b7adc6..bcbe58a73a0 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartus/StopStartUpscaleActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartus/StopStartUpscaleActions.java @@ -16,7 +16,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartus/StopStartUpscaleFlowService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartus/StopStartUpscaleFlowService.java index ffe373246d6..869e06a397b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartus/StopStartUpscaleFlowService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/stopstartus/StopStartUpscaleFlowService.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/sync/AbstractClusterSyncAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/sync/AbstractClusterSyncAction.java index 775c7314428..a581191e5ba 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/sync/AbstractClusterSyncAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/sync/AbstractClusterSyncAction.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/termination/ClusterTerminationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/termination/ClusterTerminationActions.java index f9b96fe0a82..18c807679be 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/termination/ClusterTerminationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/termination/ClusterTerminationActions.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/termination/ClusterTerminationFlowService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/termination/ClusterTerminationFlowService.java index 3e65926ce05..7f19f8d1405 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/termination/ClusterTerminationFlowService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/termination/ClusterTerminationFlowService.java @@ -4,7 +4,7 @@ import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_DELETE_FAILED; import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_DELETE_STARTED; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/upscale/ClusterUpscaleActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/upscale/ClusterUpscaleActions.java index 8c3f7f0e195..d00f2f36667 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/upscale/ClusterUpscaleActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/upscale/ClusterUpscaleActions.java @@ -8,7 +8,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/upscale/ClusterUpscaleFlowService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/upscale/ClusterUpscaleFlowService.java index 8edeca741d6..ac347fa3e96 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/upscale/ClusterUpscaleFlowService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/upscale/ClusterUpscaleFlowService.java @@ -25,7 +25,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/userpasswd/ClusterCredentialChangeActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/userpasswd/ClusterCredentialChangeActions.java index 9bb2ae3886a..bf4d7841afe 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/userpasswd/ClusterCredentialChangeActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/userpasswd/ClusterCredentialChangeActions.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/userpasswd/ClusterCredentialChangeService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/userpasswd/ClusterCredentialChangeService.java index 34147a2cf10..44e7d15bffc 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/userpasswd/ClusterCredentialChangeService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/userpasswd/ClusterCredentialChangeService.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_CHANGED_CREDENTIAL; import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_CHANGING_CREDENTIAL; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/CoreVerticalScaleActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/CoreVerticalScaleActions.java index 30e01a0fc9a..5b7853876a3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/CoreVerticalScaleActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/CoreVerticalScaleActions.java @@ -12,7 +12,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/CoreVerticalScaleService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/CoreVerticalScaleService.java index b0f32a98431..83b3240f95f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/CoreVerticalScaleService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/CoreVerticalScaleService.java @@ -8,7 +8,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/DistroXDiskUpdateActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/DistroXDiskUpdateActions.java index 8c1af806c1d..fb7a8d90af7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/DistroXDiskUpdateActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/DistroXDiskUpdateActions.java @@ -14,7 +14,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/handler/DistroXDiskUpdateHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/handler/DistroXDiskUpdateHandler.java index 0022a37f9af..7a4ac9cb7c7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/handler/DistroXDiskUpdateHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/handler/DistroXDiskUpdateHandler.java @@ -6,7 +6,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/handler/DistroXDiskUpdateResizeHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/handler/DistroXDiskUpdateResizeHandler.java index 88d33cfe863..9dc62729104 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/handler/DistroXDiskUpdateResizeHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/handler/DistroXDiskUpdateResizeHandler.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status.DATAHUB_DISK_UPDATE_RESIZE_FAILED; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/handler/DistroXDiskUpdateValidationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/handler/DistroXDiskUpdateValidationHandler.java index 01f4dda93d2..ccfc1e798fd 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/handler/DistroXDiskUpdateValidationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cluster/verticalscale/diskupdate/handler/DistroXDiskUpdateValidationHandler.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/CmDiagnosticsCollectionActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/CmDiagnosticsCollectionActions.java index f3f2d823972..80c756c69d4 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/CmDiagnosticsCollectionActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/CmDiagnosticsCollectionActions.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/CmDiagnosticsFlowService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/CmDiagnosticsFlowService.java index 64f2cb0065d..df58a838950 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/CmDiagnosticsFlowService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/CmDiagnosticsFlowService.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsCleanupHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsCleanupHandler.java index 26968f47e62..8995a130c78 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsCleanupHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsCleanupHandler.java @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsCollectionHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsCollectionHandler.java index b2d985eb677..32c0a6a5805 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsCollectionHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsCollectionHandler.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsInitHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsInitHandler.java index b5f17c7053d..790359d5e35 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsInitHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsInitHandler.java @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsUploadHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsUploadHandler.java index 31e4b3c4bd2..645886d328c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsUploadHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/cmdiagnostics/handler/CmDiagnosticsUploadHandler.java @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/DiagnosticsCollectionActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/DiagnosticsCollectionActions.java index 03b445eb651..3f12744f284 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/DiagnosticsCollectionActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/DiagnosticsCollectionActions.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/DiagnosticsFlowService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/DiagnosticsFlowService.java index dfb2de31103..237ca91c4ca 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/DiagnosticsFlowService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/DiagnosticsFlowService.java @@ -14,7 +14,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsCleanupHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsCleanupHandler.java index adae5abd531..800bdc27110 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsCleanupHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsCleanupHandler.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsCollectionHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsCollectionHandler.java index f1154b852cb..a134b73d7af 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsCollectionHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsCollectionHandler.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsEnsureMachineUserHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsEnsureMachineUserHandler.java index 25e76c0fff5..84f6e8b0558 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsEnsureMachineUserHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsEnsureMachineUserHandler.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsInitHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsInitHandler.java index 3a78d0f2efd..bd8f2029fb8 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsInitHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsInitHandler.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsPreFlightCheckHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsPreFlightCheckHandler.java index 98123cbd118..232ebc5395b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsPreFlightCheckHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsPreFlightCheckHandler.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.diagnostics.event.DiagnosticsCollectionHandlerSelectors.PREFLIGHT_CHECK_DIAGNOSTICS_EVENT; import static com.sequenceiq.cloudbreak.core.flow2.diagnostics.event.DiagnosticsCollectionStateSelectors.START_DIAGNOSTICS_INIT_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsSaltPillarUpdateHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsSaltPillarUpdateHandler.java index 908bc92de2c..95789bfee78 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsSaltPillarUpdateHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsSaltPillarUpdateHandler.java @@ -5,7 +5,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsSaltStateUpdateHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsSaltStateUpdateHandler.java index cad44dae307..bc7f44bd139 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsSaltStateUpdateHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsSaltStateUpdateHandler.java @@ -5,7 +5,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsSaltValidationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsSaltValidationHandler.java index ebd79263787..ce272b388f6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsSaltValidationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsSaltValidationHandler.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.diagnostics.event.DiagnosticsCollectionHandlerSelectors.SALT_VALIDATION_DIAGNOSTICS_EVENT; import static com.sequenceiq.cloudbreak.core.flow2.diagnostics.event.DiagnosticsCollectionStateSelectors.START_DIAGNOSTICS_SALT_PILLAR_UPDATE_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsUpgradeTelemetryHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsUpgradeTelemetryHandler.java index 63bb40ee6f4..de620ac2aff 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsUpgradeTelemetryHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsUpgradeTelemetryHandler.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.diagnostics.event.DiagnosticsCollectionHandlerSelectors.UPGRADE_DIAGNOSTICS_EVENT; import static com.sequenceiq.cloudbreak.core.flow2.diagnostics.event.DiagnosticsCollectionStateSelectors.START_DIAGNOSTICS_VM_PREFLIGHT_CHECK_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsUploadHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsUploadHandler.java index ce9a40ec734..846d2e7de7a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsUploadHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsUploadHandler.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsVmPreFlightCheckHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsVmPreFlightCheckHandler.java index 0e5ef6ee805..1780c619f7c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsVmPreFlightCheckHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/diagnostics/handler/DiagnosticsVmPreFlightCheckHandler.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/DatabaseCriteriaResolver.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/DatabaseCriteriaResolver.java index 46c8e3869f7..89659304353 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/DatabaseCriteriaResolver.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/DatabaseCriteriaResolver.java @@ -2,7 +2,7 @@ import static com.google.common.base.Preconditions.checkArgument; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/DatabaseObtainerService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/DatabaseObtainerService.java index 4f62f25b153..5dca0ab1b00 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/DatabaseObtainerService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/DatabaseObtainerService.java @@ -4,7 +4,7 @@ import java.util.Optional; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/ExternalDatabaseService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/ExternalDatabaseService.java index 41fd0d6381b..52bb2a82a6d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/ExternalDatabaseService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/ExternalDatabaseService.java @@ -7,9 +7,9 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotFoundException; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/StackUpdaterService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/StackUpdaterService.java index e3b507dfdad..469378c1943 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/StackUpdaterService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/StackUpdaterService.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.externaldatabase; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/provision/ExternalDatabaseCreationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/provision/ExternalDatabaseCreationActions.java index 9f43ce46085..8f96e429895 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/provision/ExternalDatabaseCreationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/provision/ExternalDatabaseCreationActions.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/provision/action/AbstractExternalDatabaseCreationAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/provision/action/AbstractExternalDatabaseCreationAction.java index 97c8eae3b6e..313e1b2a233 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/provision/action/AbstractExternalDatabaseCreationAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/provision/action/AbstractExternalDatabaseCreationAction.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/provision/handler/CreateExternalDatabaseHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/provision/handler/CreateExternalDatabaseHandler.java index 2cf644784a1..d3e221c2c47 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/provision/handler/CreateExternalDatabaseHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/provision/handler/CreateExternalDatabaseHandler.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.externaldatabase.provision.config.ExternalDatabaseCreationEvent.EXTERNAL_DATABASE_CREATION_FAILED_EVENT; import static com.sequenceiq.cloudbreak.core.flow2.externaldatabase.provision.config.ExternalDatabaseCreationEvent.EXTERNAL_DATABASE_WAIT_SUCCESS_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/start/ExternalDatabaseStartActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/start/ExternalDatabaseStartActions.java index 845c77f7e07..afb22a907a7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/start/ExternalDatabaseStartActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/start/ExternalDatabaseStartActions.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/start/action/AbstractExternalDatabaseStartAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/start/action/AbstractExternalDatabaseStartAction.java index e3dc6672038..8e4afb5bf14 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/start/action/AbstractExternalDatabaseStartAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/start/action/AbstractExternalDatabaseStartAction.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/start/handler/StartExternalDatabaseHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/start/handler/StartExternalDatabaseHandler.java index 5a34e06160f..813ba4b8f50 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/start/handler/StartExternalDatabaseHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/start/handler/StartExternalDatabaseHandler.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/stop/ExternalDatabaseStopActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/stop/ExternalDatabaseStopActions.java index 4d9b89c04a5..cf8c82e445c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/stop/ExternalDatabaseStopActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/stop/ExternalDatabaseStopActions.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/stop/action/AbstractExternalDatabaseStopAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/stop/action/AbstractExternalDatabaseStopAction.java index 7e40dc144c2..21379ccf544 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/stop/action/AbstractExternalDatabaseStopAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/stop/action/AbstractExternalDatabaseStopAction.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/stop/handler/StopExternalDatabaseHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/stop/handler/StopExternalDatabaseHandler.java index a16b8b39854..c1395f2dd5b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/stop/handler/StopExternalDatabaseHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/stop/handler/StopExternalDatabaseHandler.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/terminate/ExternalDatabaseTerminationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/terminate/ExternalDatabaseTerminationActions.java index 9a54a9fc6ff..cdff0abc6d2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/terminate/ExternalDatabaseTerminationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/terminate/ExternalDatabaseTerminationActions.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/terminate/action/AbstractExternalDatabaseTerminationAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/terminate/action/AbstractExternalDatabaseTerminationAction.java index 44df50e8fd6..7cf1e1e96fe 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/terminate/action/AbstractExternalDatabaseTerminationAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/terminate/action/AbstractExternalDatabaseTerminationAction.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/terminate/handler/TerminateExternalDatabaseHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/terminate/handler/TerminateExternalDatabaseHandler.java index 17659b4fd83..b4b849e13a5 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/terminate/handler/TerminateExternalDatabaseHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/externaldatabase/terminate/handler/TerminateExternalDatabaseHandler.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.externaldatabase.terminate.config.ExternalDatabaseTerminationEvent.EXTERNAL_DATABASE_TERMINATION_FAILED_EVENT; import static com.sequenceiq.cloudbreak.core.flow2.externaldatabase.terminate.config.ExternalDatabaseTerminationEvent.EXTERNAL_DATABASE_WAIT_TERMINATION_SUCCESS_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/restart/DisableOnGCPRestartAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/restart/DisableOnGCPRestartAction.java index 3f4043f958a..0d33cb07b3b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/restart/DisableOnGCPRestartAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/restart/DisableOnGCPRestartAction.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.common.type.CloudConstants.GCP; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/restart/FillInMemoryStateStoreRestartAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/restart/FillInMemoryStateStoreRestartAction.java index d16212931cc..d9749a20e2e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/restart/FillInMemoryStateStoreRestartAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/restart/FillInMemoryStateStoreRestartAction.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.restart; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/restart/InitializeMDCContextRestartAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/restart/InitializeMDCContextRestartAction.java index 74164b94a96..620cbc27947 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/restart/InitializeMDCContextRestartAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/restart/InitializeMDCContextRestartAction.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.restart; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/service/ReactorFlowManager.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/service/ReactorFlowManager.java index e22b7f685e7..c104178243a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/service/ReactorFlowManager.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/service/ReactorFlowManager.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/service/ReactorNotifier.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/service/ReactorNotifier.java index f5342ea93da..dcf44737881 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/service/ReactorNotifier.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/service/ReactorNotifier.java @@ -7,7 +7,7 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/service/TerminationTriggerService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/service/TerminationTriggerService.java index 8c8cc1eb05d..e459acfc5e2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/service/TerminationTriggerService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/service/TerminationTriggerService.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/AbstractStackFailureAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/AbstractStackFailureAction.java index 59445a8483f..5e83d554dd6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/AbstractStackFailureAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/AbstractStackFailureAction.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/CloudbreakFlowMessageService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/CloudbreakFlowMessageService.java index f7c04ca11d5..e234e33670d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/CloudbreakFlowMessageService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/CloudbreakFlowMessageService.java @@ -2,7 +2,7 @@ import java.util.Arrays; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/clusterproxy/reregister/ClusterProxyReRegistrationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/clusterproxy/reregister/ClusterProxyReRegistrationActions.java index a3bfccd382b..7eb10980339 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/clusterproxy/reregister/ClusterProxyReRegistrationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/clusterproxy/reregister/ClusterProxyReRegistrationActions.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/detach/StackUpdateService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/detach/StackUpdateService.java index 9727a069722..0396c2fc5f3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/detach/StackUpdateService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/detach/StackUpdateService.java @@ -4,7 +4,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/downscale/AbstractStackDownscaleAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/downscale/AbstractStackDownscaleAction.java index 9756223fbed..be2b8650c97 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/downscale/AbstractStackDownscaleAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/downscale/AbstractStackDownscaleAction.java @@ -14,7 +14,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.MapUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/downscale/StackDownscaleActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/downscale/StackDownscaleActions.java index eb8c6cdfc8d..7e1971a998a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/downscale/StackDownscaleActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/downscale/StackDownscaleActions.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/downscale/StackDownscaleService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/downscale/StackDownscaleService.java index 59ba76671fd..7f6c942c928 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/downscale/StackDownscaleService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/downscale/StackDownscaleService.java @@ -16,7 +16,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/AbstractStackImageUpdateAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/AbstractStackImageUpdateAction.java index d4106045665..9a7df24a18f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/AbstractStackImageUpdateAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/AbstractStackImageUpdateAction.java @@ -6,7 +6,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/PackageVersionChecker.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/PackageVersionChecker.java index d70ef370acc..f5431e42358 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/PackageVersionChecker.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/PackageVersionChecker.java @@ -12,7 +12,7 @@ import java.util.NoSuchElementException; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/StackImageUpdateActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/StackImageUpdateActions.java index 0964ab427fa..142771f9486 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/StackImageUpdateActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/StackImageUpdateActions.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/StackImageUpdateFlowTriggerCondition.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/StackImageUpdateFlowTriggerCondition.java index bc99b3dd9d8..9e7f98c0623 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/StackImageUpdateFlowTriggerCondition.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/StackImageUpdateFlowTriggerCondition.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.stack.image.update; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/StackImageUpdateService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/StackImageUpdateService.java index 154feb82620..358b2c89d31 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/StackImageUpdateService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/image/update/StackImageUpdateService.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/AbstractInstanceTerminationAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/AbstractInstanceTerminationAction.java index 11753f408e4..0ae101a317b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/AbstractInstanceTerminationAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/AbstractInstanceTerminationAction.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationAction.java index 40b3328bf02..ae809921c9d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationAction.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationFailureAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationFailureAction.java index 73ae806b9e0..2fb1fafa49c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationFailureAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationFailureAction.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationFinishedAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationFinishedAction.java index 339b3baeb33..5ea95535dac 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationFinishedAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationFinishedAction.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationFlowTriggerCondition.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationFlowTriggerCondition.java index b0f42c7eb26..9279947c2f3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationFlowTriggerCondition.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationFlowTriggerCondition.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.stack.instance.termination; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationService.java index 74541284e94..80091c6bc97 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/instance/termination/InstanceTerminationService.java @@ -12,7 +12,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/AbstractAwsVariantMigrationAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/AbstractAwsVariantMigrationAction.java index ed0d220f1f9..b77995b30d1 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/AbstractAwsVariantMigrationAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/AbstractAwsVariantMigrationAction.java @@ -6,7 +6,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/AwsVariantMigrationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/AwsVariantMigrationActions.java index 976d176b818..b4c9c010f12 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/AwsVariantMigrationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/AwsVariantMigrationActions.java @@ -8,7 +8,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.context.annotation.Bean; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/AwsMigrationUtil.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/AwsMigrationUtil.java index 8abe3f75519..6182463a3d0 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/AwsMigrationUtil.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/AwsMigrationUtil.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/CreateResourcesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/CreateResourcesHandler.java index d1ba5d5b026..9915dae1cde 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/CreateResourcesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/CreateResourcesHandler.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/DeleteCloudFormationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/DeleteCloudFormationHandler.java index 6bd11698f45..d7f53035857 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/DeleteCloudFormationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/DeleteCloudFormationHandler.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/service/LoadBalancerRecreatorService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/service/LoadBalancerRecreatorService.java index 5f9a48a3699..35d301aae36 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/service/LoadBalancerRecreatorService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/service/LoadBalancerRecreatorService.java @@ -2,7 +2,7 @@ import static org.slf4j.LoggerFactory.getLogger; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/service/SecurityGroupRecreatorService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/service/SecurityGroupRecreatorService.java index 3155c2d28fd..9a2bb2d6f58 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/service/SecurityGroupRecreatorService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/migration/handler/service/SecurityGroupRecreatorService.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/action/AbstractStackCreationAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/action/AbstractStackCreationAction.java index 622d168a364..ba3860f9c85 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/action/AbstractStackCreationAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/action/AbstractStackCreationAction.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/action/CheckImageAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/action/CheckImageAction.java index 276505ea90b..255120081b6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/action/CheckImageAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/action/CheckImageAction.java @@ -5,7 +5,7 @@ import java.util.Timer; import java.util.TimerTask; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/action/StackCreationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/action/StackCreationActions.java index cbb0c587328..4af5712c421 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/action/StackCreationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/action/StackCreationActions.java @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/service/StackCreationService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/service/StackCreationService.java index 422ef72aba4..d16078495c5 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/service/StackCreationService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/provision/service/StackCreationService.java @@ -24,7 +24,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.time.DateUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/repair/ManualStackRepairTriggerActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/repair/ManualStackRepairTriggerActions.java index ca593318452..9092cc0c167 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/repair/ManualStackRepairTriggerActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/repair/ManualStackRepairTriggerActions.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/start/StackStartActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/start/StackStartActions.java index 461c127057b..085da930152 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/start/StackStartActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/start/StackStartActions.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/start/StackStartStopService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/start/StackStartStopService.java index f9c3e74ff7c..a96066b4c66 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/start/StackStartStopService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/start/StackStartStopService.java @@ -17,7 +17,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/stop/StackStopActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/stop/StackStopActions.java index 6caf7142f48..de17a5fbd4a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/stop/StackStopActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/stop/StackStopActions.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/stop/StackStopFlowTriggerCondition.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/stop/StackStopFlowTriggerCondition.java index c5cd7a22c39..e6035903537 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/stop/StackStopFlowTriggerCondition.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/stop/StackStopFlowTriggerCondition.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.stack.stop; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/stop/StackStopRestartAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/stop/StackStopRestartAction.java index 6de186abe0b..743092578ea 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/stop/StackStopRestartAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/stop/StackStopRestartAction.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.core.flow2.stack.stop; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/sync/StackSyncActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/sync/StackSyncActions.java index 35f89312e33..aac41465e02 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/sync/StackSyncActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/sync/StackSyncActions.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/AbstractStackTerminationAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/AbstractStackTerminationAction.java index b6c9abf03ba..472e0d483d3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/AbstractStackTerminationAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/AbstractStackTerminationAction.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/AttachedVolumeConsumptionCollectionUnschedulingAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/AttachedVolumeConsumptionCollectionUnschedulingAction.java index aaa66d95d50..089fc7c84d0 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/AttachedVolumeConsumptionCollectionUnschedulingAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/AttachedVolumeConsumptionCollectionUnschedulingAction.java @@ -4,7 +4,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/ClusterProxyDeregisterAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/ClusterProxyDeregisterAction.java index 44473a6f528..b4917a4c8ed 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/ClusterProxyDeregisterAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/ClusterProxyDeregisterAction.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackPreTerminationAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackPreTerminationAction.java index 8d6e2eb51dc..76a773d2fb2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackPreTerminationAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackPreTerminationAction.java @@ -7,7 +7,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackTerminationFailureAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackTerminationFailureAction.java index 7eac15f2321..aa8eaf4eb69 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackTerminationFailureAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackTerminationFailureAction.java @@ -4,7 +4,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackTerminationFinishedAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackTerminationFinishedAction.java index b93096e5a5a..974d345ad22 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackTerminationFinishedAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackTerminationFinishedAction.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackTerminationService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackTerminationService.java index 138a5ebc572..b4cf4d733b9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackTerminationService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/termination/StackTerminationService.java @@ -5,7 +5,7 @@ import static com.sequenceiq.cloudbreak.event.ResourceEvent.STACK_FORCED_DELETE_COMPLETED; import static com.sequenceiq.cloudbreak.event.ResourceEvent.STACK_INFRASTRUCTURE_DELETE_FAILED; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/loadbalancer/StackLoadBalancerUpdateActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/loadbalancer/StackLoadBalancerUpdateActions.java index b35fe64da0f..6dde6b5b8e2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/loadbalancer/StackLoadBalancerUpdateActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/loadbalancer/StackLoadBalancerUpdateActions.java @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/loadbalancer/StackLoadBalancerUpdateService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/loadbalancer/StackLoadBalancerUpdateService.java index 04700f65bd6..166fa723890 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/loadbalancer/StackLoadBalancerUpdateService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/loadbalancer/StackLoadBalancerUpdateService.java @@ -13,7 +13,7 @@ import static com.sequenceiq.cloudbreak.event.ResourceEvent.STACK_LB_UPDATE_FAILED; import static com.sequenceiq.cloudbreak.event.ResourceEvent.STACK_LB_UPDATE_FINISHED; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/loadbalancer/StackLoadBalancerUpdateTriggerCondition.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/loadbalancer/StackLoadBalancerUpdateTriggerCondition.java index a37379725ee..36c52764e83 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/loadbalancer/StackLoadBalancerUpdateTriggerCondition.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/loadbalancer/StackLoadBalancerUpdateTriggerCondition.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/userdata/AbstractUserDataUpdateAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/userdata/AbstractUserDataUpdateAction.java index 8049fe71c4b..02bcc76d03d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/userdata/AbstractUserDataUpdateAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/userdata/AbstractUserDataUpdateAction.java @@ -7,7 +7,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/userdata/UserDataUpdateActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/userdata/UserDataUpdateActions.java index 3615769a04d..bcbda0bf455 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/userdata/UserDataUpdateActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/update/userdata/UserDataUpdateActions.java @@ -7,7 +7,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/upscale/AbstractStackUpscaleAction.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/upscale/AbstractStackUpscaleAction.java index 7ae075ec5cf..34f53b4b348 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/upscale/AbstractStackUpscaleAction.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/upscale/AbstractStackUpscaleAction.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.springframework.statemachine.StateContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/upscale/StackUpscaleActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/upscale/StackUpscaleActions.java index fe379e21136..61ad0782385 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/upscale/StackUpscaleActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/upscale/StackUpscaleActions.java @@ -12,7 +12,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/upscale/StackUpscaleService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/upscale/StackUpscaleService.java index 26929da6367..536b7340e4c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/upscale/StackUpscaleService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/stack/upscale/StackUpscaleService.java @@ -20,7 +20,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/cloud/CloudConfigValidationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/cloud/CloudConfigValidationActions.java index fc6d0743a6c..96e4d612ac3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/cloud/CloudConfigValidationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/cloud/CloudConfigValidationActions.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/cloud/handler/ValidateCloudConfigHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/cloud/handler/ValidateCloudConfigHandler.java index 872ffe6bfe6..7aa0d8d0bd9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/cloud/handler/ValidateCloudConfigHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/cloud/handler/ValidateCloudConfigHandler.java @@ -6,7 +6,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/KerberosConfigValidationActions.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/KerberosConfigValidationActions.java index 202bd8e72d2..a0532a3e211 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/KerberosConfigValidationActions.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/KerberosConfigValidationActions.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/CheckFreeIpaExistsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/CheckFreeIpaExistsHandler.java index 85c661b1480..68e67d87a5c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/CheckFreeIpaExistsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/CheckFreeIpaExistsHandler.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.core.flow2.validate.kerberosconfig.handler; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/PollBindUserCreationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/PollBindUserCreationHandler.java index f05f2a21703..16b3e8b2219 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/PollBindUserCreationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/PollBindUserCreationHandler.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.validate.kerberosconfig.config.KerberosConfigValidationEvent.VALIDATE_KERBEROS_CONFIG_EXISTS_EVENT; import static com.sequenceiq.cloudbreak.core.flow2.validate.kerberosconfig.config.KerberosConfigValidationEvent.VALIDATE_KERBEROS_CONFIG_FAILED_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/StartBindUserCreationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/StartBindUserCreationHandler.java index 05da87c641c..6ee75a21ea0 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/StartBindUserCreationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/StartBindUserCreationHandler.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.validate.kerberosconfig.config.KerberosConfigValidationEvent.VALIDATE_KERBEROS_CONFIG_FAILED_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/StartBindUserCreationService.java b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/StartBindUserCreationService.java index b6feadd0606..62b24d17ea3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/StartBindUserCreationService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/core/flow2/validate/kerberosconfig/handler/StartBindUserCreationService.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.validate.kerberosconfig.config.KerberosConfigValidationEvent.BIND_USER_CREATION_STARTED_EVENT; import static com.sequenceiq.cloudbreak.core.flow2.validate.kerberosconfig.config.KerberosConfigValidationEvent.VALIDATE_KERBEROS_CONFIG_FAILED_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/facade/DefaultCloudbreakEventsFacade.java b/core/src/main/java/com/sequenceiq/cloudbreak/facade/DefaultCloudbreakEventsFacade.java index ba624275d89..db08b82d5f5 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/facade/DefaultCloudbreakEventsFacade.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/facade/DefaultCloudbreakEventsFacade.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/filter/CloudbreakUserConfiguratorFilter.java b/core/src/main/java/com/sequenceiq/cloudbreak/filter/CloudbreakUserConfiguratorFilter.java index f7d45ee07c9..6c82a84be7c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/filter/CloudbreakUserConfiguratorFilter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/filter/CloudbreakUserConfiguratorFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/filter/FilterConfiguration.java b/core/src/main/java/com/sequenceiq/cloudbreak/filter/FilterConfiguration.java index 6f4159c61fe..6c804ac4bbf 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/filter/FilterConfiguration.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/filter/FilterConfiguration.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.filter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/filter/WorkspaceConfiguratorFilter.java b/core/src/main/java/com/sequenceiq/cloudbreak/filter/WorkspaceConfiguratorFilter.java index bc33626b575..6b076621995 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/filter/WorkspaceConfiguratorFilter.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/filter/WorkspaceConfiguratorFilter.java @@ -9,10 +9,10 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/filter/WorkspaceIdModifiedRequest.java b/core/src/main/java/com/sequenceiq/cloudbreak/filter/WorkspaceIdModifiedRequest.java index 03851899ea7..59fe2a84950 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/filter/WorkspaceIdModifiedRequest.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/filter/WorkspaceIdModifiedRequest.java @@ -3,8 +3,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; public class WorkspaceIdModifiedRequest extends HttpServletRequestWrapper { diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/init/blueprint/BlueprintLoaderService.java b/core/src/main/java/com/sequenceiq/cloudbreak/init/blueprint/BlueprintLoaderService.java index fcad79450d6..1d4df85d5ac 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/init/blueprint/BlueprintLoaderService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/init/blueprint/BlueprintLoaderService.java @@ -16,7 +16,7 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/init/blueprint/DefaultBlueprintCache.java b/core/src/main/java/com/sequenceiq/cloudbreak/init/blueprint/DefaultBlueprintCache.java index 0294b419fbd..8d62846a348 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/init/blueprint/DefaultBlueprintCache.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/init/blueprint/DefaultBlueprintCache.java @@ -8,8 +8,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/init/clustertemplate/ClusterTemplateLoaderService.java b/core/src/main/java/com/sequenceiq/cloudbreak/init/clustertemplate/ClusterTemplateLoaderService.java index 811e30e2046..9e5ffd50908 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/init/clustertemplate/ClusterTemplateLoaderService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/init/clustertemplate/ClusterTemplateLoaderService.java @@ -12,7 +12,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/init/clustertemplate/DefaultClusterTemplateCache.java b/core/src/main/java/com/sequenceiq/cloudbreak/init/clustertemplate/DefaultClusterTemplateCache.java index 214f8b6551d..a79d85d6118 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/init/clustertemplate/DefaultClusterTemplateCache.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/init/clustertemplate/DefaultClusterTemplateCache.java @@ -14,8 +14,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/AbstractStackJobInitializer.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/AbstractStackJobInitializer.java index aeafcbe34c8..3a058210f12 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/AbstractStackJobInitializer.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/AbstractStackJobInitializer.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status; import com.sequenceiq.cloudbreak.quartz.model.JobInitializer; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/StackJobInitializer.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/StackJobInitializer.java index 1df135bd7ce..620bb1c12fa 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/StackJobInitializer.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/StackJobInitializer.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.job; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/StackStatusCheckerJob.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/StackStatusCheckerJob.java index 832677cd34c..d443aca8eb2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/StackStatusCheckerJob.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/StackStatusCheckerJob.java @@ -20,7 +20,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/altus/CloudbreakUMSCleanupJobInitializer.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/altus/CloudbreakUMSCleanupJobInitializer.java index e54fe671135..c330ff167b9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/altus/CloudbreakUMSCleanupJobInitializer.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/altus/CloudbreakUMSCleanupJobInitializer.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.job.altus; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataConfig.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataConfig.java index 5c4dd054756..2fda9bd1552 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataConfig.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataConfig.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.job.instancemetadata; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataJob.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataJob.java index 262d7b3c695..87ed2480431 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataJob.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataJob.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataJobInitializer.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataJobInitializer.java index 8889f4b97cb..272a2439bb5 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataJobInitializer.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataJobInitializer.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.job.instancemetadata; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataJobService.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataJobService.java index ef7145b546b..4963864cddc 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataJobService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/instancemetadata/ArchiveInstanceMetaDataJobService.java @@ -5,7 +5,7 @@ import java.util.Date; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.JobBuilder; import org.quartz.JobDetail; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/MeteringSchedulerFactoryConfig.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/MeteringSchedulerFactoryConfig.java index eab17a83f27..1935fe6ceea 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/MeteringSchedulerFactoryConfig.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/MeteringSchedulerFactoryConfig.java @@ -4,9 +4,10 @@ import java.util.concurrent.ExecutorService; -import javax.inject.Inject; import javax.sql.DataSource; +import jakarta.inject.Inject; + import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.quartz.QuartzProperties; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/MeteringTransactionalScheduler.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/MeteringTransactionalScheduler.java index aa4920ac6dc..a56979b2ba8 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/MeteringTransactionalScheduler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/MeteringTransactionalScheduler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.job.metering; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.Scheduler; import org.springframework.beans.factory.annotation.Qualifier; @@ -19,4 +19,4 @@ public class MeteringTransactionalScheduler extends TransactionalScheduler { protected Scheduler getScheduler() { return scheduler; } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/instancechecker/MeteringInstanceCheckerJob.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/instancechecker/MeteringInstanceCheckerJob.java index 6fafb5620f3..255fc9d803a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/instancechecker/MeteringInstanceCheckerJob.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/instancechecker/MeteringInstanceCheckerJob.java @@ -6,7 +6,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/instancechecker/MeteringInstanceCheckerJobInitializer.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/instancechecker/MeteringInstanceCheckerJobInitializer.java index 2edee827df9..31699937a7e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/instancechecker/MeteringInstanceCheckerJobInitializer.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/instancechecker/MeteringInstanceCheckerJobInitializer.java @@ -9,7 +9,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/instancechecker/MeteringInstanceCheckerJobService.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/instancechecker/MeteringInstanceCheckerJobService.java index eb31523871e..3b74bee0c54 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/instancechecker/MeteringInstanceCheckerJobService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/instancechecker/MeteringInstanceCheckerJobService.java @@ -6,7 +6,7 @@ import java.time.ZonedDateTime; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.JobBuilder; import org.quartz.JobDetail; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/sync/MeteringSyncJob.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/sync/MeteringSyncJob.java index 86d2d8128b7..aeb4a23ac7a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/sync/MeteringSyncJob.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/sync/MeteringSyncJob.java @@ -6,7 +6,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/sync/MeteringSyncJobInitializer.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/sync/MeteringSyncJobInitializer.java index 847fe6e9aa4..fdedb13fbc3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/sync/MeteringSyncJobInitializer.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/sync/MeteringSyncJobInitializer.java @@ -9,7 +9,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/sync/MeteringSyncJobService.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/sync/MeteringSyncJobService.java index 33d09fb88dd..affb6e930bb 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/sync/MeteringSyncJobService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/metering/sync/MeteringSyncJobService.java @@ -6,7 +6,7 @@ import java.time.ZonedDateTime; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.JobBuilder; import org.quartz.JobDetail; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/salt/StackSaltStatusCheckerJob.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/salt/StackSaltStatusCheckerJob.java index bc80b4b1376..86a3d706793 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/salt/StackSaltStatusCheckerJob.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/salt/StackSaltStatusCheckerJob.java @@ -5,7 +5,7 @@ import java.util.EnumSet; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/salt/StackSaltStatusCheckerJobInitializer.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/salt/StackSaltStatusCheckerJobInitializer.java index 6c5449acb08..0b429b5b2d9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/salt/StackSaltStatusCheckerJobInitializer.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/salt/StackSaltStatusCheckerJobInitializer.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.job.salt; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/salt/StackSaltStatusCheckerJobService.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/salt/StackSaltStatusCheckerJobService.java index d44b1d07e04..799d7226330 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/salt/StackSaltStatusCheckerJobService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/salt/StackSaltStatusCheckerJobService.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.job.salt; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherJob.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherJob.java index 454bec4c6ef..1287faf9e32 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherJob.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherJob.java @@ -4,7 +4,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherJobInitializer.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherJobInitializer.java index 20c6955e793..858840d6a49 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherJobInitializer.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherJobInitializer.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherJobService.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherJobService.java index d62b24719e6..e940ac24071 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherJobService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherJobService.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.job.stackpatcher; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.JobBuilder; import org.quartz.JobDetail; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherServiceProvider.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherServiceProvider.java index 93026b3dda8..e0afff8c21b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherServiceProvider.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/ExistingStackPatcherServiceProvider.java @@ -2,7 +2,7 @@ import java.util.Collection; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/config/ExistingStackPatcherConfig.java b/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/config/ExistingStackPatcherConfig.java index bddc0098427..e51611f1571 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/config/ExistingStackPatcherConfig.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/job/stackpatcher/config/ExistingStackPatcherConfig.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/kerberos/KerberosConfigService.java b/core/src/main/java/com/sequenceiq/cloudbreak/kerberos/KerberosConfigService.java index a59bf15c05a..c2f423e83ad 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/kerberos/KerberosConfigService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/kerberos/KerberosConfigService.java @@ -2,9 +2,9 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.WebApplicationException; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.WebApplicationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/ldap/LdapConfigService.java b/core/src/main/java/com/sequenceiq/cloudbreak/ldap/LdapConfigService.java index eba2c6fa59b..7a3f5d14c6a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/ldap/LdapConfigService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/ldap/LdapConfigService.java @@ -3,9 +3,9 @@ import java.util.Locale; import java.util.Optional; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.WebApplicationException; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.WebApplicationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/logger/ControllerLogContextAspects.java b/core/src/main/java/com/sequenceiq/cloudbreak/logger/ControllerLogContextAspects.java index 8b260959976..7b1764bfebb 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/logger/ControllerLogContextAspects.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/logger/ControllerLogContextAspects.java @@ -2,7 +2,7 @@ import java.util.Arrays; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/node/status/CdpDoctorService.java b/core/src/main/java/com/sequenceiq/cloudbreak/node/status/CdpDoctorService.java index f0fcfc0bee2..fba48a56d9c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/node/status/CdpDoctorService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/node/status/CdpDoctorService.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/BootstrapNewNodesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/BootstrapNewNodesHandler.java index d3c473f55ba..37a2040a8ae 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/BootstrapNewNodesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/BootstrapNewNodesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/ClusterCredentialChangeHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/ClusterCredentialChangeHandler.java index 23ab9a08b24..2d4addf90c7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/ClusterCredentialChangeHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/ClusterCredentialChangeHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/ClusterResetHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/ClusterResetHandler.java index d31558f8b40..34f6439e14e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/ClusterResetHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/ClusterResetHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/ClusterSyncHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/ClusterSyncHandler.java index 0e98386aadf..561db67e3e7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/ClusterSyncHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/ClusterSyncHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/CollectDownscaleCandidatesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/CollectDownscaleCandidatesHandler.java index 5a95f8fe5c5..b7f3fa51cfe 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/CollectDownscaleCandidatesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/CollectDownscaleCandidatesHandler.java @@ -11,7 +11,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/CoreVerticalScaleHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/CoreVerticalScaleHandler.java index 57a86177e89..b2d8da579bd 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/CoreVerticalScaleHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/CoreVerticalScaleHandler.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/DecommissionHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/DecommissionHandler.java index 5610f51e498..913b3920ff1 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/DecommissionHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/DecommissionHandler.java @@ -15,7 +15,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/StopCmServicesOnHostsInsteadOfDecommissionHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/StopCmServicesOnHostsInsteadOfDecommissionHandler.java index d8ef992f40c..36ce1dff375 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/StopCmServicesOnHostsInsteadOfDecommissionHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/StopCmServicesOnHostsInsteadOfDecommissionHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/UnhealthyInstancesDetectionHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/UnhealthyInstancesDetectionHandler.java index 8fab8addda9..52f5cf0a94b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/UnhealthyInstancesDetectionHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/UnhealthyInstancesDetectionHandler.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/UpscaleStackHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/UpscaleStackHandler.java index eabd617f798..0c9fc9f1a9b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/UpscaleStackHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/UpscaleStackHandler.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/CreateCloudLoadBalancersHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/CreateCloudLoadBalancersHandler.java index 0fab79995b2..332b360bdce 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/CreateCloudLoadBalancersHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/CreateCloudLoadBalancersHandler.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/CreateLoadBalancerEntityHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/CreateLoadBalancerEntityHandler.java index 87b07c7dd6c..c2dc1ea457f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/CreateLoadBalancerEntityHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/CreateLoadBalancerEntityHandler.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/LoadBalancerMetadataHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/LoadBalancerMetadataHandler.java index faba86c8bb9..38ab9f54c5a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/LoadBalancerMetadataHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/LoadBalancerMetadataHandler.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/RegisterFreeIpaDnsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/RegisterFreeIpaDnsHandler.java index c7f1797f93c..4902f930ed1 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/RegisterFreeIpaDnsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/RegisterFreeIpaDnsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.api.event.stack.loadbalancer.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/RegisterPublicDnsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/RegisterPublicDnsHandler.java index 3da410c76b7..490f511c582 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/RegisterPublicDnsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/RegisterPublicDnsHandler.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/RestartCmForLbHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/RestartCmForLbHandler.java index 4095cc6d7c8..4391db3d94e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/RestartCmForLbHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/RestartCmForLbHandler.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/UpdateServiceConfigHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/UpdateServiceConfigHandler.java index bc441e1abb9..f84831e21e8 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/UpdateServiceConfigHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/api/event/stack/loadbalancer/handler/UpdateServiceConfigHandler.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/ImageFallbackHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/ImageFallbackHandler.java index 183aee4b232..2354f48e0fb 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/ImageFallbackHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/ImageFallbackHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/ImageFallbackService.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/ImageFallbackService.java index 13499a1dc44..5f0446fd8bf 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/ImageFallbackService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/ImageFallbackService.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.util.HashMap; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/UpdateDomainDnsResolverHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/UpdateDomainDnsResolverHandler.java index 871422c9ccb..c7ea599586f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/UpdateDomainDnsResolverHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/UpdateDomainDnsResolverHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariEnsureComponentsAreStoppedHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariEnsureComponentsAreStoppedHandler.java index 6e2d319fed1..f15020f049d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariEnsureComponentsAreStoppedHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariEnsureComponentsAreStoppedHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariGatherInstalledComponentsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariGatherInstalledComponentsHandler.java index d0025188dfb..a6dfce46aee 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariGatherInstalledComponentsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariGatherInstalledComponentsHandler.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariInitComponentsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariInitComponentsHandler.java index de25d7bad16..a964af135d8 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariInitComponentsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariInitComponentsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariInstallComponentsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariInstallComponentsHandler.java index 7a109248b06..a5d55fd6cb6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariInstallComponentsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariInstallComponentsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariRegenerateKerberosKeytabsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariRegenerateKerberosKeytabsHandler.java index 36caef91468..1441a673073 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariRegenerateKerberosKeytabsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariRegenerateKerberosKeytabsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariRestartAllHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariRestartAllHandler.java index 693f506692c..23abd4a0446 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariRestartAllHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariRestartAllHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStartComponentsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStartComponentsHandler.java index 2a773905f24..9d203b1b72c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStartComponentsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStartComponentsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStartServerAndAgentHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStartServerAndAgentHandler.java index bdcc88f8a69..6d800481b7b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStartServerAndAgentHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStartServerAndAgentHandler.java @@ -4,7 +4,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,4 +67,4 @@ public void accept(Event event) { } eventBus.notify(result.selector(), new Event<>(event.getHeaders(), result)); } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStopComponentsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStopComponentsHandler.java index 950f22aec4a..05d83665fa2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStopComponentsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStopComponentsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStopServerAndAgentHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStopServerAndAgentHandler.java index 26bbb086797..38484962cbb 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStopServerAndAgentHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AmbariStopServerAndAgentHandler.java @@ -4,7 +4,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AutoConfigureClusterManagerHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AutoConfigureClusterManagerHandler.java index cb2e2c9d5db..26f79107985 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AutoConfigureClusterManagerHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/AutoConfigureClusterManagerHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/CleanupFreeIpaHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/CleanupFreeIpaHandler.java index 1f93ae05fdd..4ac29b0abbf 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/CleanupFreeIpaHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/CleanupFreeIpaHandler.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.cluster.provision.ClusterCreationEvent.CLEANUP_FREEIPA_FAILED_EVENT; import static com.sequenceiq.cloudbreak.core.flow2.cluster.provision.ClusterCreationEvent.CLEANUP_FREEIPA_FINISHED_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterDbCertRotationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterDbCertRotationHandler.java index eb2596d8b92..09840e62744 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterDbCertRotationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterDbCertRotationHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterDownscaleFailedConclusionHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterDownscaleFailedConclusionHandler.java index e6db2683c3e..827127b67a7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterDownscaleFailedConclusionHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterDownscaleFailedConclusionHandler.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status.UPDATE_FAILED; import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_SCALING_FAILED; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterServicesRestartHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterServicesRestartHandler.java index 06e58c85d5a..685ca76c949 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterServicesRestartHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterServicesRestartHandler.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStartFailedHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStartFailedHandler.java index 9473c9ed2af..a6c297342f7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStartFailedHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStartFailedHandler.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status.START_FAILED; import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_START_FAILED; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStartHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStartHandler.java index 49904d6e0ca..91434188262 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStartHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStartHandler.java @@ -6,7 +6,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStartPillarConfigUpdateHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStartPillarConfigUpdateHandler.java index 3f47cee736d..545a882d953 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStartPillarConfigUpdateHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStartPillarConfigUpdateHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStopFailedHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStopFailedHandler.java index 26f39374bd5..d79026cdfc6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStopFailedHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStopFailedHandler.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status.STOP_FAILED; import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_STOP_FAILED; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStopHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStopHandler.java index a0f0c9aab0f..a27104db802 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStopHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterStopHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterUpscaleFailedConclusionHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterUpscaleFailedConclusionHandler.java index 5ec3112db82..1edcd838283 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterUpscaleFailedConclusionHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ClusterUpscaleFailedConclusionHandler.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.api.endpoint.v4.common.Status.UPDATE_FAILED; import static com.sequenceiq.cloudbreak.event.ResourceEvent.CLUSTER_SCALING_FAILED; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ConfigurePolicyHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ConfigurePolicyHandler.java index f4ac07c8cc8..e5435f5ea21 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ConfigurePolicyHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ConfigurePolicyHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/DeregisterServicesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/DeregisterServicesHandler.java index 62fef7d4d2c..68e9f5fe793 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/DeregisterServicesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/DeregisterServicesHandler.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/DisableKerberosHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/DisableKerberosHandler.java index 235dd16def6..4cae470a36a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/DisableKerberosHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/DisableKerberosHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/InstallClusterHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/InstallClusterHandler.java index 875222cf0e2..f305d685575 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/InstallClusterHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/InstallClusterHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ModifyProxyConfigOnCmHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ModifyProxyConfigOnCmHandler.java index cd0174eb94c..e1c36997f27 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ModifyProxyConfigOnCmHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ModifyProxyConfigOnCmHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ModifyProxyConfigSaltStateApplyHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ModifyProxyConfigSaltStateApplyHandler.java index b4c65b67de7..3b240f0f43d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ModifyProxyConfigSaltStateApplyHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/ModifyProxyConfigSaltStateApplyHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/PrepareClusterTerminationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/PrepareClusterTerminationHandler.java index ad0786f6f3c..efa37dda291 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/PrepareClusterTerminationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/PrepareClusterTerminationHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/RestartClusterManagerServerHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/RestartClusterManagerServerHandler.java index 7f4f56f9ae6..3686e44dbfe 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/RestartClusterManagerServerHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/RestartClusterManagerServerHandler.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/RestartClusterServicesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/RestartClusterServicesHandler.java index c6e773cf7b0..7c971a39348 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/RestartClusterServicesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/RestartClusterServicesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/RotateSaltPasswordHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/RotateSaltPasswordHandler.java index fae0186169f..a5149194083 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/RotateSaltPasswordHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/RotateSaltPasswordHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StartClusterHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StartClusterHandler.java index f850abbbe3f..4f1467f064e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StartClusterHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StartClusterHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartDownscaleDecommissionViaCMHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartDownscaleDecommissionViaCMHandler.java index b548c05c8b9..f089aee862c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartDownscaleDecommissionViaCMHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartDownscaleDecommissionViaCMHandler.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -225,4 +225,4 @@ private void updateInstanceStatuses(Map instanceMe } instanceMetaDataService.updateInstanceStatuses(decommissionedInstanceIds, instanceStatus, statusReason); } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartDownscaleGetRecoveryCandidatesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartDownscaleGetRecoveryCandidatesHandler.java index a1e02a39e8d..ad9c75fe0e7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartDownscaleGetRecoveryCandidatesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartDownscaleGetRecoveryCandidatesHandler.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartUpscaleCommissionViaCMHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartUpscaleCommissionViaCMHandler.java index 099b132260a..9dba43ecb0f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartUpscaleCommissionViaCMHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartUpscaleCommissionViaCMHandler.java @@ -14,8 +14,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -193,4 +193,4 @@ private void excludeAndLogDisconnectedNMsForUpscale(Stack stack, Map disconnectedNMHostNames.contains(StringUtils.lowerCase(e.getKey()))); } } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartUpscaleGetRecoveryCandidatesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartUpscaleGetRecoveryCandidatesHandler.java index 1311c656e36..7ed9ac6914c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartUpscaleGetRecoveryCandidatesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/StopStartUpscaleGetRecoveryCandidatesHandler.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/UpscaleCheckHostMetadataHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/UpscaleCheckHostMetadataHandler.java index 9095b5ed17d..4674582fb55 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/UpscaleCheckHostMetadataHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/UpscaleCheckHostMetadataHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/UpscaleClusterHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/UpscaleClusterHandler.java index 989bcc2a73f..6e3d8f6b849 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/UpscaleClusterHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/UpscaleClusterHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/UpscaleClusterManagerHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/UpscaleClusterManagerHandler.java index 004aaccb5b3..822f29c62b5 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/UpscaleClusterManagerHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/UpscaleClusterManagerHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/WaitingClusterServerHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/WaitingClusterServerHandler.java index d7ea3bc1b08..2b8a437f4ee 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/WaitingClusterServerHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/WaitingClusterServerHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/certrenew/ClusterCertificateRedeployHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/certrenew/ClusterCertificateRedeployHandler.java index 93c9ad45dd9..249092e2c06 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/certrenew/ClusterCertificateRedeployHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/certrenew/ClusterCertificateRedeployHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.certrenew; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/certrenew/ClusterCertificateReissueHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/certrenew/ClusterCertificateReissueHandler.java index f990e4f8bcb..12841075deb 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/certrenew/ClusterCertificateReissueHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/certrenew/ClusterCertificateReissueHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.certrenew; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/certrotate/ClusterHostCertificatesRotationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/certrotate/ClusterHostCertificatesRotationHandler.java index 26cc4bdcaf6..16458cee1ba 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/certrotate/ClusterHostCertificatesRotationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/certrotate/ClusterHostCertificatesRotationHandler.java @@ -4,7 +4,7 @@ import java.security.KeyPair; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/datalakemetrics/datasizes/GetDatalakeDataSizesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/datalakemetrics/datasizes/GetDatalakeDataSizesHandler.java index 67fff003b13..5014a62a345 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/datalakemetrics/datasizes/GetDatalakeDataSizesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/datalakemetrics/datasizes/GetDatalakeDataSizesHandler.java @@ -7,7 +7,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/dr/RangerVirtualGroupService.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/dr/RangerVirtualGroupService.java index 1e094e97547..f8a896aee43 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/dr/RangerVirtualGroupService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/dr/RangerVirtualGroupService.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/dr/backup/DatabaseBackupHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/dr/backup/DatabaseBackupHandler.java index 886f770689e..d6ab616a387 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/dr/backup/DatabaseBackupHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/dr/backup/DatabaseBackupHandler.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/dr/restore/DatabaseRestoreHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/dr/restore/DatabaseRestoreHandler.java index 6bf11c47959..5d31fa3c249 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/dr/restore/DatabaseRestoreHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/dr/restore/DatabaseRestoreHandler.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ClusterManagerConfigureKerberosHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ClusterManagerConfigureKerberosHandler.java index e0795b1edb0..c245c7c02ef 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ClusterManagerConfigureKerberosHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ClusterManagerConfigureKerberosHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.install; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ClusterManagerPrepareProxyConfigHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ClusterManagerPrepareProxyConfigHandler.java index f657c7a3928..5e77bd91311 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ClusterManagerPrepareProxyConfigHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ClusterManagerPrepareProxyConfigHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.install; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ClusterManagerRefreshParcelClusterHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ClusterManagerRefreshParcelClusterHandler.java index 190bed3f650..75a4314e37f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ClusterManagerRefreshParcelClusterHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ClusterManagerRefreshParcelClusterHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.install; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ConfigureClusterManagerManagementServicesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ConfigureClusterManagerManagementServicesHandler.java index 990cb4d63c2..8621be9f087 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ConfigureClusterManagerManagementServicesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ConfigureClusterManagerManagementServicesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.install; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ConfigureClusterManagerSupportTagsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ConfigureClusterManagerSupportTagsHandler.java index 1d166124831..deab0f2f92d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ConfigureClusterManagerSupportTagsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ConfigureClusterManagerSupportTagsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.install; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ExecutePostClusterManagerStartRecipesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ExecutePostClusterManagerStartRecipesHandler.java index ca7b2485f3c..e2d147d48bd 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ExecutePostClusterManagerStartRecipesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ExecutePostClusterManagerStartRecipesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.install; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ExecutePostServiceDeploymentRecipesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ExecutePostServiceDeploymentRecipesHandler.java index 1fc9e05f3cb..8374fdc2aa0 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ExecutePostServiceDeploymentRecipesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ExecutePostServiceDeploymentRecipesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.install; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/FinalizeClusterInstallHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/FinalizeClusterInstallHandler.java index eebc991a121..1dce215fe04 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/FinalizeClusterInstallHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/FinalizeClusterInstallHandler.java @@ -2,7 +2,7 @@ import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/PrepareExtendedTemplateHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/PrepareExtendedTemplateHandler.java index 066348dc20b..562ab61a67b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/PrepareExtendedTemplateHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/PrepareExtendedTemplateHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.install; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/StartClusterManagerManagementServicesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/StartClusterManagerManagementServicesHandler.java index 2789ffc1986..2d2e01325c7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/StartClusterManagerManagementServicesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/StartClusterManagerManagementServicesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.install; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/SuppressClusterWarningsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/SuppressClusterWarningsHandler.java index 1b30388f645..46ed3277aa6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/SuppressClusterWarningsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/SuppressClusterWarningsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.install; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/UpdateClusterConfigHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/UpdateClusterConfigHandler.java index 9e9d6e6a4e6..62de0557430 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/UpdateClusterConfigHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/UpdateClusterConfigHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.install; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ValidateClusterLicenceHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ValidateClusterLicenceHandler.java index 721bacc44de..57d73865803 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ValidateClusterLicenceHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/ValidateClusterLicenceHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.install; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/WaitClusterManagerHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/WaitClusterManagerHandler.java index f059ede5145..9febf4ab71d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/WaitClusterManagerHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/install/WaitClusterManagerHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.install; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterManagerUpgradeHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterManagerUpgradeHandler.java index 74f9cebbdc5..043f8fa5b44 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterManagerUpgradeHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterManagerUpgradeHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.upgrade; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterUpgradeFailedHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterUpgradeFailedHandler.java index 236ac85df78..1a78eaeb84a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterUpgradeFailedHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterUpgradeFailedHandler.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterUpgradeHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterUpgradeHandler.java index 2e154b1deb9..a55da7de962 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterUpgradeHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterUpgradeHandler.java @@ -7,7 +7,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterUpgradeInitHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterUpgradeInitHandler.java index 56edfdcee94..17a385dc964 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterUpgradeInitHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ClusterUpgradeInitHandler.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/DeregisterAgentHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/DeregisterAgentHandler.java index b67303d5e37..9d175db546a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/DeregisterAgentHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/DeregisterAgentHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.upgrade.ccm; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/FinalizeHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/FinalizeHandler.java index 0251c0b2e65..3d28b1aa22d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/FinalizeHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/FinalizeHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.upgrade.ccm; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/PushSaltStateHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/PushSaltStateHandler.java index 2fe706d60e2..11786dc6853 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/PushSaltStateHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/PushSaltStateHandler.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.cluster.ccm.upgrade.UpgradeCcmEvent.UPGRADE_CCM_REVERT_TUNNEL_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/ReconfigureNginxHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/ReconfigureNginxHandler.java index e8664f0790c..a21b837f56b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/ReconfigureNginxHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/ReconfigureNginxHandler.java @@ -4,7 +4,7 @@ import java.time.LocalDateTime; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RegisterClusterProxyHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RegisterClusterProxyHandler.java index ddf147ea572..5880be6b124 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RegisterClusterProxyHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RegisterClusterProxyHandler.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.cluster.ccm.upgrade.UpgradeCcmEvent.UPGRADE_CCM_REVERT_ALL_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RemoveAgentHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RemoveAgentHandler.java index f5ae4bc0238..0a8baabfd1c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RemoveAgentHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RemoveAgentHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.upgrade.ccm; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RevertAllHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RevertAllHandler.java index 6bc95c6cfc8..d602237ef2c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RevertAllHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RevertAllHandler.java @@ -6,7 +6,7 @@ import java.time.Duration; import java.time.LocalDateTime; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RevertSaltStatesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RevertSaltStatesHandler.java index dfc56f1606a..a107e77eaca 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RevertSaltStatesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/RevertSaltStatesHandler.java @@ -3,7 +3,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.cluster.ccm.upgrade.UpgradeCcmEvent.UPGRADE_CCM_FAILED_EVENT; import static com.sequenceiq.cloudbreak.core.flow2.cluster.ccm.upgrade.UpgradeCcmEvent.UPGRADE_CCM_REVERT_SALTSTATE_COMMENCE_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/TunnelUpdateHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/TunnelUpdateHandler.java index abd00f95607..1dadc8fd10d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/TunnelUpdateHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/ccm/TunnelUpdateHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.upgrade.ccm; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/embeddeddb/UpgradeEmbeddedDBPreparationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/embeddeddb/UpgradeEmbeddedDBPreparationHandler.java index eac9050861f..48a8e406b60 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/embeddeddb/UpgradeEmbeddedDBPreparationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/embeddeddb/UpgradeEmbeddedDBPreparationHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.upgrade.embeddeddb; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/BackupRdsDataHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/BackupRdsDataHandler.java index 1053a5a549a..8a4e302181f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/BackupRdsDataHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/BackupRdsDataHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.upgrade.rds; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/InstallPostgresPackagesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/InstallPostgresPackagesHandler.java index 72da79421b3..6eb581cc78d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/InstallPostgresPackagesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/InstallPostgresPackagesHandler.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/MigrateDatabaseSettingsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/MigrateDatabaseSettingsHandler.java index 45c1b5b7376..1360d46f185 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/MigrateDatabaseSettingsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/MigrateDatabaseSettingsHandler.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/RdsConfigUpdateService.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/RdsConfigUpdateService.java index 5739d7fac23..c42ca52407f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/RdsConfigUpdateService.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/RdsConfigUpdateService.java @@ -4,7 +4,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/RestoreRdsDataHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/RestoreRdsDataHandler.java index 9318dfd7662..15106eb425a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/RestoreRdsDataHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/RestoreRdsDataHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.upgrade.rds; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/StartServicesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/StartServicesHandler.java index 0c82d0943c1..074e5b2b48f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/StartServicesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/StartServicesHandler.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.auth.altus.model.Entitlement.CDP_POSTGRES_UPGRADE_SKIP_SERVICE_STOP; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/StopServicesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/StopServicesHandler.java index 3ac93cccfe3..88d952b03a9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/StopServicesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/StopServicesHandler.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.auth.altus.model.Entitlement.CDP_POSTGRES_UPGRADE_SKIP_SERVICE_STOP; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -90,4 +90,4 @@ public Selectable doAccept(HandlerEvent event) { } return new UpgradeRdsStopServicesResult(stackId, request.getVersion()); } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/UpdatePostgresVersionHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/UpdatePostgresVersionHandler.java index 126eb8994ef..9c7f294d108 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/UpdatePostgresVersionHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/UpdatePostgresVersionHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.upgrade.rds; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/UpgradeRdsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/UpgradeRdsHandler.java index 3b6ba99b53c..ed3235bab7a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/UpgradeRdsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/UpgradeRdsHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.upgrade.rds; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/validation/ValidateBackupSpaceHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/validation/ValidateBackupSpaceHandler.java index 8a6cb88f920..9cbef1b15e5 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/validation/ValidateBackupSpaceHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/validation/ValidateBackupSpaceHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.upgrade.rds.validation; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/validation/ValidateRdsUpgradeOnProviderHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/validation/ValidateRdsUpgradeOnProviderHandler.java index 1027e3f1dd7..a913123ea8b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/validation/ValidateRdsUpgradeOnProviderHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/rds/validation/ValidateRdsUpgradeOnProviderHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.cluster.upgrade.rds.validation; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/recover/DatalakeRecoverySetupNewInstancesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/recover/DatalakeRecoverySetupNewInstancesHandler.java index c030810aac8..70db01fc4a3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/recover/DatalakeRecoverySetupNewInstancesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/cluster/upgrade/recover/DatalakeRecoverySetupNewInstancesHandler.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/consumption/AttachedVolumeConsumptionCollectionSchedulingHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/consumption/AttachedVolumeConsumptionCollectionSchedulingHandler.java index 370671a21a6..9f3d8085662 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/consumption/AttachedVolumeConsumptionCollectionSchedulingHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/consumption/AttachedVolumeConsumptionCollectionSchedulingHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.consumption; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/consumption/AttachedVolumeConsumptionCollectionUnschedulingHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/consumption/AttachedVolumeConsumptionCollectionUnschedulingHandler.java index 08874f22f0e..029b4f16970 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/consumption/AttachedVolumeConsumptionCollectionUnschedulingHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/consumption/AttachedVolumeConsumptionCollectionUnschedulingHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.consumption; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/kerberos/KeytabConfigurationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/kerberos/KeytabConfigurationHandler.java index 40512581690..d859a1c053a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/kerberos/KeytabConfigurationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/kerberos/KeytabConfigurationHandler.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/kerberos/KeytabProvider.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/kerberos/KeytabProvider.java index b5ea78a875d..b3d2d04b0ab 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/kerberos/KeytabProvider.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/kerberos/KeytabProvider.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.reactor.handler.kerberos; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/ldap/LdapSSOConfigurationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/ldap/LdapSSOConfigurationHandler.java index 0d3cb053e95..2ab4e86ddce 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/ldap/LdapSSOConfigurationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/ldap/LdapSSOConfigurationHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.ldap; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/BootstrapMachineHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/BootstrapMachineHandler.java index 5798bd76475..c13a6bb3db4 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/BootstrapMachineHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/BootstrapMachineHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.orchestration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/CCMV1RemapKeyHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/CCMV1RemapKeyHandler.java index ee1fc2eff65..6fc611e8d0b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/CCMV1RemapKeyHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/CCMV1RemapKeyHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.orchestration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ChangePrimaryGatewayHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ChangePrimaryGatewayHandler.java index dd5293e46ea..321554d94f6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ChangePrimaryGatewayHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ChangePrimaryGatewayHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.orchestration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/CloudStorageVmValidationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/CloudStorageVmValidationHandler.java index 317070e24c4..b4e9eeab68e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/CloudStorageVmValidationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/CloudStorageVmValidationHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.orchestration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterCreationFailedHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterCreationFailedHandler.java index 17f4a4e1083..e24af285fa5 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterCreationFailedHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterCreationFailedHandler.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterProxyGatewayRegistrationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterProxyGatewayRegistrationHandler.java index 9dd120915d8..5e3c879732a 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterProxyGatewayRegistrationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterProxyGatewayRegistrationHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.orchestration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterProxyReRegistrationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterProxyReRegistrationHandler.java index f998a05a988..884c77d7960 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterProxyReRegistrationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterProxyReRegistrationHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.orchestration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterProxyRegistrationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterProxyRegistrationHandler.java index c301007b471..1fb9cc2bbae 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterProxyRegistrationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterProxyRegistrationHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.orchestration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterTerminationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterTerminationHandler.java index bdd405aef9d..f28d37dfe54 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterTerminationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/ClusterTerminationHandler.java @@ -2,7 +2,7 @@ import static com.cloudera.thunderhead.service.meteringv2.events.MeteringV2EventsProto.ClusterStatus.Value.DELETED; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/CreateUserDataHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/CreateUserDataHandler.java index 29a683f49b2..53bf1c442b3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/CreateUserDataHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/CreateUserDataHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.orchestration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/PreFlightCheckHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/PreFlightCheckHandler.java index 73eb182b10b..8bf67f48cba 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/PreFlightCheckHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/PreFlightCheckHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.orchestration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/RecoverySetupHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/RecoverySetupHandler.java index 9386ef372f4..f116f837464 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/RecoverySetupHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/RecoverySetupHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.orchestration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/RemoveHostsHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/RemoveHostsHandler.java index 72a48581c4e..3a10616bd57 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/RemoveHostsHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/RemoveHostsHandler.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/StartAmbariServicesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/StartAmbariServicesHandler.java index e6c42e3119d..5835d027b6d 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/StartAmbariServicesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/orchestration/StartAmbariServicesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.orchestration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/CcmKeyDeregisterHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/CcmKeyDeregisterHandler.java index 7a1a1361481..6078c28369e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/CcmKeyDeregisterHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/CcmKeyDeregisterHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.recipe; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/ClusterProxyDeregisterHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/ClusterProxyDeregisterHandler.java index f25d2282827..23affca3e78 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/ClusterProxyDeregisterHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/ClusterProxyDeregisterHandler.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.stack.termination.StackTerminationEvent.CLUSTER_PROXY_DEREGISTER_FAILED_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/StackPreTerminationHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/StackPreTerminationHandler.java index 5e36667052f..cb47dd264ad 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/StackPreTerminationHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/StackPreTerminationHandler.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UploadRecipesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UploadRecipesHandler.java index 4398d58e96f..52549e6feb5 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UploadRecipesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UploadRecipesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.recipe; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UploadRepairSingleMasterRecipesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UploadRepairSingleMasterRecipesHandler.java index d6e315dc218..f49fe26f582 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UploadRepairSingleMasterRecipesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UploadRepairSingleMasterRecipesHandler.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.reactor.handler.recipe; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UploadUpscaleRecipesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UploadUpscaleRecipesHandler.java index f3bf5e33217..1525fe1edf9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UploadUpscaleRecipesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UploadUpscaleRecipesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.recipe; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UpscalePostRecipesHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UpscalePostRecipesHandler.java index cd7ceedc41c..1d3b89f3bda 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UpscalePostRecipesHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/recipe/UpscalePostRecipesHandler.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.reactor.handler.recipe; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/userdata/UpdateUserDataHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/userdata/UpdateUserDataHandler.java index 3cb17ac6153..d8a85ea1d13 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/userdata/UpdateUserDataHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/userdata/UpdateUserDataHandler.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.stack.update.userdata.UpdateUserDataEvents.UPDATE_USERDATA_FAILED_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/userdata/UpdateUserDataOnProviderHandler.java b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/userdata/UpdateUserDataOnProviderHandler.java index 38637bcc7db..cf2a8b405a9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/userdata/UpdateUserDataOnProviderHandler.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/reactor/handler/userdata/UpdateUserDataOnProviderHandler.java @@ -2,7 +2,7 @@ import static com.sequenceiq.cloudbreak.core.flow2.stack.update.userdata.UpdateUserDataEvents.UPDATE_USERDATA_FAILED_EVENT; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/ArchivedInstanceMetaDataRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/ArchivedInstanceMetaDataRepository.java index 004d79c5282..b5058e64697 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/ArchivedInstanceMetaDataRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/ArchivedInstanceMetaDataRepository.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.repository; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/BlueprintRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/BlueprintRepository.java index 237f4262065..384c4e685b6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/BlueprintRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/BlueprintRepository.java @@ -5,8 +5,8 @@ import java.util.Optional; import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -57,4 +57,4 @@ List findResourceNamesByCrnAndAccountId(@Param("resource "JOIN c.blueprint b " + "WHERE c.id = :clusterId") Optional findByClusterId(@Param("clusterId") Long clusterId); -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/BlueprintViewRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/BlueprintViewRepository.java index c439813cde0..99b981f0585 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/BlueprintViewRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/BlueprintViewRepository.java @@ -2,8 +2,8 @@ import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/CloudbreakFlowLogRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/CloudbreakFlowLogRepository.java index ec8775f3bfc..5c6abaaad34 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/CloudbreakFlowLogRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/CloudbreakFlowLogRepository.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterTemplateStackApiViewRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterTemplateStackApiViewRepository.java index d8aa0a4fcc9..53e0aa3d148 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterTemplateStackApiViewRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/ClusterTemplateStackApiViewRepository.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/ComponentRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/ComponentRepository.java index 735ef4e6c03..95e25f681d6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/ComponentRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/ComponentRepository.java @@ -3,8 +3,8 @@ import java.util.Optional; import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; @@ -40,4 +40,4 @@ Optional findComponentByStackIdComponentTypeName(@Param("stackId") Lo "WHERE s.id = :stackId " + "AND cv.componentType in :componentTypes") Set findComponentByStackIdWithType(@Param("stackId") Long stackId, @Param("componentTypes") Set componentTypes); -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/ContainerRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/ContainerRepository.java index cca6c761a50..e6d5bc7a7a4 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/ContainerRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/ContainerRepository.java @@ -2,8 +2,8 @@ import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/DatabaseRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/DatabaseRepository.java index 0ed8db31252..5286a32fb70 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/DatabaseRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/DatabaseRepository.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.repository; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/FileSystemRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/FileSystemRepository.java index 107b01b07c6..52fe5e318c2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/FileSystemRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/FileSystemRepository.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.repository; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import com.sequenceiq.cloudbreak.domain.FileSystem; import com.sequenceiq.cloudbreak.workspace.repository.EntityType; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/GatewayRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/GatewayRepository.java index d41648201e2..089ca3198ff 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/GatewayRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/GatewayRepository.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/GeneratedRecipeRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/GeneratedRecipeRepository.java index 83fdb649648..3d24d33da9c 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/GeneratedRecipeRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/GeneratedRecipeRepository.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.repository; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/HostGroupRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/HostGroupRepository.java index 19edfdf51d6..5c767204e3e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/HostGroupRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/HostGroupRepository.java @@ -4,8 +4,8 @@ import java.util.Optional; import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.EntityGraph.EntityGraphType; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/HostGroupViewRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/HostGroupViewRepository.java index 6fb8e4ad427..0ff4654b400 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/HostGroupViewRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/HostGroupViewRepository.java @@ -2,8 +2,8 @@ import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/IdBrokerRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/IdBrokerRepository.java index 513d4ef8a96..7d5285a4bc3 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/IdBrokerRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/IdBrokerRepository.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.repository; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/ImageCatalogRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/ImageCatalogRepository.java index b927be4e59b..dcd73d60142 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/ImageCatalogRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/ImageCatalogRepository.java @@ -5,8 +5,8 @@ import java.util.Optional; import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceGroupNetworkRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceGroupNetworkRepository.java index c9d044906bf..11e0f03d24e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceGroupNetworkRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceGroupNetworkRepository.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceGroupRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceGroupRepository.java index 0506f26400c..9ceebfe63d2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceGroupRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceGroupRepository.java @@ -5,8 +5,8 @@ import java.util.Optional; import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.EntityGraph.EntityGraphType; @@ -122,4 +122,4 @@ List findAllInstanceGroupViewByStackIdAndGroupNames(@ @Query("SELECT i FROM InstanceGroup i JOIN FETCH i.template WHERE i.stack.id = :stackId AND i.groupName = :groupName") Optional getByStackIdAndInstanceGroupNameWithFetchTemplate(@Param("stackId") Long stackId, @Param("groupName") String groupName); -} \ No newline at end of file +} diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceGroupViewRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceGroupViewRepository.java index 84b44ecd96c..d553ccd80ca 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceGroupViewRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceGroupViewRepository.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceMetaDataRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceMetaDataRepository.java index ca776d73ac9..72ecfd466ca 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceMetaDataRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/InstanceMetaDataRepository.java @@ -6,8 +6,8 @@ import java.util.Optional; import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/LoadBalancerRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/LoadBalancerRepository.java index 6eee92b86a0..613a6161e47 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/LoadBalancerRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/LoadBalancerRepository.java @@ -2,8 +2,8 @@ import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/NetworkRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/NetworkRepository.java index 8a497d7e4ce..83e829f4399 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/NetworkRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/NetworkRepository.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.repository; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import com.sequenceiq.cloudbreak.domain.Network; import com.sequenceiq.cloudbreak.workspace.repository.EntityType; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/OrchestratorRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/OrchestratorRepository.java index 21e16bd1e1e..124728320a6 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/OrchestratorRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/OrchestratorRepository.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/RdsConfigRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/RdsConfigRepository.java index 6a703220368..ce665314f7e 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/RdsConfigRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/RdsConfigRepository.java @@ -4,8 +4,8 @@ import java.util.Optional; import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/RdsConfigWithoutClusterRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/RdsConfigWithoutClusterRepository.java index 7d917a91c34..5e401a419bf 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/RdsConfigWithoutClusterRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/RdsConfigWithoutClusterRepository.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/RecipeRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/RecipeRepository.java index 7d839f215de..7ed8145b7dd 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/RecipeRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/RecipeRepository.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import com.sequenceiq.cloudbreak.domain.Recipe; import com.sequenceiq.cloudbreak.workspace.repository.EntityType; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/RecipeViewRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/RecipeViewRepository.java index 75ca3749a51..b0a881718bf 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/RecipeViewRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/RecipeViewRepository.java @@ -5,8 +5,8 @@ import java.util.Optional; import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/ResourceRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/ResourceRepository.java index b148a2d46c9..0da1dbb66c9 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/ResourceRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/ResourceRepository.java @@ -5,8 +5,8 @@ import java.util.Optional; import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/SaltSecurityConfigRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/SaltSecurityConfigRepository.java index 72e5a7ee9f9..ba75164fc28 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/SaltSecurityConfigRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/SaltSecurityConfigRepository.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.repository; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/SecurityConfigRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/SecurityConfigRepository.java index 1e3e856ee69..0fb73628aef 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/SecurityConfigRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/SecurityConfigRepository.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/SecurityGroupRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/SecurityGroupRepository.java index 06f98e05128..2a7b02a93e8 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/SecurityGroupRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/SecurityGroupRepository.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import com.sequenceiq.cloudbreak.domain.Network; import com.sequenceiq.cloudbreak.domain.SecurityGroup; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/SecurityRuleRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/SecurityRuleRepository.java index 3c5f3fa962d..7ff7c0ae6b0 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/SecurityRuleRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/SecurityRuleRepository.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackApiViewRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackApiViewRepository.java index e6a9d9a15b7..9c3e7e7ea7f 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackApiViewRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackApiViewRepository.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackAuthenticationRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackAuthenticationRepository.java index 888c019a84e..0e865294812 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackAuthenticationRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackAuthenticationRepository.java @@ -1,7 +1,7 @@ package com.sequenceiq.cloudbreak.repository; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackPatchRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackPatchRepository.java index 41851d231c5..0bc26fbbde2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackPatchRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackPatchRepository.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Optional; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackReferenceRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackReferenceRepository.java index 50c84f15b9f..da78d86e3c2 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackReferenceRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackReferenceRepository.java @@ -1,6 +1,6 @@ package com.sequenceiq.cloudbreak.repository; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackStatusRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackStatusRepository.java index 5d05a3f7876..e2129c21d9b 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackStatusRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/StackStatusRepository.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.Optional; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/TargetGroupRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/TargetGroupRepository.java index 63cb0260a81..a7b136218e7 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/TargetGroupRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/TargetGroupRepository.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/repository/TemplateRepository.java b/core/src/main/java/com/sequenceiq/cloudbreak/repository/TemplateRepository.java index 8a05c2d2620..6c03a9b5f17 100644 --- a/core/src/main/java/com/sequenceiq/cloudbreak/repository/TemplateRepository.java +++ b/core/src/main/java/com/sequenceiq/cloudbreak/repository/TemplateRepository.java @@ -2,8 +2,8 @@ import java.util.Set; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.springframework.data.repository.CrudRepository; @@ -17,4 +17,4 @@ public interface TemplateRepository extends CrudRepository { Set