made object converters more strict, extended request builder

Author: fquirin

src/main/java/net/b07z/sepia/server/core/microservices/DbStationResults.java

@@ -121,8 +121,8 @@ public DbStation(JSONObject data){
 
 			this.stationName = (String) data.get("name");
 			this.stationId = (String) data.get("id");
-			this.longitude = Converters.obj2Double(data.get("lon"));
-			this.latitude = Converters.obj2Double(data.get("lat"));
+			this.longitude = Converters.obj2DoubleOrDefault(data.get("lon"), Double.NEGATIVE_INFINITY); 		//TODO: is this ok?
+			this.latitude = Converters.obj2DoubleOrDefault(data.get("lat"), Double.NEGATIVE_INFINITY);
 		}
 
 		@Override
@@ -143,6 +143,9 @@ public double getLongitude(){
 			return longitude;
 		}
 		public double getApproxDistance(double lat, double lng){
+			if (this.latitude == Double.NEGATIVE_INFINITY || this.longitude == Double.NEGATIVE_INFINITY){
+				return Double.MAX_VALUE;		//TODO: is this ok?
+			}
 			try{
 				return Math.sqrt((Math.pow(lat - latitude, 2) + Math.pow(lng - longitude, 2)));
 

src/main/java/net/b07z/sepia/server/core/server/FakeRequest.java

@@ -3,7 +3,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.json.simple.JSONObject;
+
 import net.b07z.sepia.server.core.data.Defaults;
+import net.b07z.sepia.server.core.tools.Converters;
 import net.b07z.sepia.server.core.users.Account;
 import net.b07z.sepia.server.core.users.LocalTestAccount;
 
@@ -16,21 +19,39 @@
  *
  */
 public class FakeRequest extends Request {
-	private final Map<String, String> params = new HashMap<>();
+	private final Map<String, String> params;
 	private Account fakeAccount;
 
 	public FakeRequest(String... params) {
+		this.params = new HashMap<>();
 		for (String param : params) {
 			String[] parts = param.split("=",2);
 			this.params.put(parts[0], parts[1]);
 		}
 		fakeAccount = new LocalTestAccount();
 	}
+	public FakeRequest(Map<String, String> params) {
+		this.params = params;
+		fakeAccount = new LocalTestAccount();
+	}
+	public FakeRequest(JSONObject params) {
+		this.params = Converters.json2HashMapStrStr(params);
+		fakeAccount = new LocalTestAccount();
+	}
 	public FakeRequest(Account fakeAccount, String... params) {
 		this(params);
 		this.fakeAccount = fakeAccount;
 	}
 
+	/**
+	 * Overwrite a certain parameter
+	 * @param key
+	 * @param value
+	 */
+	public void overwriteParameter(String key, String value){
+		this.params.put(key, value);
+	}
+	
 	/**
 	 * Set a new account (e.g. LocalTestAccount) as this request's account.<br>
 	 * Note: use attribute(Defaults.ACCOUNT_ATTR) to get account back.

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

@@ -98,7 +98,7 @@ public static String url_utf8(String in){
 	 * @return rounded double as string or empty
 	 */
 	public static String smartRound(Object val, boolean round_to_int){
-		double v = obj2Double(val);
+		double v = obj2DoubleOrDefault(val, Double.NEGATIVE_INFINITY);
 		if (v == Double.NEGATIVE_INFINITY){
 			System.err.println(DateTime.getLogDate() + " ERROR - Converters.java smartRound(..) FAILED! with: " + val.toString());
 			return "";
@@ -124,52 +124,56 @@ public static String smartRound(Object val, boolean round_to_int){
 	}
 
 	/**
-	 * Convert a string to a long. If it fails the long will be -1. Best used for System.time checks.
-	 * @param in - string in long-format to convert
-	 * @return long value or -1. If -1 is important to you DON'T use this method
+	 * Convert an unknown object to String or return null.
+	 * @param in - object to convert
+	 * @param def - default
+	 * @return String or default
 	 */
-	public static long str2Long(String in){
+	public static String obj2StringOrDefault(Object in, String def){
 		try {
-			return Long.parseLong(in);
+			return in.toString();
 		} catch (Exception e){
-			return -1;
+			return def;
 		}
 	}
 	/**
 	 * Convert an unknown object that holds a double (real double or string double) to double.
 	 * @param in - string to convert, must be in double format
-	 * @return double value or NEGATIVE_INFINITY. If NEGATIVE_INFINITY is important to you DON'T use this method
+	 * @param def - default
+	 * @return double value or default
 	 */
-	public static double obj2Double(Object in){
+	public static double obj2DoubleOrDefault(Object in, Double def){
 		try {
 			return Double.parseDouble((String.valueOf(in)));
 		} catch (Exception e){
-			return Double.NEGATIVE_INFINITY;
+			return def;
 		}
 	}
 	/**
 	 * Convert an unknown object that holds a double (real double or string double) to long.
 	 * @param in - string to convert, must be in double format
-	 * @return long value or -1. If -1 is important to you DON'T use this method
+	 * @param def - default
+	 * @return long value or default
 	 */
-	public static long obj2Long(Object in){
+	public static long obj2LongOrDefault(Object in, Long def){
 		try {
 			return (long) Double.parseDouble((String.valueOf(in)));
 		} catch (Exception e){
-			return -1;
+			return def;
 		}
 	}
 	/**
 	 * Convert an unknown object that holds an integer/double (real type or as string) to an integer.
 	 * Removes all non-numbers (except .,+-) in the string!
 	 * @param in - string to convert, must be in double format
-	 * @return int value or -1. If -1 is important to you DON'T use this method or check if it was there before
+	 * @param def - default
+	 * @return int value or def
 	 */
-	public static int obj2Int(Object in){
+	public static int obj2IntOrDefault(Object in, Integer def){
 		try {
 			return (int) Double.parseDouble((String.valueOf(in).replaceAll("[^\\d\\.,\\-\\+]", "")));
 		} catch (Exception e){
-			return -1;
+			return def;
 		}
 	}
 
@@ -372,6 +376,18 @@ public static Map<String, String> json2HashMapStrStr(JSONObject jsonObject) {
 	public static Map<String, Object> json2HashMap(JSONObject jsonObject) {
 		return object2HashMapStrObj(jsonObject);
 	}
+	/**
+	 * Add content of JSONObject to a Map converting all values to String.
+	 * @param jsonSource - source JSONObject
+	 * @param targetMap - target Map (non null!)
+	 */
+	@SuppressWarnings("unchecked")
+	public static void addJsonToMapAsStrings(JSONObject jsonSource, Map<String, String> targetMap){
+		for (Object entry : jsonSource.entrySet()) {
+			Map.Entry<String, Object> entryObj = (Map.Entry<String, Object>) entry;
+			targetMap.put(entryObj.getKey(), entryObj.getValue().toString());
+		}
+	}
 
 	/**
 	 * Makes an unchecked (cause you can't check it, can you?) cast from Object to HashMap&#60String, Object&#62.

src/main/java/net/b07z/sepia/server/core/users/Account.java

@@ -256,7 +256,7 @@ public void importJSON(JSONObject account){
 		userId = (String) account.get("userId");
 		email = (String) account.get("email");
 		phone = (String) account.get("phone");
-		accessLevel = Converters.obj2Int(account.get("accessLevel"));
+		accessLevel = Converters.obj2IntOrDefault(account.get("accessLevel"), -1);
 		JSONObject uname = (JSONObject) account.get("userName");
 		if (uname != null){
 			userName = uname;

src/main/java/net/b07z/sepia/server/core/users/AuthenticationAssistAPI.java

@@ -80,7 +80,7 @@ public boolean authenticate(JSONObject info) {
 
 			//ACCESS LEVEL 
 			//TODO: not yet fully implemented, but should be 0 for access via token, 1 for real password and -1 for no access.
-			accessLevel = Converters.obj2Int(response.get("access_level"));
+			accessLevel = Converters.obj2IntOrDefault(response.get("access_level"), -1);
 
 			//NAME
 			JSONObject user_name = (JSONObject) response.get("user_name");