Code cleanup and linting (#141)

* Various cleanup to
- remove unused imports
- use addAll() instead of adding items in a loop
- use try-with-resources for closeable objects
- use contains() instead of indexOf()

* Various cleanup to
- remove unused imports
- use addAll() instead of adding items in a loop
- use try-with-resources for closeable objects
- use contains() instead of indexOf()

* use try-with-resources, session is closeable

Author: hansenmc

src/main/java/com/marklogic/client/ext/DatabaseClientConfig.java

@@ -47,7 +47,7 @@ public DatabaseClientConfig(String host, int port, String username, String passw
 
 	@Override
 	public String toString() {
-		return String.format("[%s@%s:%d]", username, host, port, username);
+		return String.format("[%s@%s:%d]", username, host, port);
 	}
 
 	public String getHost() {

src/main/java/com/marklogic/client/ext/batch/DefaultBatchHandler.java

@@ -35,9 +35,7 @@ public void handleBatch(DatabaseClient client, List<? extends DocumentWriteOpera
 		}
 
 		DocumentWriteSet set = mgr.newWriteSet();
-		for (DocumentWriteOperation item : items) {
-			set.add(item);
-		}
+		set.addAll(items);
 
 		int count = set.size();
 		String connectionInfo = format("port: %d", client.getPort());

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

@@ -5,6 +5,7 @@
 import org.springframework.core.io.Resource;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -22,15 +23,9 @@ public class DefaultDocumentFormatGetter implements FormatGetter {
 	private List<String> jsonExtensions = new ArrayList<>();
 
 	public DefaultDocumentFormatGetter() {
-		for (String ext : DEFAULT_BINARY_EXTENSIONS) {
-			binaryExtensions.add(ext);
-		}
-		for (String ext : DEFAULT_XML_EXTENSIONS) {
-			xmlExtensions.add(ext);
-		}
-		for (String ext : DEFAULT_JSON_EXTENSIONS) {
-			jsonExtensions.add(ext);
-		}
+		binaryExtensions.addAll(Arrays.asList(DEFAULT_BINARY_EXTENSIONS));
+		xmlExtensions.addAll(Arrays.asList(DEFAULT_XML_EXTENSIONS));
+		jsonExtensions.addAll(Arrays.asList(DEFAULT_JSON_EXTENSIONS));
 	}
 
 	@Override

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

@@ -213,9 +213,7 @@ protected List<DocumentFileProcessor> buildDocumentFileProcessors() {
 			processors.add(new TokenReplacerDocumentFileProcessor(tokenReplacer));
 		}
 		if (documentFileProcessors != null) {
-			for (DocumentFileProcessor dfp : documentFileProcessors) {
-				processors.add(dfp);
-			}
+			processors.addAll(documentFileProcessors);
 		}
 		return processors;
 	}

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

@@ -75,7 +75,7 @@ protected void addAssetDirectories(Modules modules, String baseDir) {
 				if (!(isRecognized || hasWeirdWarPath)) {
 					boolean isDir = (resource instanceof FileSystemResource && f.isDirectory());
 					boolean isUrlResource = (resource instanceof UrlResource);
-					boolean notInList = dirs.indexOf(resource) < 0;
+					boolean notInList = !dirs.contains(resource);
 					if ((isDir || isUrlResource) && notInList) {
 						dirs.add(resource);
 					}

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;
 
-
 /**
  * Default implementation that loads all of the different kinds of REST modules.
  */

src/main/java/com/marklogic/client/ext/tokenreplacer/FilePropertiesSource.java

@@ -34,9 +34,7 @@ public Properties getProperties() {
 	protected Properties loadPropertiesFromFile(File file) {
 		Properties properties = new Properties();
 		if (file.exists()) {
-			FileReader reader = null;
-			try {
-				reader = new FileReader(file);
+			try (FileReader reader = new FileReader(file)) {
 				if (logger.isDebugEnabled()) {
 					logger.debug("Loading properties from: " + file.getAbsolutePath());
 				}
@@ -45,15 +43,8 @@ protected Properties loadPropertiesFromFile(File file) {
 				logger.warn(
 					"Unable to load properties from file " + file.getAbsolutePath() + "; cause: " + ex.getMessage(),
 					ex);
-			} finally {
-				if (reader != null) {
-					try {
-						reader.close();
-					} catch (IOException ie) {
-						// Ignore
-					}
-				}
 			}
+			// Ignore
 		}
 		return properties;
 	}

src/main/java/com/marklogic/xcc/template/XccTemplate.java

@@ -56,14 +56,11 @@ public XccTemplate(ContentSource contentSource) {
     }
 
     public <T> T execute(XccCallback<T> callback) {
-        Session session = contentSource.newSession();
-        try {
-            return callback.execute(session);
-        } catch (RequestException re) {
-            throw new RuntimeException(re);
-        } finally {
-            session.close();
-        }
+		try (Session session = contentSource.newSession()) {
+			return callback.execute(session);
+		} catch (RequestException re) {
+			throw new RuntimeException(re);
+		}
     }
 
     /**

src/test/java/com/marklogic/client/ext/batch/RestBatchWriterTest.java

@@ -18,7 +18,7 @@
 
 import java.io.IOException;
 import java.nio.file.Paths;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -33,7 +33,7 @@ public void failureTest() {
 			"/test.xml", null, new StringHandle("<hello>world</hello>asdf"));
 
 		writer.initialize();
-		writer.write(Arrays.asList(op));
+		writer.write(Collections.singletonList(op));
 
 		try {
 			writer.waitForCompletion();
@@ -53,7 +53,7 @@ public void failureTestWithCustomListener() {
 			"/test.xml", null, new StringHandle("<hello>world</hello>asdf"));
 
 		writer.initialize();
-		writer.write(Arrays.asList(op));
+		writer.write(Collections.singletonList(op));
 		writer.waitForCompletion();
 
 		Throwable caughtError = testWriteListener.caughtError;
@@ -78,7 +78,7 @@ public void writeDocumentWithTransform() throws IOException {
 		writer.setServerTransform(new ServerTransform("simple"));
 		writer.setContentFormat(Format.XML);
 		writer.initialize();
-		writer.write(Arrays.asList(op));
+		writer.write(Collections.singletonList(op));
 		writer.waitForCompletion();
 
 		client = newClient("Documents");