CB-20045: Jakarta rename

README.md

@@ -243,7 +243,7 @@ Import static all other imports
 <blank line>
 import java.*
 <blank line>
-import javax.*
+import jakarta.*
 <blank line>
 import org.*
 <blank line>

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;

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;

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;
 

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;
 

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;

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;

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;

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;
     }
-}
+}

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;

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 {
 

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;
 

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;
 

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;

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;

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;

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;

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);
-}
+}

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;
 

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;

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;
 

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;
 

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;

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;

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;
 

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");
     }
 
-}
+}

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());
     }
-}
+}

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;

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)

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;
 

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;

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;

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;
 

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;

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;