Task(CLI) Java 21 Migration (#28974)

### Proposed Changes * Changing all ee javax to the new jakarta ee * Adjusting Tests as required
dotCMS · Jun 26, 2024 · 09cba8b · 09cba8b
1 parent cd3bb5f
commit 09cba8b
Show file tree

Hide file tree

Showing 173 changed files with 442 additions and 437 deletions.
diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/AssetAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/AssetAPI.java
@@ -11,8 +11,8 @@
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.jboss.resteasy.annotations.providers.multipart.MultipartForm;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
 import java.io.InputStream;
 
 /**

diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/AuthenticationAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/AuthenticationAPI.java
@@ -5,11 +5,11 @@
 import com.dotcms.model.ResponseEntityView;
 import com.dotcms.model.authentication.APITokenRequest;
 import com.dotcms.model.authentication.TokenEntity;
-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 org.eclipse.microprofile.openapi.annotations.Operation;
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 import org.eclipse.microprofile.openapi.annotations.tags.Tags;

diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/BuiltVersionServiceImpl.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/BuiltVersionServiceImpl.java
@@ -5,8 +5,8 @@
 import java.io.InputStream;
 import java.util.Optional;
 import java.util.Properties;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.jboss.logging.Logger;
 
 /**

diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/ContentTypeAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/ContentTypeAPI.java
@@ -10,16 +10,16 @@
 import com.dotcms.model.views.CommonViews.ContentTypeInternalView;
 import com.fasterxml.jackson.annotation.JsonView;
 import java.util.List;
-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 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.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.eclipse.microprofile.openapi.annotations.Operation;
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 import org.eclipse.microprofile.openapi.annotations.tags.Tags;

diff --git a/...cms-cli/api-data-model/src/main/java/com/dotcms/api/DefaultAuthenticationContextImpl.java b/...cms-cli/api-data-model/src/main/java/com/dotcms/api/DefaultAuthenticationContextImpl.java
@@ -16,9 +16,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 

diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/FolderAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/FolderAPI.java
@@ -6,12 +6,12 @@
 import com.dotcms.model.folder.SearchByPathRequest;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.Consumes;
-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.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 import org.eclipse.microprofile.openapi.annotations.tags.Tags;
 import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;

diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/LanguageAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/LanguageAPI.java
@@ -8,15 +8,15 @@
 import com.dotcms.model.views.CommonViews.LanguageFileView;
 import com.fasterxml.jackson.annotation.JsonView;
 import java.util.List;
-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.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.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import org.eclipse.microprofile.openapi.annotations.Operation;
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 import org.eclipse.microprofile.openapi.annotations.tags.Tags;

diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/SiteAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/SiteAPI.java
@@ -10,16 +10,16 @@
 import com.dotcms.model.site.SiteView;
 import java.util.List;
 import java.util.Map;
-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 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.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.eclipse.microprofile.openapi.annotations.Operation;
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 import org.eclipse.microprofile.openapi.annotations.tags.Tags;

diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/UserAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/UserAPI.java
@@ -3,11 +3,11 @@
 import com.dotcms.api.provider.DefaultResponseExceptionMapper;
 import com.dotcms.api.provider.DotCMSClientHeaders;
 import com.dotcms.model.user.User;
-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 org.eclipse.microprofile.openapi.annotations.Operation;
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 import org.eclipse.microprofile.openapi.annotations.tags.Tags;

diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/WorkflowAPI.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/WorkflowAPI.java
@@ -5,13 +5,13 @@
 import com.dotcms.model.ResponseEntityView;
 import com.dotcms.model.content.CreateContentRequest;
 import java.util.Map;
-import javax.ws.rs.Consumes;
-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.ws.rs.Consumes;
+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.eclipse.microprofile.openapi.annotations.Operation;
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 import org.eclipse.microprofile.openapi.annotations.tags.Tags;

diff --git a/...-data-model/src/main/java/com/dotcms/api/client/model/AuthenticationParamContextImpl.java b/...-data-model/src/main/java/com/dotcms/api/client/model/AuthenticationParamContextImpl.java
@@ -3,7 +3,7 @@
 import io.quarkus.arc.DefaultBean;
 import java.util.Arrays;
 import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * This class is used to pass the token from the CLI to the API client. If the token is present here we use directly

diff --git a/...i/api-data-model/src/main/java/com/dotcms/api/client/model/RemoteURLParamContextImpl.java b/...i/api-data-model/src/main/java/com/dotcms/api/client/model/RemoteURLParamContextImpl.java
@@ -3,7 +3,7 @@
 import io.quarkus.arc.DefaultBean;
 import java.net.URL;
 import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * This class is used to pass the token from the CLI to the API client. If the token is present here

diff --git a/...otcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/RestClientFactory.java b/...otcms-cli/api-data-model/src/main/java/com/dotcms/api/client/model/RestClientFactory.java
@@ -8,8 +8,8 @@
 import java.net.URL;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 import org.jboss.logging.Logger;
 

diff --git a/...i-data-model/src/main/java/com/dotcms/api/client/model/YAMLFactoryServiceManagerImpl.java b/...i-data-model/src/main/java/com/dotcms/api/client/model/YAMLFactoryServiceManagerImpl.java
@@ -16,7 +16,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 @ApplicationScoped

diff --git a/.../dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/BuildVersionHeaders.java b/.../dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/BuildVersionHeaders.java
@@ -1,9 +1,9 @@
 package com.dotcms.api.provider;
 
 import com.dotcms.api.BuiltVersionService;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.MultivaluedMap;
 import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory;
 import org.jboss.logging.Logger;
 

diff --git a/...s/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/ClientObjectMapper.java b/...s/dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/ClientObjectMapper.java
@@ -50,7 +50,7 @@
 import com.github.jonpeterson.jackson.module.versioning.VersioningModule;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.ext.ContextResolver;
+import jakarta.ws.rs.ext.ContextResolver;
 
 public class ClientObjectMapper implements ContextResolver<ObjectMapper> {
 

diff --git a/.../api-data-model/src/main/java/com/dotcms/api/provider/DefaultResponseExceptionMapper.java b/.../api-data-model/src/main/java/com/dotcms/api/provider/DefaultResponseExceptionMapper.java
@@ -2,17 +2,17 @@
 
 import com.dotcms.model.ResponseEntityView;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.quarkus.arc.Priority;
 import io.quarkus.security.UnauthorizedException;
+import jakarta.annotation.Priority;
+import jakarta.validation.ValidationException;
+import jakarta.ws.rs.core.Response;
 import java.io.ByteArrayInputStream;
-import javax.validation.ValidationException;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.MediaType;
+
 import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper;
 
 /**

diff --git a/.../dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/DotCMSClientHeaders.java b/.../dotcms-cli/api-data-model/src/main/java/com/dotcms/api/provider/DotCMSClientHeaders.java
@@ -1,11 +1,11 @@
 package com.dotcms.api.provider;
 
 import com.dotcms.api.AuthenticationContext;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.MultivaluedMap;
 import java.io.IOException;
 import java.util.Optional;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.ws.rs.core.MultivaluedMap;
 
 
 /**

diff --git a/...dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AbstractLocalPathStructure.java b/...dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AbstractLocalPathStructure.java
@@ -3,7 +3,7 @@
 import com.dotcms.model.annotation.ValueType;
 import java.io.File;
 import java.nio.file.Path;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.immutables.value.Value;
 import org.immutables.value.Value.Default;
 import org.immutables.value.Value.Derived;

diff --git a/...otcms-cli/api-data-model/src/main/java/com/dotcms/common/AbstractRemotePathStructure.java b/...otcms-cli/api-data-model/src/main/java/com/dotcms/common/AbstractRemotePathStructure.java
@@ -2,7 +2,7 @@
 
 import com.dotcms.model.annotation.ValueType;
 import java.nio.file.Path;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.immutables.value.Value;
 import org.immutables.value.Value.Derived;
 

diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/WorkspaceManagerImpl.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/WorkspaceManagerImpl.java
@@ -6,15 +6,15 @@
 import com.dotcms.model.config.WorkspaceInfo.Builder;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.quarkus.arc.DefaultBean;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Comparator;
 import java.util.Optional;
 import java.util.stream.Stream;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.jboss.logging.Logger;
 @DefaultBean
 @ApplicationScoped

diff --git a/.../dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Category.java b/.../dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Category.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/...ms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/CategoryField.java b/...ms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/CategoryField.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/...tcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/ColumnField.java b/...tcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/ColumnField.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Field.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Field.java
@@ -19,7 +19,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.immutables.value.Value;
 import org.immutables.value.Value.Default;
 

diff --git a/...ms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/FieldVariable.java b/...ms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/FieldVariable.java
@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.util.Date;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.immutables.value.Value;
 
 @JsonTypeInfo(

diff --git a/...li/api-data-model/src/main/java/com/dotcms/contenttype/model/field/RelationshipField.java b/...li/api-data-model/src/main/java/com/dotcms/contenttype/model/field/RelationshipField.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/...ms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Relationships.java b/...ms-cli/api-data-model/src/main/java/com/dotcms/contenttype/model/field/Relationships.java
@@ -4,12 +4,12 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonInclude(Include.USE_DEFAULTS)
-@Value.Style(passAnnotations = {JsonInclude.class})
+@Value.Style(passAnnotations = {JsonInclude.class}, jakarta = true)
 @JsonSerialize(as = ImmutableRelationships.class)
 @JsonDeserialize(as = ImmutableRelationships.class)
 public interface Relationships {