From 279efd3071337390f2f00bb644a4beb199f9dcf0 Mon Sep 17 00:00:00 2001 From: Lucian Tuca Date: Thu, 11 Apr 2019 16:41:00 +0300 Subject: [PATCH] ATS-329 - updated exception package --- .../alfresco/transformer/OptionsBuilder.java | 2 +- .../executors/LibreOfficeJavaExecutor.java | 2 +- .../alfresco/transformer/TikaController.java | 2 +- .../executors/TikaJavaExecutor.java | 2 +- .../AbstractTransformerController.java | 2 +- .../transformer/TransformController.java | 2 +- .../AlfrescoSharedFileStoreClient.java | 2 +- .../exceptions/TransformException.java | 48 ------------------- .../executors/AbstractCommandExecutor.java | 2 +- .../transformer/executors/JavaExecutor.java | 2 +- .../alfresco/transformer/fs/FileManager.java | 2 +- .../probes/ProbeTestTransform.java | 2 +- pom.xml | 2 +- 13 files changed, 12 insertions(+), 60 deletions(-) delete mode 100644 alfresco-transformer-base/src/main/java/org/alfresco/transformer/exceptions/TransformException.java diff --git a/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/OptionsBuilder.java b/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/OptionsBuilder.java index d9ff7864..52ff9287 100644 --- a/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/OptionsBuilder.java +++ b/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/OptionsBuilder.java @@ -8,7 +8,7 @@ import static org.springframework.http.HttpStatus.BAD_REQUEST; import java.util.List; import java.util.StringJoiner; -import org.alfresco.transformer.exceptions.TransformException; +import org.alfresco.transform.exceptions.TransformException; /** * ImageMagick options builder. diff --git a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java index f147800b..a11d5037 100644 --- a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java +++ b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java @@ -8,7 +8,7 @@ import java.io.IOException; import javax.annotation.PostConstruct; -import org.alfresco.transformer.exceptions.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.pdfbox.pdmodel.PDDocument; diff --git a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java b/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java index 19ab6142..add8d6a4 100644 --- a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java +++ b/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java @@ -33,7 +33,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.alfresco.transformer.exceptions.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.executors.TikaJavaExecutor; import org.alfresco.transformer.logging.LogEntry; import org.alfresco.transformer.probes.ProbeTestTransform; diff --git a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/executors/TikaJavaExecutor.java b/alfresco-docker-tika/src/main/java/org/alfresco/transformer/executors/TikaJavaExecutor.java index 7a02d79e..c7bf687d 100644 --- a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/executors/TikaJavaExecutor.java +++ b/alfresco-docker-tika/src/main/java/org/alfresco/transformer/executors/TikaJavaExecutor.java @@ -8,7 +8,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.StringJoiner; -import org.alfresco.transformer.exceptions.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.logging.LogEntry; import org.apache.tika.exception.TikaException; import org.springframework.beans.factory.annotation.Autowired; 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 f5e362b9..1c12d22e 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 @@ -41,7 +41,7 @@ import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; import org.alfresco.transform.client.model.TransformRequestValidator; import org.alfresco.transformer.clients.AlfrescoSharedFileStoreClient; -import org.alfresco.transformer.exceptions.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.logging.LogEntry; import org.alfresco.transformer.model.FileRefResponse; import org.alfresco.util.TempFileProvider; 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 index d44c2719..86ddd483 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java @@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletResponse; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transformer.exceptions.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.logging.LogEntry; import org.alfresco.transformer.probes.ProbeTestTransform; import org.slf4j.Logger; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java index 4339ca5f..f448bc75 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java @@ -9,7 +9,7 @@ package org.alfresco.transformer.clients; import java.io.File; -import org.alfresco.transformer.exceptions.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.model.FileRefResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/exceptions/TransformException.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/exceptions/TransformException.java deleted file mode 100644 index c7951c31..00000000 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/exceptions/TransformException.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.transformer.exceptions; - -public class TransformException extends RuntimeException -{ - private final int statusCode; - - public TransformException(int statusCode, String message) - { - super(message); - this.statusCode = statusCode; - } - - public TransformException(int statusCode, String message, Throwable cause) - { - super(message, cause); - this.statusCode = statusCode; - } - - public int getStatusCode() - { - return statusCode; - } -} diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java index f889cfba..5a3f3a3c 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java @@ -6,7 +6,7 @@ import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import java.io.File; import java.util.Map; -import org.alfresco.transformer.exceptions.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.util.exec.RuntimeExec; import org.alfresco.util.exec.RuntimeExec.ExecutionResult; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/JavaExecutor.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/JavaExecutor.java index 6887beb1..38495ae7 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/JavaExecutor.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/JavaExecutor.java @@ -2,7 +2,7 @@ package org.alfresco.transformer.executors; import java.io.File; -import org.alfresco.transformer.exceptions.TransformException; +import org.alfresco.transform.exceptions.TransformException; /** * Basic interface for executing transformations inside Java/JVM diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java index 0d6fdc76..a0e5d664 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java @@ -13,7 +13,7 @@ import java.util.Arrays; import javax.servlet.http.HttpServletRequest; -import org.alfresco.transformer.exceptions.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.logging.LogEntry; import org.alfresco.util.TempFileProvider; import org.springframework.core.io.Resource; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java index 65f1d836..77f4e24a 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java @@ -43,7 +43,7 @@ import java.util.concurrent.atomic.AtomicLong; import javax.servlet.http.HttpServletRequest; import org.alfresco.transformer.AbstractTransformerController; -import org.alfresco.transformer.exceptions.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.logging.LogEntry; import org.alfresco.util.TempFileProvider; import org.slf4j.Logger; diff --git a/pom.xml b/pom.xml index 8a8e4413..66253802 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 8.8 3.0.1.1 ${project.version} - 1.0.1 + 1.0.2 5.15.9 2.9.8