Merge pull request #862 from Alfresco/feature/ACS-6033_migrate_to_spr…

…ing_boot_3 Migrated to Spring Boot 3
Alfresco · Sep 19, 2023 · 1a3e44a · 1a3e44a
2 parents 1c1ed87 + 974f7a3
commit 1a3e44a
Show file tree

Hide file tree

Showing 49 changed files with 271 additions and 196 deletions.
diff --git a/deprecated/alfresco-transformer-base/pom.xml b/deprecated/alfresco-transformer-base/pom.xml
@@ -71,8 +71,8 @@
             <artifactId>pooled-jms</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/...ransformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java b/...ransformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -56,7 +56,7 @@
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;

diff --git a/...fresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java b/...fresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -31,9 +31,9 @@
 
 import java.util.Optional;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
 
 import org.alfresco.transform.client.model.TransformReply;
 import org.alfresco.transform.client.model.TransformRequest;

diff --git a/...alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java b/...alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -34,8 +34,8 @@
 import java.util.Collection;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.alfresco.transform.client.model.TransformReply;
 import org.alfresco.transform.client.model.TransformRequest;

diff --git a/...lfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformInterceptor.java b/...lfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformInterceptor.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -30,11 +30,11 @@
 import static org.alfresco.transformer.fs.FileManager.TARGET_FILE;
 import static org.alfresco.transformer.fs.FileManager.deleteFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.alfresco.transformer.logging.LogEntry;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import org.springframework.web.servlet.AsyncHandlerInterceptor;
 
 /**
  * @deprecated will be removed in a future release. Replaced by alfresco-base-t-engine.
@@ -44,7 +44,7 @@
  * Handles ThreadLocal Log entries for each request.
  */
 @Deprecated
-public class TransformInterceptor extends HandlerInterceptorAdapter
+public class TransformInterceptor implements AsyncHandlerInterceptor
 {
     @Override
     public boolean preHandle(HttpServletRequest request,

diff --git a/...fresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java b/...fresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -33,7 +33,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.alfresco.transform.config.TransformConfig;
 import org.alfresco.transform.registry.AbstractTransformRegistry;

diff --git a/...er-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java b/...er-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -39,6 +39,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.web.client.HttpClientErrorException;
@@ -73,7 +74,7 @@ public ResponseEntity<Resource> retrieveFile(String fileRef)
         }
         catch (HttpClientErrorException e)
         {
-            throw new TransformException(e.getStatusCode(), e.getMessage(), e);
+            throw new TransformException(HttpStatus.resolve(e.getStatusCode().value()), e.getMessage(), e);
         }
     }
 
@@ -100,7 +101,7 @@ public FileRefResponse saveFile(File file)
         }
         catch (HttpClientErrorException e)
         {
-            throw new TransformException(e.getStatusCode(), e.getMessage(), e);
+            throw new TransformException(HttpStatus.resolve(e.getStatusCode().value()), e.getMessage(), e);
         }
     }
 }
diff --git a/...d/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/MTLSConfig.java b/...d/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/MTLSConfig.java
@@ -26,12 +26,18 @@
  */
 package org.alfresco.transformer.config;
 
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
+import org.apache.hc.core5.http.config.Registry;
+import org.apache.hc.core5.http.config.RegistryBuilder;
+import org.apache.hc.core5.http.ssl.TLS;
+import org.apache.hc.core5.ssl.SSLContextBuilder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -40,7 +46,6 @@
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 
-import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.KeyManagementException;
@@ -120,11 +125,23 @@ private boolean isKeystoreConfigured()
     }
 
     private RestTemplate createRestTemplateWithSslContext(SSLContextBuilder sslContextBuilder) throws NoSuchAlgorithmException, KeyManagementException {
-        SSLContext sslContext = sslContextBuilder.build();
-        SSLConnectionSocketFactory sslContextFactory = hostNameVerificationDisabled ? new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE)
-                : new SSLConnectionSocketFactory(sslContext);
+        final SSLConnectionSocketFactoryBuilder sslConnectionSocketFactoryBuilder =
+                SSLConnectionSocketFactoryBuilder.create()
+                        .setSslContext(sslContextBuilder.build())
+                        .setTlsVersions(TLS.V_1_2, TLS.V_1_3);
+        if (hostNameVerificationDisabled) {
+            sslConnectionSocketFactoryBuilder.setHostnameVerifier(NoopHostnameVerifier.INSTANCE);
+        }
+        final SSLConnectionSocketFactory sslConnectionSocketFactory = sslConnectionSocketFactoryBuilder.build();
+
+        final Registry<ConnectionSocketFactory> sslSocketFactoryRegistry =
+                RegistryBuilder.<ConnectionSocketFactory> create()
+                        .register("https", sslConnectionSocketFactory)
+                        .build();
+
+        final BasicHttpClientConnectionManager sslConnectionManager = new BasicHttpClientConnectionManager(sslSocketFactoryRegistry);
 
-        HttpClientBuilder httpClientBuilder = HttpClients.custom().setSSLSocketFactory(sslContextFactory);
+        HttpClientBuilder httpClientBuilder = HttpClients.custom().setConnectionManager(sslConnectionManager);
         CloseableHttpClient httpClient = httpClientBuilder.build();
         ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
         return new RestTemplate(requestFactory);

diff --git a/...ated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java b/...ated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -40,7 +40,7 @@
 import java.nio.file.StandardCopyOption;
 import java.util.Arrays;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.alfresco.transform.exceptions.TransformException;
 import org.alfresco.transformer.logging.LogEntry;

diff --git a/...co-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java b/...co-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,8 +26,8 @@
  */
 package org.alfresco.transformer.messaging;
 
-import javax.jms.ConnectionFactory;
-import javax.jms.Queue;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Queue;
 
 import org.alfresco.transform.messages.TransformRequestValidator;
 import org.apache.activemq.command.ActiveMQQueue;

diff --git a/...esco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java b/...esco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,7 +26,7 @@
  */
 package org.alfresco.transformer.messaging;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...rmer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java b/...rmer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -39,9 +39,9 @@
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Service;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.Session;
 
 /**
  * @deprecated will be removed in a future release. Replaced by alfresco-base-t-engine.

diff --git a/...ansformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java b/...ansformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,7 +26,7 @@
  */
 package org.alfresco.transformer.messaging;
 
-import javax.jms.Destination;
+import jakarta.jms.Destination;
 
 import org.alfresco.transform.client.model.TransformReply;
 import org.slf4j.Logger;

diff --git a/...co-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java b/...co-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -42,7 +42,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.alfresco.transform.exceptions.TransformException;
 import org.alfresco.transformer.AbstractTransformerController;

diff --git a/...esco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java b/...esco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -36,7 +36,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;

diff --git a/...nsformer-base/src/test/java/org/alfresco/transformer/AbstractQueueTransformServiceIT.java b/...nsformer-base/src/test/java/org/alfresco/transformer/AbstractQueueTransformServiceIT.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -28,7 +28,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import javax.jms.Queue;
+import jakarta.jms.Queue;
 
 import org.alfresco.transform.client.model.TransformReply;
 import org.alfresco.transform.client.model.TransformRequest;

diff --git a/...co-transformer-base/src/test/java/org/alfresco/transformer/QueueTransformServiceTest.java b/...co-transformer-base/src/test/java/org/alfresco/transformer/QueueTransformServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -36,9 +36,9 @@
 import static org.springframework.http.HttpStatus.CREATED;
 import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
 
 import org.alfresco.transform.client.model.TransformReply;
 import org.alfresco.transform.client.model.TransformRequest;