diff --git a/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java b/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java index cab9ebea..b88bb8f5 100644 --- a/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java +++ b/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java @@ -84,14 +84,14 @@ public class LibreOfficeControllerTest extends AbstractTransformerControllerTest doAnswer((Answer) invocation -> { - File sourceFile = invocation.getArgumentAt(0, File.class); - File targetFile = invocation.getArgumentAt(1, File.class); + File sourceFile = invocation.getArgument(0); + File targetFile = invocation.getArgument(1); String actualTargetExtension = StringUtils.getFilenameExtension(targetFile.getAbsolutePath()); assertNotNull(sourceFile); assertNotNull(targetFile); - Long actualTimeout = invocation.getArgumentAt(2, Long.class); + Long actualTimeout = invocation.getArgument(2); assertNotNull(actualTimeout); if (expectedTimeout != null) { diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml index 815a7f19..cd21190e 100644 --- a/alfresco-transformer-base/pom.xml +++ b/alfresco-transformer-base/pom.xml @@ -17,6 +17,10 @@ org.springframework.boot spring-boot-starter-thymeleaf + + org.springframework.boot + spring-boot-starter-web + org.springframework.boot spring-boot-starter-test @@ -30,6 +34,33 @@ org.alfresco alfresco-transform-data-model + + + + + org.mockito + mockito-core + test + + + org.mockito + mockito-inline + 2.22.0 + test + + + net.bytebuddy + byte-buddy + 1.9.0 + test + + + net.bytebuddy + byte-buddy-agent + 1.9.0 + test + + diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java index 64e1222f..7813f98d 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java @@ -720,22 +720,15 @@ public abstract class AbstractTransformerController protected ResponseEntity createAttachment(String targetFilename, File targetFile, Long testDelay) { - try - { - Resource targetResource = load(targetFile); - targetFilename = UriUtils.encodePath(StringUtils.getFilename(targetFilename), "UTF-8"); - ResponseEntity body = ResponseEntity.ok().header(HttpHeaders.CONTENT_DISPOSITION, - "attachment; filename*= UTF-8''" + targetFilename).body(targetResource); - LogEntry.setTargetSize(targetFile.length()); - long time = LogEntry.setStatusCodeAndMessage(200, "Success"); - time += LogEntry.addDelay(testDelay); - getProbeTestTransformInternal().recordTransformTime(time); - return body; - } - catch (UnsupportedEncodingException e) - { - throw new TransformException(500, "Filename encoding error", e); - } + Resource targetResource = load(targetFile); + targetFilename = UriUtils.encodePath(StringUtils.getFilename(targetFilename), "UTF-8"); + ResponseEntity body = ResponseEntity.ok().header(HttpHeaders.CONTENT_DISPOSITION, + "attachment; filename*= UTF-8''" + targetFilename).body(targetResource); + LogEntry.setTargetSize(targetFile.length()); + long time = LogEntry.setStatusCodeAndMessage(200, "Success"); + time += LogEntry.addDelay(testDelay); + getProbeTestTransformInternal().recordTransformTime(time); + return body; } /** diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/WebApplicationConfig.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/WebApplicationConfig.java index 1e9ca806..df599f28 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/WebApplicationConfig.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/WebApplicationConfig.java @@ -28,12 +28,13 @@ package org.alfresco.transformer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.client.RestTemplate; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.alfresco.transform.client.model.TransformRequestValidator; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration -public class WebApplicationConfig extends WebMvcConfigurerAdapter { +public class WebApplicationConfig implements WebMvcConfigurer +{ @Override public void addInterceptors(InterceptorRegistry registry) { diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java index f45fcbe1..47e5343a 100644 --- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java +++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java @@ -27,7 +27,7 @@ package org.alfresco.transformer; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.embedded.LocalServerPort; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.http.*; import org.springframework.util.LinkedMultiValueMap; diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java index c58f893f..bef4562a 100644 --- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java +++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java @@ -138,7 +138,7 @@ public abstract class AbstractTransformerControllerTest { public RuntimeExec.ExecutionResult answer(InvocationOnMock invocation) throws Throwable { - Map actualProperties = invocation.getArgumentAt(0, Map.class); + Map actualProperties = invocation.getArgument(0); assertEquals("There should be 3 properties", 3, actualProperties.size()); String actualOptions = actualProperties.get("options"); @@ -160,7 +160,7 @@ public abstract class AbstractTransformerControllerTest assertEquals("expectedOptions", expectedOptions, actualOptions); } - Long actualTimeout = invocation.getArgumentAt(1, Long.class); + Long actualTimeout = invocation.getArgument(1); assertNotNull(actualTimeout); if (expectedTimeout != null) { diff --git a/pom.xml b/pom.xml index 91375056..d9a6e262 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ latest 2.0.8 3.5.37 - 1.5.15.RELEASE + 2.0.5.RELEASE 7.3 8.8 3.0.1.1 @@ -98,6 +98,15 @@ 3.2.6 + + + + + org.mockito + mockito-core + 2.22.0 + test +