From 47d842a3eb04bb338507fb9b2555eb0a598a2ef3 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 24 Sep 2021 15:07:25 -0400 Subject: [PATCH] 7978 change returning new array list to Collections.emptyList() --- .../centralrepository/application/OtherOccurrences.java | 4 ++-- .../datamodel/CorrelationAttributeUtil.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/application/OtherOccurrences.java b/Core/src/org/sleuthkit/autopsy/centralrepository/application/OtherOccurrences.java index 85f0fcd6de..f1f0b5ea91 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/application/OtherOccurrences.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/application/OtherOccurrences.java @@ -25,8 +25,8 @@ import java.nio.file.Files; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -89,7 +89,7 @@ public final class OtherOccurrences { logger.log(Level.INFO, String.format("Unable to check create CorrelationAttribtueInstance for osAccount %s.", osAccountAddr.get()), ex); } } - return new ArrayList<>(); + return Collections.emptyList(); } /** diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeUtil.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeUtil.java index ffd9c96399..bc934b0926 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeUtil.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeUtil.java @@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.centralrepository.datamodel; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Optional; @@ -86,7 +87,7 @@ public class CorrelationAttributeUtil { if (artifactTypeID == ARTIFACT_TYPE.TSK_CALLLOG.getTypeID() || artifactTypeID == ARTIFACT_TYPE.TSK_MESSAGE.getTypeID() || artifactTypeID == ARTIFACT_TYPE.TSK_CONTACT.getTypeID()) { - return new ArrayList<>(); + return Collections.emptyList(); } return CorrelationAttributeUtil.makeCorrAttrsForSearch(artifact); } @@ -109,7 +110,7 @@ public class CorrelationAttributeUtil { } public static List makeCorrAttrsToSave(AnalysisResult file) { - return new ArrayList<>(); + return Collections.emptyList(); } public static List makeCorrAttrsToSave(OsAccountInstance osAccountInstance) { @@ -354,7 +355,7 @@ public class CorrelationAttributeUtil { /* * Normalize the phone number. */ - List corrAttrInstances = new ArrayList<>(); + List corrAttrInstances = Collections.emptyList(); if (value != null && CorrelationAttributeNormalizer.isValidPhoneNumber(value)) { value = CorrelationAttributeNormalizer.normalizePhone(value);