Skip to content

Commit fca0815

Browse files
fquirinfquirin
committed
renamed some snake-case methods
1 parent dc1c31d commit fca0815

File tree

5 files changed

+33
-32
lines changed

5 files changed

+33
-32
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ public DbStation(JSONObject data){
121121

122122
this.stationName = (String) data.get("name");
123123
this.stationId = (String) data.get("id");
124-
this.longitude = Converters.obj_2_double(data.get("lon"));
125-
this.latitude = Converters.obj_2_double(data.get("lat"));
124+
this.longitude = Converters.obj2Double(data.get("lon"));
125+
this.latitude = Converters.obj2Double(data.get("lat"));
126126
}
127127

128128
@Override

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

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.ArrayList;
77
import java.util.HashMap;
88
import java.util.Iterator;
9+
import java.util.List;
910
import java.util.Map;
1011
import java.util.Random;
1112

@@ -97,7 +98,7 @@ public static String url_utf8(String in){
9798
* @return rounded double as string or empty
9899
*/
99100
public static String smartRound(Object val, boolean round_to_int){
100-
double v = obj_2_double(val);
101+
double v = obj2Double(val);
101102
if (v == Double.NEGATIVE_INFINITY){
102103
System.err.println(DateTime.getLogDate() + " ERROR - Converters.java smartRound(..) FAILED! with: " + val.toString());
103104
return "";
@@ -127,7 +128,7 @@ public static String smartRound(Object val, boolean round_to_int){
127128
* @param in - string in long-format to convert
128129
* @return long value or -1. If -1 is important to you DON'T use this method
129130
*/
130-
public static long str_2_long(String in){
131+
public static long str2Long(String in){
131132
try {
132133
return Long.parseLong(in);
133134
} catch (Exception e){
@@ -139,7 +140,7 @@ public static long str_2_long(String in){
139140
* @param in - string to convert, must be in double format
140141
* @return double value or NEGATIVE_INFINITY. If NEGATIVE_INFINITY is important to you DON'T use this method
141142
*/
142-
public static double obj_2_double(Object in){
143+
public static double obj2Double(Object in){
143144
try {
144145
return Double.parseDouble((String.valueOf(in)));
145146
} catch (Exception e){
@@ -151,7 +152,7 @@ public static double obj_2_double(Object in){
151152
* @param in - string to convert, must be in double format
152153
* @return long value or -1. If -1 is important to you DON'T use this method
153154
*/
154-
public static long obj_2_long(Object in){
155+
public static long obj2Long(Object in){
155156
try {
156157
return (long) Double.parseDouble((String.valueOf(in)));
157158
} catch (Exception e){
@@ -164,7 +165,7 @@ public static long obj_2_long(Object in){
164165
* @param in - string to convert, must be in double format
165166
* @return int value or -1. If -1 is important to you DON'T use this method or check if it was there before
166167
*/
167-
public static int obj_2_int(Object in){
168+
public static int obj2Int(Object in){
168169
try {
169170
return (int) Double.parseDouble((String.valueOf(in).replaceAll("[^\\d\\.,\\-\\+]", "")));
170171
} catch (Exception e){
@@ -177,7 +178,7 @@ public static int obj_2_int(Object in){
177178
* @param s - String to parse
178179
* @return JSONObject
179180
*/
180-
public static JSONObject str_2_JSON(String s){
181+
public static JSONObject str2Json(String s){
181182
JSONParser parser = new JSONParser();
182183
JSONObject result;
183184
try {
@@ -276,13 +277,13 @@ public static String dataStringSetAttribute(String dataString, HashMap<String, O
276277
}
277278

278279
/**
279-
* Converts a HashMap&lt;String,String&gt; to a JSONObject
280+
* Converts a Map&lt;String,String&gt; to a JSONObject
280281
*
281-
* @param m - hashMap&lt;String, String&gt;
282+
* @param m - Map&lt;String, String&gt;
282283
* @return
283284
*/
284285
@SuppressWarnings("unchecked")
285-
public static JSONObject hashMap_StrStr_2_JSON(HashMap<String, String> m){
286+
public static JSONObject mapStrStr2Json(Map<String, String> m){
286287
JSONObject params = new JSONObject();
287288
for (Map.Entry<String, String> entry : m.entrySet()) {
288289
String p = entry.getKey();
@@ -293,13 +294,13 @@ public static JSONObject hashMap_StrStr_2_JSON(HashMap<String, String> m){
293294
return params;
294295
}
295296
/**
296-
* Converts a HashMap&lt;String,Long&gt; to a JSONObject
297+
* Converts a Map&lt;String,Long&gt; to a JSONObject
297298
*
298-
* @param m - hashMap&lt;String, Long&gt;
299+
* @param m - Map&lt;String, Long&gt;
299300
* @return
300301
*/
301302
@SuppressWarnings("unchecked")
302-
public static JSONObject hashMap_StrLng_2_JSON(HashMap<String, Long> m){
303+
public static JSONObject mapStrLng2Json(Map<String, Long> m){
303304
JSONObject params = new JSONObject();
304305
for (Map.Entry<String, Long> entry : m.entrySet()) {
305306
String p = entry.getKey();
@@ -310,13 +311,13 @@ public static JSONObject hashMap_StrLng_2_JSON(HashMap<String, Long> m){
310311
return params;
311312
}
312313
/**
313-
* Converts a HashMap&lt;String,Object&gt; to a JSONObject
314+
* Converts a Map&lt;String,Object&gt; to a JSONObject
314315
*
315-
* @param m - hashMap&lt;String, Object&gt;
316+
* @param m - Map&lt;String, Object&gt;
316317
* @return
317318
*/
318319
@SuppressWarnings("unchecked")
319-
public static JSONObject hashMap_StrObj_2_JSON(HashMap<String, Object> m){
320+
public static JSONObject mapStrObj2Json(Map<String, Object> m){
320321
JSONObject params = new JSONObject();
321322
for (Map.Entry<String, Object> entry : m.entrySet()) {
322323
String p = entry.getKey();
@@ -328,12 +329,12 @@ public static JSONObject hashMap_StrObj_2_JSON(HashMap<String, Object> m){
328329
}
329330

330331
/**
331-
* Converts a HashMap&lt;String,String&gt; to a single string separated by ";;"
332+
* Converts a Map&lt;String,String&gt; to a single string separated by ";;"
332333
*
333-
* @param m - hashMap&lt;String, String&gt;
334+
* @param m - Map&lt;String, String&gt;
334335
* @return
335336
*/
336-
public static String hashMap_StrStr_2_Str(HashMap<String, String> m){
337+
public static String mapStrStr2Str(Map<String, String> m){
337338
String result="";
338339
for (Map.Entry<String, String> entry : m.entrySet()) {
339340
String p = entry.getKey();
@@ -350,7 +351,7 @@ public static String hashMap_StrStr_2_Str(HashMap<String, String> m){
350351
* @return HashMap&lt;String,String&gt; (can be empty)
351352
*/
352353
@SuppressWarnings("unchecked")
353-
public static Map<String, String> Json2HashMap_SS(JSONObject jsonObject) {
354+
public static Map<String, String> json2HashMapStrStr(JSONObject jsonObject) {
354355
Map<String,String> params = new HashMap<>();
355356
if (jsonObject == null) {
356357
return params;
@@ -369,7 +370,7 @@ public static Map<String, String> Json2HashMap_SS(JSONObject jsonObject) {
369370
* @return HashMap&lt;String,String&gt; (can be empty)
370371
*/
371372
@SuppressWarnings("unchecked")
372-
public static Map<String, Object> Json2HashMap(JSONObject jsonObject) {
373+
public static Map<String, Object> json2HashMap(JSONObject jsonObject) {
373374
Map<String, Object> params = new HashMap<>();
374375
if (jsonObject == null) {
375376
return params;
@@ -388,9 +389,9 @@ public static Map<String, Object> Json2HashMap(JSONObject jsonObject) {
388389
* @return HashMap or null
389390
*/
390391
@SuppressWarnings("unchecked")
391-
public static HashMap<String, Object> object2HashMap_SO(Object input){
392+
public static Map<String, Object> object2HashMapStrObj(Object input){
392393
try {
393-
HashMap<String, Object> output = (HashMap<String, Object>) input;
394+
Map<String, Object> output = (HashMap<String, Object>) input;
394395
return output;
395396
}catch(Exception e){
396397
e.printStackTrace();
@@ -403,9 +404,9 @@ public static HashMap<String, Object> object2HashMap_SO(Object input){
403404
* @return ArrayList or null
404405
*/
405406
@SuppressWarnings("unchecked")
406-
public static ArrayList<Object> object2ArrayList_O(Object input){
407+
public static List<Object> object2ArrayListObj(Object input){
407408
try {
408-
ArrayList<Object> output = (ArrayList<Object>) input;
409+
List<Object> output = (ArrayList<Object>) input;
409410
return output;
410411
}catch(Exception e){
411412
e.printStackTrace();
@@ -418,9 +419,9 @@ public static ArrayList<Object> object2ArrayList_O(Object input){
418419
* @return ArrayList or null
419420
*/
420421
@SuppressWarnings("unchecked")
421-
public static ArrayList<String> object2ArrayList_S(Object input){
422+
public static List<String> object2ArrayListStr(Object input){
422423
try {
423-
ArrayList<String> output = (ArrayList<String>) input;
424+
List<String> output = (ArrayList<String>) input;
424425
return output;
425426
}catch(Exception e){
426427
e.printStackTrace();

‎src/main/java/net/b07z/sepia/server/core/tools/InputPrompt.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static String askString(String comment, boolean closeAfterwards){
2121
System.out.println(comment);
2222
String in = reader.next();
2323
if(closeAfterwards){
24-
reader.close();
24+
reader.close(); //Closes System.in for rest of session O_O
2525
}
2626
return in;
2727
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public boolean authenticate(RequestParameters params){
209209

210210
//Roles
211211
if (info.containsKey("user_roles")){
212-
userRoles = Converters.object2ArrayList_S(info.get("user_roles"));
212+
userRoles = Converters.object2ArrayListStr(info.get("user_roles"));
213213
}else{
214214
userRoles = new ArrayList<>();
215215
}
@@ -256,7 +256,7 @@ public void importJSON(JSONObject account){
256256
userId = (String) account.get("userId");
257257
email = (String) account.get("email");
258258
phone = (String) account.get("phone");
259-
accessLevel = Converters.obj_2_int(account.get("accessLevel"));
259+
accessLevel = Converters.obj2Int(account.get("accessLevel"));
260260
JSONObject uname = (JSONObject) account.get("userName");
261261
if (uname != null){
262262
userName = uname;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public boolean authenticate(JSONObject info) {
8080

8181
//ACCESS LEVEL
8282
//TODO: not yet fully implemented, but should be 0 for access via token, 1 for real password and -1 for no access.
83-
accessLevel = Converters.obj_2_int(response.get("access_level"));
83+
accessLevel = Converters.obj2Int(response.get("access_level"));
8484

8585
//NAME
8686
JSONObject user_name = (JSONObject) response.get("user_name");

0 commit comments

Comments
 (0)