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

Merge branch 'ATS-371' into 'master'

Browse Source 
ATS-371 : Error in AWS_AI Engine when upload .jpeg files in ACS

See merge request Repository/alfresco-docker-transformers!47
This commit is contained in:
Lucian Tuca 2019-04-05 13:21:42 +01:00
commit 2c9194b15d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
View File

@ -30,6 +30,7 @@ import static org.alfresco.transformer.fs.FileManager.createTargetFileName;
import static org.alfresco.transformer.fs.FileManager.deleteFile; import static org.alfresco.transformer.fs.FileManager.deleteFile;
import static org.alfresco.transformer.fs.FileManager.getFilenameFromContentDisposition; import static org.alfresco.transformer.fs.FileManager.getFilenameFromContentDisposition;
import static org.alfresco.transformer.fs.FileManager.save; import static org.alfresco.transformer.fs.FileManager.save;
import static org.springframework.http.HttpStatus.BAD_REQUEST;
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
@ -145,7 +146,7 @@ public abstract class AbstractTransformerController implements TransformControll
reply.setStatus(e.getStatusCode()); reply.setStatus(e.getStatusCode());
reply.setErrorDetails(messageWithCause("Failed at reading the source file", e)); reply.setErrorDetails(messageWithCause("Failed at reading the source file", e));
logger.error("Failed to load source file (TransformException), sending " + reply, e); logger.error("Failed to load source file (TransformException), sending " + reply);
return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus())); return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus()));
} }
catch (HttpClientErrorException e) catch (HttpClientErrorException e)
@ -279,7 +280,10 @@ public abstract class AbstractTransformerController implements TransformControll
final Resource body = responseEntity.getBody(); final Resource body = responseEntity.getBody();
if (body == null) if (body == null)
{ {
throw new Exception("Failed to retrieve the file body from the request"); String message = "Source file with reference: " + sourceReference + " is null or empty. "
+ "Transformation will fail and stop now as there is no content to be transformed.";
logger.warn(message);
throw new TransformException(BAD_REQUEST.value(), message);
} }
File file = TempFileProvider.createTempFile("source_", "." + extension); File file = TempFileProvider.createTempFile("source_", "." + extension);