() {
-
- @Override
- public int compare(Contact o1, Contact o2) {
- return (int) (o2.getId() - o1.getId());
- }
- });
- return arrayList;
+ filteredContacts.sort(Comparator.comparingLong(Contact::getId).reversed());
+ return filteredContacts;
}
public synchronized long count() {
@@ -92,12 +71,6 @@ public synchronized void save(Contact entry) {
if (entry.getId() == null) {
entry.setId(nextId++);
}
- try {
- entry = (Contact) BeanUtils.cloneBean(entry);
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
contacts.put(entry.getId(), entry);
}
-
}
diff --git a/src/main/java/com/devopsdemo/utilities/CaseInsensitiveComparator.java b/src/main/java/com/devopsdemo/utilities/CaseInsensitiveComparator.java
index 156ad8af..59aad5f0 100644
--- a/src/main/java/com/devopsdemo/utilities/CaseInsensitiveComparator.java
+++ b/src/main/java/com/devopsdemo/utilities/CaseInsensitiveComparator.java
@@ -1,99 +1,95 @@
package com.devopsdemo.utilities;
import java.lang.reflect.InvocationTargetException;
-import java.util.Date;
+import java.time.LocalDate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CaseInsensitiveComparator extends GenericComparator {
- private static final long serialVersionUID = -6836701171640412573L;
- private static final Logger LOG =LoggerFactory.getLogger(CaseInsensitiveComparator.class);
+ private static final long serialVersionUID = -6836701171640412573L;
+ private static final Logger LOG = LoggerFactory.getLogger(CaseInsensitiveComparator.class);
- /**
- * This functiona call base GenericComparator(boolean sortAscending) class and set whether sorting is in ascending or descending
- * sortAscending = true then ascending
- * sortAscending = false then descending
- */
- public CaseInsensitiveComparator(boolean sortAscending) {
- super(sortAscending);
- this.targetMethod = null;
- this.sortAscending = sortAscending;
- }
- /*
- * This function call base GenericComparator(boolean sortField) class and set which field we need to sort and sort as asc
- */
- public CaseInsensitiveComparator(String sortField) {
- super(sortField);
- this.targetMethod = prepareTargetMethod(sortField);
- this.sortAscending = true;
- }
- /*
- * This function call base GenericComparator(boolean sortField,sortAscending) class and set which field we need to sort and sort based on the boolen value given
- * sortAscending = true then ascending
- * sortAscending = false then descending
- */
- public CaseInsensitiveComparator(String sortField, boolean sortAscending) {
- super(sortField, sortAscending);
- this.targetMethod = prepareTargetMethod(sortField);
- this.sortAscending = sortAscending;
- }
+ /**
+ * This functiona call base GenericComparator(boolean sortAscending) class and set whether sorting is in ascending or descending
+ * sortAscending = true then ascending
+ * sortAscending = false then descending
+ */
+ public CaseInsensitiveComparator(boolean sortAscending) {
+ super(sortAscending);
+ this.targetMethod = null;
+ this.sortAscending = sortAscending;
+ }
+ /*
+ * This function call base GenericComparator(boolean sortField) class and set which field we need to sort and sort as asc
+ */
+ public CaseInsensitiveComparator(String sortField) {
+ super(sortField);
+ this.targetMethod = prepareTargetMethod(sortField);
+ this.sortAscending = true;
+ }
+ /*
+ * This function call base GenericComparator(boolean sortField,sortAscending) class and set which field we need to sort and sort based on the boolen value given
+ * sortAscending = true then ascending
+ * sortAscending = false then descending
+ */
+ public CaseInsensitiveComparator(String sortField, boolean sortAscending) {
+ super(sortField, sortAscending);
+ this.targetMethod = prepareTargetMethod(sortField);
+ this.sortAscending = sortAscending;
+ }
- /*
- * (non-Javadoc)
- * @see com.devopsdemo.utilities.GenericComparator#compare(java.lang.Object, java.lang.Object)
- */
- public int compare(Object o1, Object o2) {
- int response = LESSER;
- Object v1,v2;
- String returnType;
- try {
- if(this.targetMethod==null){
- v1=o1;
- v2=02;
- returnType=o1.getClass().getName();
- }else{
- v1=getValue(o1);
- v2=getValue(o2);
- returnType=getMethod(o1).getReturnType().getName();
- }
-
- CompareMode cm = findCompareMode(v1, v2);
- if (!cm.equals(CompareMode.DEFAULT)) {
- return compareAlternate(cm);
- }
- response = compareActual(v1, v2, returnType);
- }
- catch (NoSuchMethodException e){LOG.error(new LoggerStackTraceUtil().getErrorMessage(e));}
- catch (IllegalAccessException e){LOG.error(new LoggerStackTraceUtil().getErrorMessage(e));}
- catch (InvocationTargetException e){LOG.error(new LoggerStackTraceUtil().getErrorMessage(e));}
- return response;
+ /*
+ * (non-Javadoc)
+ * @see com.devopsdemo.utilities.GenericComparator#compare(java.lang.Object, java.lang.Object)
+ */
+ @Override
+ public int compare(Object o1, Object o2) {
+ int response = LESSER;
+ Object v1, v2;
+ String returnType;
+ try {
+ if (this.targetMethod == null) {
+ v1 = o1;
+ v2 = o2;
+ returnType = o1.getClass().getName();
+ } else {
+ v1 = getValue(o1);
+ v2 = getValue(o2);
+ returnType = getMethod(o1).getReturnType().getName();
+ }
+
+ CompareMode cm = findCompareMode(v1, v2);
+ if (!cm.equals(CompareMode.DEFAULT)) {
+ return compareAlternate(cm);
+ }
+ response = compareActual(v1, v2, returnType);
+ } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+ LOG.error(new LoggerStackTraceUtil().getErrorMessage(e));
}
- /*
- * This Method is the overridden compareActual of GenericComparator.
- * If the data type is String then it convert string to upper case and compare it with other.
- */
- protected int compareActual(Object v1, Object v2, String returnType) {
- String obj = returnType;
- if ("java.lang.Object".equals(obj) && v1!=null) {
- obj = v1.getClass().getName();
- }
- int acutal = LESSER;
- if (obj.equals(DATATYPE_INTEGER)) {
- acutal = ((Integer) v1).compareTo((Integer) v2) * determinePosition();
- } else if (obj.equals(DATATYPE_LONG)) {
- acutal = ((Long) v1).compareTo((Long) v2) * determinePosition();
- } else if (obj.equals(DATATYPE_STRING)) {
- acutal = ((String) v1).toUpperCase().compareTo(((String) v2).toUpperCase()) * determinePosition();
- } else if (obj.equals(DATATYPE_DATE)) {
- acutal = ((Date) v1).compareTo((Date) v2) * determinePosition();
- } else if (obj.equals(DATATYPE_FLOAT)) {
- acutal = ((Float) v1).compareTo((Float) v2) * determinePosition();
- } else if (obj.equals(DATATYPE_DOUBLE)) {
- acutal = ((Double) v1).compareTo((Double) v2) * determinePosition();
- }
- return acutal;
+ return response;
+ }
+
+ /*
+ * This Method is the overridden compareActual of GenericComparator.
+ * If the data type is String then it convert string to upper case and compare it with other.
+ */
+ @Override
+ protected int compareActual(Object v1, Object v2, String returnType) {
+ String obj = returnType;
+ if ("java.lang.Object".equals(obj) && v1 != null) {
+ obj = v1.getClass().getName();
}
+ return switch (obj) {
+ case DATATYPE_INTEGER -> ((Integer) v1).compareTo((Integer) v2) * determinePosition();
+ case DATATYPE_LONG -> ((Long) v1).compareTo((Long) v2) * determinePosition();
+ case DATATYPE_STRING -> ((String) v1).compareToIgnoreCase((String) v2) * determinePosition();
+ case DATATYPE_DATE -> ((LocalDate) v1).compareTo((LocalDate) v2) * determinePosition();
+ case DATATYPE_FLOAT -> ((Float) v1).compareTo((Float) v2) * determinePosition();
+ case DATATYPE_DOUBLE -> ((Double) v1).compareTo((Double) v2) * determinePosition();
+ default -> LESSER;
+ };
+ }
}
diff --git a/src/main/java/com/devopsdemo/utilities/GenericComparator.java b/src/main/java/com/devopsdemo/utilities/GenericComparator.java
index 84a03fb8..0fe4bac3 100644
--- a/src/main/java/com/devopsdemo/utilities/GenericComparator.java
+++ b/src/main/java/com/devopsdemo/utilities/GenericComparator.java
@@ -1,9 +1,10 @@
package com.devopsdemo.utilities;
+
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.time.LocalDate;
import java.util.Comparator;
-import java.util.Date;
/*****
* Sorting - Generic Comparator
@@ -18,25 +19,25 @@
@SuppressWarnings("rawtypes")
public class GenericComparator implements Comparator, Serializable {
- protected static final long serialVersionUID = -2293914106471884607L;
- protected static final int LESSER = -1;
- protected static final int EQUAL = 0;
- protected static final int GREATER = 1;
- protected static final String METHOD_GET_PREFIX = "get";
- protected static final String DATATYPE_STRING = "java.lang.String";
- protected static final String DATATYPE_DATE = "java.util.Date";
- protected static final String DATATYPE_INTEGER = "java.lang.Integer";
- protected static final String DATATYPE_LONG = "java.lang.Long";
- protected static final String DATATYPE_FLOAT = "java.lang.Float";
- protected static final String DATATYPE_DOUBLE = "java.lang.Double";
- protected static final String DATATYPE_BOOLEAN = "java.lang.Boolean";
+ protected static final long serialVersionUID = -2293914106471884607L;
+ protected static final int LESSER = -1;
+ protected static final int EQUAL = 0;
+ protected static final int GREATER = 1;
+ protected static final String METHOD_GET_PREFIX = "get";
+ protected static final String DATATYPE_STRING = "java.lang.String";
+ protected static final String DATATYPE_DATE = "java.time.LocalDate";
+ protected static final String DATATYPE_INTEGER = "java.lang.Integer";
+ protected static final String DATATYPE_LONG = "java.lang.Long";
+ protected static final String DATATYPE_FLOAT = "java.lang.Float";
+ protected static final String DATATYPE_DOUBLE = "java.lang.Double";
+ protected static final String DATATYPE_BOOLEAN = "java.lang.Boolean";
- protected enum CompareMode { EQUAL, LESS_THAN, GREATER_THAN, DEFAULT }
- // generic comparator attributes
- protected String targetMethod;
- protected boolean sortAscending;
+ protected enum CompareMode { EQUAL, LESS_THAN, GREATER_THAN, DEFAULT }
- /**
+ protected String targetMethod;
+ protected boolean sortAscending;
+
+ /**
* default constructor - assumes comparator for Type List
*
* For Example-
@@ -110,63 +111,46 @@ public GenericComparator(String sortField, boolean sortAscending) {
*/
public int compare(Object o1, Object o2) {
int response = LESSER;
- Object v1,v2;
+ Object v1, v2;
String returnType;
try {
- if(this.targetMethod==null){
- v1=o1;
- v2=02;
- returnType=o1.getClass().getName();
- }else{
- v1=getValue(o1);
- v2=getValue(o2);
- returnType=getMethod(o1).getReturnType().getName();
+ if (this.targetMethod == null) {
+ v1 = o1;
+ v2 = o2;
+ returnType = o1.getClass().getName();
+ } else {
+ v1 = getValue(o1);
+ v2 = getValue(o2);
+ returnType = getMethod(o1).getReturnType().getName();
}
-
+
CompareMode cm = findCompareMode(v1, v2);
if (!cm.equals(CompareMode.DEFAULT)) {
return compareAlternate(cm);
}
response = compareActual(v1, v2, returnType);
}
- // in JSE 1.7 the below is accepted
- /*
- catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException nsme) {
- } */
- catch (NoSuchMethodException e){
- LoggerStackTraceUtil.printErrorMessage(e);
- }catch (IllegalAccessException e){
+ catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
LoggerStackTraceUtil.printErrorMessage(e);
- }catch (InvocationTargetException e){
- LoggerStackTraceUtil.printErrorMessage(e);
- }
+ }
return response;
}
-
-//---------------------------------------------------------------------------------//
-// Private methods used by {@link com.myjeeva.comparator.GenericComparator} //
-//---------------------------------------------------------------------------------//
- /**
+
+ /**
* alternate to actual value comparison i.e., either (lsh & rhs) one the value could be null
*
* @param cm - a enum used to idetify the position for sorting
*/
protected int compareAlternate(CompareMode cm) {
- int compareState = LESSER;
- switch(cm) {
- case LESS_THAN:
- compareState = LESSER * determinePosition();
- break;
- case GREATER_THAN:
- compareState = GREATER * determinePosition();
- break;
- case EQUAL:
- compareState = EQUAL * determinePosition();
- break;
- }
- return compareState;
-}
- /**
+ return switch (cm) {
+ case LESS_THAN -> LESSER * determinePosition();
+ case GREATER_THAN -> GREATER * determinePosition();
+ case EQUAL -> EQUAL * determinePosition();
+ default -> LESSER;
+ };
+ }
+
+ /**
* actual value comparison for sorting; both lsh & rhs value available
*
* @param v1 - value of lhs
@@ -176,27 +160,19 @@ protected int compareAlternate(CompareMode cm) {
*/
private int compareActual(Object v1, Object v2, String returnType) {
String obj = returnType;
- if ("java.lang.Object".equals(obj) && v1!=null) {
- obj = v1.getClass().getName();
+ if ("java.lang.Object".equals(obj) && v1 != null) {
+ obj = v1.getClass().getName();
}
- int acutal = LESSER;
-
- if (obj.equals(DATATYPE_INTEGER)) {
- acutal = ((Integer) v1).compareTo((Integer) v2) * determinePosition();
- } else if (obj.equals(DATATYPE_LONG)) {
- acutal = ((Long) v1).compareTo((Long) v2) * determinePosition();
- } else if (obj.equals(DATATYPE_STRING)) {
- acutal = ((String) v1).compareTo((String) v2) * determinePosition();
- } else if (obj.equals(DATATYPE_DATE)) {
- acutal = ((Date) v1).compareTo((Date) v2) * determinePosition();
- } else if (obj.equals(DATATYPE_FLOAT)) {
- acutal = ((Float) v1).compareTo((Float) v2) * determinePosition();
- } else if (obj.equals(DATATYPE_DOUBLE)) {
- acutal = ((Double) v1).compareTo((Double) v2) * determinePosition();
- } else if (obj.equals(DATATYPE_BOOLEAN)) {
- acutal = ((Boolean) v1).compareTo((Boolean) v2) * determinePosition();
- }
- return acutal;
+ return switch (obj) {
+ case DATATYPE_INTEGER -> ((Integer) v1).compareTo((Integer) v2) * determinePosition();
+ case DATATYPE_LONG -> ((Long) v1).compareTo((Long) v2) * determinePosition();
+ case DATATYPE_STRING -> ((String) v1).compareTo((String) v2) * determinePosition();
+ case DATATYPE_DATE -> ((LocalDate) v1).compareTo((LocalDate) v2) * determinePosition();
+ case DATATYPE_FLOAT -> ((Float) v1).compareTo((Float) v2) * determinePosition();
+ case DATATYPE_DOUBLE -> ((Double) v1).compareTo((Double) v2) * determinePosition();
+ case DATATYPE_BOOLEAN -> ((Boolean) v1).compareTo((Boolean) v2) * determinePosition();
+ default -> LESSER;
+ };
}
/**
* preparing target name of getter method for given sort field
@@ -204,10 +180,8 @@ private int compareActual(Object v1, Object v2, String returnType) {
* @param name a {@link java.lang.String}
* @return methodName a {@link java.lang.String}
*/
- protected final static String prepareTargetMethod(String name) {
- StringBuffer fieldName = new StringBuffer(METHOD_GET_PREFIX);
- fieldName.append(name.substring(0, 1).toUpperCase()).append(name.substring(1));
- return fieldName.toString();
+ protected static String prepareTargetMethod(String name) {
+ return METHOD_GET_PREFIX + name.substring(0, 1).toUpperCase() + name.substring(1);
}
/**
@@ -218,7 +192,7 @@ protected final static String prepareTargetMethod(String name) {
* @throws NoSuchMethodException
*/
protected final Method getMethod(Object obj) throws NoSuchMethodException {
- return obj.getClass().getMethod(targetMethod, null);
+ return obj.getClass().getMethod(targetMethod);
}
/**
@@ -231,8 +205,8 @@ protected final Method getMethod(Object obj) throws NoSuchMethodException {
* @throws IllegalAccessException
*/
- private final static Object invoke(Method method, Object obj) throws InvocationTargetException, IllegalAccessException {
- return method.invoke(obj, null);
+ private static Object invoke(Method method, Object obj) throws InvocationTargetException, IllegalAccessException {
+ return method.invoke(obj);
}
/**
* fetching a value from given object
@@ -254,18 +228,12 @@ protected Object getValue(Object obj) throws InvocationTargetException, IllegalA
* @return compareMode - a {@link com.devopsdemo.utilities.GenericComparator.CompareMode}
*/
protected CompareMode findCompareMode(Object o1, Object o2) {
- CompareMode cm = CompareMode.LESS_THAN;
- if(null != o1 & null != o2) {
- cm = CompareMode.DEFAULT;
- } else if (null == o1 & null != o2) {
- cm = CompareMode.LESS_THAN;
- } else if (null != o1 & null == o2) {
- cm = CompareMode.GREATER_THAN;
- } else if (null == o1 & null == o2) {
- cm = CompareMode.EQUAL;
- }
- return cm;
- }
+ if (o1 == null && o2 == null) return CompareMode.EQUAL;
+ if (o1 == null) return CompareMode.LESS_THAN;
+ if (o2 == null) return CompareMode.GREATER_THAN;
+ return CompareMode.DEFAULT;
+ }
+
/**
* Determining positing for sorting
*
diff --git a/src/main/java/com/devopsdemo/utilities/HexAsciiConvertor.java b/src/main/java/com/devopsdemo/utilities/HexAsciiConvertor.java
index e0e466f9..28d08dbc 100644
--- a/src/main/java/com/devopsdemo/utilities/HexAsciiConvertor.java
+++ b/src/main/java/com/devopsdemo/utilities/HexAsciiConvertor.java
@@ -1,59 +1,49 @@
package com.devopsdemo.utilities;
public class HexAsciiConvertor {
- /****
- * Method to convert hexadecimal values into ascii
- * method is return the ascii value
- * @param hexValue
- * @return outputAscii
- **/
-
- public static String convertHexToASCII(String hexValue)
- {
- StringBuilder outputAscii = new StringBuilder();
- String asciiValue = null;
- try{
- if(hexValue!=null){
- for (int i = 0; i < hexValue.length(); i += 2)
- {
- String str = hexValue.substring(i, i + 2);
- outputAscii.append((char) Integer.parseInt(str, 16));
- }
- asciiValue = outputAscii.toString();
- }
- }
- catch(Exception ex){
- LoggerStackTraceUtil.printErrorMessage(ex);
- }
- return asciiValue;
- }
-
- /**
- * Method to convert ascii values into hexadecimal
- * method is returning the hexadecimal value
- * @param asciiValue
- * @return hex
- */
-
- public static String convertAsciiToHex(String asciiValue)
- {
- String hexvalue = null;
- try {
-
- if(asciiValue!=null)
- {
- char[] chars = asciiValue.toCharArray();
- StringBuffer hex = new StringBuffer();
- for (int i = 0; i < chars.length; i++)
- {
- hex.append(Integer.toHexString((int) chars[i]));
- }
- hexvalue= hex.toString();
- }
- }
- catch (Exception e) {
- LoggerStackTraceUtil.printErrorMessage(e);
- }
- return hexvalue;
- }
+
+ /**
+ * Converts hexadecimal values into ASCII.
+ *
+ * @param hexValue the hexadecimal value
+ * @return the ASCII value
+ */
+ public static String convertHexToASCII(String hexValue) {
+ if (hexValue == null || hexValue.isEmpty()) {
+ return null;
+ }
+
+ var outputAscii = new StringBuilder();
+ try {
+ for (int i = 0; i < hexValue.length(); i += 2) {
+ var str = hexValue.substring(i, i + 2);
+ outputAscii.append((char) Integer.parseInt(str, 16));
+ }
+ } catch (Exception ex) {
+ LoggerStackTraceUtil.printErrorMessage(ex);
+ }
+ return outputAscii.toString();
+ }
+
+ /**
+ * Converts ASCII values into hexadecimal.
+ *
+ * @param asciiValue the ASCII value
+ * @return the hexadecimal value
+ */
+ public static String convertAsciiToHex(String asciiValue) {
+ if (asciiValue == null || asciiValue.isEmpty()) {
+ return null;
+ }
+
+ var hex = new StringBuilder();
+ try {
+ for (char c : asciiValue.toCharArray()) {
+ hex.append(Integer.toHexString(c));
+ }
+ } catch (Exception e) {
+ LoggerStackTraceUtil.printErrorMessage(e);
+ }
+ return hex.toString();
+ }
}
diff --git a/src/main/java/com/devopsdemo/utilities/LoggerStackTraceUtil.java b/src/main/java/com/devopsdemo/utilities/LoggerStackTraceUtil.java
index 815a7ea6..2f7dc88e 100644
--- a/src/main/java/com/devopsdemo/utilities/LoggerStackTraceUtil.java
+++ b/src/main/java/com/devopsdemo/utilities/LoggerStackTraceUtil.java
@@ -1,59 +1,65 @@
package com.devopsdemo.utilities;
+
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-//// Class used to log the print stack trace items
+/**
+ * Utility class for logging stack trace details.
+ */
public class LoggerStackTraceUtil {
- private static final Logger LOG =LoggerFactory.getLogger(LoggerStackTraceUtil.class);
- private int maxCount=3;
-
- /***
- * @param th - The exception that was thrown and to be logged.
- * @return at very least the 1st error, if stacktrace is more than 1, then it also
- * returns the immediate cause
- *
- * Note this function cannot be made static for thread safety..
- */
- public String getErrorMessage(Throwable th){
- if (th==null) return "";
- StringBuilder b = new StringBuilder("");
- String [] aryError = ExceptionUtils.getRootCauseStackTrace(th);
- b.append(aryError[0].trim());
- if (aryError.length >= 2){
- b.append(String.format("%nCause:%s",aryError[1].trim()));
- }
- if (aryError.length >= maxCount){
- b.append(String.format("%nCause:%s",aryError[2].trim()));
- }
- return b.toString();
- }
-
- // Static Logger function
- public static void printErrorMessage(Throwable th)
- {
- try{
- // log the error caused by
- LOG.error("Error Cause: {}",th.getMessage());
- // Conditional statement to check the length of the array
- int count=0;
- for(StackTraceElement stackTrace:th.getStackTrace()){
- if(count<=25){
- LOG.error("Error Class: {} and Line Number: {}",stackTrace.getClassName(),stackTrace.getLineNumber());
- }else{
- break;
- }
- count++;
- }
- }
- catch(Exception e)
- {
- // log the exception error
- LoggerStackTraceUtil.printErrorMessage(e);
- }
-
-
- }
+ private static final Logger LOG = LoggerFactory.getLogger(LoggerStackTraceUtil.class);
+ private final int maxCount = 3;
+
+ /**
+ * Retrieves the error message from a throwable, including root causes.
+ *
+ * @param th the throwable to process
+ * @return a formatted error message
+ */
+ public String getErrorMessage(Throwable th) {
+ if (th == null) {
+ return "";
+ }
+
+ var b = new StringBuilder();
+ var aryError = ExceptionUtils.getRootCauseStackTrace(th);
+
+ b.append(aryError[0].trim());
+ if (aryError.length >= 2) {
+ b.append(String.format("%nCause: %s", aryError[1].trim()));
+ }
+ if (aryError.length >= maxCount) {
+ b.append(String.format("%nCause: %s", aryError[2].trim()));
+ }
+
+ return b.toString();
+ }
+
+ /**
+ * Logs the error message and stack trace of a throwable.
+ *
+ * @param th the throwable to log
+ */
+ public static void printErrorMessage(Throwable th) {
+ if (th == null) {
+ return;
+ }
+
+ try {
+ LOG.error("Error Cause: {}", th.getMessage());
+ var count = 0;
+ for (var stackTrace : th.getStackTrace()) {
+ if (count > 25) {
+ break;
+ }
+ LOG.error("Error Class: {} and Line Number: {}", stackTrace.getClassName(), stackTrace.getLineNumber());
+ count++;
+ }
+ } catch (Exception e) {
+ LOG.error("Failed to log error message: {}", e.getMessage());
+ }
+ }
}
diff --git a/src/main/java/com/devopsdemo/utilities/PrepareTargetMethod.java b/src/main/java/com/devopsdemo/utilities/PrepareTargetMethod.java
index 7e846ac8..d2b1d561 100644
--- a/src/main/java/com/devopsdemo/utilities/PrepareTargetMethod.java
+++ b/src/main/java/com/devopsdemo/utilities/PrepareTargetMethod.java
@@ -2,16 +2,15 @@
public class PrepareTargetMethod {
- private static final String METHOD_GET_PREFIX = "get";
- /***
- * preparing target name of getter method for given sort field
- *
- * @param name a {@link java.lang.String}
- * @return methodName a {@link java.lang.String}
- **/
- public String prepareTargetMethod(String name) {
- StringBuffer fieldName = new StringBuffer(METHOD_GET_PREFIX);
- fieldName.append(name.substring(0, 1).toUpperCase()).append(name.substring(1));
- return fieldName.toString();
- }
+ private static final String METHOD_GET_PREFIX = "get";
+
+ /**
+ * Prepares the target name of the getter method for a given sort field.
+ *
+ * @param name the field name
+ * @return the getter method name
+ */
+ public String prepareTargetMethod(String name) {
+ return METHOD_GET_PREFIX + name.substring(0, 1).toUpperCase() + name.substring(1);
+ }
}
diff --git a/src/main/java/com/devopsdemo/utilities/PropertyHelper.java b/src/main/java/com/devopsdemo/utilities/PropertyHelper.java
index 3526fd5f..19e593d2 100644
--- a/src/main/java/com/devopsdemo/utilities/PropertyHelper.java
+++ b/src/main/java/com/devopsdemo/utilities/PropertyHelper.java
@@ -1,97 +1,76 @@
package com.devopsdemo.utilities;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.Properties;
-@SuppressWarnings("unchecked")
/**
- * Helper Class to load Properties from a property file to be passed to caller for execution.
- * Multiple properties can be loaded.
- * Note that if same property is specified multiple times in a single file, there is no guaranteed "Winner"
- * Also note in the case of loading multiple files and duplicate definition of properties across files,
- * the last loaded property file "wins".
- * The getProperty()/get() methods also returns "" silently if no such query exists.
- * @author Seshagiri Sriram
- * @version 1.0
- * @see PropertyLoader
+ * Helper Class to load Properties from a property file to be passed to caller for execution.
+ * Multiple properties can be loaded.
+ * Note that if the same property is specified multiple times in a single file, there is no guaranteed "Winner".
+ * Also note in the case of loading multiple files and duplicate definition of properties across files,
+ * the last loaded property file "wins".
+ * The getProperty()/get() methods also return "" silently if no such query exists.
*/
-
public final class PropertyHelper {
-/**
- * hMapProperties contains the hashmap of key/value pairs associated with each property
- */
-protected final static HashMap HMAPPROPERTIES = new HashMap();
-
-
-/**
- * @param propertyFile
- * @return
- */
-public static HashMap loadProperties(String propertyFile) {
- Properties properties = PropertyLoader.loadProperties(propertyFile);
- Enumeration keys = (Enumeration) properties.propertyNames();
- while (keys.hasMoreElements()) {
- String tmpKey = (String) keys.nextElement();
- HMAPPROPERTIES.put(tmpKey,properties.getProperty(tmpKey));
-
- }
- return HMAPPROPERTIES;
- }
+ /**
+ * hMapProperties contains the hashmap of key/value pairs associated with each property
+ */
+ protected static final HashMap HMAPPROPERTIES = new HashMap<>();
+ /**
+ * Loads properties from a file into a HashMap.
+ *
+ * @param propertyFile the property file to load
+ * @return a HashMap containing the properties
+ */
+ public static HashMap loadProperties(String propertyFile) {
+ var properties = PropertyLoader.loadProperties(propertyFile);
+ properties.stringPropertyNames().forEach(
+ key -> HMAPPROPERTIES.put(key, properties.getProperty(key))
+ );
+ return HMAPPROPERTIES;
+ }
-/**
- * @param propertyName
- * @return
- */
-public static String getProperty(String propertyName){
- String propertyValue = "";
- try {
- propertyValue = (String) HMAPPROPERTIES.get(propertyName);
- }
- catch (Exception e){
- LoggerStackTraceUtil.printErrorMessage(e);
- propertyValue = "";
- }
- finally {
- }
- return propertyValue;
- }
+ /**
+ * Retrieves the value of a property by name.
+ *
+ * @param propertyName the name of the property
+ * @return the value of the property, or an empty string if not found
+ */
+ public static String getProperty(String propertyName) {
+ try {
+ return (String) HMAPPROPERTIES.getOrDefault(propertyName, "");
+ } catch (Exception e) {
+ LoggerStackTraceUtil.printErrorMessage(e);
+ return "";
+ }
+ }
-/**
- * Function used to get the default value if the property is null
- * @param propertyName - Name of the property
- * @param strDefault - Default value that needs to be returned if the value is null
- * @return Property value/Default Value as String
- */
-public static String getProperty(String propertyName,String strDefault){
- String propertyValue = "";
- try {
- propertyValue = (String) HMAPPROPERTIES.get(propertyName);
- // Check the property value is null/not
- if(propertyValue == null){
- // Assign the default value to the propertyValue
- propertyValue=strDefault;
- }
- }
- catch (Exception e){
- LoggerStackTraceUtil.printErrorMessage(e);
- propertyValue = "";
- }
- finally {
- }
- return propertyValue;
- }
+ /**
+ * Retrieves the value of a property by name, or a default value if the property is not found.
+ *
+ * @param propertyName the name of the property
+ * @param strDefault the default value to return if the property is not found
+ * @return the value of the property, or the default value if not found
+ */
+ public static String getProperty(String propertyName, String strDefault) {
+ try {
+ return (String) HMAPPROPERTIES.getOrDefault(propertyName, strDefault);
+ } catch (Exception e) {
+ LoggerStackTraceUtil.printErrorMessage(e);
+ return strDefault;
+ }
+ }
-/**
- * A convenience method (aliasing getProperty)
- * @param propertyName property to be retrieved.
- * @return
- * @see getProperty
- */
-public static String get(String propertyName){
- return getProperty(propertyName);
+ /**
+ * A convenience method (aliasing getProperty).
+ *
+ * @param propertyName the property to be retrieved
+ * @return the value of the property
+ */
+ public static String get(String propertyName) {
+ return getProperty(propertyName);
+ }
}
- }
diff --git a/src/main/java/com/devopsdemo/utilities/PropertyLoader.java b/src/main/java/com/devopsdemo/utilities/PropertyLoader.java
index 5802e80d..9f64702e 100644
--- a/src/main/java/com/devopsdemo/utilities/PropertyLoader.java
+++ b/src/main/java/com/devopsdemo/utilities/PropertyLoader.java
@@ -1,107 +1,81 @@
package com.devopsdemo.utilities;
import java.io.InputStream;
-import java.util.Enumeration;
import java.util.Locale;
import java.util.Properties;
import java.util.ResourceBundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/***
- * Looks up a resource named 'name' in the classpath. The resource must map
- * to a file with .properties extention. The name is assumed to be absolute
- * and can use either "/" or "." for package segment separation with an
- * optional leading "/" and optional ".properties" suffix. Thus, the
- * following names refer to the same resource:
- *
- * @author Seshagiri Sriram
- * @version 1.0
- * @param name classpath resource name [may not be null]
- * @param loader classloader through which to load the resource [null
- * is equivalent to the application loader]
- * @return resource converted to java.util.Properties [may be null if the
- * resource was not found and THROW_ON_LOAD_FAILURE is false]
- * @throws IllegalArgumentException if the resource was not found and
- * THROW_ON_LOAD_FAILURE is true
+
+/**
+ * Utility class for loading properties from files or resource bundles.
*/
+public class PropertyLoader {
+
+ private static final boolean THROW_ON_LOAD_FAILURE = true;
+ private static final boolean LOAD_AS_RESOURCE_BUNDLE = false;
+ private static final String SUFFIX = ".properties";
+
+ /**
+ * Logger enabled for the current class
+ */
+ private static final Logger LOG = LoggerFactory.getLogger(PropertyLoader.class);
+
+ /**
+ * Loads properties using the current thread's context classloader.
+ *
+ * @param name the name of the properties file
+ * @return the loaded properties
+ */
+ public static Properties loadProperties(final String name) {
+ return loadProperties(name, Thread.currentThread().getContextClassLoader());
+ }
-public class PropertyLoader
-{
+ /**
+ * Loads properties from a file or resource bundle.
+ *
+ * @param names the name of the properties file
+ * @param loader the classloader to use
+ * @return the loaded properties
+ */
+ public static Properties loadProperties(String names, ClassLoader loader) {
+ if (names == null) {
+ throw new IllegalArgumentException("null input: name");
+ }
- private static final boolean THROW_ON_LOAD_FAILURE = true;
- private static final boolean LOAD_AS_RESOURCE_BUNDLE = false;
- private static final String SUFFIX = ".properties";
+ String name = names.startsWith("/") ? names.substring(1) : names;
+ name = name.endsWith(SUFFIX) ? name.substring(0, name.length() - SUFFIX.length()) : name;
- /**
- * Logger enabled for the current class
- */
- private static final Logger LOG =LoggerFactory.getLogger(PropertyLoader.class);
+ Properties result = new Properties();
- /**
- * A convenience overload of {@link #loadProperties(String, ClassLoader)}
- * that uses the current thread's context classloader.
- */
+ try {
+ if (LOAD_AS_RESOURCE_BUNDLE) {
+ name = name.replace('/', '.');
+ ResourceBundle rb = ResourceBundle.getBundle(name, Locale.getDefault(),
+ loader != null ? loader : ClassLoader.getSystemClassLoader());
+ rb.keySet().forEach(key -> result.put(key, rb.getString(key)));
+ } else {
+ name = name.replace('.', '/');
+ if (!name.endsWith(SUFFIX)) {
+ name = name.concat(SUFFIX);
+ }
- public static Properties loadProperties (final String name) {
- return loadProperties (name, Thread.currentThread ().getContextClassLoader ());
- }
+ try (InputStream in = loader != null ? loader.getResourceAsStream(name) : null) {
+ if (in != null) {
+ result.load(in);
+ }
+ }
+ }
+ } catch (Exception e) {
+ LoggerStackTraceUtil.printErrorMessage(e);
+ }
- @SuppressWarnings("rawtypes")
- public static Properties loadProperties (String names, ClassLoader loader)
- {
- String name = null;
- ClassLoader loaders;
- if (names == null) throw new IllegalArgumentException ("null input: name");
- if (names.startsWith ("/")) name = names.substring (1);
- if (names.endsWith (SUFFIX)) name = names.substring (0, names.length () - SUFFIX.length ());
- Properties result = null;
- InputStream in = null;
- try {
- if (loader == null)
- loaders = ClassLoader.getSystemClassLoader ();
- if (LOAD_AS_RESOURCE_BUNDLE)
- {
- name = name.replace ('/', '.'); // Throws MissingResourceException on lookup failures:
- final ResourceBundle rb = ResourceBundle.getBundle (name, Locale.getDefault (), loaders);
- result = new Properties ();
- for (Enumeration keys = rb.getKeys (); keys.hasMoreElements ();)
- {
- final String key = (String) keys.nextElement ();
- final String value = rb.getString (key);
- result.put (key, value);
- }
- }
- else {
- name = name.replace ('.', '/');
- if (! name.endsWith (SUFFIX)) name = name.concat (SUFFIX); // Returns null on lookup failures:
- if(loader!=null)
- in = loader.getResourceAsStream (name);
- if (in != null) {
- result = new Properties ();
- result.load (in); // Can throw IOException
- }
- }
- }
- catch (Exception e) {
- result = new Properties ();
- LoggerStackTraceUtil.printErrorMessage(e);
- }
- finally {
- if (in != null)
- try
- {
- in.close ();
- }
- catch (Throwable ignore) {}
- }
- if (THROW_ON_LOAD_FAILURE && (result == null))
- {
- // LOG exception... Do not re-throw this.. as I do not expect users to catch this exception :-)
- //throw new IllegalArgumentException ("could not load [" + name + "]"+ " as " + (LOAD_AS_RESOURCE_BUNDLE ? "a resource bundle" : "a classloader resource"));
- result = new Properties ();
- }
- return result;
- }
+ if (THROW_ON_LOAD_FAILURE && result.isEmpty()) {
+ LOG.error("Could not load [{}] as {}", name,
+ LOAD_AS_RESOURCE_BUNDLE ? "a resource bundle" : "a classloader resource");
+ }
+ return result;
+ }
}
diff --git a/src/main/java/com/devopsdemo/utilities/StringUtilities.java b/src/main/java/com/devopsdemo/utilities/StringUtilities.java
index 98af3bb9..9230f907 100644
--- a/src/main/java/com/devopsdemo/utilities/StringUtilities.java
+++ b/src/main/java/com/devopsdemo/utilities/StringUtilities.java
@@ -3,8 +3,8 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -14,70 +14,32 @@
/**
- * An utility class that is used to split an string into an array list and providing mechanism to
- * build a HashMap value based on a variable number of arguements.
- * @author Seshagiri Sriram
- * @version 1.0
- *
+ * A utility class for string manipulations and conversions.
*/
public class StringUtilities {
- /**
- * The string separator for splitting a string into a list
- */
- private final static String COMMA_SEPARATOR = ",";
- /**
- * The String separator for splitting a parameter value.
- * Parameters are expected to be in form: "parametername=value"
- */
- private final static String PARAM_SEPARATOR = "=";
- /**
- * The String separator for splitting a parameter value into appropriate type.
- * Required for HQL Queries, never for Native SQL queries
- * Parameters are expected to be in form: "parametername=value:type (int, string, float, double)"
- */
- private final static String TYPE_SEPARATOR = ";";
- /**
- * The String separator for splitting a date parameter value into appropriate format.
- */
- private final static String DATEFORMAT_SEPARATOR = "@";
-
- /**
- * The method to be invoked to convert a given String value to a specific Object type
- */
- private final static String CONVERTOR_METHOD_NAME = "valueOf" ;
-
- /**
- * The String to represent the type "DATE"
- */
- private final static String DATE_TYPE = "date" ;
-
- /**
- * Default Date format to which the date will be formatted
- */
-
- private final static String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss" ;
- /**
- * Variable to represent the type "STRING"
- */
- private final static String STRING_TYPE ="string";
- /**
- * Logger enabled for the current class
- */
- private static final Logger LOG =LoggerFactory.getLogger(StringUtilities.class);
-
- /** Primitive type name -> class map. */
- private static final HashMap> PRIMITIVE_NAME_TYPE_MAP = new HashMap>();
-
- /** Setup the primitives map. */
- static {
- PRIMITIVE_NAME_TYPE_MAP.put("boolean", Boolean.class);
- PRIMITIVE_NAME_TYPE_MAP.put("int", Integer.class);
- PRIMITIVE_NAME_TYPE_MAP.put("long", Long.class);
- PRIMITIVE_NAME_TYPE_MAP.put("float", Float.class);
- PRIMITIVE_NAME_TYPE_MAP.put("double", Double.class);
- }
- /**
+ private static final String COMMA_SEPARATOR = ",";
+ private static final String PARAM_SEPARATOR = "=";
+ private static final String TYPE_SEPARATOR = ";";
+ private static final String DATEFORMAT_SEPARATOR = "@";
+ private static final String CONVERTOR_METHOD_NAME = "valueOf";
+ private static final String DATE_TYPE = "date";
+ private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
+ private static final String STRING_TYPE = "string";
+
+ private static final Logger LOG = LoggerFactory.getLogger(StringUtilities.class);
+
+ private static final HashMap> PRIMITIVE_NAME_TYPE_MAP = new HashMap<>();
+
+ static {
+ PRIMITIVE_NAME_TYPE_MAP.put("boolean", Boolean.class);
+ PRIMITIVE_NAME_TYPE_MAP.put("int", Integer.class);
+ PRIMITIVE_NAME_TYPE_MAP.put("long", Long.class);
+ PRIMITIVE_NAME_TYPE_MAP.put("float", Float.class);
+ PRIMITIVE_NAME_TYPE_MAP.put("double", Double.class);
+ }
+
+ /**
* given a comma separated string and type, returns an ArrayList of specific types
* @param strParamValueList The string (assumed to be comma separated). Usually meant for use in creating
* parameter values for passing in IN Clauses
@@ -85,13 +47,16 @@ public class StringUtilities {
* @return ArrayList if passed value is not null or empty, null otherwise
*/
public static List