From 17a96626c0866d2a2109d73498869d0c44b90075 Mon Sep 17 00:00:00 2001 From: alandavis Date: Thu, 8 Sep 2022 17:07:56 +0100 Subject: [PATCH] Batch 3 of changes from of review comments - there are more --- .../AbstractMetadataExtractorEmbedder.java | 64 +++++++++---------- .../base/transform/ProcessHandler.java | 4 +- .../base/transform/TransformHandler.java | 4 +- .../transform/tika/transformers/Tika.java | 1 - .../transform/common/TransformerDebug.java | 2 +- 5 files changed, 37 insertions(+), 38 deletions(-) diff --git a/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java b/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java index 71909704..faa6b12d 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java @@ -116,7 +116,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo protected final Logger logger; private Map> defaultExtractMapping; - private ThreadLocal>> extractMapping = new ThreadLocal<>(); + private final ThreadLocal>> extractMapping = new ThreadLocal<>(); private Map> embedMapping; public enum Type @@ -180,8 +180,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo { TypeReference> typeRef = new TypeReference<>() {}; HashMap systemProperties = jsonObjectMapper.readValue(metadataAsJson, typeRef); - Map rawProperties = mapSystemToRaw(systemProperties); - return rawProperties; + return mapSystemToRaw(systemProperties); } catch (JsonProcessingException e) { @@ -213,8 +212,8 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo { logger.debug( "Converted system model values to metadata values: \n" + - " System Properties: " + systemMetadata + "\n" + - " Metadata Properties: " + metadataProperties); + " System Properties: {}\n" + + " Metadata Properties: {}", systemMetadata, metadataProperties); } return metadataProperties; } @@ -238,7 +237,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo Properties properties = readProperties(filename); if (properties == null) { - logger.error("Failed to read "+filename); + logger.error("Failed to read {}", filename); } Map namespacesByPrefix = getNamespaces(properties); @@ -270,7 +269,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo } if (logger.isTraceEnabled()) { - logger.trace("Added mapping from " + documentProperty + " to " + qnames); + logger.trace("Added mapping from {} to {}", documentProperty, qnames); } } return convertedMapping; @@ -293,21 +292,21 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo String filename = getPropertiesFilename(EMBED); Properties properties = readProperties(filename); - Map> embedMapping; + Map> mapping; if (properties != null) { Map namespacesByPrefix = getNamespaces(properties); - embedMapping = buildEmbedMapping(properties, namespacesByPrefix); + mapping = buildEmbedMapping(properties, namespacesByPrefix); } else { 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> buildEmbedMapping(Properties properties, Map namespacesByPrefix) @@ -325,7 +324,8 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo modelProperty = getQNameString(namespacesByPrefix, entry, modelProperty, EMBED); String[] metadataKeysArray = metadataKeysString.split(","); Set metadataKeys = new HashSet(metadataKeysArray.length); - for (String metadataKey : metadataKeysArray) { + for (String metadataKey : metadataKeysArray) + { metadataKeys.add(metadataKey.trim()); } // Create the entry @@ -340,28 +340,28 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo private Map> buildEmbedMappingByReversingExtract() { - Map> extractMapping = buildExtractMapping(); - Map> embedMapping; - embedMapping = new HashMap<>(extractMapping.size()); - for (String metadataKey : extractMapping.keySet()) + Map> extract = buildExtractMapping(); + Map> mapping; + mapping = new HashMap<>(extract.size()); + 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(); - Set metadataKeys = embedMapping.get(modelProperty); + String modelProperty = extract.get(metadataKey).iterator().next(); + Set metadataKeys = mapping.get(modelProperty); if (metadataKeys == null) { - metadataKeys = new HashSet(1); - embedMapping.put(modelProperty, metadataKeys); + metadataKeys = new HashSet<>(1); + mapping.put(modelProperty, metadataKeys); } metadataKeys.add(metadataKey); 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) @@ -395,7 +395,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo private Map getNamespaces(Properties properties) { - Map namespacesByPrefix = new HashMap(5); + Map namespacesByPrefix = new HashMap<>(5); for (Map.Entry entry : properties.entrySet()) { String propertyName = (String) entry.getKey(); @@ -463,7 +463,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo } else { - if (valueStr.indexOf("\u0000") != -1) + if (valueStr.contains("\u0000")) { valueStr = valueStr.replaceAll("\u0000", ""); } @@ -539,7 +539,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo if (logger.isDebugEnabled()) { logger.debug("Raw metadata:"); - metadata.forEach((k,v) -> logger.debug(" "+k+"="+v)); + metadata.forEach((k,v) -> logger.debug(" {}={}", k, v)); } metadata = mapRawToSystem(metadata, extractMapping); @@ -561,7 +561,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo { logger.debug("Returned metadata:"); } - Map systemProperties = new HashMap(rawMetadata.size() * 2 + 1); + Map systemProperties = new HashMap<>(rawMetadata.size() * 2 + 1); for (Map.Entry entry : rawMetadata.entrySet()) { String documentKey = entry.getKey(); @@ -571,7 +571,7 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo systemProperties.put(documentKey, documentValue); if (debugEnabled) { - logger.debug(" " + documentKey + "=" + documentValue); + logger.debug(" {}={}", documentKey, documentValue); } continue; } @@ -582,17 +582,17 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo continue; } - Set systemQNames = extractMapping.get(documentKey); + Set systemQNames = extractMapping.get(documentKey); for (String systemQName : systemQNames) { if (debugEnabled) { - logger.debug(" "+systemQName+"="+documentValue+" ("+documentKey+")"); + logger.debug(" {}={} ({})", systemQName, documentValue, documentKey); } systemProperties.put(systemQName, documentValue); } } - return new TreeMap(systemProperties); + return new TreeMap<>(systemProperties); } private void writeMetadata(OutputStream outputStream, Map results) diff --git a/engines/base/src/main/java/org/alfresco/transform/base/transform/ProcessHandler.java b/engines/base/src/main/java/org/alfresco/transform/base/transform/ProcessHandler.java index b5fcb5b3..42bc8d19 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/transform/ProcessHandler.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/transform/ProcessHandler.java @@ -134,7 +134,7 @@ abstract class ProcessHandler extends FragmentHandler { transformerDebug.logFailure(reference, " Error: "+e.getMessage()); LogEntry.setStatusCodeAndMessage(e.getStatus(), e.getMessage()); - handleTransformException(e, e.getStatus()); + handleTransformException(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; } diff --git a/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java index 77c674a7..12692b10 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java @@ -241,9 +241,9 @@ public class TransformHandler } @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 diff --git a/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/Tika.java b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/Tika.java index 67c7c598..cf8f06ad 100644 --- a/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/Tika.java +++ b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/Tika.java @@ -255,7 +255,6 @@ public class Tika } else { - javax.xml.transform.TransformerFactory.newInstance(); SAXTransformerFactory factory = (SAXTransformerFactory) SAXTransformerFactory.newInstance(); TransformerHandler transformerHandler; transformerHandler = factory.newTransformerHandler(); diff --git a/model/src/main/java/org/alfresco/transform/common/TransformerDebug.java b/model/src/main/java/org/alfresco/transform/common/TransformerDebug.java index 8a8ae4b2..8ba54df6 100644 --- a/model/src/main/java/org/alfresco/transform/common/TransformerDebug.java +++ b/model/src/main/java/org/alfresco/transform/common/TransformerDebug.java @@ -197,7 +197,7 @@ public class TransformerDebug { if (logger.isDebugEnabled()) { - logger.debug("%s fragment[%d]%s", getPaddedReference(reference), index, fileSize(size)); + logger.debug("{} fragment[{}]{}", getPaddedReference(reference), index, fileSize(size)); } }