Please cherry-pick:

- improved exception message when the expected interface is not implemented
  (meaning wrong call)
- now the value's simple class name is being included

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/jfinancials/converter/businesscontact/FinancialsBusinessContactConverter.java b/src/java/org/mxchange/jfinancials/converter/businesscontact/FinancialsBusinessContactConverter.java
index 62b6991b50db55f228425d8b1ce81541c1c63efa..491531c1d67a3053c4c09844f40e90541ca1cbbc 100644 (file)
--- a/src/java/org/mxchange/jfinancials/converter/businesscontact/FinancialsBusinessContactConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/businesscontact/FinancialsBusinessContactConverter.java
@@ -44,7 +44,7 @@ public class FinancialsBusinessContactConverter implements Converter {
        private static BusinessDataSessionBeanRemote BUSINESS_CONTACT_BEAN;
 
        /**
-        * Initialization of this converter
+        * Default constructor
         */
        public FinancialsBusinessContactConverter () {
        }
@@ -100,15 +100,15 @@ public class FinancialsBusinessContactConverter implements Converter {
        @Override
        public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
                // Is the object null?
-               if ((null == value) || ((String.valueOf(value)).isEmpty())) {
+               if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
                } else if (!(value instanceof Contact)) {
                        // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement Contact.", value)); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement Contact.", value.getClass().getSimpleName())); //NOI18N
                }
 
-               // Return category id
+               // Return id number
                return String.valueOf(((BusinessBasicData) value).getBusinessDataId());
        }
 

diff --git a/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java b/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
index 5a2501e4a5cf240998425a37df4b51404bc3156e..3516acd8a9b11918118c03d095ea7e11c0b9ad49 100644 (file)
--- a/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
@@ -43,7 +43,7 @@ public class FinancialsContactConverter implements Converter {
        private static ContactSessionBeanRemote CONTACT_BEAN;
 
        /**
-        * Initialization of this converter
+        * Default constructor
         */
        public FinancialsContactConverter () {
        }
@@ -99,15 +99,15 @@ public class FinancialsContactConverter implements Converter {
        @Override
        public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
                // Is the object null?
-               if ((null == value) || ((String.valueOf(value)).isEmpty())) {
+               if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
                } else if (!(value instanceof Contact)) {
                        // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement Contact.", value)); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement Contact.", value.getClass().getSimpleName())); //NOI18N
                }
 
-               // Return category id
+               // Return id number
                return String.valueOf(((Contact) value).getContactId());
        }
 

diff --git a/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java b/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java
index 1b5978daa1adc70d0a810468384077615213b6d3..51796b694048d6d039ca4490a2b27bff97ffcce2 100644 (file)
--- a/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java
@@ -44,7 +44,7 @@ public class FinancialsCountryConverter implements Converter {
        private static CountrySingletonBeanRemote COUNTRY_BEAN;
 
        /**
-        * Initialization of this converter
+        * Default constructor
         */
        public FinancialsCountryConverter () {
        }
@@ -111,15 +111,15 @@ public class FinancialsCountryConverter implements Converter {
        @Override
        public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
                // Is the object null?
-               if ((null == value) || ((String.valueOf(value)).isEmpty())) {
+               if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
                } else if (!(value instanceof Country)) {
                        // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement Country.", value)); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement Country.", value.getClass().getSimpleName())); //NOI18N
                }
 
-               // Return category id
+               // Return id number
                return String.valueOf(((Country) value).getCountryId());
        }
 

diff --git a/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java b/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java
index 3bb2bf25fc494574a32b405e0023757a74f830e9..075887d814847a283791c7ba9999a7537cdd87ce 100644 (file)
--- a/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java
@@ -44,7 +44,7 @@ public class FinancialsFaxNumberConverter implements Converter {
        private static PhoneSessionBeanRemote PHONE_BEAN;
 
        /**
-        * Initialization of this converter
+        * Default constructor
         */
        public FinancialsFaxNumberConverter () {
        }
@@ -107,15 +107,15 @@ public class FinancialsFaxNumberConverter implements Converter {
        @Override
        public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
                // Is the object null?
-               if ((null == value) || ((String.valueOf(value)).isEmpty())) {
+               if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
                } else if (!(value instanceof DialableNumber)) {
                        // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement DialableNumber.", value)); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement DialableNumber.", value.getClass().getSimpleName())); //NOI18N
                }
 
-               // Return category id
+               // Return id number
                return String.valueOf(((DialableNumber) value).getPhoneId());
        }
 

diff --git a/src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java b/src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java
index aa641262e4106f994e60d3bd0233564f2d52394e..60b887009b7f26bf828d4c82d9ec8ca93df461c6 100644 (file)
--- a/src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java
@@ -44,7 +44,7 @@ public class FinancialsLandLineNumberConverter implements Converter {
        private static PhoneSessionBeanRemote PHONE_BEAN;
 
        /**
-        * Initialization of this converter
+        * Default constructor
         */
        public FinancialsLandLineNumberConverter () {
        }
@@ -100,15 +100,15 @@ public class FinancialsLandLineNumberConverter implements Converter {
        @Override
        public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
                // Is the object null?
-               if ((null == value) || ((String.valueOf(value)).isEmpty())) {
+               if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
                } else if (!(value instanceof DialableNumber)) {
                        // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement DialableNumber.", value)); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement DialableNumber.", value.getClass().getSimpleName())); //NOI18N
                }
 
-               // Return category id
+               // Return id number
                return String.valueOf(((DialableNumber) value).getPhoneId());
        }
 

diff --git a/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java b/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java
index e5d99653f5fb048d962c4c1ef3618184d10137d6..737c6acb2f18bd8361d88bef0497f86f35a575d1 100644 (file)
--- a/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java
@@ -44,7 +44,7 @@ public class FinancialsMobileNumberConverter implements Converter {
        private static PhoneSessionBeanRemote PHONE_BEAN;
 
        /**
-        * Initialization of this converter
+        * Default constructor
         */
        public FinancialsMobileNumberConverter () {
        }
@@ -100,15 +100,15 @@ public class FinancialsMobileNumberConverter implements Converter {
        @Override
        public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
                // Is the object null?
-               if ((null == value) || ((String.valueOf(value)).isEmpty())) {
+               if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
                } else if (!(value instanceof DialableNumber)) {
                        // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement DialableNumber.", value)); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement DialableNumber.", value.getClass().getSimpleName())); //NOI18N
                }
 
-               // Return category id
+               // Return id number
                return String.valueOf(((DialableNumber) value).getPhoneId());
        }
 

diff --git a/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java b/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
index 845ebab5b43db10b92731c144c2af9bb90cd64e4..4d104a429d58ae3377c2434f3697d0ada4796211 100644 (file)
--- a/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
@@ -44,7 +44,7 @@ public class FinancialsMobileProviderConverter implements Converter {
        private static MobileProviderSingletonBeanRemote MOBILE_PROVIDER_BEAN;
 
        /**
-        * Initialization of this converter
+        * Default constructor
         */
        public FinancialsMobileProviderConverter () {
        }
@@ -111,15 +111,15 @@ public class FinancialsMobileProviderConverter implements Converter {
        @Override
        public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
                // Is the object null?
-               if ((null == value) || ((String.valueOf(value)).isEmpty())) {
+               if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
                } else if (!(value instanceof MobileProvider)) {
                        // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement MobileProvider.", value)); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement MobileProvider.", value.getClass().getSimpleName())); //NOI18N
                }
 
-               // Return category id
+               // Return id number
                return String.valueOf(((MobileProvider) value).getProviderId());
        }
 

diff --git a/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java b/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java
index 17c29fa860cde936a172e7ddf78f67ad578a37fa..1db850b9044993c43040a30b78683f30f7648e7d 100644 (file)
--- a/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java
@@ -43,7 +43,7 @@ public class FinancialsUserConverter implements Converter {
        private static UserSessionBeanRemote USER_BEAN;
 
        /**
-        * Initialization of this converter
+        * Default constructor
         */
        public FinancialsUserConverter () {
        }
@@ -99,15 +99,15 @@ public class FinancialsUserConverter implements Converter {
        @Override
        public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
                // Is the object null?
-               if ((null == value) || ((String.valueOf(value)).isEmpty())) {
+               if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
                } else if (!(value instanceof User)) {
                        // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement User.", value)); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement User.", value.getClass().getSimpleName())); //NOI18N
                }
 
-               // Return category id
+               // Return id number
                return String.valueOf(((User) value).getUserId());
        }
 }

diff --git a/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java b/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
index 1fbfe2b17cc314f75d0ff334188bc229ce6086dc..3b5ff90b524d50944c6d16604fae0df7a76aed5e 100644 (file)
--- a/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
+++ b/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
@@ -49,7 +49,7 @@ public class FinancialsUserIdValidator extends BaseLongValidator implements Vali
        private static final long serialVersionUID = 12_869_569_314_764_690L;
 
        /**
-        * Initialization of this converter
+        * Default constructor
         */
        public FinancialsUserIdValidator () {
        }