From a04a26d6f61b8f328182972ca3ac1a0c7fc8952b Mon Sep 17 00:00:00 2001 From: alandavis Date: Tue, 26 Jul 2022 14:27:39 +0100 Subject: [PATCH] Save point: [skip ci] * Tika test --- .../java/org/alfresco/transform/base/TransformProcess.java | 6 +++--- .../java/org/alfresco/transform/tika/transformers/Tika.java | 2 +- .../src/test/java/org/alfresco/transform/tika/TikaTest.java | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformProcess.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformProcess.java index a7f23ffd..c4bd0304 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/TransformProcess.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/TransformProcess.java @@ -87,13 +87,13 @@ abstract class TransformProcess extends TransformStreamHandler } catch (TransformException e) { - transformerDebug.logFailure(reference, e.getMessage()); + transformerDebug.logFailure(reference, " Error: "+e.getMessage()); LogEntry.setStatusCodeAndMessage(e.getStatus(), e.getMessage()); handleTransformException(e, e.getStatus()); } catch (Exception e) { - transformerDebug.logFailure(reference, e.getMessage()); + transformerDebug.logFailure(reference, " Error: "+e.getMessage()); LogEntry.setStatusCodeAndMessage(INTERNAL_SERVER_ERROR, e.getMessage()); handleException(e); } @@ -134,6 +134,6 @@ abstract class TransformProcess extends TransformStreamHandler protected void handleException(Exception e) { - throw new RuntimeException(e); + throw new TransformException(INTERNAL_SERVER_ERROR, e.getMessage(), e); } } diff --git a/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/Tika.java b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/Tika.java index ef2459f1..cf8f06ad 100644 --- a/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/Tika.java +++ b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/Tika.java @@ -236,7 +236,7 @@ public class Tika } catch (UnsupportedEncodingException e) { - throw new IllegalStateException("Unsupported encoding "+e.getMessage(), e); + throw new IllegalArgumentException("Unsupported encoding "+e.getMessage(), e); } catch (SAXException | TikaException | IOException e) { diff --git a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaTest.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaTest.java index 8ab00707..491a84e4 100644 --- a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaTest.java +++ b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaTest.java @@ -245,10 +245,6 @@ public class TikaTest extends AbstractBaseTest { mockTransformCommand(PDF, TXT, MIMETYPE_PDF, true); targetEncoding = "rubbish"; -// mockMvc.perform( -// mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", targetExtension)) -// .andExpect(MockMvcResultMatchers.status().is(INTERNAL_SERVER_ERROR.value())); - mockMvc.perform( mockMvcRequest(ENDPOINT_TRANSFORM, sourceFile, "targetExtension", targetExtension)) .andExpect(status().is(INTERNAL_SERVER_ERROR.value()));