|
@@ -14,8 +14,6 @@ |
14 |
14 |
|
|
15 |
15 |
|
public class UtilsCommon extends EqualSupport |
16 |
16 |
|
{ |
17 |
|
- |
public static final Object[] EMPTY_OBJECT_ARRAY = new Object[0]; |
18 |
|
- |
|
19 |
17 |
|
public static final String MUST_BE_POSITIVE = " must be positive"; |
20 |
18 |
|
public static final String CANNOT_BE_NEGATIVE = " cannot be negative"; |
21 |
19 |
|
public static final String NOT_ALLOWED_TO_BE_NULL = ": Not allowed to be null"; |
|
@@ -362,16 +360,6 @@ |
362 |
360 |
|
return pExisting.trim() + Strings.deNull( pSeparator ) + pToAppend.trim(); |
363 |
361 |
|
} |
364 |
362 |
|
|
365 |
|
- |
public static boolean areNonArraysEqual( Object pThis, Object pThat ) |
366 |
|
- |
{ |
367 |
|
- |
if ( pThis == pThat ) // Same or both null |
368 |
|
- |
{ |
369 |
|
- |
return true; |
370 |
|
- |
} |
371 |
|
- |
// Both CAN'T be null |
372 |
|
- |
return (pThis != null) ? pThis.equals( pThat ) : pThat.equals( pThis ); |
373 |
|
- |
} |
374 |
|
- |
|
375 |
363 |
|
public static boolean areNonArraysEqual( boolean pThis, boolean pThat ) |
376 |
364 |
|
{ |
377 |
365 |
|
return (pThis == pThat); |
|
@@ -414,7 +402,7 @@ |
414 |
402 |
|
|
415 |
403 |
|
public static boolean areEqual( Object pThis, Object pThat ) |
416 |
404 |
|
{ |
417 |
|
- |
if ( areNonArraysEqual( pThis, pThat ) ) |
|
405 |
+ |
if ( Objects.areNonArraysEqual( pThis, pThat ) ) |
418 |
406 |
|
{ |
419 |
407 |
|
return true; |
420 |
408 |
|
} |
|
@@ -467,11 +455,6 @@ |
467 |
455 |
|
return pToCheck; |
468 |
456 |
|
} |
469 |
457 |
|
|
470 |
|
- |
public static <T> T deNull( T pToCheck, T pDefault ) |
471 |
|
- |
{ |
472 |
|
- |
return (pToCheck != null) ? pToCheck : pDefault; |
473 |
|
- |
} |
474 |
|
- |
|
475 |
458 |
|
public static String deNullToString( Object value, Object defaultValue ) |
476 |
459 |
|
{ |
477 |
460 |
|
return Strings.deNull( noEmptyToString( value ), noEmptyToString( defaultValue ) ); |
|
@@ -479,17 +462,7 @@ |
479 |
462 |
|
|
480 |
463 |
|
public static String noEmptyToString( Object value ) |
481 |
464 |
|
{ |
482 |
|
- |
return Strings.noEmpty( nullOKtoString( value ) ); |
483 |
|
- |
} |
484 |
|
- |
|
485 |
|
- |
public static String nullOKtoString( Object value ) |
486 |
|
- |
{ |
487 |
|
- |
return (value == null) ? null : value.toString(); |
488 |
|
- |
} |
489 |
|
- |
|
490 |
|
- |
public static String nullToEmptytoString( Object value ) |
491 |
|
- |
{ |
492 |
|
- |
return (value == null) ? "" : value.toString(); |
|
465 |
+ |
return Strings.noEmpty( Strings.nullOKtoString( value ) ); |
493 |
466 |
|
} |
494 |
467 |
|
|
495 |
468 |
|
public static int intValue( Integer pInteger, int pDefault ) |
|
@@ -585,7 +558,7 @@ |
585 |
558 |
|
public static void assertAll7BitAsciiAlpha( String pObjectName, String pToBeAssert ) |
586 |
559 |
|
throws IllegalArgumentException |
587 |
560 |
|
{ |
588 |
|
- |
assertNotNull( pObjectName, pToBeAssert ); |
|
561 |
+ |
Objects.assertNotNull( pObjectName, pToBeAssert ); |
589 |
562 |
|
for ( int i = 0; i < pToBeAssert.length(); i++ ) |
590 |
563 |
|
{ |
591 |
564 |
|
char c = pToBeAssert.charAt( i ); |
|
@@ -596,15 +569,6 @@ |
596 |
569 |
|
} |
597 |
570 |
|
} |
598 |
571 |
|
|
599 |
|
- |
public static void assertNotEqual( String pObjectName, int pNotExpected, int pActual ) |
600 |
|
- |
throws IllegalArgumentException |
601 |
|
- |
{ |
602 |
|
- |
if ( pNotExpected == pActual ) |
603 |
|
- |
{ |
604 |
|
- |
throw new IllegalArgumentException( pObjectName + ": '" + pNotExpected + "' Not allowed" ); |
605 |
|
- |
} |
606 |
|
- |
} |
607 |
|
- |
|
608 |
572 |
|
public static void assertNotEqual( String pObjectName, long pNotExpected, long pActual ) |
609 |
573 |
|
throws IllegalArgumentException |
610 |
574 |
|
{ |
|
@@ -614,28 +578,6 @@ |
614 |
578 |
|
} |
615 |
579 |
|
} |
616 |
580 |
|
|
617 |
|
- |
public static void assertEqual( String pObjectName, int pExpected, int pActual ) |
618 |
|
- |
throws IllegalArgumentException |
619 |
|
- |
{ |
620 |
|
- |
if ( pExpected != pActual ) |
621 |
|
- |
{ |
622 |
|
- |
throw new IllegalArgumentException( pObjectName + ": Expected '" + pExpected + "', but was '" + pActual + "'" ); |
623 |
|
- |
} |
624 |
|
- |
} |
625 |
|
- |
|
626 |
|
- |
public static void assertEqual( String pObjectName, Object pExpected, Object pActual ) |
627 |
|
- |
throws IllegalArgumentException |
628 |
|
- |
{ |
629 |
|
- |
if ( null == pExpected && null == pActual ) |
630 |
|
- |
{ |
631 |
|
- |
return; |
632 |
|
- |
} |
633 |
|
- |
if ( null != pExpected && !pExpected.equals( pActual ) ) |
634 |
|
- |
{ |
635 |
|
- |
throw new IllegalArgumentException( pObjectName + ": Expected '" + pExpected + "', but was '" + pActual + "'" ); |
636 |
|
- |
} |
637 |
|
- |
} |
638 |
|
- |
|
639 |
581 |
|
public static void assertTrue( String pValueDescription, boolean pActual ) |
640 |
582 |
|
throws IllegalArgumentException |
641 |
583 |
|
{ |
|
@@ -645,25 +587,6 @@ |
645 |
587 |
|
} |
646 |
588 |
|
} |
647 |
589 |
|
|
648 |
|
- |
public static void assertNull( String pObjectName, Object pToBeAssert ) |
649 |
|
- |
throws IllegalArgumentException |
650 |
|
- |
{ |
651 |
|
- |
if ( pToBeAssert != null ) |
652 |
|
- |
{ |
653 |
|
- |
throw new IllegalArgumentException( pObjectName + ": Expected null, but was'" + pToBeAssert + "'" ); |
654 |
|
- |
} |
655 |
|
- |
} |
656 |
|
- |
|
657 |
|
- |
public static <T> T assertNotNull( String pObjectName, T pToBeAssert ) |
658 |
|
- |
throws IllegalArgumentException |
659 |
|
- |
{ |
660 |
|
- |
if ( pToBeAssert == null ) |
661 |
|
- |
{ |
662 |
|
- |
throw new IllegalArgumentException( pObjectName + NOT_ALLOWED_TO_BE_NULL ); |
663 |
|
- |
} |
664 |
|
- |
return pToBeAssert; |
665 |
|
- |
} |
666 |
|
- |
|
667 |
590 |
|
public static void assertNotEmptyIfNotNull( String pParamName, String pToBeAsserted ) |
668 |
591 |
|
throws IllegalArgumentException |
669 |
592 |
|
{ |
|
@@ -678,7 +601,7 @@ |
678 |
601 |
|
{ |
679 |
602 |
|
if ( Strings.isNullOrEmptyOrSpaces( pStringToAssert ) ) |
680 |
603 |
|
{ |
681 |
|
- |
nullOrEmptyOrSpace( pErrorMessage, "String" ); |
|
604 |
+ |
Strings.nullOrEmptyOrSpace( pErrorMessage, "String" ); |
682 |
605 |
|
} |
683 |
606 |
|
} |
684 |
607 |
|
|
|
@@ -688,7 +611,7 @@ |
688 |
611 |
|
String rv = Strings.noEmpty( pStringToAssert ); |
689 |
612 |
|
if ( rv == null ) |
690 |
613 |
|
{ |
691 |
|
- |
nullOrEmpty( pErrorMessage, "String" ); |
|
614 |
+ |
Strings.nullOrEmpty( pErrorMessage, "String" ); |
692 |
615 |
|
} |
693 |
616 |
|
return rv; |
694 |
617 |
|
} |
|
@@ -698,7 +621,7 @@ |
698 |
621 |
|
{ |
699 |
622 |
|
if ( isNullOrEmpty( pCollectionToAssert ) ) |
700 |
623 |
|
{ |
701 |
|
- |
nullOrEmpty( pErrorMessage, "Collection" ); |
|
624 |
+ |
Strings.nullOrEmpty( pErrorMessage, "Collection" ); |
702 |
625 |
|
} |
703 |
626 |
|
} |
704 |
627 |
|
|
|
@@ -710,7 +633,7 @@ |
710 |
633 |
|
String rv = pStringToAssert.trim(); |
711 |
634 |
|
if ( pStringToAssert.length() != rv.length() ) |
712 |
635 |
|
{ |
713 |
|
- |
error( "String", pErrorMessage, "No Leading or trailing whitespace allowed" ); |
|
636 |
+ |
Strings.error( "String", pErrorMessage, "No Leading or trailing whitespace allowed" ); |
714 |
637 |
|
} |
715 |
638 |
|
} |
716 |
639 |
|
return pStringToAssert; |
|
@@ -728,7 +651,7 @@ |
728 |
651 |
|
{ |
729 |
652 |
|
if ( isNullOrEmpty( pStringArrayToAssert ) ) |
730 |
653 |
|
{ |
731 |
|
- |
nullOrEmpty( pErrorMessage, "String[]" ); |
|
654 |
+ |
Strings.nullOrEmpty( pErrorMessage, "String[]" ); |
732 |
655 |
|
} |
733 |
656 |
|
} |
734 |
657 |
|
|
|
@@ -741,7 +664,7 @@ |
741 |
664 |
|
String s = Strings.noEmpty( pStringArrayToAssert[i] ); |
742 |
665 |
|
if ( s == null ) |
743 |
666 |
|
{ |
744 |
|
- |
nullOrEmpty( pErrorMessage + "[" + i + "]", "String[]" ); |
|
667 |
+ |
Strings.nullOrEmpty( pErrorMessage + "[" + i + "]", "String[]" ); |
745 |
668 |
|
} |
746 |
669 |
|
rv[i] = s; |
747 |
670 |
|
} |
|
@@ -762,7 +685,7 @@ |
762 |
685 |
|
String strValue = noEmptyToString( value ); |
763 |
686 |
|
if ( strValue == null ) |
764 |
687 |
|
{ |
765 |
|
- |
nullOrEmpty( what, String.valueOf( justClassNameOf( value ) ) ); |
|
688 |
+ |
Strings.nullOrEmpty( what, String.valueOf( justClassNameOf( value ) ) ); |
766 |
689 |
|
} |
767 |
690 |
|
return strValue; |
768 |
691 |
|
} |
|
@@ -780,7 +703,7 @@ |
780 |
703 |
|
{ |
781 |
704 |
|
if ( value == null ) |
782 |
705 |
|
{ |
783 |
|
- |
nullOrEmpty( what, String.valueOf( justClassNameOf( value ) ) ); |
|
706 |
+ |
Strings.nullOrEmpty( what, String.valueOf( justClassNameOf( value ) ) ); |
784 |
707 |
|
} |
785 |
708 |
|
if ( value instanceof String ) |
786 |
709 |
|
{ |
|
@@ -839,32 +762,6 @@ |
839 |
762 |
|
return pValue; |
840 |
763 |
|
} |
841 |
764 |
|
|
842 |
|
- |
private static void nullOrEmptyOrSpace( String pErrorMessage, String pForm ) |
843 |
|
- |
throws IllegalArgumentException |
844 |
|
- |
{ |
845 |
|
- |
error( pForm, pErrorMessage, " not allowed to be null or empty or have any spaces" ); |
846 |
|
- |
} |
847 |
|
- |
|
848 |
|
- |
private static void nullOrEmpty( String pErrorMessage, String pForm ) |
849 |
|
- |
throws IllegalArgumentException |
850 |
|
- |
{ |
851 |
|
- |
error( pForm, pErrorMessage, " not allowed to be null or empty" ); |
852 |
|
- |
} |
853 |
|
- |
|
854 |
|
- |
public static void error( String pForm, String pErrorMessage, String pMessagePlus ) |
855 |
|
- |
throws IllegalArgumentException |
856 |
|
- |
{ |
857 |
|
- |
if ( Strings.isNullOrEmpty( pErrorMessage ) ) |
858 |
|
- |
{ |
859 |
|
- |
pErrorMessage = pForm; |
860 |
|
- |
} |
861 |
|
- |
if ( -1 != pErrorMessage.indexOf( ' ' ) ) |
862 |
|
- |
{ |
863 |
|
- |
throw new IllegalArgumentException( pErrorMessage ); |
864 |
|
- |
} |
865 |
|
- |
throw new IllegalArgumentException( pErrorMessage + pMessagePlus ); |
866 |
|
- |
} |
867 |
|
- |
|
868 |
765 |
|
public static String displayFormatFlag( boolean pFlag, String pTrueString ) |
869 |
766 |
|
{ |
870 |
767 |
|
return pFlag ? pTrueString : ""; |
|
@@ -1044,32 +941,6 @@ |
1044 |
941 |
|
|
1045 |
942 |
|
// Object Group: |
1046 |
943 |
|
|
1047 |
|
- |
public static Object[] appendObjectArrays( Object[] pArray1, Object[] pArray2 ) |
1048 |
|
- |
{ |
1049 |
|
- |
if ( isNullOrEmpty( pArray2 ) ) |
1050 |
|
- |
{ |
1051 |
|
- |
return pArray1; |
1052 |
|
- |
} |
1053 |
|
- |
if ( isNullOrEmpty( pArray1 ) ) |
1054 |
|
- |
{ |
1055 |
|
- |
return pArray2; |
1056 |
|
- |
} |
1057 |
|
- |
Object[] joined = new Object[pArray1.length + pArray2.length]; |
1058 |
|
- |
System.arraycopy( pArray1, 0, joined, 0, pArray1.length ); |
1059 |
|
- |
System.arraycopy( pArray2, 0, joined, pArray1.length, pArray2.length ); |
1060 |
|
- |
return joined; |
1061 |
|
- |
} |
1062 |
|
- |
|
1063 |
|
- |
public static Object[] prependObject( Object pNewFirst, Object[] pTheRest ) |
1064 |
|
- |
{ |
1065 |
|
- |
return appendObjectArrays( new Object[]{pNewFirst}, pTheRest ); |
1066 |
|
- |
} |
1067 |
|
- |
|
1068 |
|
- |
public static Object[] appendObject( Object[] pCurArray, Object pNewLast ) |
1069 |
|
- |
{ |
1070 |
|
- |
return appendObjectArrays( pCurArray, new Object[]{pNewLast} ); |
1071 |
|
- |
} |
1072 |
|
- |
|
1073 |
944 |
|
public static String padIt( int pMinDesiredLength, Object pIt ) |
1074 |
945 |
|
{ |
1075 |
946 |
|
return padIt( pMinDesiredLength, "" + pIt ); |
|
@@ -1087,7 +958,7 @@ |
1087 |
958 |
|
{ |
1088 |
959 |
|
if ( pArrayToAssert[i] == null ) |
1089 |
960 |
|
{ |
1090 |
|
- |
nullOrEmpty( pErrorMessage, "Object[" + i + "]" ); |
|
961 |
+ |
Strings.nullOrEmpty( pErrorMessage, "Object[" + i + "]" ); |
1091 |
962 |
|
} |
1092 |
963 |
|
} |
1093 |
964 |
|
} |
|
@@ -1097,7 +968,7 @@ |
1097 |
968 |
|
{ |
1098 |
969 |
|
if ( pArrayToAssert == null ) |
1099 |
970 |
|
{ |
1100 |
|
- |
nullOrEmpty( pErrorMessage, "Object[]" ); |
|
971 |
+ |
Strings.nullOrEmpty( pErrorMessage, "Object[]" ); |
1101 |
972 |
|
} |
1102 |
973 |
|
assertElementsNotNull( pErrorMessage, pArrayToAssert ); |
1103 |
974 |
|
} |
|
@@ -1114,7 +985,7 @@ |
1114 |
985 |
|
{ |
1115 |
986 |
|
if ( isNullOrEmpty( pArrayToAssert ) ) |
1116 |
987 |
|
{ |
1117 |
|
- |
nullOrEmpty( pErrorMessage, "Object[]" ); |
|
988 |
+ |
Strings.nullOrEmpty( pErrorMessage, "Object[]" ); |
1118 |
989 |
|
} |
1119 |
990 |
|
} |
1120 |
991 |
|
|