inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some deprecated methods and classes in the MetadataExtracter hierarchy

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130493 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2016-09-08 16:02:39 +00:00
parent 3e01528a9d
commit 8991f629ee
5 changed files with 88 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/java/org/alfresco/repo/content/metadata/MetadataExtracterRegistry.java
View File

@@ -201,16 +201,20 @@ public class MetadataExtracterRegistry
return liveExtractor;
}
@SuppressWarnings("deprecation")
private String getName(MetadataExtracter extractor)
{
return extractor == null
? null
: extractor instanceof AbstractMetadataExtracter
? ((AbstractMetadataExtracter)extractor).getBeanName()
: extractor instanceof AbstractMappingMetadataExtracter
? ((AbstractMappingMetadataExtracter)extractor).getBeanName()
: extractor.getClass().getSimpleName();
{
if (extractor == null)
{
return null;
}
else if (extractor instanceof AbstractMappingMetadataExtracter)
{
return ((AbstractMappingMetadataExtracter)extractor).getBeanName();
}
else
{
return extractor.getClass().getSimpleName();
}
}
/**
@@ -218,8 +222,11 @@ public class MetadataExtracterRegistry
* @return Returns a set of extractors that will work for the given mimetype
*/
private List<MetadataExtracter> findBestExtracters(String sourceMimetype)
{
logger.debug("Finding extractors for " + sourceMimetype);
{
if (logger.isDebugEnabled())
{
logger.debug("Finding extractors for " + sourceMimetype);
}
List<MetadataExtracter> extractors = new ArrayList<MetadataExtracter>(1);
@@ -227,14 +234,23 @@ public class MetadataExtracterRegistry
{
if (!extractor.isSupported(sourceMimetype))
{
// extraction not achievable
logger.debug("Find unsupported: "+getName(extractor));
// extraction not achievable
if (logger.isDebugEnabled())
{
logger.debug("Find unsupported: "+getName(extractor));
}
continue;
}
if (logger.isDebugEnabled())
{
logger.debug("Find supported: "+getName(extractor));
}
logger.debug("Find supported: "+getName(extractor));
extractors.add(extractor);
}
if (logger.isDebugEnabled())
{
logger.debug("Find returning: "+extractors);
}
logger.debug("Find returning: "+extractors);
return extractors;
}