updated pom and simplified Converters

Author: fquirin

pom.xml

@@ -37,9 +37,8 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>
-								${project.build.directory}/libs
-							</outputDirectory>
+							<outputDirectory>${project.build.directory}/release/libs</outputDirectory>
+							<includeScope>runtime</includeScope>
 						</configuration>
 					</execution>
 				</executions>
@@ -58,7 +57,8 @@
 							</mainClass>
 						</manifest>
 					</archive>
-					<finalName>tools-v${project.version}</finalName>
+					<outputDirectory>${project.build.directory}/release</outputDirectory>
+					<finalName>sepia-core-tools-v${project.version}</finalName>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -120,6 +120,13 @@
 		    <artifactId>httpmime</artifactId>
 		    <version>4.5.3</version>
 		</dependency>
+		
+		<dependency>
+      		<groupId>junit</groupId>
+      		<artifactId>junit</artifactId>
+      		<version>4.12</version>
+      		<scope>test</scope>
+    	</dependency>
     </dependencies>
 
 	<developers>

src/main/java/net/b07z/sepia/server/core/tools/Converters.java

@@ -364,23 +364,13 @@ public static Map<String, String> json2HashMapStrStr(JSONObject jsonObject) {
 		return params;
 	}
 	/**
-	 * Convert JSONObject to HashMap&lt;String,Object&gt; by transferring all TOP-LEVEL key-value pairs.
+	 * Convert JSONObject to HashMap&lt;String,Object&gt; by unchecked cast.
 	 * Nested JSONObjects remain what they are.
 	 * @param jsonObject - simple JSON object
 	 * @return HashMap&lt;String,String&gt; (can be empty)
 	 */
-	@SuppressWarnings("unchecked")
 	public static Map<String, Object> json2HashMap(JSONObject jsonObject) {
-		Map<String, Object> params = new HashMap<>();
-		if (jsonObject == null) {
-			return params;
-		}else{
-			for (Object entry : jsonObject.entrySet()) {
-				Map.Entry<String, Object> entryObj = (Map.Entry<String, Object>) entry;
-				params.put(entryObj.getKey(), entryObj.getValue());
-			}
-		}
-		return params;
+		return object2HashMapStrObj(jsonObject);
 	}
 
 	/**
@@ -391,8 +381,7 @@ public static Map<String, Object> json2HashMap(JSONObject jsonObject) {
 	@SuppressWarnings("unchecked")
 	public static Map<String, Object> object2HashMapStrObj(Object input){
 		try {
-			Map<String, Object> output = (HashMap<String, Object>) input;
-			return output;
+			return (HashMap<String, Object>) input;
 		}catch(Exception e){
 			e.printStackTrace();
 			return null;
@@ -406,8 +395,7 @@ public static Map<String, Object> object2HashMapStrObj(Object input){
 	@SuppressWarnings("unchecked")
 	public static List<Object> object2ArrayListObj(Object input){
 		try {
-			List<Object> output = (ArrayList<Object>) input;
-			return output;
+			return (ArrayList<Object>) input;
 		}catch(Exception e){
 			e.printStackTrace();
 			return null;
@@ -421,8 +409,7 @@ public static List<Object> object2ArrayListObj(Object input){
 	@SuppressWarnings("unchecked")
 	public static List<String> object2ArrayListStr(Object input){
 		try {
-			List<String> output = (ArrayList<String>) input;
-			return output;
+			return (ArrayList<String>) input;
 		}catch(Exception e){
 			e.printStackTrace();
 			return null;