diff --git a/pom.xml b/pom.xml
index b12565e..f261c78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,10 +31,6 @@
org.apache.maven.plugins
maven-surefire-plugin
2.20.1
-
- true
- true
-
org.apache.maven.plugins
diff --git a/src/main/java/net/locusworks/common/objectmapper/ObjectMapperHelper.java b/src/main/java/net/locusworks/common/objectmapper/ObjectMapperHelper.java
index 017ef30..9ce2050 100644
--- a/src/main/java/net/locusworks/common/objectmapper/ObjectMapperHelper.java
+++ b/src/main/java/net/locusworks/common/objectmapper/ObjectMapperHelper.java
@@ -88,6 +88,9 @@ public class ObjectMapperHelper {
*/
public static ObjectMapperResults readValue(Object src, Class clazz) {
try {
+ if (src instanceof String) {
+ return readValue((String)src, clazz);
+ }
return readValue(mapper.writeValueAsString(src), clazz);
} catch (Exception ex) {
return new ObjectMapperResults(ex);
@@ -116,6 +119,9 @@ public class ObjectMapperHelper {
*/
public static > ObjectMapperListResults> readListValue(Object object, Class objectClass, Class listClass) {
try {
+ if (object instanceof String) {
+ return readListValue((String)object, objectClass, listClass);
+ }
return readListValue(mapper.writeValueAsString(object), objectClass, listClass);
} catch (Exception ex) {
return new ObjectMapperListResults<>(ex);
@@ -131,7 +137,7 @@ public class ObjectMapperHelper {
* @param The expect class of the list
* @return the object list populated with the data in the json string
*/
- public static > ObjectMapperListResults> readListValue(String src, Class objectClass, Class listClass) {
+ public static > ObjectMapperListResults> readListValue(String src, Class objectClass, Class listClass) {
try {
List item = mapper.readValue(src, mapper.getTypeFactory().constructCollectionType(listClass, objectClass));
return new ObjectMapperListResults<>(item);
diff --git a/src/main/java/net/locusworks/common/utils/FileReader.java b/src/main/java/net/locusworks/common/utils/FileReader.java
index 1a2741b..5991e3a 100644
--- a/src/main/java/net/locusworks/common/utils/FileReader.java
+++ b/src/main/java/net/locusworks/common/utils/FileReader.java
@@ -4,7 +4,6 @@ import static net.locusworks.common.Charsets.UTF_8;
import java.io.BufferedReader;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.file.Files;
@@ -84,12 +83,8 @@ public class FileReader implements AutoCloseableIterator, I
throw new IllegalArgumentException("Unable to find resource with name of" + fileName);
}
- //Call the buffered reader initializer once the file is found
- try(BufferedReader br = new BufferedReader(new InputStreamReader(is, UTF_8))) {
- init(br);
- } catch (IOException e) {
- throw new IllegalArgumentException(e);
- }
+ BufferedReader br = new BufferedReader(new InputStreamReader(is, UTF_8));
+ init(br);
}
/**
@@ -100,7 +95,8 @@ public class FileReader implements AutoCloseableIterator, I
if (file == null) throw new IllegalArgumentException("File cannot be null");
if (Files.notExists(file)) throw new IllegalArgumentException("File " + file + " does not exist");
if (!Files.isRegularFile(file)) throw new IllegalArgumentException("File " + file + " is not a file");
- try (BufferedReader br = Files.newBufferedReader(file)) {
+ try {
+ BufferedReader br = Files.newBufferedReader(file);
init(br);
} catch (Exception ex) {
throw new RuntimeException(ex);
diff --git a/temp.properties b/temp.properties
deleted file mode 100644
index 15169ba..0000000
--- a/temp.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#test propertis
-#Fri Feb 16 09:42:40 EST 2018
-logLevel=INFO
-dbPort=3306
-userExpirationDays=3650
-dbHost=localhost