inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-14 17:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Batch 3 of changes from of review comments - there are more

Browse Source
This commit is contained in:
alandavis
2022-09-08 17:07:56 +01:00
parent c1c2348ec6
commit 17a96626c0
5 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java
View File

@@ -116,7 +116,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
protected final Logger logger; protected final Logger logger;
private Map<String, Set<String>> defaultExtractMapping; private Map<String, Set<String>> defaultExtractMapping;
private ThreadLocal<Map<String, Set<String>>> extractMapping = new ThreadLocal<>(); private final ThreadLocal<Map<String, Set<String>>> extractMapping = new ThreadLocal<>();
private Map<String, Set<String>> embedMapping; private Map<String, Set<String>> embedMapping;
public enum Type public enum Type
@@ -180,8 +180,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
{ {
TypeReference<HashMap<String, Serializable>> typeRef = new TypeReference<>() {}; TypeReference<HashMap<String, Serializable>> typeRef = new TypeReference<>() {};
HashMap<String, Serializable> systemProperties = jsonObjectMapper.readValue(metadataAsJson, typeRef); HashMap<String, Serializable> systemProperties = jsonObjectMapper.readValue(metadataAsJson, typeRef);
Map<String, Serializable> rawProperties = mapSystemToRaw(systemProperties); return mapSystemToRaw(systemProperties);
return rawProperties;
} }
catch (JsonProcessingException e) catch (JsonProcessingException e)
{ {
@@ -213,8 +212,8 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
{ {
logger.debug( logger.debug(
"Converted system model values to metadata values: \n" + "Converted system model values to metadata values: \n" +
" System Properties: " + systemMetadata + "\n" + " System Properties: {}\n" +
" Metadata Properties: " + metadataProperties); " Metadata Properties: {}", systemMetadata, metadataProperties);
} }
return metadataProperties; return metadataProperties;
} }
@@ -238,7 +237,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
Properties properties = readProperties(filename); Properties properties = readProperties(filename);
if (properties == null) if (properties == null)
{ {
logger.error("Failed to read "+filename); logger.error("Failed to read {}", filename);
} }
Map<String, String> namespacesByPrefix = getNamespaces(properties); Map<String, String> namespacesByPrefix = getNamespaces(properties);
@@ -270,7 +269,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
} }
if (logger.isTraceEnabled()) if (logger.isTraceEnabled())
{ {
logger.trace("Added mapping from " + documentProperty + " to " + qnames); logger.trace("Added mapping from {} to {}", documentProperty, qnames);
} }
} }
return convertedMapping; return convertedMapping;
@@ -293,21 +292,21 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
String filename = getPropertiesFilename(EMBED); String filename = getPropertiesFilename(EMBED);
Properties properties = readProperties(filename); Properties properties = readProperties(filename);
Map<String, Set<String>> embedMapping; Map<String, Set<String>> mapping;
if (properties != null) if (properties != null)
{ {
Map<String, String> namespacesByPrefix = getNamespaces(properties); Map<String, String> namespacesByPrefix = getNamespaces(properties);
embedMapping = buildEmbedMapping(properties, namespacesByPrefix); mapping = buildEmbedMapping(properties, namespacesByPrefix);
} }
else else
{ {
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.debug("No " + filename + ", assuming reverse of extract mapping"); logger.debug("No {}, assuming reverse of extract mapping", filename);
} }
embedMapping = buildEmbedMappingByReversingExtract(); mapping = buildEmbedMappingByReversingExtract();
} }
return embedMapping; return mapping;
} }
private Map<String, Set<String>> buildEmbedMapping(Properties properties, Map<String, String> namespacesByPrefix) private Map<String, Set<String>> buildEmbedMapping(Properties properties, Map<String, String> namespacesByPrefix)
@@ -325,7 +324,8 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
modelProperty = getQNameString(namespacesByPrefix, entry, modelProperty, EMBED); modelProperty = getQNameString(namespacesByPrefix, entry, modelProperty, EMBED);
String[] metadataKeysArray = metadataKeysString.split(","); String[] metadataKeysArray = metadataKeysString.split(",");
Set<String> metadataKeys = new HashSet<String>(metadataKeysArray.length); Set<String> metadataKeys = new HashSet<String>(metadataKeysArray.length);
for (String metadataKey : metadataKeysArray) { for (String metadataKey : metadataKeysArray)
{
metadataKeys.add(metadataKey.trim()); metadataKeys.add(metadataKey.trim());
} }
// Create the entry // Create the entry
@@ -340,28 +340,28 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
private Map<String, Set<String>> buildEmbedMappingByReversingExtract() private Map<String, Set<String>> buildEmbedMappingByReversingExtract()
{ {
Map<String, Set<String>> extractMapping = buildExtractMapping(); Map<String, Set<String>> extract = buildExtractMapping();
Map<String, Set<String>> embedMapping; Map<String, Set<String>> mapping;
embedMapping = new HashMap<>(extractMapping.size()); mapping = new HashMap<>(extract.size());
for (String metadataKey : extractMapping.keySet()) for (String metadataKey : extract.keySet())
{ {
if (extractMapping.get(metadataKey) != null && extractMapping.get(metadataKey).size() > 0) if (extract.get(metadataKey) != null && extract.get(metadataKey).size() > 0)
{ {
String modelProperty = extractMapping.get(metadataKey).iterator().next(); String modelProperty = extract.get(metadataKey).iterator().next();
Set<String> metadataKeys = embedMapping.get(modelProperty); Set<String> metadataKeys = mapping.get(modelProperty);
if (metadataKeys == null) if (metadataKeys == null)
{ {
metadataKeys = new HashSet<String>(1); metadataKeys = new HashSet<>(1);
embedMapping.put(modelProperty, metadataKeys); mapping.put(modelProperty, metadataKeys);
} }
metadataKeys.add(metadataKey); metadataKeys.add(metadataKey);
if (logger.isTraceEnabled()) if (logger.isTraceEnabled())
{ {
logger.trace("Added mapping from " + modelProperty + " to " + metadataKeys.toString()); logger.trace("Added mapping from {} to {}", modelProperty, metadataKeys);
} }
} }
} }
return embedMapping; return mapping;
} }
private String getPropertiesFilename(String suffix) private String getPropertiesFilename(String suffix)
@@ -395,7 +395,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
private Map<String, String> getNamespaces(Properties properties) private Map<String, String> getNamespaces(Properties properties)
{ {
Map<String, String> namespacesByPrefix = new HashMap<String, String>(5); Map<String, String> namespacesByPrefix = new HashMap<>(5);
for (Map.Entry<Object, Object> entry : properties.entrySet()) for (Map.Entry<Object, Object> entry : properties.entrySet())
{ {
String propertyName = (String) entry.getKey(); String propertyName = (String) entry.getKey();
@@ -463,7 +463,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
} }
else else
{ {
if (valueStr.indexOf("\u0000") != -1) if (valueStr.contains("\u0000"))
{ {
valueStr = valueStr.replaceAll("\u0000", ""); valueStr = valueStr.replaceAll("\u0000", "");
} }
@@ -539,7 +539,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.debug("Raw metadata:"); logger.debug("Raw metadata:");
metadata.forEach((k,v) -> logger.debug(" "+k+"="+v)); metadata.forEach((k,v) -> logger.debug(" {}={}", k, v));
} }
metadata = mapRawToSystem(metadata, extractMapping); metadata = mapRawToSystem(metadata, extractMapping);
@@ -561,7 +561,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
{ {
logger.debug("Returned metadata:"); logger.debug("Returned metadata:");
} }
Map<String, Serializable> systemProperties = new HashMap<String, Serializable>(rawMetadata.size() * 2 + 1); Map<String, Serializable> systemProperties = new HashMap<>(rawMetadata.size() * 2 + 1);
for (Map.Entry<String, Serializable> entry : rawMetadata.entrySet()) for (Map.Entry<String, Serializable> entry : rawMetadata.entrySet())
{ {
String documentKey = entry.getKey(); String documentKey = entry.getKey();
@@ -571,7 +571,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
systemProperties.put(documentKey, documentValue); systemProperties.put(documentKey, documentValue);
if (debugEnabled) if (debugEnabled)
{ {
logger.debug(" " + documentKey + "=" + documentValue); logger.debug(" {}={}", documentKey, documentValue);
} }
continue; continue;
} }
@@ -582,17 +582,17 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
continue; continue;
} }
Set<String> systemQNames = extractMapping.get(documentKey); Set<String> systemQNames = extractMapping.get(documentKey);
for (String systemQName : systemQNames) for (String systemQName : systemQNames)
{ {
if (debugEnabled) if (debugEnabled)
{ {
logger.debug(" "+systemQName+"="+documentValue+" ("+documentKey+")"); logger.debug(" {}={} ({})", systemQName, documentValue, documentKey);
} }
systemProperties.put(systemQName, documentValue); systemProperties.put(systemQName, documentValue);
} }
} }
return new TreeMap<String, Serializable>(systemProperties); return new TreeMap<>(systemProperties);
} }
private void writeMetadata(OutputStream outputStream, Map<String, Serializable> results) private void writeMetadata(OutputStream outputStream, Map<String, Serializable> results)

4
engines/base/src/main/java/org/alfresco/transform/base/transform/ProcessHandler.java
View File

@@ -134,7 +134,7 @@ abstract class ProcessHandler extends FragmentHandler
{ {
transformerDebug.logFailure(reference, " Error: "+e.getMessage()); transformerDebug.logFailure(reference, " Error: "+e.getMessage());
LogEntry.setStatusCodeAndMessage(e.getStatus(), e.getMessage()); LogEntry.setStatusCodeAndMessage(e.getStatus(), e.getMessage());
handleTransformException(e, e.getStatus()); handleTransformException(e);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -178,7 +178,7 @@ abstract class ProcessHandler extends FragmentHandler
{ {
} }
protected void handleTransformException(TransformException e, HttpStatus status) protected void handleTransformException(TransformException e)
{ {
throw e; throw e;
} }

4
engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java
View File

@@ -241,9 +241,9 @@ public class TransformHandler
} }
@Override @Override
protected void handleTransformException(TransformException e, HttpStatus status) protected void handleTransformException(TransformException e)
{ {
sendFailedResponse(reply, e, status, replyToQueue); sendFailedResponse(reply, e, e.getStatus(), replyToQueue);
} }
@Override @Override

1
engines/tika/src/main/java/org/alfresco/transform/tika/transformers/Tika.java
View File

@@ -255,7 +255,6 @@ public class Tika
} }
else else
{ {
javax.xml.transform.TransformerFactory.newInstance();
SAXTransformerFactory factory = (SAXTransformerFactory) SAXTransformerFactory.newInstance(); SAXTransformerFactory factory = (SAXTransformerFactory) SAXTransformerFactory.newInstance();
TransformerHandler transformerHandler; TransformerHandler transformerHandler;
transformerHandler = factory.newTransformerHandler(); transformerHandler = factory.newTransformerHandler();

2
model/src/main/java/org/alfresco/transform/common/TransformerDebug.java
View File

@@ -197,7 +197,7 @@ public class TransformerDebug
{ {
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.debug("%s fragment[%d]%s", getPaddedReference(reference), index, fileSize(size)); logger.debug("{} fragment[{}]{}", getPaddedReference(reference), index, fileSize(size));
} }
} }