From 86317731bbb7ad0a4128a4bae10f863683bcb071 Mon Sep 17 00:00:00 2001 From: Grzegorz Oleksy Date: Tue, 28 Nov 2023 13:05:40 +0100 Subject: [PATCH] ACS-6151 - removed unnecessary property --- .../aio/AIOLivenessReadinessProbeTest.java | 2 +- .../base/LivenessReadinessProbeTest.java | 17 +++++++++-------- .../ImageMagickLivenessReadinessProbeTest.java | 2 +- .../LibreOfficeLivenessReadinessProbeTest.java | 2 +- .../misc/MiscLivenessReadinessProbeTest.java | 2 +- .../PdfRendererLivenessReadinessProbeTest.java | 2 +- .../tika/TikaLivenessReadinessProbeTest.java | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOLivenessReadinessProbeTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOLivenessReadinessProbeTest.java index 7d19a41a..55aa4d4c 100644 --- a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOLivenessReadinessProbeTest.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOLivenessReadinessProbeTest.java @@ -32,6 +32,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest; public class AIOLivenessReadinessProbeTest extends LivenessReadinessProbeTest { @Override protected LivenessReadinessProbeTest.ImagesForTests getImageForTest() { - return new ImagesForTests("ats-aio", "alfresco-transform-core-aio", "text/plain", "text/plain", "original.txt"); + return new ImagesForTests("alfresco-transform-core-aio", "text/plain", "text/plain", "original.txt"); } } diff --git a/engines/base/src/test/java/org/alfresco/transform/base/LivenessReadinessProbeTest.java b/engines/base/src/test/java/org/alfresco/transform/base/LivenessReadinessProbeTest.java index e67256a8..b200c75a 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/LivenessReadinessProbeTest.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/LivenessReadinessProbeTest.java @@ -23,7 +23,8 @@ import org.springframework.web.reactive.function.client.WebClient; public abstract class LivenessReadinessProbeTest { @Test - public void readinessShouldReturnAn429ErrorAfterReachingMaxTransforms() throws URISyntaxException { + public void readinessShouldReturnAn429ErrorAfterReachingMaxTransforms() throws URISyntaxException + { final ImagesForTests testData = getImageForTest(); try (final var env = createEnv(testData.image)) @@ -59,16 +60,13 @@ public abstract class LivenessReadinessProbeTest protected static class ImagesForTests { - private final String name; private final String image; - private final String sourceMimetype; private final String targetMimetype; private final String filename; - public ImagesForTests(String name, String image, String sourceMimetype, String targetMimetype, String filename) + public ImagesForTests(String image, String sourceMimetype, String targetMimetype, String filename) { - this.name = Objects.requireNonNull(name); this.image = Objects.requireNonNull(image); this.sourceMimetype = Objects.requireNonNull(sourceMimetype); this.targetMimetype = Objects.requireNonNull(targetMimetype); @@ -76,7 +74,8 @@ public abstract class LivenessReadinessProbeTest } } - private void sendTransformRequest(String url, String sourceMimetype, String targetMimetype, String filename) { + private void sendTransformRequest(String url, String sourceMimetype, String targetMimetype, String filename) + { var builder = createRequestBuilder(sourceMimetype, targetMimetype, filename); WebClient client = WebClient.create(); WebClient.ResponseSpec responseSpec = client.post() @@ -88,7 +87,8 @@ public abstract class LivenessReadinessProbeTest assertEquals(OK, responseSpec.toBodilessEntity().block().getStatusCode()); } - private MultipartBodyBuilder createRequestBuilder(String sourceMimetype, String targetMimetype, String filename) { + private MultipartBodyBuilder createRequestBuilder(String sourceMimetype, String targetMimetype, String filename) + { MultipartBodyBuilder builder = new MultipartBodyBuilder(); builder.part("_sourceMimetype", sourceMimetype); builder.part("_targetMimetype", targetMimetype); @@ -97,7 +97,8 @@ public abstract class LivenessReadinessProbeTest return builder; } - private static void assertProbeDied(String url) { + private static void assertProbeDied(String url) + { WebTestClient client = WebTestClient.bindToServer().baseUrl(url+"/ready").build(); client.get() .exchange() diff --git a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickLivenessReadinessProbeTest.java b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickLivenessReadinessProbeTest.java index 3c073899..6415565a 100644 --- a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickLivenessReadinessProbeTest.java +++ b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickLivenessReadinessProbeTest.java @@ -32,6 +32,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest; public class ImageMagickLivenessReadinessProbeTest extends LivenessReadinessProbeTest { @Override protected ImagesForTests getImageForTest() { - return new ImagesForTests("imagemagick", "alfresco-imagemagick", "image/jpeg", "image/png", "test.jpeg"); + return new ImagesForTests("alfresco-imagemagick", "image/jpeg", "image/png", "test.jpeg"); } } diff --git a/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeLivenessReadinessProbeTest.java b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeLivenessReadinessProbeTest.java index 306c5310..21f07643 100644 --- a/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeLivenessReadinessProbeTest.java +++ b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeLivenessReadinessProbeTest.java @@ -32,6 +32,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest; public class LibreOfficeLivenessReadinessProbeTest extends LivenessReadinessProbeTest { @Override protected ImagesForTests getImageForTest() { - return new ImagesForTests("libreoffice", "alfresco-libreoffice", "text/plain", "application/pdf", "original.txt"); + return new ImagesForTests("alfresco-libreoffice", "text/plain", "application/pdf", "original.txt"); } } diff --git a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscLivenessReadinessProbeTest.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscLivenessReadinessProbeTest.java index fed80711..50b104b2 100644 --- a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscLivenessReadinessProbeTest.java +++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscLivenessReadinessProbeTest.java @@ -32,6 +32,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest; public class MiscLivenessReadinessProbeTest extends LivenessReadinessProbeTest { @Override protected ImagesForTests getImageForTest() { - return new ImagesForTests("misc", "alfresco-transform-misc", "text/plain", "text/plain", "original.txt"); + return new ImagesForTests("alfresco-transform-misc", "text/plain", "text/plain", "original.txt"); } } diff --git a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java index e8f3d7ab..30c91f50 100644 --- a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java +++ b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java @@ -32,6 +32,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest; public class PdfRendererLivenessReadinessProbeTest extends LivenessReadinessProbeTest { @Override protected ImagesForTests getImageForTest() { - return new ImagesForTests("pdf-renderer", "alfresco-pdf-renderer", "application/pdf", "image/png", "test.pdf"); + return new ImagesForTests("alfresco-pdf-renderer", "application/pdf", "image/png", "test.pdf"); } } diff --git a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaLivenessReadinessProbeTest.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaLivenessReadinessProbeTest.java index ea994dfc..a382fa78 100644 --- a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaLivenessReadinessProbeTest.java +++ b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaLivenessReadinessProbeTest.java @@ -33,6 +33,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest; public class TikaLivenessReadinessProbeTest extends LivenessReadinessProbeTest { @Override protected ImagesForTests getImageForTest() { - return new ImagesForTests("tika", "alfresco-tika", "text/plain", "text/plain", "original.txt"); + return new ImagesForTests("alfresco-tika", "text/plain", "text/plain", "original.txt"); } }