From 537070285dc557effeba4086c99333834ab8bd88 Mon Sep 17 00:00:00 2001 From: David Edwards Date: Fri, 3 Apr 2020 11:27:23 +0100 Subject: [PATCH] ATS-675/ATS-703 Rename OptionsBuilder to PdfRendererOptionsBuilder This is to avoid confilct with OptionsBuilders in other T-engines. --- .../AlfrescoPdfRendererController.java | 4 +-- ...er.java => PdfRendererOptionsBuilder.java} | 28 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) rename alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/{OptionsBuilder.java => PdfRendererOptionsBuilder.java} (74%) diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java index 2bfd9207..5a65ecc8 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java @@ -114,7 +114,7 @@ public class AlfrescoPdfRendererController extends AbstractTransformerController logger.debug("Processing request with: sourceFile '{}', targetFile '{}', transformOptions" + " '{}', timeout {} ms", sourceFile, targetFile, transformOptions, timeout); - final String options = OptionsBuilder + final String options = PdfRendererOptionsBuilder .builder() .withPage(transformOptions.get("page")) .withWidth(transformOptions.get("width")) @@ -147,7 +147,7 @@ public class AlfrescoPdfRendererController extends AbstractTransformerController File targetFile = createTargetFile(request, targetFilename); // Both files are deleted by TransformInterceptor.afterCompletion - final String options = OptionsBuilder + final String options = PdfRendererOptionsBuilder .builder() .withPage(page) .withWidth(width) diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/OptionsBuilder.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/PdfRendererOptionsBuilder.java similarity index 74% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/OptionsBuilder.java rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/PdfRendererOptionsBuilder.java index 36c6a407..be8d0118 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/OptionsBuilder.java +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/PdfRendererOptionsBuilder.java @@ -36,7 +36,7 @@ import java.util.StringJoiner; * * @author Cezar Leahu */ -final class OptionsBuilder +public final class PdfRendererOptionsBuilder { private Integer page; private Integer width; @@ -44,58 +44,58 @@ final class OptionsBuilder private Boolean allowPdfEnlargement; private Boolean maintainPdfAspectRatio; - private OptionsBuilder() {} + private PdfRendererOptionsBuilder() {} - public OptionsBuilder withPage(final String page) + public PdfRendererOptionsBuilder withPage(final String page) { return withPage(stringToInteger(page)); } - public OptionsBuilder withPage(final Integer page) + public PdfRendererOptionsBuilder withPage(final Integer page) { this.page = page; return this; } - public OptionsBuilder withWidth(final String width) + public PdfRendererOptionsBuilder withWidth(final String width) { return withWidth(stringToInteger(width)); } - public OptionsBuilder withWidth(final Integer width) + public PdfRendererOptionsBuilder withWidth(final Integer width) { this.width = width; return this; } - public OptionsBuilder withHeight(final String height) + public PdfRendererOptionsBuilder withHeight(final String height) { return withHeight(stringToInteger(height)); } - public OptionsBuilder withHeight(final Integer height) + public PdfRendererOptionsBuilder withHeight(final Integer height) { this.height = height; return this; } - public OptionsBuilder withAllowPdfEnlargement(final String allowPdfEnlargement) + public PdfRendererOptionsBuilder withAllowPdfEnlargement(final String allowPdfEnlargement) { return withAllowPdfEnlargement(stringToBoolean(allowPdfEnlargement)); } - public OptionsBuilder withAllowPdfEnlargement(final Boolean allowPdfEnlargement) + public PdfRendererOptionsBuilder withAllowPdfEnlargement(final Boolean allowPdfEnlargement) { this.allowPdfEnlargement = allowPdfEnlargement; return this; } - public OptionsBuilder withMaintainPdfAspectRatio(final String maintainPdfAspectRatio) + public PdfRendererOptionsBuilder withMaintainPdfAspectRatio(final String maintainPdfAspectRatio) { return withMaintainPdfAspectRatio(stringToBoolean(maintainPdfAspectRatio)); } - public OptionsBuilder withMaintainPdfAspectRatio(final Boolean maintainPdfAspectRatio) + public PdfRendererOptionsBuilder withMaintainPdfAspectRatio(final Boolean maintainPdfAspectRatio) { this.maintainPdfAspectRatio = maintainPdfAspectRatio; return this; @@ -127,8 +127,8 @@ final class OptionsBuilder return args.toString(); } - public static OptionsBuilder builder() + public static PdfRendererOptionsBuilder builder() { - return new OptionsBuilder(); + return new PdfRendererOptionsBuilder(); } }