inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-05-19 17:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-6151 - removed unnecessary property

Browse Source
This commit is contained in:
Grzegorz Oleksy 2023-11-28 13:05:40 +01:00
parent 314453f847
commit 86317731bb
7 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/aio/src/test/java/org/alfresco/transform/aio/AIOLivenessReadinessProbeTest.java
View File

@ -32,6 +32,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest;
public class AIOLivenessReadinessProbeTest extends LivenessReadinessProbeTest { public class AIOLivenessReadinessProbeTest extends LivenessReadinessProbeTest {
@Override @Override
protected LivenessReadinessProbeTest.ImagesForTests getImageForTest() { 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");
} }
} }

17
engines/base/src/test/java/org/alfresco/transform/base/LivenessReadinessProbeTest.java
View File

@ -23,7 +23,8 @@ import org.springframework.web.reactive.function.client.WebClient;
public abstract class LivenessReadinessProbeTest public abstract class LivenessReadinessProbeTest
{ {
@Test @Test
public void readinessShouldReturnAn429ErrorAfterReachingMaxTransforms() throws URISyntaxException { public void readinessShouldReturnAn429ErrorAfterReachingMaxTransforms() throws URISyntaxException
{
final ImagesForTests testData = getImageForTest(); final ImagesForTests testData = getImageForTest();
try (final var env = createEnv(testData.image)) try (final var env = createEnv(testData.image))
@ -59,16 +60,13 @@ public abstract class LivenessReadinessProbeTest
protected static class ImagesForTests protected static class ImagesForTests
{ {
private final String name;
private final String image; private final String image;
private final String sourceMimetype; private final String sourceMimetype;
private final String targetMimetype; private final String targetMimetype;
private final String filename; 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.image = Objects.requireNonNull(image);
this.sourceMimetype = Objects.requireNonNull(sourceMimetype); this.sourceMimetype = Objects.requireNonNull(sourceMimetype);
this.targetMimetype = Objects.requireNonNull(targetMimetype); 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); var builder = createRequestBuilder(sourceMimetype, targetMimetype, filename);
WebClient client = WebClient.create(); WebClient client = WebClient.create();
WebClient.ResponseSpec responseSpec = client.post() WebClient.ResponseSpec responseSpec = client.post()
@ -88,7 +87,8 @@ public abstract class LivenessReadinessProbeTest
assertEquals(OK, responseSpec.toBodilessEntity().block().getStatusCode()); 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(); MultipartBodyBuilder builder = new MultipartBodyBuilder();
builder.part("_sourceMimetype", sourceMimetype); builder.part("_sourceMimetype", sourceMimetype);
builder.part("_targetMimetype", targetMimetype); builder.part("_targetMimetype", targetMimetype);
@ -97,7 +97,8 @@ public abstract class LivenessReadinessProbeTest
return builder; return builder;
} }
private static void assertProbeDied(String url) { private static void assertProbeDied(String url)
{
WebTestClient client = WebTestClient.bindToServer().baseUrl(url+"/ready").build(); WebTestClient client = WebTestClient.bindToServer().baseUrl(url+"/ready").build();
client.get() client.get()
.exchange() .exchange()

2
engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickLivenessReadinessProbeTest.java
View File

@ -32,6 +32,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest;
public class ImageMagickLivenessReadinessProbeTest extends LivenessReadinessProbeTest { public class ImageMagickLivenessReadinessProbeTest extends LivenessReadinessProbeTest {
@Override @Override
protected ImagesForTests getImageForTest() { 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");
} }
} }

2
engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeLivenessReadinessProbeTest.java
View File

@ -32,6 +32,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest;
public class LibreOfficeLivenessReadinessProbeTest extends LivenessReadinessProbeTest { public class LibreOfficeLivenessReadinessProbeTest extends LivenessReadinessProbeTest {
@Override @Override
protected ImagesForTests getImageForTest() { 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");
} }
} }

2
engines/misc/src/test/java/org/alfresco/transform/misc/MiscLivenessReadinessProbeTest.java
View File

@ -32,6 +32,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest;
public class MiscLivenessReadinessProbeTest extends LivenessReadinessProbeTest { public class MiscLivenessReadinessProbeTest extends LivenessReadinessProbeTest {
@Override @Override
protected ImagesForTests getImageForTest() { 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");
} }
} }

2
engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java
View File

@ -32,6 +32,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest;
public class PdfRendererLivenessReadinessProbeTest extends LivenessReadinessProbeTest { public class PdfRendererLivenessReadinessProbeTest extends LivenessReadinessProbeTest {
@Override @Override
protected ImagesForTests getImageForTest() { 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");
} }
} }

2
engines/tika/src/test/java/org/alfresco/transform/tika/TikaLivenessReadinessProbeTest.java
View File

@ -33,6 +33,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest;
public class TikaLivenessReadinessProbeTest extends LivenessReadinessProbeTest { public class TikaLivenessReadinessProbeTest extends LivenessReadinessProbeTest {
@Override @Override
protected ImagesForTests getImageForTest() { 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");
} }
} }