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

Repeat Bump dependency.tika.version from 2.1.0 to 2.2.1 (#516)

Browse Source 
* Repeat Bump dependency.tika.version from 2.1.0 to 2.2.1

Original PR https://github.com/Alfresco/alfresco-transform-core/pull/506 was merged to master where it failed. There had been no build of the PR before the merge, which is why this branch has been created.

* Use non deprecated TikaCoreProperties.SUBJECT with tika 2.2.1.

The deprecated OfficeOpenXMLCore.SUBJECT value worked in 2.2.0 but not 2.2.1

* With the upgrade of Tika from 2.2.0 to 2.2.1, the deprecated OfficeOpenXMLCore.SUBJECT metadata value became being null and the replacement TikaCoreProperties.SUBJECT became a multi value in a few of our test cases. For backward compatibility with very old versions of Alfresco, we have historically been added a number of extra values including "subject" and "description" back into the raw metadata, before mapping them onto Alfresco properties. These values existed in the original version of Tika used by Alfresco, so it is possible there are custom mappings out there that using them.

To complicate matters a little, out standard mappings for some types put the raw "subject" value into cm:description property. What makes it interesting is that the extra "description" value is not used but has the value originally in our expected metadata extarct data. That is why the quick_*_json files have been modified.
This commit is contained in:
Alan Davis 2022-01-13 17:25:56 +00:00 committed by GitHub
parent 3889fa73b5
commit 59325bc38a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaMetadataExtractsIT.java
View File

@ -548,4 +548,28 @@ public class TikaMetadataExtractsIT extends AbstractMetadataExtractsIT
);
}
@ParameterizedTest
@MethodSource("tika2_2_1_upgradeFailures")
public void testTika_2_2_1_upgradeFailures(TestFileInfo testFileInfo)
{
super.testTransformation(testFileInfo);
}
private static Stream<TestFileInfo> tika2_2_1_upgradeFailures()
{
// When we upgraded to Tika 2.2.1 from 2.2.0:
// - the original OfficeOpenXMLCore.SUBJECT raw metadata value started being null.
// - the replacement TikaCoreProperties.SUBJECT raw metadata changed into a multi value
// The following test files were the ones that failed.
return Stream.of(
testFile(MIMETYPE_OPENDOCUMENT_GRAPHICS_TEMPLATE, "otg", "quick.otg"),
testFile(MIMETYPE_OPENOFFICE1_WRITER, "sxw", "quick.sxw"),
testFile(MIMETYPE_OPENDOCUMENT_GRAPHICS, "odg", "quick.odg"),
testFile(MIMETYPE_OPENDOCUMENT_TEXT, "odt", "quick.odt"),
testFile(MIMETYPE_OPENDOCUMENT_TEXT_TEMPLATE, "ott", "quick.ott"),
testFile(MIMETYPE_OPENDOCUMENT_FORMULA, "odf", "quick.odf"),
testFile(MIMETYPE_PDF, "pdf", "quick.pdf")
);
}
}

2
alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odf_metadata.json
View File

@ -1,5 +1,5 @@
{
"{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}created" : 1138362922000,
"{http://www.alfresco.org/model/content/1.0}author" : null,
"{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"

2
alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odg_metadata.json
View File

@ -1,5 +1,5 @@
{
"{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}created" : 1138362371000,
"{http://www.alfresco.org/model/content/1.0}author" : "Derek Hulley",
"{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"

2
alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odt_metadata.json
View File

@ -1,5 +1,5 @@
{
"{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}created" : 1126049640000,
"{http://www.alfresco.org/model/content/1.0}author" : "Jesper Steen Møller",
"{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"

2
alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.otg_metadata.json
View File

@ -1,5 +1,5 @@
{
"{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}created" : 1138362371000,
"{http://www.alfresco.org/model/content/1.0}author" : "Derek Hulley",
"{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"

2
alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ott_metadata.json
View File

@ -1,5 +1,5 @@
{
"{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}created" : 1126049640000,
"{http://www.alfresco.org/model/content/1.0}author" : "Jesper Steen Møller",
"{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"

2
alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.pdf_metadata.json
View File

@ -1,5 +1,5 @@
{
"{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}created" : "2005-05-26T19:52:58Z",
"{http://www.alfresco.org/model/content/1.0}author" : "Nevin Nollop",
"{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"

2
alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.sxw_metadata.json
View File

@ -1,5 +1,5 @@
{
"{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}description" : "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog",
"{http://www.alfresco.org/model/content/1.0}created" : 1126049640000,
"{http://www.alfresco.org/model/content/1.0}author" : "Jesper Steen Møller",
"{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog"

4
alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractTikaMetadataExtractor.java
View File

@ -2,7 +2,7 @@
* #%L
* Alfresco Transform Core
* %%
* Copyright (C) 2005 - 2021 Alfresco Software Limited
* Copyright (C) 2005 - 2022 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
@ -269,7 +269,7 @@ public abstract class AbstractTikaMetadataExtractor extends AbstractMetadataExtr
// Get the subject and description, despite things not
// being nearly as consistent as one might hope
String subject = getMetadataValue(metadata, OfficeOpenXMLCore.SUBJECT);
String subject = getMetadataValue(metadata, TikaCoreProperties.SUBJECT);
String description = getMetadataValue(metadata, TikaCoreProperties.DESCRIPTION);
if (subject != null && description != null)
{

4
alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java
View File

@ -2,7 +2,7 @@
* #%L
* Alfresco Transform Core
* %%
* Copyright (C) 2005 - 2021 Alfresco Software Limited
* Copyright (C) 2005 - 2022 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
@ -103,7 +103,7 @@ public abstract class AbstractMetadataExtractsIT
Map<String, Serializable> expectedMetadata = readExpectedMetadata(metadataFilename, actualMetadataFile);
assertEquals(expectedMetadata, actualMetadata,
"The metadata did not match the expected value. It has been saved in "+actualMetadataFile.getAbsolutePath());
sourceFile+": The metadata did not match the expected value. It has been saved in "+actualMetadataFile.getAbsolutePath());
actualMetadataFile.delete();
}
catch (Exception e)

6
alfresco-transformer-base/src/test/java/org/alfresco/transformer/TestFileInfo.java
View File

@ -76,4 +76,10 @@ public class TestFileInfo
{
return new TestFileInfo(mimeType, extension, path, false);
}
@Override
public String toString()
{
return path;
}
}

2
pom.xml
View File

@ -27,7 +27,7 @@
<dependency.jackson-databind.version>${dependency.jackson.version}</dependency.jackson-databind.version>
<dependency.junit.version>4.13.2</dependency.junit.version>
<dependency.cxf.version>3.5.0</dependency.cxf.version>
<dependency.tika.version>2.1.0</dependency.tika.version>
<dependency.tika.version>2.2.1</dependency.tika.version>
<dependency.poi.version>4.1.2</dependency.poi.version>
<dependency.ooxml-schemas.version>1.4</dependency.ooxml-schemas.version>