diff --git a/src/main/java/emissary/command/WhatCommand.java b/src/main/java/emissary/command/WhatCommand.java
index f93f9b6597..cf1946320d 100644
--- a/src/main/java/emissary/command/WhatCommand.java
+++ b/src/main/java/emissary/command/WhatCommand.java
@@ -68,7 +68,7 @@ public String getCommandName() {
     private boolean recursive = false;
 
     protected List<IServiceProviderPlace> places;
-    protected List<String> placeLabels = new ArrayList<String>();
+    protected List<String> placeLabels = new ArrayList<>();
     protected Set<String> textPlaces;
     // protected DropOffUtil dropOffUtil;
     private ParserFactory parserFactory;
@@ -97,7 +97,7 @@ public void setupWhat() {
             parserFactory = new ParserFactory();
             final Configurator configG = ConfigUtil.getConfigInfo(this.getClass());
             final List<String> placeNames = configG.findEntries("PLACE");
-            this.places = new ArrayList<IServiceProviderPlace>();
+            this.places = new ArrayList<>();
             for (final String entry : placeNames) {
                 final String[] parts = entry.split("/");
                 final String instanceName = parts[0];
@@ -217,7 +217,7 @@ protected Identification identify(@Nullable final IBaseDataObject b, final boole
     private Identification runEngines(@Nullable final IBaseDataObject b) {
 
         final Identification ident = new Identification();
-        final List<String> typesFound = new ArrayList<String>();
+        final List<String> typesFound = new ArrayList<>();
 
         if (b != null && b.dataLength() == 0) {
             ident.addType(Form.EMPTY);
diff --git a/src/main/java/emissary/core/HDMobileAgent.java b/src/main/java/emissary/core/HDMobileAgent.java
index 6b1485681b..93233fcb3b 100755
--- a/src/main/java/emissary/core/HDMobileAgent.java
+++ b/src/main/java/emissary/core/HDMobileAgent.java
@@ -30,7 +30,7 @@ public class HDMobileAgent extends MobileAgent {
     static final long serialVersionUID = 786319119844306571L;
 
     // What we carry around with us
-    protected List<IBaseDataObject> payloadList = Collections.synchronizedList(new ArrayList<IBaseDataObject>());
+    protected List<IBaseDataObject> payloadList = Collections.synchronizedList(new ArrayList<>());
 
     /**
      * Still have the uncaught exception handler but not really in a true ThreadGroup
@@ -218,7 +218,7 @@ protected void agentControl(final IServiceProviderPlace currentPlaceArg) {
                     atPlaceHD(currentPlace, this.payloadList);
                 } else {
                     // Add the primary payload object to a list
-                    final List<IBaseDataObject> toBeProcessed = new ArrayList<IBaseDataObject>();
+                    final List<IBaseDataObject> toBeProcessed = new ArrayList<>();
                     toBeProcessed.add(mypayload);
 
                     // Add any other payload that has the same current form
diff --git a/src/main/java/emissary/core/MetricsManager.java b/src/main/java/emissary/core/MetricsManager.java
index ca07b316e8..415b9ff92f 100644
--- a/src/main/java/emissary/core/MetricsManager.java
+++ b/src/main/java/emissary/core/MetricsManager.java
@@ -38,10 +38,10 @@ public class MetricsManager {
     public static final String DEFAULT_NAMESPACE_NAME = "MetricsManager";
 
     @SuppressWarnings("rawtypes")
-    public static final SortedMap<String, Gauge> EMPTY_GUAGES = new TreeMap<String, Gauge>();
-    public static final SortedMap<String, Counter> EMPTY_COUNTERS = new TreeMap<String, Counter>();
-    public static final SortedMap<String, Histogram> EMPTY_HISTOGRAMS = new TreeMap<String, Histogram>();
-    public static final SortedMap<String, Meter> EMPTY_METERS = new TreeMap<String, Meter>();
+    public static final SortedMap<String, Gauge> EMPTY_GUAGES = new TreeMap<>();
+    public static final SortedMap<String, Counter> EMPTY_COUNTERS = new TreeMap<>();
+    public static final SortedMap<String, Histogram> EMPTY_HISTOGRAMS = new TreeMap<>();
+    public static final SortedMap<String, Meter> EMPTY_METERS = new TreeMap<>();
 
     protected static final Logger logger = LoggerFactory.getLogger(MetricsManager.class);
 
@@ -76,7 +76,7 @@ public MetricsManager(final Configurator conf) {
     }
 
     public void logMetrics(final Map<String, Timer> stats) {
-        final SortedMap<String, Timer> m = new TreeMap<String, Timer>();
+        final SortedMap<String, Timer> m = new TreeMap<>();
         m.putAll(stats);
         this.reporter.report(EMPTY_GUAGES, EMPTY_COUNTERS, EMPTY_HISTOGRAMS, EMPTY_METERS, m);
     }
diff --git a/src/main/java/emissary/kff/KffChain.java b/src/main/java/emissary/kff/KffChain.java
index 32367c3879..f6b484b6eb 100755
--- a/src/main/java/emissary/kff/KffChain.java
+++ b/src/main/java/emissary/kff/KffChain.java
@@ -20,13 +20,13 @@
 public class KffChain {
     private static final Logger logger = LoggerFactory.getLogger(KffChain.class);
 
-    protected List<KffFilter> list = new ArrayList<KffFilter>();
+    protected List<KffFilter> list = new ArrayList<>();
 
     // Smaller than this and we don't report a hit
     protected int KFF_MIN_DATA_SIZE = 0;
 
     // The algorithms to compute
-    protected List<String> algorithms = new ArrayList<String>();
+    protected List<String> algorithms = new ArrayList<>();
 
     /**
      * Construct an empty KFF Chain
@@ -109,7 +109,7 @@ public boolean removeAlgorithm(String alg) {
      * @see java.security.MessageDigest#getInstance(String)
      */
     public List<String> getAlgorithms() {
-        List<String> list = new ArrayList<String>(algorithms);
+        List<String> list = new ArrayList<>(algorithms);
         return list;
     }
 
diff --git a/src/main/java/emissary/kff/KffDataObjectHandler.java b/src/main/java/emissary/kff/KffDataObjectHandler.java
index ca67e47529..db26dca3f6 100755
--- a/src/main/java/emissary/kff/KffDataObjectHandler.java
+++ b/src/main/java/emissary/kff/KffDataObjectHandler.java
@@ -89,7 +89,7 @@ public Map<String, String> hashData(byte[] data, String name) {
      * @return parameter entries suitable for a BaseDataObject
      */
     public Map<String, String> hashData(@Nullable byte[] data, String name, @Nullable String prefix) {
-        Map<String, String> results = new HashMap<String, String>();
+        Map<String, String> results = new HashMap<>();
 
         if (prefix == null) {
             prefix = "";
diff --git a/src/main/java/emissary/kff/KffMemcached.java b/src/main/java/emissary/kff/KffMemcached.java
index ebd9f38188..80f9c8bc5d 100644
--- a/src/main/java/emissary/kff/KffMemcached.java
+++ b/src/main/java/emissary/kff/KffMemcached.java
@@ -134,7 +134,7 @@ public KffMemcached(String testIdWithSpaces, String filterName, FilterType dupli
 
         // Load up the list of servers
         Set<String> serversFromConfig = configG.findEntriesAsSet("MEMCACHED_SERVER");
-        List<InetSocketAddress> servers = new LinkedList<InetSocketAddress>();
+        List<InetSocketAddress> servers = new LinkedList<>();
         for (String serverFromConfig : serversFromConfig) {
             // Transform to an InetSocketAddress
             if (serverFromConfig.contains(":")) {
diff --git a/src/main/java/emissary/kff/KffResult.java b/src/main/java/emissary/kff/KffResult.java
index 1de90d9456..6c51531a7b 100755
--- a/src/main/java/emissary/kff/KffResult.java
+++ b/src/main/java/emissary/kff/KffResult.java
@@ -28,7 +28,7 @@ public class KffResult implements Serializable {
     long crc32 = -1L;
     String ssdeep = null;
 
-    Map<String, byte[]> hashComp = new TreeMap<String, byte[]>();
+    Map<String, byte[]> hashComp = new TreeMap<>();
 
     /**
      * Create an empty result object
@@ -233,7 +233,7 @@ public String getResultString(String alg) {
      * Get names of all algorithm results present
      */
     public Set<String> getResultNames() {
-        return new TreeSet<String>(hashComp.keySet());
+        return new TreeSet<>(hashComp.keySet());
     }
 
     /**
diff --git a/src/main/java/emissary/output/DropOffUtil.java b/src/main/java/emissary/output/DropOffUtil.java
index 3c937b4952..1f63bed9d3 100755
--- a/src/main/java/emissary/output/DropOffUtil.java
+++ b/src/main/java/emissary/output/DropOffUtil.java
@@ -504,7 +504,7 @@ public String getBestIdFrom(final IBaseDataObject d) {
      * @return id
      */
     public String[] getExistingIds(final IBaseDataObject d) {
-        final List<String> values = new ArrayList<String>();
+        final List<String> values = new ArrayList<>();
         for (final String s : this.idTokens) {
             if (!StringUtils.isBlank(d.getStringParameter(s))) {
                 values.add(d.getStringParameter(s));
@@ -1006,7 +1006,7 @@ public void processMetadata(final List<IBaseDataObject> payloadList) {
 
         // Keep track of parent's filetype to output
         // relies on the attachments being sorted
-        final Map<String, String> parentTypes = new HashMap<String, String>();
+        final Map<String, String> parentTypes = new HashMap<>();
         final IBaseDataObject tld = payloadList.get(0);
         final List<String> extended_filetypes = new ArrayList<>();
         parentTypes.put("1", tld.getFileType());
diff --git a/src/main/java/emissary/output/filter/AbstractFilter.java b/src/main/java/emissary/output/filter/AbstractFilter.java
index 126d892634..f2335ef71e 100755
--- a/src/main/java/emissary/output/filter/AbstractFilter.java
+++ b/src/main/java/emissary/output/filter/AbstractFilter.java
@@ -211,7 +211,7 @@ protected void loadFilterConfiguration(@Nullable final Configurator suppliedFilt
             return;
         }
 
-        final List<String> configPreferences = new ArrayList<String>();
+        final List<String> configPreferences = new ArrayList<>();
 
         if (getFilterName() != null) {
             configPreferences.add(this.getClass().getPackage().getName() + "." + getFilterName() + ConfigUtil.CONFIG_FILE_ENDING);
@@ -412,7 +412,7 @@ protected boolean isOutputtable(final Collection<String> types) {
 
         final boolean canOutput = !Collections.disjoint(this.outputTypes, types);
         if (canOutput && this.logger.isDebugEnabled()) {
-            final Set<String> outputFor = new HashSet<String>();
+            final Set<String> outputFor = new HashSet<>();
             for (final String s : this.outputTypes) {
                 if (types.contains(s)) {
                     outputFor.add(s);
@@ -440,7 +440,7 @@ protected Set<String> getTypesToCheck(final IBaseDataObject d) {
     }
 
     protected Set<String> getTypesToCheckForNamedView(final IBaseDataObject d, final String viewName) {
-        final Set<String> checkTypes = new HashSet<String>();
+        final Set<String> checkTypes = new HashSet<>();
         final String lang = this.dropOffUtil.getLanguage(d);
         final String fileType = DropOffUtil.getFileType(d);
         final String currentForm = d.currentForm();
@@ -500,6 +500,6 @@ public String getErrorSpec() {
 
     @Override
     public Collection<String> getOutputTypes() {
-        return new HashSet<String>(this.outputTypes);
+        return new HashSet<>(this.outputTypes);
     }
 }
diff --git a/src/main/java/emissary/parser/DataIdentifier.java b/src/main/java/emissary/parser/DataIdentifier.java
index 1f27255664..817336ea91 100755
--- a/src/main/java/emissary/parser/DataIdentifier.java
+++ b/src/main/java/emissary/parser/DataIdentifier.java
@@ -28,7 +28,7 @@ public class DataIdentifier {
     protected int DATA_ID_STR_SZ = 100;
 
     // Things we know how to identify
-    protected Map<String, String> TYPES = new HashMap<String, String>();
+    protected Map<String, String> TYPES = new HashMap<>();
 
     /**
      * Create the id engine
diff --git a/src/main/java/emissary/parser/SessionProducer.java b/src/main/java/emissary/parser/SessionProducer.java
index 7d095db9b3..655407d3ba 100755
--- a/src/main/java/emissary/parser/SessionProducer.java
+++ b/src/main/java/emissary/parser/SessionProducer.java
@@ -46,7 +46,7 @@ public SessionProducer(SessionParser sp, String myKey, List<String> initialForms
      */
     public SessionProducer(SessionParser sp, String initialForm) {
         this.sp = sp;
-        this.initialForms = new ArrayList<String>();
+        this.initialForms = new ArrayList<>();
         this.initialForms.add(initialForm);
     }
 
diff --git a/src/main/java/emissary/parser/SimpleNioParser.java b/src/main/java/emissary/parser/SimpleNioParser.java
index 7a03b3f82d..b562a3ad7e 100644
--- a/src/main/java/emissary/parser/SimpleNioParser.java
+++ b/src/main/java/emissary/parser/SimpleNioParser.java
@@ -52,7 +52,7 @@ protected DecomposedSession decomposeSession(@Nullable InputSession session) thr
                 Map<String, Object> md = session.getMetaData();
                 if (md != null) {
                     Map<String, String> cooked = cookMetaRecords(md);
-                    d.setMetaData(new HashMap<String, Object>()); // clear
+                    d.setMetaData(new HashMap<>()); // clear
                     for (Map.Entry<String, String> entry : cooked.entrySet()) {
                         d.addMetaData(entry.getKey(), entry.getValue());
                     }
diff --git a/src/main/java/emissary/pickup/PickUpSpace.java b/src/main/java/emissary/pickup/PickUpSpace.java
index f85d8e8d73..def8f9b894 100755
--- a/src/main/java/emissary/pickup/PickUpSpace.java
+++ b/src/main/java/emissary/pickup/PickUpSpace.java
@@ -14,19 +14,19 @@
  */
 public abstract class PickUpSpace extends emissary.pickup.PickUpPlace implements IPickUpSpace {
     // List of workspace instances to interact with
-    protected List<String> openSpaceNames = new ArrayList<String>();
+    protected List<String> openSpaceNames = new ArrayList<>();
 
     // Map of how many consecutive take errors by workspace name
-    protected Map<String, Integer> numConsecutiveTakeErrors = new HashMap<String, Integer>();
+    protected Map<String, Integer> numConsecutiveTakeErrors = new HashMap<>();
 
     // Comms adapter
     protected WorkSpaceAdapter tpa = new WorkSpaceAdapter();
 
     // Map of last bundle size by workspace name
-    protected Map<String, Integer> lastBundleSize = new HashMap<String, Integer>();
+    protected Map<String, Integer> lastBundleSize = new HashMap<>();
 
     // Map of pending bundles to workspace name to facilitate replying
-    protected Map<String, String> pendingBundles = new HashMap<String, String>();
+    protected Map<String, String> pendingBundles = new HashMap<>();
 
     // Number of consecutive take errors that cause space to close
     protected int TAKE_ERROR_MAX = 10;
@@ -119,7 +119,7 @@ public String getSpaceName() {
      */
     @Override
     public List<String> getSpaceNames() {
-        return new ArrayList<String>(openSpaceNames);
+        return new ArrayList<>(openSpaceNames);
     }
 
     /**
@@ -144,7 +144,7 @@ public boolean take() {
         }
 
         // Keep track of space we may have to close
-        List<String> closers = new ArrayList<String>();
+        List<String> closers = new ArrayList<>();
 
         // We will take up to one bundle per workspace
         int countTaken = 0;
@@ -185,7 +185,7 @@ public boolean take() {
      * @param forceClosers additional spaces to close
      */
     protected void cleanupFailedSpaces(List<String> forceClosers) {
-        List<String> closers = new ArrayList<String>(forceClosers);
+        List<String> closers = new ArrayList<>(forceClosers);
         for (String s : openSpaceNames) {
             if (getNumConsecutiveTakeErrors(s) > TAKE_ERROR_MAX) {
                 logger.error("Closing down space " + s + " due to repeated errors");
diff --git a/src/main/java/emissary/pickup/PickupQueue.java b/src/main/java/emissary/pickup/PickupQueue.java
index 44d33b6267..f34883a5bf 100755
--- a/src/main/java/emissary/pickup/PickupQueue.java
+++ b/src/main/java/emissary/pickup/PickupQueue.java
@@ -11,7 +11,7 @@
  */
 public class PickupQueue {
     // Data structure for the bundles
-    protected final LinkedList<WorkBundle> queue = new LinkedList<WorkBundle>();
+    protected final LinkedList<WorkBundle> queue = new LinkedList<>();
 
     // Our logger
     private static final Logger logger = LoggerFactory.getLogger(PickupQueue.class);
diff --git a/src/main/java/emissary/pickup/file/FilePickUpPlace.java b/src/main/java/emissary/pickup/file/FilePickUpPlace.java
index fb093f5e41..36860bb73c 100755
--- a/src/main/java/emissary/pickup/file/FilePickUpPlace.java
+++ b/src/main/java/emissary/pickup/file/FilePickUpPlace.java
@@ -16,7 +16,7 @@ public class FilePickUpPlace extends PickUpPlace implements IPickUp {
     protected int pollingInterval = 30000;
 
     // List of FileDataServer objects
-    protected List<FileDataServer> theDataServer = new ArrayList<FileDataServer>();
+    protected List<FileDataServer> theDataServer = new ArrayList<>();
 
     // How many files the FileDataServer should group
     protected int BUNDLE_SIZE = 20;
diff --git a/src/main/java/emissary/place/Main.java b/src/main/java/emissary/place/Main.java
index 51f19bd670..7ae6b5e07c 100644
--- a/src/main/java/emissary/place/Main.java
+++ b/src/main/java/emissary/place/Main.java
@@ -85,21 +85,21 @@ public class Main {
     /** Regex for which metadata to print out */
     protected String[] metaPatterns;
     /** hash of parameters/values to set before process */
-    protected HashMap<String, String> params = new HashMap<String, String>();
+    protected HashMap<String, String> params = new HashMap<>();
     /** Set to turn off Emissary node context and directory setup */
     protected boolean runWithoutContext = false;
     /** The command line options */
     protected Options options = getStandardOptions();
     /** set of alt views to print after processing */
-    protected Set<String> viewsToPrint = new HashSet<String>();
+    protected Set<String> viewsToPrint = new HashSet<>();
     /** Class name of parser to run on input data */
     protected String parserName = SimpleParser.class.getName();
     /** Number of threads to use to process input files */
     protected int numThreads = 1;
     /** The workers that call the place */
-    List<Worker> workers = new ArrayList<Worker>();
+    List<Worker> workers = new ArrayList<>();
     /** Queue of payload object for workers to pull from */
-    protected final LinkedList<IBaseDataObject> workQueue = new LinkedList<IBaseDataObject>();
+    protected final LinkedList<IBaseDataObject> workQueue = new LinkedList<>();
     /** hashing support */
     protected KffDataObjectHandler kff = null;
     /** loop on input */
@@ -348,7 +348,7 @@ public void setRunWithoutContext(boolean val) {
      * @return the list of file arguments or an empty list
      */
     public List<String> getFileArgs() {
-        List<String> l = new ArrayList<String>();
+        List<String> l = new ArrayList<>();
         for (int i = 0; fileArgs != null && i < fileArgs.length; i++) {
             l.add(fileArgs[i]);
         }
@@ -914,7 +914,7 @@ public void queuePayload(IBaseDataObject payload) {
      * Called by the Worker consumer to process the given payload
      */
     public void processPayload(IBaseDataObject payload) {
-        List<IBaseDataObject> attachments = new ArrayList<IBaseDataObject>();
+        List<IBaseDataObject> attachments = new ArrayList<>();
         MDC.put(MDCConstants.SHORT_NAME, payload.shortName());
         try {
             boolean shouldContinue = preProcessHook(payload, attachments);
diff --git a/src/main/java/emissary/pool/MoveSpool.java b/src/main/java/emissary/pool/MoveSpool.java
index b8dde340f0..931ef41fa9 100755
--- a/src/main/java/emissary/pool/MoveSpool.java
+++ b/src/main/java/emissary/pool/MoveSpool.java
@@ -30,7 +30,7 @@ public class MoveSpool implements Runnable {
     private static final Logger logger = LoggerFactory.getLogger(MoveSpool.class);
 
     // The payload FIFO
-    protected final LinkedList<SpoolItem> spool = new LinkedList<SpoolItem>();
+    protected final LinkedList<SpoolItem> spool = new LinkedList<>();
 
     // Reference to the agent pool
     protected AgentPool pool;
@@ -45,7 +45,7 @@ public class MoveSpool implements Runnable {
     public static final String NAMESPACE_NAME = "ArrivalSpool";
 
     // Stats on how many moves and for what types arrived here
-    public final Map<String, Integer> moveCountMap = new HashMap<String, Integer>();
+    public final Map<String, Integer> moveCountMap = new HashMap<>();
 
     // Stats collection
     private int highWaterMark = 0;
@@ -345,7 +345,7 @@ public static MoveSpool lookup() throws NamespaceException {
      */
     public Map<String, Integer> getMoveCountMap() {
         synchronized (moveCountMap) {
-            return new HashMap<String, Integer>(moveCountMap);
+            return new HashMap<>(moveCountMap);
         }
     }
 
diff --git a/src/main/java/emissary/util/FileComparator.java b/src/main/java/emissary/util/FileComparator.java
index 171a035b35..8ed44fa73b 100755
--- a/src/main/java/emissary/util/FileComparator.java
+++ b/src/main/java/emissary/util/FileComparator.java
@@ -48,7 +48,7 @@ public static void main(String[] args) {
 
         File dir = new File(args[0]);
         File[] fileList = dir.listFiles();
-        List<File> fileVector = new ArrayList<File>();
+        List<File> fileVector = new ArrayList<>();
         for (int i = 0; i < fileList.length; i++) {
             // System.out.println(fileList[i].getName() + " " + fileList[i].length());
             fileVector.add(fileList[i]);
diff --git a/src/main/java/emissary/util/MagicNumberUtil.java b/src/main/java/emissary/util/MagicNumberUtil.java
index daac68d110..350425ef44 100644
--- a/src/main/java/emissary/util/MagicNumberUtil.java
+++ b/src/main/java/emissary/util/MagicNumberUtil.java
@@ -80,7 +80,7 @@ public final class MagicNumberUtil {
     private static final Logger log = LoggerFactory.getLogger(MagicNumberUtil.class);
 
     /** The magic number instances */
-    private final List<MagicNumber> magicNumbers = new ArrayList<MagicNumber>();
+    private final List<MagicNumber> magicNumbers = new ArrayList<>();
 
     /**
      * Log flag for storing parse errors - they will just be discarded. Switching this on will allow erroneous entries to be
@@ -96,13 +96,13 @@ public final class MagicNumberUtil {
      * Log data structure for continuations. Maps entries with depth 0 with a List of continuation entries containing the
      * errors
      */
-    private final Map<String, List<String>> extErrorMap = new TreeMap<String, List<String>>();
+    private final Map<String, List<String>> extErrorMap = new TreeMap<>();
 
     /**
      * Log data structure for entries with a depth of '0' - these are the important entries. Just maintains a simple list of
      * these entries
      */
-    private final List<String> errorList = new ArrayList<String>();
+    private final List<String> errorList = new ArrayList<>();
 
     /**
      * Private Constructor
diff --git a/src/main/java/emissary/util/ThreadDump.java b/src/main/java/emissary/util/ThreadDump.java
index e30350fadc..fcfc2a63e2 100644
--- a/src/main/java/emissary/util/ThreadDump.java
+++ b/src/main/java/emissary/util/ThreadDump.java
@@ -26,7 +26,7 @@ public ThreadInfo[] getThreadInfo() {
 
     public ThreadInfo[] getThreadInfo(final boolean excludeSystem) {
         final ThreadInfo[] t = getThreadInfo();
-        final List<ThreadInfo> l = new ArrayList<ThreadInfo>();
+        final List<ThreadInfo> l = new ArrayList<>();
         if (excludeSystem) {
             for (final ThreadInfo ti : t) {
                 if (ti == null) {
diff --git a/src/main/java/emissary/util/UnixFile.java b/src/main/java/emissary/util/UnixFile.java
index 082d87903c..eca5a76ab6 100644
--- a/src/main/java/emissary/util/UnixFile.java
+++ b/src/main/java/emissary/util/UnixFile.java
@@ -17,7 +17,7 @@ public class UnixFile {
     private static Logger log = LoggerFactory.getLogger(UnixFile.class);
 
     /** The magic number configuration file. The file which contains all magic number entries */
-    private List<File> magicFiles = new ArrayList<File>();
+    private List<File> magicFiles = new ArrayList<>();
 
     /** The Magic number helper class */
     private MagicNumberUtil util = new MagicNumberUtil();
diff --git a/src/main/java/emissary/util/io/UnitTestFileUtils.java b/src/main/java/emissary/util/io/UnitTestFileUtils.java
index 6874672fe9..b9f1394919 100644
--- a/src/main/java/emissary/util/io/UnitTestFileUtils.java
+++ b/src/main/java/emissary/util/io/UnitTestFileUtils.java
@@ -15,7 +15,7 @@
 
 public class UnitTestFileUtils {
     public static void cleanupDirectoryRecursively(Path path) throws IOException {
-        Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
+        Files.walkFileTree(path, new SimpleFileVisitor<>() {
             @Override
             public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
                 Files.delete(file);
diff --git a/src/main/java/emissary/util/magic/MagicMath.java b/src/main/java/emissary/util/magic/MagicMath.java
index 1086cefc31..540bc00940 100644
--- a/src/main/java/emissary/util/magic/MagicMath.java
+++ b/src/main/java/emissary/util/magic/MagicMath.java
@@ -53,8 +53,8 @@ public static String byteArrayToHexString(byte[] b) {
     }
 
     public static byte[] parseEscapedString(String s) {
-        List<Number> array = new ArrayList<Number>();
-        Stack<Character> chars = new Stack<Character>();
+        List<Number> array = new ArrayList<>();
+        Stack<Character> chars = new Stack<>();
         for (int i = (s.length() - 1); i >= 0; i--)
             chars.push(s.charAt(i));
         while (!chars.empty()) {
diff --git a/src/main/java/emissary/util/magic/MagicNumber.java b/src/main/java/emissary/util/magic/MagicNumber.java
index ca5d446599..08df09547b 100644
--- a/src/main/java/emissary/util/magic/MagicNumber.java
+++ b/src/main/java/emissary/util/magic/MagicNumber.java
@@ -162,7 +162,7 @@ private String format(String desc, byte[] data) {
 
         if (!substitute)
             return desc;
-        Stack<Character> stack = new Stack<Character>();
+        Stack<Character> stack = new Stack<>();
         for (int i = (desc.length() - 1); i >= 0; --i)
             stack.push(desc.charAt(i));
         StringBuilder sb = new StringBuilder();
@@ -358,7 +358,7 @@ private static byte[] getElement(@Nullable byte[] data, int offset, int length)
      */
     public void addDependencyLayer(MagicNumber[] dependencyLayer) {
         if (dependencies == null)
-            dependencies = new ArrayList<MagicNumber[]>();
+            dependencies = new ArrayList<>();
         dependencies.add(dependencyLayer);
     }
 
diff --git a/src/main/java/emissary/util/magic/MagicNumberFactory.java b/src/main/java/emissary/util/magic/MagicNumberFactory.java
index c7d42f9bf6..a3b661b996 100644
--- a/src/main/java/emissary/util/magic/MagicNumberFactory.java
+++ b/src/main/java/emissary/util/magic/MagicNumberFactory.java
@@ -60,10 +60,10 @@ public static List<MagicNumber> buildMagicNumberList(byte[] configData, List<Str
     public static List<MagicNumber> buildMagicNumberList(byte[] configData, @Nullable List<String> zeroDepthErrorList,
             @Nullable Map<String, List<String>> continuationErrorMap, boolean swallowParseException) {
 
-        List<MagicNumber> magicNumberList = new ArrayList<MagicNumber>();
+        List<MagicNumber> magicNumberList = new ArrayList<>();
         MagicNumber finger = null;
         int currentDepth = -1;
-        List<MagicNumber> extensions = new ArrayList<MagicNumber>();
+        List<MagicNumber> extensions = new ArrayList<>();
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(configData), MagicNumber.DEFAULT_CHARSET))) {
             String s;
             int counter = 0;
@@ -78,11 +78,11 @@ public static List<MagicNumber> buildMagicNumberList(byte[] configData, @Nullabl
                     if (depth == 0 && extensions.size() > 0) {
                         if (finger == null) {
                             extensions = null;
-                            extensions = new ArrayList<MagicNumber>();
+                            extensions = new ArrayList<>();
                         } else {
                             addExtensionsLayer(extensions, finger);
                             extensions = null;
-                            extensions = new ArrayList<MagicNumber>();
+                            extensions = new ArrayList<>();
                             finger = null;
                         }
                     }
@@ -111,7 +111,7 @@ public static List<MagicNumber> buildMagicNumberList(byte[] configData, @Nullabl
                             currentDepth = depth;
                             addExtensionsLayer(extensions, finger);
                             extensions = null;
-                            extensions = new ArrayList<MagicNumber>();
+                            extensions = new ArrayList<>();
                             parseAndStore(extensions, s, swallowParseException);
                         }
                     }
@@ -133,7 +133,7 @@ public static List<MagicNumber> buildMagicNumberList(byte[] configData, @Nullabl
                         String signature = mItem.toString();
                         List<String> failedExtensions = continuationErrorMap.get(signature);
                         if (failedExtensions == null) {
-                            failedExtensions = new ArrayList<String>();
+                            failedExtensions = new ArrayList<>();
                             continuationErrorMap.put(mItem.toString(), failedExtensions);
                         }
                         failedExtensions.add("[MAGIC LINE# " + counter + "] " + s);
diff --git a/src/main/java/emissary/util/search/FastBoyerMoore.java b/src/main/java/emissary/util/search/FastBoyerMoore.java
index 175fb44208..5919bd7ea8 100755
--- a/src/main/java/emissary/util/search/FastBoyerMoore.java
+++ b/src/main/java/emissary/util/search/FastBoyerMoore.java
@@ -196,7 +196,7 @@ public static void main(final String[] args) {
             final byte[] dataBytes = dataString.toString().getBytes();
 
             // A vector for holding the results.
-            final List<int[]> result = new ArrayList<int[]>();
+            final List<int[]> result = new ArrayList<>();
             scanner.setData(dataBytes);
             scanner.scan(0, dataBytes.length, result);
             for (int i = 0; i < result.size(); i++) {
@@ -247,7 +247,7 @@ public static void main(final String[] args) {
                 final byte[] dataBytes = dataString.toString().getBytes();
 
                 // A vector for holding the results.
-                final List<int[]> hits = new ArrayList<int[]>();
+                final List<int[]> hits = new ArrayList<>();
                 /*
                  * loop through the data from beginint to end calling scan at each position. This shows how to use scan(), but in
                  * general this should be used more effediently (with a boyer more algorithm or something.
@@ -282,7 +282,7 @@ public static void main2(final String[] args) {
                 final byte[] dataBytes = dataString.toString().getBytes();
 
                 // A vector for holding the results.
-                final List<int[]> hits = new ArrayList<int[]>();
+                final List<int[]> hits = new ArrayList<>();
                 /*
                  * loop through the data from beginint to end calling scan at each position. This shows how to use scan(), but in
                  * general this should be used more effediently (with a boyer more algorithm or something.
diff --git a/src/test/java/emissary/output/DropOffPlaceTest.java b/src/test/java/emissary/output/DropOffPlaceTest.java
index 6034bea44a..848b208e32 100644
--- a/src/test/java/emissary/output/DropOffPlaceTest.java
+++ b/src/test/java/emissary/output/DropOffPlaceTest.java
@@ -176,7 +176,7 @@ void testOutputObjectMetric() throws ParseException, JsonProcessingException {
     }
 
     public static void cleanupDirectoryRecursively(Path path) throws IOException {
-        Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
+        Files.walkFileTree(path, new SimpleFileVisitor<>() {
             @Override
             public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
                 Files.delete(file);
diff --git a/src/test/java/emissary/pickup/FTestFailedPickupClient.java b/src/test/java/emissary/pickup/FTestFailedPickupClient.java
index 2ad5e16351..bc0e8735bf 100755
--- a/src/test/java/emissary/pickup/FTestFailedPickupClient.java
+++ b/src/test/java/emissary/pickup/FTestFailedPickupClient.java
@@ -31,8 +31,8 @@ class FTestFailedPickupClient extends FunctionalTest {
     private File holdarea;
     private File outarea;
 
-    private List<File> workingFiles = new ArrayList<File>();
-    private List<String> workingFilePaths = new ArrayList<String>();
+    private List<File> workingFiles = new ArrayList<>();
+    private List<String> workingFilePaths = new ArrayList<>();
 
     @Override
     @BeforeEach
diff --git a/src/test/java/emissary/pickup/FTestMultipleWorkSpaces.java b/src/test/java/emissary/pickup/FTestMultipleWorkSpaces.java
index 0b03270bb8..a99cd944e0 100644
--- a/src/test/java/emissary/pickup/FTestMultipleWorkSpaces.java
+++ b/src/test/java/emissary/pickup/FTestMultipleWorkSpaces.java
@@ -38,8 +38,8 @@ class FTestMultipleWorkSpaces extends FunctionalTest {
 
     private File holdarea;
 
-    private List<File> workingFiles = new ArrayList<File>();
-    private List<String> workingFilePaths = new ArrayList<String>();
+    private List<File> workingFiles = new ArrayList<>();
+    private List<String> workingFilePaths = new ArrayList<>();
 
     @Override
     @BeforeEach
diff --git a/src/test/java/emissary/pickup/FTestWorkSpaceMaxBundleSize.java b/src/test/java/emissary/pickup/FTestWorkSpaceMaxBundleSize.java
index 9b58e87e9e..d5c9eda8ca 100644
--- a/src/test/java/emissary/pickup/FTestWorkSpaceMaxBundleSize.java
+++ b/src/test/java/emissary/pickup/FTestWorkSpaceMaxBundleSize.java
@@ -29,8 +29,8 @@ class FTestWorkSpaceMaxBundleSize extends FunctionalTest {
     private File outarea1;
     private File holdarea;
 
-    private List<File> workingFiles = new ArrayList<File>();
-    private List<String> workingFilePaths = new ArrayList<String>();
+    private List<File> workingFiles = new ArrayList<>();
+    private List<String> workingFilePaths = new ArrayList<>();
 
     @Override
     @BeforeEach