From f6bc897a421e0e9d4922548c5fef37680ab39ad7 Mon Sep 17 00:00:00 2001 From: yyin-talend Date: Wed, 15 Jan 2025 20:58:12 +0800 Subject: [PATCH 1/3] chore(QTDI-1079):[TCK] Upgrade CXF to 4.1.0 --- build/NpmPublish.groovy | 14 +- .../form/internal/jaxrs/JAXRSClient.java | 20 +- component-runtime-manager/pom.xml | 5 + .../manager/service/http/JAXBManager.java | 12 +- .../service/http/codec/JAXBDecoder.java | 5 +- .../service/http/codec/JAXBEncoder.java | 6 +- .../service/HttpClientFactoryImplTest.java | 3 +- .../component/server/api/ActionResource.java | 20 +- .../server/api/BulkReadResource.java | 12 +- .../server/api/ComponentResource.java | 28 +- .../server/api/ConfigurationTypeResource.java | 20 +- .../server/api/DocumentationResource.java | 16 +- .../server/api/EnvironmentResource.java | 6 +- .../component-server/pom.xml | 5 + .../server/configuration/MdcInitializer.java | 12 +- .../WebSocketBroadcastSetup.java | 23 +- .../server/front/ActionResourceImpl.java | 11 +- .../server/front/BulkReadResourceImpl.java | 17 +- .../server/front/ComponentResourceImpl.java | 17 +- .../front/ConfigurationTypeResourceImpl.java | 9 +- .../front/DocumentationResourceImpl.java | 9 +- .../server/front/EnvironmentResourceImpl.java | 5 +- .../front/TalendComponentApplication.java | 4 +- ...tomApplicationExceptionMapperEnforcer.java | 9 +- .../CompletionExceptionExceptionMapper.java | 11 +- .../front/error/DefaultExceptionHandler.java | 11 +- .../front/filter/encoding/ForceEncoding.java | 14 +- .../filter/message/MessageResponseFilter.java | 11 +- .../server/front/memory/AsyncContextImpl.java | 19 +- .../server/front/memory/InMemoryRequest.java | 54 ++-- .../server/front/memory/InMemoryResponse.java | 30 +-- .../front/memory/MemoryInputStream.java | 6 +- .../front/memory/SimpleServletConfig.java | 6 +- .../security/CommandSecurityProvider.java | 17 +- .../security/ConnectionSecurityProvider.java | 17 +- .../security/web/DocumentationToggle.java | 15 +- .../front/security/web/EnvironmentFilter.java | 15 +- .../server/mdc/MdcRequestBinder.java | 15 +- .../service/ComponentManagerService.java | 5 +- .../ExtensionComponentMetadataManager.java | 3 +- .../jcache/FrontCacheKeyGenerator.java | 9 +- .../server/front/ActionResourceImplTest.java | 10 +- .../front/BulkReadResourceImplTest.java | 14 +- .../front/ComponentResourceImplTest.java | 18 +- .../ConfigurationTypeResourceImplTest.java | 6 +- .../front/DocumentationResourceImplTest.java | 6 +- .../front/EnvironmentResourceImplTest.java | 4 +- .../component/server/front/MigrationTest.java | 6 +- .../beam/BeamActionSerializationTest.java | 6 +- .../beam/BeamComponentResourceImplTest.java | 4 +- .../server/service/UiSchemaTest.java | 4 +- .../VirtualDependenciesServiceTest.java | 10 +- .../component/server/test/ClientProducer.java | 6 +- .../server/test/ComponentClient.java | 4 +- .../server/test/vault/TenantHeaderFilter.java | 6 +- .../server/test/vault/VaultMock.java | 20 +- .../server/tomcat/TomcatSetupTest.java | 2 +- .../server/extension/api/action/Action.java | 4 +- component-server-parent/pom.xml | 13 + component-starter-server/pom.xml | 11 +- .../HttpHeaderSecurityFilter.java | 247 ++++++++++++++++++ .../configuration/ServletConfigurer.java | 24 +- .../server/front/ApiDemoEndpoints.java | 25 +- .../server/front/EnvironmentResource.java | 5 +- .../starter/server/front/ProjectResource.java | 31 +-- .../starter/server/front/RRDEndpoint.java | 19 +- .../server/front/StarterApplication.java | 5 +- .../server/front/js/IndexRedirector.java | 18 +- .../server/service/info/ServerInfo.java | 9 +- .../server/front/ProjectResourceTest.java | 10 +- .../starter/server/front/RRDEndpointTest.java | 8 +- .../front/apidemo/ApiDemoEndpointsTest.java | 10 +- .../component/starter/server/test/Client.java | 16 +- .../component/tools/webapp/AdminResource.java | 11 +- .../webapp/FrontCompatibilityRouter.java | 6 +- .../component/tools/webapp/LazyClient.java | 21 +- .../component/tools/webapp/ResourceProxy.java | 15 +- .../tools/webapp/WebAppComponentProxy.java | 29 +- .../generator/StaticResourceGenerator.java | 11 +- .../servlet/StaticResourceServlet.java | 9 +- documentation/pom.xml | 10 + .../runtime/documentation/Generator.java | 11 +- .../talend/runtime/documentation/Github.java | 17 +- .../runtime/documentation/Gravatars.java | 8 +- pom.xml | 19 +- talend-component-maven-plugin/pom.xml | 6 +- vault-client/pom.xml | 10 + .../components/vault/client/VaultClient.java | 15 +- .../vault/client/VaultClientSetup.java | 7 +- .../vault/client/VaultClientTest.java | 10 +- .../vault/client/vault/VaultMock.java | 30 +-- 91 files changed, 851 insertions(+), 521 deletions(-) create mode 100644 component-starter-server/src/main/java/org/talend/sdk/component/starter/server/configuration/HttpHeaderSecurityFilter.java diff --git a/build/NpmPublish.groovy b/build/NpmPublish.groovy index fe5697456ab9d..7f85cd7c4f4b5 100644 --- a/build/NpmPublish.groovy +++ b/build/NpmPublish.groovy @@ -23,18 +23,18 @@ import org.apache.maven.settings.crypto.SettingsDecrypter import javax.json.bind.JsonbBuilder import javax.json.bind.annotation.JsonbProperty -import javax.ws.rs.client.Client -import javax.ws.rs.client.ClientBuilder -import javax.ws.rs.client.WebTarget -import javax.ws.rs.core.MediaType -import javax.ws.rs.core.Response +import jakarta.ws.rs.client.Client +import jakarta.ws.rs.client.ClientBuilder +import jakarta.ws.rs.client.WebTarget +import jakarta.ws.rs.core.MediaType +import jakarta.ws.rs.core.Response import java.nio.charset.StandardCharsets import java.nio.file.Files import java.security.MessageDigest import java.util.zip.GZIPOutputStream -import static javax.ws.rs.client.Entity.entity -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE +import static jakarta.ws.rs.client.Entity.entity +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE // // Helper script to publish a folder to npm using a settings.xml server diff --git a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/jaxrs/JAXRSClient.java b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/jaxrs/JAXRSClient.java index cfa3d7400f413..f4f74c8fabfab 100644 --- a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/jaxrs/JAXRSClient.java +++ b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/jaxrs/JAXRSClient.java @@ -15,22 +15,22 @@ */ package org.talend.sdk.component.form.internal.jaxrs; +import static jakarta.ws.rs.client.Entity.entity; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static java.util.stream.Collectors.toMap; -import static javax.ws.rs.client.Entity.entity; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; + +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; - import org.talend.sdk.component.form.api.Client; public class JAXRSClient implements Client { - private final javax.ws.rs.client.Client delegate; + private final jakarta.ws.rs.client.Client delegate; private final WebTarget target; @@ -42,7 +42,7 @@ public JAXRSClient(final String base) { this(newClient(), base, true); } - public JAXRSClient(final javax.ws.rs.client.Client client, final String base, final boolean closeClient) { + public JAXRSClient(final jakarta.ws.rs.client.Client client, final String base, final boolean closeClient) { this.delegate = client; this.closeClient = closeClient; this.target = client.target(base); @@ -74,8 +74,8 @@ public void close() { } } - private static javax.ws.rs.client.Client newClient() { - final javax.ws.rs.client.Client instance = ClientBuilder.newClient(); + private static jakarta.ws.rs.client.Client newClient() { + final jakarta.ws.rs.client.Client instance = ClientBuilder.newClient(); System .getProperties() .stringPropertyNames() diff --git a/component-runtime-manager/pom.xml b/component-runtime-manager/pom.xml index ce4412bf2b3f4..72905c46c889e 100644 --- a/component-runtime-manager/pom.xml +++ b/component-runtime-manager/pom.xml @@ -79,6 +79,11 @@ org.apache.johnzon johnzon-core + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind.version} + org.slf4j diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/JAXBManager.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/JAXBManager.java index 426641d046eab..a759fef13aaba 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/JAXBManager.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/JAXBManager.java @@ -18,6 +18,11 @@ import static java.util.Optional.ofNullable; import static java.util.stream.Stream.of; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + import java.lang.reflect.Method; import java.lang.reflect.Parameter; import java.util.HashMap; @@ -25,11 +30,6 @@ import java.util.Objects; import java.util.stream.Stream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - import org.talend.sdk.component.api.service.http.Decoder; import org.talend.sdk.component.api.service.http.Header; import org.talend.sdk.component.api.service.http.Headers; @@ -52,7 +52,7 @@ class JAXB { try { ofNullable(JAXB.class.getClassLoader()) .orElseGet(ClassLoader::getSystemClassLoader) - .loadClass("javax.xml.bind.annotation.XmlType"); + .loadClass("jakarta.xml.bind.annotation.XmlType"); active = true; } catch (final ClassNotFoundException e) { log.info("JAXB is not available in classloader {}", JAXB.class.getClassLoader()); diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/codec/JAXBDecoder.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/codec/JAXBDecoder.java index 47077041981e2..326da13ca225e 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/codec/JAXBDecoder.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/codec/JAXBDecoder.java @@ -15,12 +15,13 @@ */ package org.talend.sdk.component.runtime.manager.service.http.codec; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; + import java.io.ByteArrayInputStream; import java.lang.reflect.Type; import java.util.Map; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; import javax.xml.transform.stream.StreamSource; import org.talend.sdk.component.api.service.http.Decoder; diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/codec/JAXBEncoder.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/codec/JAXBEncoder.java index a79a22671dbb8..9c9a165a152da 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/codec/JAXBEncoder.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/codec/JAXBEncoder.java @@ -15,12 +15,12 @@ */ package org.talend.sdk.component.runtime.manager.service.http.codec; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; + import java.io.ByteArrayOutputStream; import java.util.Map; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - import org.talend.sdk.component.api.service.http.Encoder; import lombok.AllArgsConstructor; diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/HttpClientFactoryImplTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/HttpClientFactoryImplTest.java index 36e49cf517f89..360d59079df21 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/HttpClientFactoryImplTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/HttpClientFactoryImplTest.java @@ -26,6 +26,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.talend.sdk.component.api.service.http.QueryFormat.MULTI; +import jakarta.xml.bind.annotation.XmlRootElement; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -41,7 +43,6 @@ import java.util.stream.Stream; import javax.json.bind.JsonbBuilder; -import javax.xml.bind.annotation.XmlRootElement; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpServer; diff --git a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ActionResource.java b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ActionResource.java index bc9d5e9426735..dc1bbd9a0b0d3 100644 --- a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ActionResource.java +++ b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ActionResource.java @@ -15,23 +15,23 @@ */ package org.talend.sdk.component.server.api; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.eclipse.microprofile.openapi.annotations.enums.ParameterIn.QUERY; import static org.eclipse.microprofile.openapi.annotations.enums.SchemaType.OBJECT; import static org.eclipse.microprofile.openapi.annotations.enums.SchemaType.STRING; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +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.Response; + import java.util.Map; import java.util.concurrent.CompletionStage; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -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.Response; - import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/BulkReadResource.java b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/BulkReadResource.java index 93dc38b0c091f..fcd7419821dad 100644 --- a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/BulkReadResource.java +++ b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/BulkReadResource.java @@ -15,14 +15,14 @@ */ package org.talend.sdk.component.server.api; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import java.util.concurrent.CompletionStage; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import java.util.concurrent.CompletionStage; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ComponentResource.java b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ComponentResource.java index 2d6ebe816a838..b72fb0c4d5110 100644 --- a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ComponentResource.java +++ b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ComponentResource.java @@ -15,26 +15,26 @@ */ package org.talend.sdk.component.server.api; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; import static org.eclipse.microprofile.openapi.annotations.enums.ParameterIn.PATH; import static org.eclipse.microprofile.openapi.annotations.enums.ParameterIn.QUERY; import static org.eclipse.microprofile.openapi.annotations.enums.SchemaType.OBJECT; import static org.eclipse.microprofile.openapi.annotations.enums.SchemaType.STRING; -import java.util.Map; +import jakarta.ws.rs.Consumes; +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 jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; -import javax.ws.rs.Consumes; -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 javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; +import java.util.Map; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ConfigurationTypeResource.java b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ConfigurationTypeResource.java index 9c32de1beda18..d1e4c67d187a4 100644 --- a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ConfigurationTypeResource.java +++ b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ConfigurationTypeResource.java @@ -15,23 +15,23 @@ */ package org.talend.sdk.component.server.api; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.eclipse.microprofile.openapi.annotations.enums.ParameterIn.PATH; import static org.eclipse.microprofile.openapi.annotations.enums.ParameterIn.QUERY; import static org.eclipse.microprofile.openapi.annotations.enums.SchemaType.BOOLEAN; import static org.eclipse.microprofile.openapi.annotations.enums.SchemaType.OBJECT; import static org.eclipse.microprofile.openapi.annotations.enums.SchemaType.STRING; -import java.util.Map; +import jakarta.ws.rs.Consumes; +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 javax.ws.rs.Consumes; -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 java.util.Map; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/DocumentationResource.java b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/DocumentationResource.java index a39b1dc006b6a..f64e68fb9e15a 100644 --- a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/DocumentationResource.java +++ b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/DocumentationResource.java @@ -15,19 +15,19 @@ */ package org.talend.sdk.component.server.api; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.eclipse.microprofile.openapi.annotations.enums.ParameterIn.PATH; import static org.eclipse.microprofile.openapi.annotations.enums.ParameterIn.QUERY; import static org.eclipse.microprofile.openapi.annotations.enums.SchemaType.OBJECT; import static org.eclipse.microprofile.openapi.annotations.enums.SchemaType.STRING; -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.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.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/EnvironmentResource.java b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/EnvironmentResource.java index 11a15482e8321..fe44a2c1b60fe 100644 --- a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/EnvironmentResource.java +++ b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/EnvironmentResource.java @@ -15,10 +15,10 @@ */ package org.talend.sdk.component.server.api; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/component-server-parent/component-server/pom.xml b/component-server-parent/component-server/pom.xml index 47e9375641ab3..df557e12be1f9 100644 --- a/component-server-parent/component-server/pom.xml +++ b/component-server-parent/component-server/pom.xml @@ -93,6 +93,11 @@ meecrowave-core ${meecrowave.version} + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.version} + org.eclipse.microprofile.config microprofile-config-api diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/configuration/MdcInitializer.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/configuration/MdcInitializer.java index e62638691368e..d60311b752484 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/configuration/MdcInitializer.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/configuration/MdcInitializer.java @@ -15,15 +15,15 @@ */ package org.talend.sdk.component.server.configuration; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.ServletContainerInitializer; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; + import java.util.EnumSet; import java.util.Set; -import javax.servlet.DispatcherType; -import javax.servlet.FilterRegistration; -import javax.servlet.ServletContainerInitializer; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; - import org.talend.sdk.component.server.mdc.MdcRequestBinder; import lombok.extern.slf4j.Slf4j; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/configuration/WebSocketBroadcastSetup.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/configuration/WebSocketBroadcastSetup.java index 51d5d4002370d..46e54e88bf8a0 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/configuration/WebSocketBroadcastSetup.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/configuration/WebSocketBroadcastSetup.java @@ -20,6 +20,18 @@ import static java.util.Collections.singletonList; import static java.util.Locale.ENGLISH; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.HttpHeaders; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -44,14 +56,6 @@ import javax.enterprise.context.Dependent; import javax.enterprise.inject.Instance; import javax.inject.Inject; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.websocket.CloseReason; import javax.websocket.DeploymentException; import javax.websocket.Endpoint; @@ -60,9 +64,6 @@ import javax.websocket.Session; import javax.websocket.server.ServerContainer; import javax.websocket.server.ServerEndpointConfig; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.HttpHeaders; import javax.xml.namespace.QName; import org.apache.cxf.Bus; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ActionResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ActionResourceImpl.java index 9af4e05fa49fa..8390227bc4c83 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ActionResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ActionResourceImpl.java @@ -15,11 +15,16 @@ */ package org.talend.sdk.component.server.front; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static java.util.Arrays.asList; import static java.util.Optional.ofNullable; import static java.util.function.Function.identity; import static java.util.stream.Collectors.toList; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; + +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.util.Collection; import java.util.HashMap; @@ -36,10 +41,6 @@ import javax.cache.annotation.CacheResult; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; import org.talend.sdk.component.api.exception.ComponentException; import org.talend.sdk.component.runtime.manager.ComponentManager; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/BulkReadResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/BulkReadResourceImpl.java index 8a1f4ca1c551d..22d6410bebf72 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/BulkReadResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/BulkReadResourceImpl.java @@ -22,6 +22,15 @@ import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -44,14 +53,6 @@ import javax.json.Json; import javax.json.JsonObject; import javax.json.bind.Jsonb; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.apache.cxf.Bus; import org.apache.cxf.transport.http.DestinationRegistry; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java index 296c9801a07b3..e219951903ad9 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java @@ -15,6 +15,7 @@ */ package org.talend.sdk.component.server.front; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; @@ -22,12 +23,19 @@ import static java.util.function.UnaryOperator.identity; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION; import static org.talend.sdk.component.server.front.model.ErrorDictionary.COMPONENT_MISSING; import static org.talend.sdk.component.server.front.model.ErrorDictionary.DESIGN_MODEL_MISSING; import static org.talend.sdk.component.server.front.model.ErrorDictionary.PLUGIN_MISSING; +import jakarta.ws.rs.WebApplicationException; +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.Response.Status; +import jakarta.ws.rs.core.StreamingOutput; + import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; @@ -60,13 +68,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -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.Response.Status; -import javax.ws.rs.core.StreamingOutput; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.Transformer; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImpl.java index 2abe9e5b27bc7..974d911562290 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImpl.java @@ -22,6 +22,11 @@ import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toSet; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; + import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -40,10 +45,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; import org.talend.sdk.component.api.exception.ComponentException; import org.talend.sdk.component.container.Container; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/DocumentationResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/DocumentationResourceImpl.java index a1052dfe65575..aabb97cc847bd 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/DocumentationResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/DocumentationResourceImpl.java @@ -15,13 +15,16 @@ */ package org.talend.sdk.component.server.front; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import static java.util.Collections.list; import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; + +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import java.io.BufferedReader; import java.io.IOException; @@ -52,8 +55,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Instance; import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; import org.talend.sdk.component.container.Container; import org.talend.sdk.component.path.PathFactory; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/EnvironmentResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/EnvironmentResourceImpl.java index e42598f8706b6..6b0a2e10b6ff3 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/EnvironmentResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/EnvironmentResourceImpl.java @@ -15,6 +15,9 @@ */ package org.talend.sdk.component.server.front; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; + import java.util.Date; import java.util.Spliterator; import java.util.Spliterators; @@ -25,8 +28,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Instance; import javax.inject.Inject; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.talend.sdk.component.server.api.EnvironmentResource; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/TalendComponentApplication.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/TalendComponentApplication.java index 84031f10a7cba..47ec1a9a6b82d 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/TalendComponentApplication.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/TalendComponentApplication.java @@ -15,8 +15,8 @@ */ package org.talend.sdk.component.server.front; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; import org.eclipse.microprofile.openapi.annotations.info.Contact; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/cxf/CxfCustomApplicationExceptionMapperEnforcer.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/cxf/CxfCustomApplicationExceptionMapperEnforcer.java index 9842e159d439b..08c9de801481e 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/cxf/CxfCustomApplicationExceptionMapperEnforcer.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/cxf/CxfCustomApplicationExceptionMapperEnforcer.java @@ -17,11 +17,12 @@ import static java.util.Optional.ofNullable; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.ext.Provider; + import javax.enterprise.context.Dependent; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.ext.Provider; import org.apache.cxf.jaxrs.utils.JAXRSUtils; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/error/CompletionExceptionExceptionMapper.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/error/CompletionExceptionExceptionMapper.java index 6f4213a257c5a..9a6f98aa66392 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/error/CompletionExceptionExceptionMapper.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/error/CompletionExceptionExceptionMapper.java @@ -15,14 +15,15 @@ */ package org.talend.sdk.component.server.front.error; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Providers; + import java.util.concurrent.CompletionException; import javax.enterprise.context.Dependent; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.Providers; import org.talend.sdk.component.server.front.model.ErrorDictionary; import org.talend.sdk.component.server.front.model.error.ErrorPayload; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/error/DefaultExceptionHandler.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/error/DefaultExceptionHandler.java index 9e566643b1ad1..24ed5a22a9b3d 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/error/DefaultExceptionHandler.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/error/DefaultExceptionHandler.java @@ -15,17 +15,18 @@ */ package org.talend.sdk.component.server.front.error; -import static javax.ws.rs.core.MediaType.WILDCARD_TYPE; +import static jakarta.ws.rs.core.MediaType.WILDCARD_TYPE; + +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import java.util.Optional; import javax.annotation.PostConstruct; import javax.enterprise.context.Dependent; import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; import org.talend.sdk.component.server.configuration.ComponentServerConfiguration; import org.talend.sdk.component.server.front.model.ErrorDictionary; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/filter/encoding/ForceEncoding.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/filter/encoding/ForceEncoding.java index 86247e423ed75..b183088fac4cf 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/filter/encoding/ForceEncoding.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/filter/encoding/ForceEncoding.java @@ -15,14 +15,14 @@ */ package org.talend.sdk.component.server.front.filter.encoding; -import java.io.IOException; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; +import java.io.IOException; @WebFilter(asyncSupported = true, urlPatterns = "/*") public class ForceEncoding implements Filter { diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/filter/message/MessageResponseFilter.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/filter/message/MessageResponseFilter.java index b699a80097f07..778181f818813 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/filter/message/MessageResponseFilter.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/filter/message/MessageResponseFilter.java @@ -15,12 +15,13 @@ */ package org.talend.sdk.component.server.front.filter.message; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ext.Provider; + import javax.enterprise.context.Dependent; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.ext.Provider; @Provider @Dependent diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/AsyncContextImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/AsyncContextImpl.java index 6c0ef97706e98..9a021f8b45195 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/AsyncContextImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/AsyncContextImpl.java @@ -17,6 +17,16 @@ import static java.util.Optional.ofNullable; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.AsyncEvent; +import jakarta.servlet.AsyncListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; @@ -26,15 +36,6 @@ import java.util.List; import javax.enterprise.inject.spi.CDI; -import javax.servlet.AsyncContext; -import javax.servlet.AsyncEvent; -import javax.servlet.AsyncListener; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.cxf.transport.servlet.ServletController; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/InMemoryRequest.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/InMemoryRequest.java index 4f74f8c45dac2..bf11749c1a4ad 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/InMemoryRequest.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/InMemoryRequest.java @@ -20,6 +20,21 @@ import static java.util.Collections.enumeration; import static java.util.Collections.singleton; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConnection; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpUpgradeHandler; +import jakarta.servlet.http.Part; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -33,20 +48,6 @@ import java.util.Map; import java.util.function.Supplier; -import javax.servlet.AsyncContext; -import javax.servlet.DispatcherType; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpUpgradeHandler; -import javax.servlet.http.Part; - import org.apache.cxf.transport.servlet.ServletController; import org.apache.tomcat.util.http.FastHttpDateFormat; import org.talend.sdk.component.server.front.security.ConnectionSecurityProvider; @@ -252,11 +253,6 @@ public boolean isRequestedSessionIdFromURL() { return false; } - @Override - public boolean isRequestedSessionIdFromUrl() { - return false; - } - @Override public boolean authenticate(final HttpServletResponse httpServletResponse) { return false; @@ -411,11 +407,6 @@ public boolean isSecure() { return false; } - @Override - public String getRealPath(final String s) { - return null; - } - @Override public int getRemotePort() { return 0; @@ -480,4 +471,19 @@ public AsyncContext getAsyncContext() { public DispatcherType getDispatcherType() { throw new UnsupportedOperationException(); } + + @Override + public String getRequestId() { + return null; + } + + @Override + public String getProtocolRequestId() { + return null; + } + + @Override + public ServletConnection getServletConnection() { + return null; + } } diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/InMemoryResponse.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/InMemoryResponse.java index 466d3358dba80..ed3b672009a2b 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/InMemoryResponse.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/InMemoryResponse.java @@ -17,6 +17,11 @@ import static java.util.Collections.singletonList; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -33,11 +38,6 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; - public class InMemoryResponse implements HttpServletResponse { private final BooleanSupplier isOpen; @@ -92,11 +92,6 @@ public void setStatus(final int i) { setCode(i); } - @Override - public void setStatus(final int i, final String s) { - setCode(i); - } - @Override public void addCookie(final Cookie cookie) { setHeader(cookie.getName(), cookie.getValue()); @@ -137,16 +132,6 @@ public String encodeRedirectURL(final String s) { return toEncoded(s); } - @Override - public String encodeUrl(final String s) { - return toEncoded(s); - } - - @Override - public String encodeRedirectUrl(final String s) { - return encodeRedirectURL(s); - } - public String getHeader(final String name) { final Collection strings = headers.get(name); return strings == null ? null : strings.iterator().next(); @@ -193,6 +178,11 @@ public void sendRedirect(final String path) throws IOException { } } + @Override + public void sendRedirect(final String s, final int i, final boolean b) throws IOException { + sendRedirect(s); + } + @Override public void setDateHeader(final String s, final long l) { addDateHeader(s, l); diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/MemoryInputStream.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/MemoryInputStream.java index 9d267d98522e0..03df52af74fd3 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/MemoryInputStream.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/MemoryInputStream.java @@ -15,12 +15,12 @@ */ package org.talend.sdk.component.server.front.memory; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; + import java.io.IOException; import java.io.InputStream; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; - public class MemoryInputStream extends ServletInputStream { protected final InputStream delegate; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/SimpleServletConfig.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/SimpleServletConfig.java index b5dcdee870b5b..82f62d90072db 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/SimpleServletConfig.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/memory/SimpleServletConfig.java @@ -17,10 +17,10 @@ import static java.util.Collections.emptyEnumeration; -import java.util.Enumeration; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; +import java.util.Enumeration; import lombok.AllArgsConstructor; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/CommandSecurityProvider.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/CommandSecurityProvider.java index 5aa98cf8218cb..d5c86d7e8292b 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/CommandSecurityProvider.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/CommandSecurityProvider.java @@ -15,21 +15,22 @@ */ package org.talend.sdk.component.server.front.security; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.talend.sdk.component.server.front.model.ErrorDictionary.UNAUTHORIZED; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + import java.io.IOException; import javax.enterprise.context.Dependent; import javax.enterprise.event.Event; import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; import org.talend.sdk.component.server.front.model.error.ErrorPayload; import org.talend.sdk.component.server.service.security.event.OnCommand; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/ConnectionSecurityProvider.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/ConnectionSecurityProvider.java index bf93e5309574d..5bbead8dee36f 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/ConnectionSecurityProvider.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/ConnectionSecurityProvider.java @@ -15,21 +15,22 @@ */ package org.talend.sdk.component.server.front.security; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.talend.sdk.component.server.front.model.ErrorDictionary.UNAUTHORIZED; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + import java.io.IOException; import javax.enterprise.context.Dependent; import javax.enterprise.event.Event; import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; import org.talend.sdk.component.server.front.model.error.ErrorPayload; import org.talend.sdk.component.server.service.security.event.OnConnection; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/web/DocumentationToggle.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/web/DocumentationToggle.java index 7ed76af736fbc..f797d372686db 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/web/DocumentationToggle.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/web/DocumentationToggle.java @@ -15,17 +15,18 @@ */ package org.talend.sdk.component.server.front.security.web; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import javax.enterprise.context.Dependent; import javax.inject.Inject; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletResponse; import org.talend.sdk.component.server.configuration.ComponentServerConfiguration; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/web/EnvironmentFilter.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/web/EnvironmentFilter.java index aa04b213d3848..af6462b3d8fbf 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/web/EnvironmentFilter.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/web/EnvironmentFilter.java @@ -15,17 +15,18 @@ */ package org.talend.sdk.component.server.front.security.web; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import javax.enterprise.context.Dependent; import javax.inject.Inject; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletResponse; import org.talend.sdk.component.server.configuration.ComponentServerConfiguration; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/mdc/MdcRequestBinder.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/mdc/MdcRequestBinder.java index ed5642db1001c..db779ca74cc40 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/mdc/MdcRequestBinder.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/mdc/MdcRequestBinder.java @@ -17,6 +17,14 @@ import static java.util.Optional.ofNullable; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; + import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; @@ -24,13 +32,6 @@ import java.util.Map; import javax.enterprise.inject.Vetoed; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; import org.apache.logging.log4j.ThreadContext; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ComponentManagerService.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ComponentManagerService.java index be4cbe82cbc2f..8cef8039eba4a 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ComponentManagerService.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ComponentManagerService.java @@ -22,6 +22,9 @@ import static java.util.stream.Collectors.toSet; import static java.util.stream.Stream.empty; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; + import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; @@ -50,8 +53,6 @@ import javax.enterprise.event.Observes; import javax.enterprise.inject.Produces; import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; import org.talend.sdk.component.container.Container; import org.talend.sdk.component.container.ContainerListener; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ExtensionComponentMetadataManager.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ExtensionComponentMetadataManager.java index 767aeb6cce958..3dd7286d31600 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ExtensionComponentMetadataManager.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ExtensionComponentMetadataManager.java @@ -22,6 +22,8 @@ import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; +import jakarta.ws.rs.core.MediaType; + import java.io.BufferedOutputStream; import java.io.IOException; import java.nio.file.Files; @@ -45,7 +47,6 @@ import javax.enterprise.event.NotificationOptions; import javax.enterprise.event.Observes; import javax.inject.Inject; -import javax.ws.rs.core.MediaType; import org.talend.sdk.component.path.PathFactory; import org.talend.sdk.component.server.configuration.ComponentServerConfiguration; diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/jcache/FrontCacheKeyGenerator.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/jcache/FrontCacheKeyGenerator.java index 2848e24cbf500..9af8a0348c14f 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/jcache/FrontCacheKeyGenerator.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/jcache/FrontCacheKeyGenerator.java @@ -15,6 +15,11 @@ */ package org.talend.sdk.component.server.service.jcache; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.UriInfo; + import java.lang.annotation.Annotation; import java.util.Arrays; import java.util.stream.Stream; @@ -25,10 +30,6 @@ import javax.cache.annotation.GeneratedCacheKey; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.UriInfo; import lombok.extern.slf4j.Slf4j; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ActionResourceImplTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ActionResourceImplTest.java index e357820eecc57..96365aa773e6d 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ActionResourceImplTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ActionResourceImplTest.java @@ -16,7 +16,7 @@ package org.talend.sdk.component.server.front; import static java.util.Collections.emptyMap; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -34,10 +34,10 @@ import javax.inject.Inject; import javax.json.JsonObject; import javax.json.bind.spi.JsonbProvider; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.junit.jupiter.api.Disabled; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/BulkReadResourceImplTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/BulkReadResourceImplTest.java index 307eba7b09ac8..beac0e8af6c3d 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/BulkReadResourceImplTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/BulkReadResourceImplTest.java @@ -19,9 +19,9 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; -import static javax.ws.rs.client.Entity.entity; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.client.Entity.entity; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -31,10 +31,10 @@ import javax.inject.Inject; import javax.json.bind.Jsonb; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.HttpHeaders; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.junit.jupiter.api.Test; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ComponentResourceImplTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ComponentResourceImplTest.java index 0b4efeb984179..fd19cc6243a60 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ComponentResourceImplTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ComponentResourceImplTest.java @@ -16,10 +16,10 @@ package org.talend.sdk.component.server.front; import static java.util.Collections.singletonList; -import static javax.ws.rs.client.Entity.entity; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_SVG_XML_TYPE; +import static jakarta.ws.rs.client.Entity.entity; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_SVG_XML_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -52,11 +52,11 @@ import java.util.stream.IntStream; import javax.inject.Inject; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.apache.ziplock.IO; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImplTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImplTest.java index 656ea3d89f4e5..ebc0a96b40e05 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImplTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImplTest.java @@ -17,7 +17,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singleton; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -31,8 +31,8 @@ import javax.json.JsonBuilderFactory; import javax.json.JsonObject; import javax.json.spi.JsonProvider; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.junit.jupiter.api.Assertions; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/DocumentationResourceImplTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/DocumentationResourceImplTest.java index 178477979b6ed..1f97e7046d82d 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/DocumentationResourceImplTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/DocumentationResourceImplTest.java @@ -15,14 +15,14 @@ */ package org.talend.sdk.component.server.front; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.function.Function; import javax.inject.Inject; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.junit.jupiter.api.RepeatedTest; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/EnvironmentResourceImplTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/EnvironmentResourceImplTest.java index 2ff34be90c5d8..2321266812015 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/EnvironmentResourceImplTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/EnvironmentResourceImplTest.java @@ -15,7 +15,7 @@ */ package org.talend.sdk.component.server.front; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -24,7 +24,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.junit.jupiter.api.Assertions; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/MigrationTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/MigrationTest.java index 2efcc8abbe226..1a3e2fafa659b 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/MigrationTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/MigrationTest.java @@ -15,15 +15,15 @@ */ package org.talend.sdk.component.server.front; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.junit.jupiter.api.Test; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/beam/BeamActionSerializationTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/beam/BeamActionSerializationTest.java index 553bfe64c4870..c38a351259825 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/beam/BeamActionSerializationTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/beam/BeamActionSerializationTest.java @@ -16,12 +16,12 @@ package org.talend.sdk.component.server.front.beam; import static java.util.Collections.emptyMap; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import javax.inject.Inject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.junit.jupiter.api.Test; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/beam/BeamComponentResourceImplTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/beam/BeamComponentResourceImplTest.java index 43d73bb322e33..4a07610d077b3 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/beam/BeamComponentResourceImplTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/beam/BeamComponentResourceImplTest.java @@ -15,12 +15,12 @@ */ package org.talend.sdk.component.server.front.beam; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import javax.inject.Inject; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.junit.jupiter.api.Test; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/UiSchemaTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/UiSchemaTest.java index 5478a19171f55..1e47af26f7a90 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/UiSchemaTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/UiSchemaTest.java @@ -16,7 +16,7 @@ package org.talend.sdk.component.server.service; import static java.util.Collections.emptyList; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -31,7 +31,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.junit.jupiter.api.Test; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/VirtualDependenciesServiceTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/VirtualDependenciesServiceTest.java index 9dcf93ced8655..0961efbf3c7a2 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/VirtualDependenciesServiceTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/VirtualDependenciesServiceTest.java @@ -18,8 +18,8 @@ import static java.util.Collections.emptyMap; import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toSet; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; @@ -38,9 +38,9 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.apache.ziplock.IO; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/ClientProducer.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/ClientProducer.java index a229ac915c745..ded2c78826085 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/ClientProducer.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/ClientProducer.java @@ -18,9 +18,9 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/ComponentClient.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/ComponentClient.java index 48bd2c4528a2c..193b2fe60e223 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/ComponentClient.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/ComponentClient.java @@ -15,11 +15,11 @@ */ package org.talend.sdk.component.server.test; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import org.talend.sdk.component.server.front.model.ComponentIndices; import org.talend.sdk.component.server.front.model.ConfigTypeNodes; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/vault/TenantHeaderFilter.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/vault/TenantHeaderFilter.java index 6d458acdbfcce..a61cc27742d10 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/vault/TenantHeaderFilter.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/vault/TenantHeaderFilter.java @@ -16,9 +16,9 @@ package org.talend.sdk.component.server.test.vault; import javax.enterprise.context.Dependent; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; @Dependent @Provider diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/vault/VaultMock.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/vault/VaultMock.java index 0ae707f63c597..19039b0094031 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/vault/VaultMock.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/vault/VaultMock.java @@ -21,16 +21,16 @@ import java.util.Base64; import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.Consumes; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.talend.sdk.components.vault.client.VaultClient; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/tomcat/TomcatSetupTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/tomcat/TomcatSetupTest.java index d86065eb26fbf..f845164c08297 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/tomcat/TomcatSetupTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/tomcat/TomcatSetupTest.java @@ -19,7 +19,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import javax.inject.Inject; -import javax.ws.rs.client.Client; +import jakarta.ws.rs.client.Client; import org.apache.meecrowave.Meecrowave; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; diff --git a/component-server-parent/extensions/component-server-extension-api/src/main/java/org/talend/sdk/component/server/extension/api/action/Action.java b/component-server-parent/extensions/component-server-extension-api/src/main/java/org/talend/sdk/component/server/extension/api/action/Action.java index 0fff87978910e..c08a6988001ca 100644 --- a/component-server-parent/extensions/component-server-extension-api/src/main/java/org/talend/sdk/component/server/extension/api/action/Action.java +++ b/component-server-parent/extensions/component-server-extension-api/src/main/java/org/talend/sdk/component/server/extension/api/action/Action.java @@ -15,12 +15,12 @@ */ package org.talend.sdk.component.server.extension.api.action; +import jakarta.ws.rs.core.Response; + import java.util.Map; import java.util.concurrent.CompletionStage; import java.util.function.BiFunction; -import javax.ws.rs.core.Response; - import org.talend.sdk.component.server.front.model.ActionReference; import lombok.Data; diff --git a/component-server-parent/pom.xml b/component-server-parent/pom.xml index 873a2a63d71cd..3c32d09e62faa 100644 --- a/component-server-parent/pom.xml +++ b/component-server-parent/pom.xml @@ -33,4 +33,17 @@ component-server extensions + + + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind.version} + + diff --git a/component-starter-server/pom.xml b/component-starter-server/pom.xml index eaa4f644a55ef..86f1b64748b59 100644 --- a/component-starter-server/pom.xml +++ b/component-starter-server/pom.xml @@ -108,7 +108,16 @@ rrd4j 3.7 - + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.version} + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.version} + org.apache.meecrowave meecrowave-junit diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/configuration/HttpHeaderSecurityFilter.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/configuration/HttpHeaderSecurityFilter.java new file mode 100644 index 0000000000000..879aafc3c55c5 --- /dev/null +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/configuration/HttpHeaderSecurityFilter.java @@ -0,0 +1,247 @@ +/** + * Copyright (C) 2006-2025 Talend Inc. - www.talend.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.talend.sdk.component.starter.server.configuration; + +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class HttpHeaderSecurityFilter implements Filter { + + // HSTS + private static final String HSTS_HEADER_NAME = "Strict-Transport-Security"; + private boolean hstsEnabled = true; + private int hstsMaxAgeSeconds = 0; + private boolean hstsIncludeSubDomains = false; + private boolean hstsPreload = false; + private String hstsHeaderValue; + + // Click-jacking protection + private static final String ANTI_CLICK_JACKING_HEADER_NAME = "X-Frame-Options"; + private boolean antiClickJackingEnabled = true; + private XFrameOption antiClickJackingOption = XFrameOption.DENY; + private URI antiClickJackingUri; + private String antiClickJackingHeaderValue; + + // Block content sniffing + private static final String BLOCK_CONTENT_TYPE_SNIFFING_HEADER_NAME = "X-Content-Type-Options"; + private static final String BLOCK_CONTENT_TYPE_SNIFFING_HEADER_VALUE = "nosniff"; + private boolean blockContentTypeSniffingEnabled = true; + + // Cross-site scripting filter protection + @Deprecated + private static final String XSS_PROTECTION_HEADER_NAME = "X-XSS-Protection"; + @Deprecated + private static final String XSS_PROTECTION_HEADER_VALUE = "1; mode=block"; + @Deprecated + private boolean xssProtectionEnabled = false; + + @Override + public void init(final FilterConfig filterConfig) throws ServletException { + // Build HSTS header value + StringBuilder hstsValue = new StringBuilder("max-age="); + hstsValue.append(hstsMaxAgeSeconds); + if (hstsIncludeSubDomains) { + hstsValue.append(";includeSubDomains"); + } + if (hstsPreload) { + hstsValue.append(";preload"); + } + hstsHeaderValue = hstsValue.toString(); + + // Anti click-jacking + StringBuilder cjValue = new StringBuilder(antiClickJackingOption.headerValue); + if (antiClickJackingOption == XFrameOption.ALLOW_FROM) { + cjValue.append(' '); + cjValue.append(antiClickJackingUri); + } + antiClickJackingHeaderValue = cjValue.toString(); + } + + + @Override + public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) + throws IOException, ServletException { + + if (response instanceof HttpServletResponse) { + HttpServletResponse httpResponse = (HttpServletResponse) response; + + if (response.isCommitted()) { + throw new ServletException("Unable to add HTTP headers since response is already committed on entry to the HTTP header security Filter"); + } + + // HSTS + if (hstsEnabled && request.isSecure()) { + httpResponse.setHeader(HSTS_HEADER_NAME, hstsHeaderValue); + } + + // anti click-jacking + if (antiClickJackingEnabled) { + httpResponse.setHeader(ANTI_CLICK_JACKING_HEADER_NAME, antiClickJackingHeaderValue); + } + + // Block content type sniffing + if (blockContentTypeSniffingEnabled) { + httpResponse.setHeader(BLOCK_CONTENT_TYPE_SNIFFING_HEADER_NAME, + BLOCK_CONTENT_TYPE_SNIFFING_HEADER_VALUE); + } + + // cross-site scripting filter protection + if (xssProtectionEnabled) { + httpResponse.setHeader(XSS_PROTECTION_HEADER_NAME, XSS_PROTECTION_HEADER_VALUE); + } + } + + chain.doFilter(request, response); + } + + public boolean isHstsEnabled() { + return hstsEnabled; + } + + + public void setHstsEnabled(final boolean hstsEnabled) { + this.hstsEnabled = hstsEnabled; + } + + + public int getHstsMaxAgeSeconds() { + return hstsMaxAgeSeconds; + } + + + public void setHstsMaxAgeSeconds(final int hstsMaxAgeSeconds) { + if (hstsMaxAgeSeconds < 0) { + this.hstsMaxAgeSeconds = 0; + } else { + this.hstsMaxAgeSeconds = hstsMaxAgeSeconds; + } + } + + + public boolean isHstsIncludeSubDomains() { + return hstsIncludeSubDomains; + } + + + public void setHstsIncludeSubDomains(final boolean hstsIncludeSubDomains) { + this.hstsIncludeSubDomains = hstsIncludeSubDomains; + } + + + public boolean isHstsPreload() { + return hstsPreload; + } + + + public void setHstsPreload(final boolean hstsPreload) { + this.hstsPreload = hstsPreload; + } + + + public boolean isAntiClickJackingEnabled() { + return antiClickJackingEnabled; + } + + + public void setAntiClickJackingEnabled(final boolean antiClickJackingEnabled) { + this.antiClickJackingEnabled = antiClickJackingEnabled; + } + + + public String getAntiClickJackingOption() { + return antiClickJackingOption.toString(); + } + + + public void setAntiClickJackingOption(final String antiClickJackingOption) { + for (XFrameOption option : XFrameOption.values()) { + if (option.getHeaderValue().equalsIgnoreCase(antiClickJackingOption)) { + this.antiClickJackingOption = option; + return; + } + } + throw new IllegalArgumentException( + "An invalid value [" + antiClickJackingOption + "] was specified for the anti click-jacking header"); + } + + + public String getAntiClickJackingUri() { + return antiClickJackingUri.toString(); + } + + + public boolean isBlockContentTypeSniffingEnabled() { + return blockContentTypeSniffingEnabled; + } + + + public void setBlockContentTypeSniffingEnabled(final boolean blockContentTypeSniffingEnabled) { + this.blockContentTypeSniffingEnabled = blockContentTypeSniffingEnabled; + } + + + public void setAntiClickJackingUri(final String antiClickJackingUri) { + URI uri; + try { + uri = new URI(antiClickJackingUri); + } catch (URISyntaxException e) { + throw new IllegalArgumentException(e); + } + this.antiClickJackingUri = uri; + } + + + @Deprecated + public boolean isXssProtectionEnabled() { + return xssProtectionEnabled; + } + + + @Deprecated + public void setXssProtectionEnabled(final boolean xssProtectionEnabled) { + this.xssProtectionEnabled = xssProtectionEnabled; + } + + + private enum XFrameOption { + DENY("DENY"), + SAME_ORIGIN("SAMEORIGIN"), + ALLOW_FROM("ALLOW-FROM"); + + + private final String headerValue; + + XFrameOption(final String headerValue) { + this.headerValue = headerValue; + } + + public String getHeaderValue() { + return headerValue; + } + } +} diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/configuration/ServletConfigurer.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/configuration/ServletConfigurer.java index f03ec00a7f0a3..0996e208b1f1f 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/configuration/ServletConfigurer.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/configuration/ServletConfigurer.java @@ -15,23 +15,22 @@ */ package org.talend.sdk.component.starter.server.configuration; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.ServletContainerInitializer; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.util.EnumSet; import java.util.Set; import javax.inject.Inject; -import javax.servlet.DispatcherType; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterRegistration; -import javax.servlet.ServletContainerInitializer; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; - -import org.apache.catalina.filters.HttpHeaderSecurityFilter; public class ServletConfigurer implements ServletContainerInitializer { @@ -72,4 +71,5 @@ public void doFilter(final ServletRequest request, final ServletResponse respons chain.doFilter(request, response); } } + } diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ApiDemoEndpoints.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ApiDemoEndpoints.java index 3058f36b21177..4552865dfb0bd 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ApiDemoEndpoints.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ApiDemoEndpoints.java @@ -15,10 +15,19 @@ */ package org.talend.sdk.component.starter.server.front; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; -import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; +import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE; + +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.Response; import java.io.IOException; import java.io.InputStream; @@ -28,14 +37,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.json.Json; import javax.json.JsonObject; -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.Response; import lombok.extern.slf4j.Slf4j; diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/EnvironmentResource.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/EnvironmentResource.java index 9848c6a709aad..c3d2e2d0894cb 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/EnvironmentResource.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/EnvironmentResource.java @@ -15,10 +15,11 @@ */ package org.talend.sdk.component.starter.server.front; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; + import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; import org.talend.sdk.component.starter.server.model.Environment; import org.talend.sdk.component.starter.server.service.info.ServerInfo; diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ProjectResource.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ProjectResource.java index 513bc075f9560..0bbcf96504ed2 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ProjectResource.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ProjectResource.java @@ -15,6 +15,7 @@ */ package org.talend.sdk.component.starter.server.front; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; @@ -22,7 +23,21 @@ import static java.util.function.Function.identity; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Providers; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -43,20 +58,6 @@ import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Providers; import org.talend.sdk.component.starter.server.configuration.StarterConfiguration; import org.talend.sdk.component.starter.server.model.ErrorMessage; diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/RRDEndpoint.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/RRDEndpoint.java index b250ad38b43aa..a5031407074f4 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/RRDEndpoint.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/RRDEndpoint.java @@ -15,9 +15,18 @@ */ package org.talend.sdk.component.starter.server.front; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; + +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.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.InputStream; import java.util.Collection; @@ -31,14 +40,6 @@ import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -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.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; import org.rrd4j.core.FetchData; import org.talend.sdk.component.starter.server.model.ErrorMessage; diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/StarterApplication.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/StarterApplication.java index e8ad1ad637055..4683a2f8eaa01 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/StarterApplication.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/StarterApplication.java @@ -15,9 +15,10 @@ */ package org.talend.sdk.component.starter.server.front; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; + import javax.enterprise.context.Dependent; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; @Dependent @ApplicationPath("api") diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/js/IndexRedirector.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/js/IndexRedirector.java index dec54506ef753..8dbe343d66c0b 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/js/IndexRedirector.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/js/IndexRedirector.java @@ -15,18 +15,18 @@ */ package org.talend.sdk.component.starter.server.front.js; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; + import java.io.IOException; import java.util.stream.Stream; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; - // enforce the server to redirect to the client to handle the 404 to have a nice ui @WebFilter(asyncSupported = true, urlPatterns = "/*") public class IndexRedirector implements Filter { diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/info/ServerInfo.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/info/ServerInfo.java index fb0e772e6dbed..73c63aae94116 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/info/ServerInfo.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/info/ServerInfo.java @@ -20,6 +20,11 @@ import static lombok.AccessLevel.NONE; import static lombok.AccessLevel.PRIVATE; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; + import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; @@ -36,10 +41,6 @@ import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; diff --git a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/ProjectResourceTest.java b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/ProjectResourceTest.java index 778f0a68fed3f..1cf8ab7463276 100644 --- a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/ProjectResourceTest.java +++ b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/ProjectResourceTest.java @@ -20,7 +20,7 @@ import static java.util.Collections.singletonList; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toSet; -import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.talend.sdk.component.starter.server.service.Resources.resourceFileToString; @@ -43,10 +43,10 @@ import javax.inject.Inject; import javax.json.Json; import javax.json.bind.Jsonb; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MediaType; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.junit.jupiter.api.Test; diff --git a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/RRDEndpointTest.java b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/RRDEndpointTest.java index c58ec8b1833d0..41181827ae40c 100644 --- a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/RRDEndpointTest.java +++ b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/RRDEndpointTest.java @@ -16,14 +16,14 @@ package org.talend.sdk.component.starter.server.front; import static java.lang.Thread.sleep; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import java.util.Collection; import java.util.Map; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.junit.jupiter.api.Test; diff --git a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/ApiDemoEndpointsTest.java b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/ApiDemoEndpointsTest.java index 9d903adfb2883..3362b0b8afe97 100644 --- a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/ApiDemoEndpointsTest.java +++ b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/ApiDemoEndpointsTest.java @@ -15,9 +15,9 @@ */ package org.talend.sdk.component.starter.server.front.apidemo; -import static javax.ws.rs.client.Entity.entity; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE; +import static jakarta.ws.rs.client.Entity.entity; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -28,8 +28,8 @@ import javax.json.JsonArray; import javax.json.JsonObject; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; import org.junit.jupiter.api.Test; diff --git a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/test/Client.java b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/test/Client.java index 663496fd3cdcb..53f364eb6fb43 100644 --- a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/test/Client.java +++ b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/test/Client.java @@ -23,8 +23,8 @@ import java.lang.annotation.Target; import javax.enterprise.inject.spi.CDI; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; import org.apache.meecrowave.Meecrowave; import org.junit.jupiter.api.extension.AfterAllCallback; @@ -48,26 +48,26 @@ public static class ClientRuleExtension implements BeforeAllCallback, AfterAllCa @Override public void afterAll(final ExtensionContext context) { - javax.ws.rs.client.Client.class - .cast(context.getStore(NAMESPACE).get(javax.ws.rs.client.Client.class.getName())) + jakarta.ws.rs.client.Client.class + .cast(context.getStore(NAMESPACE).get(jakarta.ws.rs.client.Client.class.getName())) .close(); } @Override public void beforeAll(final ExtensionContext context) { - final javax.ws.rs.client.Client client = ClientBuilder.newClient(); - context.getStore(NAMESPACE).put(javax.ws.rs.client.Client.class.getName(), client); + final jakarta.ws.rs.client.Client client = ClientBuilder.newClient(); + context.getStore(NAMESPACE).put(jakarta.ws.rs.client.Client.class.getName(), client); context.getStore(NAMESPACE).put(WebTarget.class.getName(), target(client)); } - private WebTarget target(final javax.ws.rs.client.Client client) { + private WebTarget target(final jakarta.ws.rs.client.Client client) { final Meecrowave.Builder config = CDI.current().select(Meecrowave.Builder.class).get(); return client.target("http://localhost:" + config.getHttpPort() + "/api"); } @Override public boolean supports(final Class type) { - return WebTarget.class == type || javax.ws.rs.client.Client.class == type; + return WebTarget.class == type || jakarta.ws.rs.client.Client.class == type; } @Override diff --git a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/AdminResource.java b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/AdminResource.java index c62391c0fadab..d42a62f05ef5a 100644 --- a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/AdminResource.java +++ b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/AdminResource.java @@ -17,13 +17,14 @@ import static java.util.Optional.ofNullable; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; + import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.ws.rs.HEAD; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; import org.talend.sdk.component.container.ContainerManager; import org.talend.sdk.component.runtime.manager.ComponentFamilyMeta; diff --git a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/FrontCompatibilityRouter.java b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/FrontCompatibilityRouter.java index 676ad40d93139..88f646082db23 100644 --- a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/FrontCompatibilityRouter.java +++ b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/FrontCompatibilityRouter.java @@ -15,10 +15,10 @@ */ package org.talend.sdk.component.tools.webapp; -import java.util.Set; +import jakarta.servlet.ServletContainerInitializer; +import jakarta.servlet.ServletContext; -import javax.servlet.ServletContainerInitializer; -import javax.servlet.ServletContext; +import java.util.Set; public class FrontCompatibilityRouter implements ServletContainerInitializer { diff --git a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/LazyClient.java b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/LazyClient.java index edfe75fd73edd..bbce5aaa05513 100644 --- a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/LazyClient.java +++ b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/LazyClient.java @@ -17,6 +17,16 @@ import static java.util.Optional.ofNullable; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; + import java.io.IOException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -29,15 +39,6 @@ import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; import javax.inject.Inject; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; import org.talend.sdk.component.form.api.Client; import org.talend.sdk.component.form.internal.jaxrs.JAXRSClient; @@ -74,7 +75,7 @@ public Thread newThread(final Runnable r) { return thread; } }); - final javax.ws.rs.client.Client jaxrsClient = + final jakarta.ws.rs.client.Client jaxrsClient = ClientBuilder.newBuilder().property("executorService", executorService).build(); webTarget = jaxrsClient.target(baseValue); client = new JAXRSClient<>(jaxrsClient, baseValue, true); diff --git a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/ResourceProxy.java b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/ResourceProxy.java index b7d97bba4f587..1dc8e5f2ebf6b 100644 --- a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/ResourceProxy.java +++ b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/ResourceProxy.java @@ -15,6 +15,14 @@ */ package org.talend.sdk.component.tools.webapp; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletRequest; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -23,13 +31,6 @@ import javax.enterprise.context.Dependent; import javax.inject.Inject; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletRequest; @Dependent @WebFilter(urlPatterns = "/*", asyncSupported = true, filterName = "ResourceProxy") diff --git a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/WebAppComponentProxy.java b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/WebAppComponentProxy.java index bfbb78ac9b81d..a3b29539a3464 100644 --- a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/WebAppComponentProxy.java +++ b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/WebAppComponentProxy.java @@ -15,9 +15,23 @@ */ package org.talend.sdk.component.tools.webapp; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static java.util.Collections.emptyMap; import static java.util.Optional.ofNullable; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; + +import jakarta.servlet.http.HttpServletRequest; +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.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.container.Suspended; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import java.nio.charset.StandardCharsets; import java.util.Base64; @@ -27,19 +41,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -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.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; import org.talend.sdk.component.form.api.ActionService; import org.talend.sdk.component.form.api.Client; diff --git a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/generator/StaticResourceGenerator.java b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/generator/StaticResourceGenerator.java index db9cc457fc79e..22049f17207c0 100644 --- a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/generator/StaticResourceGenerator.java +++ b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/generator/StaticResourceGenerator.java @@ -20,6 +20,12 @@ import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.toList; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -47,11 +53,6 @@ import javax.json.bind.JsonbBuilder; import javax.json.bind.JsonbConfig; import javax.json.bind.config.BinaryDataStrategy; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; import org.talend.sdk.component.path.PathFactory; import org.talend.sdk.component.server.api.ActionResource; diff --git a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/servlet/StaticResourceServlet.java b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/servlet/StaticResourceServlet.java index 06d028ae8785a..463752666cae9 100644 --- a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/servlet/StaticResourceServlet.java +++ b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/servlet/StaticResourceServlet.java @@ -19,6 +19,11 @@ import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.toMap; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.InputStream; import java.lang.reflect.ParameterizedType; @@ -39,10 +44,6 @@ import javax.json.bind.JsonbBuilder; import javax.json.bind.JsonbConfig; import javax.json.bind.config.BinaryDataStrategy; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.talend.sdk.component.path.PathFactory; import org.talend.sdk.component.tools.webapp.standalone.Route; diff --git a/documentation/pom.xml b/documentation/pom.xml index f994d88996ee8..eae4f39fc0630 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -155,6 +155,16 @@ provided + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind.version} + + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.version} + args4j args4j diff --git a/documentation/src/main/java/org/talend/runtime/documentation/Generator.java b/documentation/src/main/java/org/talend/runtime/documentation/Generator.java index 9668b50c1054a..f09c7a20bda41 100644 --- a/documentation/src/main/java/org/talend/runtime/documentation/Generator.java +++ b/documentation/src/main/java/org/talend/runtime/documentation/Generator.java @@ -15,6 +15,7 @@ */ package org.talend.runtime.documentation; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static java.lang.Math.min; import static java.util.Collections.emptyMap; import static java.util.Comparator.comparing; @@ -30,10 +31,14 @@ import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toSet; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static lombok.AccessLevel.PRIVATE; import static org.apache.ziplock.JarLocation.jarLocation; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; + import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -90,10 +95,6 @@ import javax.json.bind.JsonbBuilder; import javax.json.bind.JsonbConfig; import javax.json.bind.config.PropertyOrderStrategy; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.text.WordUtils; diff --git a/documentation/src/main/java/org/talend/runtime/documentation/Github.java b/documentation/src/main/java/org/talend/runtime/documentation/Github.java index c3117b9003200..6b21ab3423848 100644 --- a/documentation/src/main/java/org/talend/runtime/documentation/Github.java +++ b/documentation/src/main/java/org/talend/runtime/documentation/Github.java @@ -15,6 +15,7 @@ */ package org.talend.runtime.documentation; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static java.util.Comparator.comparing; import static java.util.Locale.ROOT; import static java.util.Optional.ofNullable; @@ -22,7 +23,14 @@ import static java.util.function.Function.identity; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; + +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.nio.charset.StandardCharsets; import java.util.Base64; @@ -38,13 +46,6 @@ import java.util.stream.Stream; import javax.json.bind.annotation.JsonbProperty; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; import org.apache.johnzon.jaxrs.jsonb.jaxrs.JsonbJaxrsProvider; import org.talend.sdk.component.maven.MavenDecrypter; diff --git a/documentation/src/main/java/org/talend/runtime/documentation/Gravatars.java b/documentation/src/main/java/org/talend/runtime/documentation/Gravatars.java index ac70addd33969..557751720331c 100644 --- a/documentation/src/main/java/org/talend/runtime/documentation/Gravatars.java +++ b/documentation/src/main/java/org/talend/runtime/documentation/Gravatars.java @@ -15,18 +15,18 @@ */ package org.talend.runtime.documentation; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static java.util.Optional.ofNullable; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static lombok.AccessLevel.PRIVATE; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; + import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; - import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/pom.xml b/pom.xml index bf78901f234f9..62c6f53db1889 100644 --- a/pom.xml +++ b/pom.xml @@ -178,7 +178,7 @@ 1.2.15 2.0.27 9.0.98 - 3.5.9 + 4.1.0 6.5.0 @@ -216,6 +216,9 @@ 1.11.4 1.15.3 2.1.4 + 3.1.0 + 6.1.0 + 4.0.2 3.8.0 @@ -287,7 +290,7 @@ org.talend.components:servicenow:0.0.1-SNAPSHOT - 2.3.1 + 4.0.5 2.3.8 0.75 @@ -996,9 +999,9 @@ pom - javax.xml.bind - jaxb-api - ${jaxb.version} + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 com.sun.xml.bind @@ -1379,12 +1382,6 @@ * limitations under the License. */]]> - - ${maven.multiModuleProjectDirectory}/build/talend_java_eclipse_formatter.xml - - - ${maven.multiModuleProjectDirectory}/build/talend.importorder - diff --git a/talend-component-maven-plugin/pom.xml b/talend-component-maven-plugin/pom.xml index dacda70d04977..d28fd67f8ffc7 100644 --- a/talend-component-maven-plugin/pom.xml +++ b/talend-component-maven-plugin/pom.xml @@ -140,9 +140,9 @@ - javax.activation - activation - 1.1.1 + jakarta.activation + jakarta.activation-api + 2.1.3 diff --git a/vault-client/pom.xml b/vault-client/pom.xml index 831d22f66fb31..381bc54ce6e91 100644 --- a/vault-client/pom.xml +++ b/vault-client/pom.xml @@ -74,6 +74,16 @@ log4j-jul ${log4j2.version} + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.version} + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.version} + org.apache.geronimo.specs diff --git a/vault-client/src/main/java/org/talend/sdk/components/vault/client/VaultClient.java b/vault-client/src/main/java/org/talend/sdk/components/vault/client/VaultClient.java index 74a6d16a8ad38..0085aacd8f501 100644 --- a/vault-client/src/main/java/org/talend/sdk/components/vault/client/VaultClient.java +++ b/vault-client/src/main/java/org/talend/sdk/components/vault/client/VaultClient.java @@ -15,6 +15,8 @@ */ package org.talend.sdk.components.vault.client; +import static jakarta.ws.rs.client.Entity.entity; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static java.util.Optional.of; import static java.util.Optional.ofNullable; import static java.util.concurrent.CompletableFuture.completedFuture; @@ -23,8 +25,12 @@ import static java.util.function.Function.identity; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; -import static javax.ws.rs.client.Entity.entity; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; + +import jakarta.servlet.ServletContext; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import java.nio.charset.StandardCharsets; import java.time.Clock; @@ -59,11 +65,6 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.json.bind.annotation.JsonbProperty; -import javax.servlet.ServletContext; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.talend.sdk.components.vault.configuration.Documentation; diff --git a/vault-client/src/main/java/org/talend/sdk/components/vault/client/VaultClientSetup.java b/vault-client/src/main/java/org/talend/sdk/components/vault/client/VaultClientSetup.java index e7d81316552f0..49a17d35b0c9e 100644 --- a/vault-client/src/main/java/org/talend/sdk/components/vault/client/VaultClientSetup.java +++ b/vault-client/src/main/java/org/talend/sdk/components/vault/client/VaultClientSetup.java @@ -18,6 +18,10 @@ import static java.util.Optional.ofNullable; import static java.util.concurrent.TimeUnit.MILLISECONDS; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -45,9 +49,6 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.talend.sdk.components.vault.configuration.Documentation; diff --git a/vault-client/src/test/java/org/talend/sdk/components/vault/client/VaultClientTest.java b/vault-client/src/test/java/org/talend/sdk/components/vault/client/VaultClientTest.java index a705d48e120f8..fc613a1ce6a37 100644 --- a/vault-client/src/test/java/org/talend/sdk/components/vault/client/VaultClientTest.java +++ b/vault-client/src/test/java/org/talend/sdk/components/vault/client/VaultClientTest.java @@ -15,7 +15,7 @@ */ package org.talend.sdk.components.vault.client; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -25,10 +25,10 @@ import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; import javax.inject.Inject; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.apache.meecrowave.Meecrowave; import org.apache.meecrowave.junit5.MonoMeecrowaveConfig; diff --git a/vault-client/src/test/java/org/talend/sdk/components/vault/client/vault/VaultMock.java b/vault-client/src/test/java/org/talend/sdk/components/vault/client/vault/VaultMock.java index 006b08d847007..9e29d935600bc 100644 --- a/vault-client/src/test/java/org/talend/sdk/components/vault/client/vault/VaultMock.java +++ b/vault-client/src/test/java/org/talend/sdk/components/vault/client/vault/VaultMock.java @@ -16,8 +16,8 @@ package org.talend.sdk.components.vault.client.vault; import static java.util.Collections.singletonList; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import java.nio.charset.StandardCharsets; import java.util.Base64; @@ -26,19 +26,19 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.HeaderParam; -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.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.HeaderParam; +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.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.talend.sdk.components.vault.client.VaultClient; From f6da8884377e6aca8b128cf26b1909cea28463e5 Mon Sep 17 00:00:00 2001 From: yyin-talend Date: Fri, 17 Jan 2025 10:01:24 +0800 Subject: [PATCH 2/3] update pom --- pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62c6f53db1889..6518a3f4ed69a 100644 --- a/pom.xml +++ b/pom.xml @@ -1001,7 +1001,7 @@ jakarta.xml.bind jakarta.xml.bind-api - 4.0.2 + ${jakarta.xml.bind.version} com.sun.xml.bind @@ -1382,6 +1382,12 @@ * limitations under the License. */]]> + + ${maven.multiModuleProjectDirectory}/build/talend_java_eclipse_formatter.xml + + + ${maven.multiModuleProjectDirectory}/build/talend.importorder + From 44bd658f809a94686f44df858f24f252a40ed4ff Mon Sep 17 00:00:00 2001 From: yyin-talend Date: Fri, 17 Jan 2025 10:58:08 +0800 Subject: [PATCH 3/3] update glassfish version --- component-runtime-manager/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/component-runtime-manager/pom.xml b/component-runtime-manager/pom.xml index 72905c46c889e..eb94f5d8ce13a 100644 --- a/component-runtime-manager/pom.xml +++ b/component-runtime-manager/pom.xml @@ -79,6 +79,11 @@ org.apache.johnzon johnzon-core + + org.glassfish.jaxb + jaxb-runtime + ${jaxb.version} + jakarta.xml.bind jakarta.xml.bind-api @@ -103,11 +108,6 @@ test - - org.glassfish.jaxb - jaxb-runtime - - org.apache.geronimo.specs geronimo-activation_1.1_spec