Save point: [skip ci]

* TikaTests
This commit is contained in:
alandavis
2022-07-25 17:20:13 +01:00
parent 17b294b8a0
commit e06989e544
12 changed files with 210 additions and 123 deletions

View File

@@ -189,7 +189,7 @@ public class TransformHandler
MultipartFile sourceMultipartFile, String sourceMimetype, String targetMimetype,
Map<String, String> requestParameters)
{
return createResponseEntity(targetMimetype, os ->
return createResponseEntity(sourceMimetype, targetMimetype, os ->
{
new TransformProcess(this, sourceMimetype, targetMimetype, requestParameters,
"e" + httpRequestCount.getAndIncrement())
@@ -216,7 +216,7 @@ public class TransformHandler
@Override
protected OutputStream getOutputStream()
{
return transformManager.setOutputStream(os);
return os;
}
@Override
@@ -538,10 +538,10 @@ public class TransformHandler
return customTransformer;
}
private ResponseEntity<StreamingResponseBody> createResponseEntity(String targetMimetype,
private ResponseEntity<StreamingResponseBody> createResponseEntity(String sourceMimetype, String targetMimetype,
StreamingResponseBody body)
{
String extension = ExtensionService.getExtensionForMimetype(targetMimetype);
String extension = ExtensionService.getExtensionForTargetMimetype(targetMimetype, sourceMimetype);
HttpHeaders headers = new HttpHeaders();
headers.setContentDisposition(
ContentDisposition.attachment()

View File

@@ -36,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.jms.Destination;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.OutputStream;
import java.util.Map;
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
@@ -70,7 +71,6 @@ abstract class TransformProcess extends TransformStreamHandler
transformHandler.getProbeTransform().incrementTransformerCount();
}
@Override
public void handleTransformRequest()
{
transformManager.setSourceMimetype(sourceMimetype);

View File

@@ -374,6 +374,8 @@ public abstract class AbstractMetadataExtractor implements CustomTransformer
String className = this.getClass().getName();
String shortClassName = className.split("\\.")[className.split("\\.").length - 1];
shortClassName = shortClassName.replace('$', '-');
// The embedder uses the reverse of the extractor's data.
shortClassName = shortClassName.replace("Embedder", "Extractor");
return shortClassName + "_metadata_" + suffix + ".properties";
}