Merge pull request #134 from hansenmc/feature/try-with-resources

Minor updates for code quality (try-with-resources, diamond operator, remove unused imports)

Author: rjrudin

src/main/java/com/marklogic/client/ext/file/DefaultDocumentFormatGetter.java

@@ -17,7 +17,7 @@ public class DefaultDocumentFormatGetter implements FormatGetter {
 	public final static String[] DEFAULT_XML_EXTENSIONS = new String[]{"xml", "xsl", "xslt", "xsd", "tdex"};
 	public final static String[] DEFAULT_JSON_EXTENSIONS = new String[]{"json", "tdej"};
 
-	private List<String> binaryExtensions = new ArrayList<String>();
+	private List<String> binaryExtensions = new ArrayList<>();
 	private List<String> xmlExtensions = new ArrayList<>();
 	private List<String> jsonExtensions = new ArrayList<>();
 

src/main/java/com/marklogic/client/ext/file/PropertiesDrivenDocumentFileProcessor.java

@@ -71,16 +71,10 @@ protected Properties loadProperties(File propertiesFile) throws IOException {
 		}
 
 		props = new Properties();
-		FileReader reader = null;
-		try {
-			reader = new FileReader(propertiesFile);
+		try (FileReader reader = new FileReader(propertiesFile)) {
 			props.load(reader);
 			propertiesCache.put(propertiesFile, props);
 			return props;
-		} finally {
-			if (reader != null) {
-				reader.close();
-			}
 		}
 	}
 

src/main/java/com/marklogic/client/ext/file/TokenReplacerDocumentFileProcessor.java

@@ -6,9 +6,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.util.FileCopyUtils;
 
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
 
 /**
  * Processor that delegates to a TokenReplacer for replacing tokens in the content of a DocumentFile. In order to

src/main/java/com/marklogic/client/ext/helper/ClientHelper.java

@@ -55,7 +55,7 @@ public List<String> getUrisInCollection(String collectionName, int pageLength) {
         StringQueryDefinition def = mgr.newStringDefinition();
         def.setCollections(collectionName);
         SearchHandle h = mgr.search(def, new SearchHandle());
-        List<String> uris = new ArrayList<String>();
+        List<String> uris = new ArrayList<>();
         for (MatchDocumentSummary s : h.getMatchResults()) {
             uris.add(s.getUri());
         }

src/main/java/com/marklogic/client/ext/modulesloader/impl/BaseModulesFinder.java

@@ -1,6 +1,5 @@
 package com.marklogic.client.ext.modulesloader.impl;
 
-import com.marklogic.client.ext.helper.FilenameUtil;
 import com.marklogic.client.ext.helper.LoggingObject;
 import com.marklogic.client.ext.modulesloader.Modules;
 import com.marklogic.client.ext.modulesloader.ModulesFinder;
@@ -11,7 +10,6 @@
 import org.springframework.core.io.support.ResourcePatternResolver;
 
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/com/marklogic/client/ext/modulesloader/impl/DefaultModulesFinder.java

@@ -3,7 +3,6 @@
 import com.marklogic.client.ext.modulesloader.Modules;
 import com.marklogic.client.ext.modulesloader.ModulesFinder;
 
-import java.nio.file.Paths;
 
 /**
  * Default implementation that loads all of the different kinds of REST modules.

src/main/java/com/marklogic/client/ext/modulesloader/impl/PropertiesModuleManager.java

@@ -114,18 +114,10 @@ public boolean hasFileBeenModifiedSinceLastLoaded(File file) {
 	public void saveLastLoadedTimestamp(File file, Date date) {
         String key = buildKey(file);
         props.setProperty(key, date.getTime() + "");
-        FileWriter fw = null;
-        try {
-            fw = new FileWriter(new File(propertiesFilePath));
+        try (FileWriter fw = new FileWriter(propertiesFilePath)) {
             props.store(fw, "");
         } catch (Exception e) {
             logger.warn("Unable to store properties, cause: " + e.getMessage());
-        } finally {
-            try {
-                fw.close();
-            } catch (Exception e) {
-                logger.warn(e.getMessage());
-            }
         }
     }