inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-09-17 14:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-5191 Bug: T-Engine should provide mapping rather than the repo. (#227)

Browse Source 
Bug found while reviewing documents on how to create a custom metadata extractor. The original refactor had left the repo doing the mapping. It should have been passing the fully qualified repo properties to the T-Engine to do the mapping.

Linked to:
    Alfresco/acs-packaging#1826
    Alfresco/alfresco-transform-core#316
This commit is contained in:
Alan Davis
2021-01-07 11:56:42 +00:00
committed by GitHub
parent be8e77941d
commit 04d699cf86
4 changed files with 164 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
repository/src/test/java/org/alfresco/repo/action/executer/AsynchronousExtractorTest.java
View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2020 Alfresco Software Limited
* Copyright (C) 2005 - 2021 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
@@ -36,7 +36,6 @@ import org.alfresco.repo.content.transform.AbstractContentTransformerTest;
import org.alfresco.repo.content.transform.TransformerDebug;
import org.alfresco.repo.content.transform.UnsupportedTransformationException;
import org.alfresco.repo.rendition2.RenditionDefinition2;
import org.alfresco.repo.rendition2.RenditionDefinitionRegistry2;
import org.alfresco.repo.rendition2.RenditionDefinitionRegistry2Impl;
import org.alfresco.repo.rendition2.RenditionService2Impl;
import org.alfresco.repo.rendition2.TransformClient;
@@ -97,6 +96,7 @@ import static org.alfresco.model.ContentModel.PROP_CREATED;
import static org.alfresco.model.ContentModel.PROP_CREATOR;
import static org.alfresco.model.ContentModel.PROP_MODIFIED;
import static org.alfresco.model.ContentModel.PROP_MODIFIER;
import static org.alfresco.model.ContentModel.PROP_TITLE;
import static org.alfresco.repo.rendition2.RenditionService2Impl.SOURCE_HAS_NO_CONTENT;
/**
@@ -145,6 +145,7 @@ public class AsynchronousExtractorTest extends BaseSpringTest
private Map<QName, Serializable> origProperties;
private Map<QName, Serializable> expectedProperties;
private Map<QName, Serializable> properties;
private Map<String, String> transformOptionsPassedToTEngine;
private class TestAsynchronousExtractor extends AsynchronousExtractor
{
@@ -215,8 +216,20 @@ public class AsynchronousExtractorTest extends BaseSpringTest
return true;
}
@Override
protected Map<String, Serializable> mapSystemToRaw(Map<QName, Serializable> systemMetadata)
{
// Add a property value that is a Collection, to ensure we can handle it.
Map<QName, Serializable> metadataWithCollection = new HashMap<>(systemMetadata);
Serializable collection = new ArrayList(Set.of("one", "two", "three"));
metadataWithCollection.put(PROP_TITLE, collection);
return super.mapSystemToRaw(metadataWithCollection);
}
private void mockTransform(NodeRef sourceNodeRef, RenditionDefinition2 renditionDefinition, int sourceContentHashCode)
{
transformOptionsPassedToTEngine = renditionDefinition.getTransformOptions();
try
{
transformerDebug.pushMisc();
@@ -604,8 +617,26 @@ public class AsynchronousExtractorTest extends BaseSpringTest
File file = new File(resource.toURI());
long fileSize = file.length();
assertAsyncMetadataExecute(contentMetadataEmbedder, "quick/quick.html", // just replace the pdf with html!
// Replace the source pdf with html so we can see the content change size
assertAsyncMetadataExecute(contentMetadataEmbedder, "quick/quick.html",
UNCHANGED_HASHCODE, fileSize, expectedProperties, OverwritePolicy.PRAGMATIC);
// Check the metadata sent to the T-Engine contains one of the fixed property values.
String metadata = transformOptionsPassedToTEngine.get("metadata");
System.err.println("METADATA="+metadata);
assertTrue("System properties were not set: simple value", metadata.contains("\"{http://www.alfresco.org/model/content/1.0}creator\":\"System\""));
// Check the metadata sent to the T-Engine contains the collection value added by the mockTransform.
// The order of elements in the collection may change, so we cannot use a simple string compare.
int i = metadata.indexOf("\"{http://www.alfresco.org/model/content/1.0}title\":[");
assertTrue("The title is missing: "+metadata, i > 0);
int j = metadata.indexOf(']', i);
assertTrue("No closing ] : "+metadata.substring(i), j > 0);
String collection = metadata.substring(i, j);
assertTrue("There should have 3 elements: "+collection, collection.split(",").length == 3);
assertTrue("\"one\" is missing", collection.contains("\"one\""));
assertTrue("\"two\" is missing", collection.contains("\"two\""));
assertTrue("\"three\" is missing", collection.contains("\"three\""));
}
@Test

142
repository/src/test/java/org/alfresco/repo/action/executer/ContentMetadataEmbedderTest.java
View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2020 Alfresco Software Limited
* Copyright (C) 2005 - 2021 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
@@ -43,18 +43,12 @@ import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID;
import org.apache.tika.embedder.Embedder;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.ParseContext;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.transaction.annotation.Transactional;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Collection;
@@ -82,6 +76,8 @@ public class ContentMetadataEmbedderTest extends BaseSpringTest
private NodeRef nodeRef;
private ContentMetadataEmbedder executer;
private long origSize = -1;
private long newSize = -1;
private final static String ID = GUID.generate();
@@ -128,73 +124,81 @@ public class ContentMetadataEmbedderTest extends BaseSpringTest
@Test
public void testFailingEmbedder()
{
AbstractMappingMetadataExtracter embedder = new FailingMappingMetadataEmbedder(Arrays.asList(MimetypeMap.MIMETYPE_PDF));
AbstractMappingMetadataExtracter embedder = new MockFailingEmbedder();
setupEmbedderActionAndThenExecute(embedder);
assertEquals("The original content should remain unchanged on embed failures", origSize, newSize);
}
/**
* Test that a successful embedder does change the original content
*/
@Test
public void testSuccessfulEmbedder()
{
AbstractMappingMetadataExtracter embedder = new MockSuccessfulEmbedder();
setupEmbedderActionAndThenExecute(embedder);
assertNotSame("The original content should remain unchanged on embed failures", origSize, newSize);
}
private void setupEmbedderActionAndThenExecute(AbstractMappingMetadataExtracter embedder)
{
embedder.setRegistry(metadataExtracterRegistry);
embedder.setDictionaryService(this.dictionaryService);
embedder.setMimetypeService(this.mimetypeService);
embedder.setDictionaryService(dictionaryService);
embedder.setMimetypeService(mimetypeService);
embedder.register();
String myCreator = "Embedded creator";
// Get the old props
Map<QName, Serializable> props = this.nodeService.getProperties(this.nodeRef);
props.put(ContentModel.PROP_AUTHOR, myCreator);
this.nodeService.setProperties(this.nodeRef, props);
Map<QName, Serializable> origProps = nodeService.getProperties(nodeRef);
origProps.put(ContentModel.PROP_AUTHOR, myCreator);
nodeService.setProperties(nodeRef, origProps);
// Execute the action
// Create the action
ActionImpl action = new ActionImpl(null, ID, SetPropertyValueActionExecuter.NAME, null);
ContentReader origReader = this.contentService.getReader(this.nodeRef, ContentModel.PROP_CONTENT);
long origSize = origReader.getSize();
ContentReader origReader = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT);
origSize = origReader.getSize();
assertTrue(origSize > 0);
this.executer.execute(action, this.nodeRef);
ContentReader embeddedReader = this.contentService.getReader(this.nodeRef, ContentModel.PROP_CONTENT);
assertEquals("The original content should remain unchanged on embed failures", origSize, embeddedReader.getSize());
}
/**
* Embedder which fails upon calling embed on its {@link FailingEmbedder}
*/
private class FailingMappingMetadataEmbedder extends AbstractMappingMetadataExtracter
{
/**
* Constructor for setting supported extract and embed mimetypes
*
* @param mimetypes the supported extract and embed mimetypes
*/
public FailingMappingMetadataEmbedder(Collection<String> mimetypes)
{
super(
new HashSet<String>(mimetypes),
new HashSet<String>(mimetypes));
}
// Execute the action
executer.execute(action, nodeRef);
ContentReader embeddedReader = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT);
newSize = embeddedReader.getSize();
}
private static class MockFailingEmbedder extends MockEmbedder
{
@Override
protected void embedInternal(Map<String, Serializable> metadata, ContentReader reader, ContentWriter writer) throws Throwable
{
Embedder embedder = getEmbedder();
if (embedder == null)
{
return;
}
Map<String, String> metadataAsStrings = convertMetadataToStrings(metadata);
Metadata metadataToEmbed = new Metadata();
metadataAsStrings.forEach((k,v)->metadataToEmbed.add(k, v));
InputStream inputStream = reader.getContentInputStream();
OutputStream outputStream = writer.getContentOutputStream();
embedder.embed(metadataToEmbed, null, outputStream, null);
throw new IOException("Forced test failure");
}
}
protected Embedder getEmbedder()
private static class MockSuccessfulEmbedder extends MockEmbedder
{
@Override
protected void embedInternal(Map<String, Serializable> metadata, ContentReader reader, ContentWriter writer) throws Throwable
{
return new FailingEmbedder();
// Just set the content as this is testing embedding in the repo rather than via the AsynchronousExtractor and T-Engines.
File htmlFile = AbstractContentTransformerTest.loadQuickTestFile("html");
writer.putContent(htmlFile);
}
}
private static class MockEmbedder extends AbstractMappingMetadataExtracter
{
private static final Collection<String> MIMETYPES = Arrays.asList(MimetypeMap.MIMETYPE_PDF);
public MockEmbedder()
{
super(new HashSet<String>(MIMETYPES), new HashSet<String>(MIMETYPES));
}
@Override
protected Map<String, Set<QName>> readMappingProperties(String propertiesUrl)
{
@@ -217,26 +221,4 @@ public class ContentMetadataEmbedderTest extends BaseSpringTest
return null;
}
}
/**
* Metadata embedder which fails on a call to embed.
*/
private class FailingEmbedder implements Embedder
{
private static final long serialVersionUID = -4954679684941467571L;
@Override
public Set<MediaType> getSupportedEmbedTypes(ParseContext context)
{
return null;
}
@Override
public void embed(Metadata metadata, InputStream originalStream, OutputStream outputStream, ParseContext context)
throws IOException
{
throw new IOException("Forced failure");
}
}
}