Please cherry-pick:

[addressbook-ejb.git] / src / java / org / mxchange / jcountry / data / AddressbookCountrySingletonBean.java

diff --git a/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java b/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java
index 9358bcf85555edf90920459f2478b0c24f32c599..05cde2dff437bbc8c0c702575209cc076c5fc757 100644 (file)
--- a/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java
+++ b/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java
@@ -42,6 +42,9 @@ public class AddressbookCountrySingletonBean extends BaseDatabaseBean implements
 
        @Override
        public Country addCountry (final Country country) throws CountryAlreadyAddedException {
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addCountry: country={1} - CALLED!", this.getClass().getSimpleName(), country)); //NOI18N
+
                // Is it already there?
                if (null == country) {
                        // Throw NPE
@@ -49,7 +52,7 @@ public class AddressbookCountrySingletonBean extends BaseDatabaseBean implements
                } else if (country.getCountryCode().isEmpty()) {
                        // Code is not set
                        throw new IllegalArgumentException("country.countryCode is empty"); //NOI18N
-               } else if (country.getCountryI18nkey().isEmpty()) {
+               } else if (country.getCountryI18nKey().isEmpty()) {
                        // I18n key is not set
                        throw new IllegalArgumentException("country.countryI18nKey is empty"); //NOI18N
                } else if (country.getCountryId() != null) {
@@ -69,6 +72,9 @@ public class AddressbookCountrySingletonBean extends BaseDatabaseBean implements
                // Flush it to get id number back, maybe it is directly needed?
                this.getEntityManager().flush();
 
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addCountry: country={1} - EXIT!", this.getClass().getSimpleName(), country)); //NOI18N
+
                // Return updated instance
                return country;
        }
@@ -76,11 +82,20 @@ public class AddressbookCountrySingletonBean extends BaseDatabaseBean implements
        @Override
        @SuppressWarnings ("unchecked")
        public List<Country> allCountries () {
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allCountries: CALLED!", this.getClass().getSimpleName())); //NOI18N
+
                // Init query
                Query query = this.getEntityManager().createNamedQuery("AllCountries", CountryData.class); //NOI18N
 
+               // Get list
+               List<Country> countries = query.getResultList();
+
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allCountries: countries.size()={1} - EXIT!", this.getClass().getSimpleName(), countries.size())); //NOI18N
+
                // Return it
-               return query.getResultList();
+               return countries;
        }
 
        /**
@@ -98,7 +113,7 @@ public class AddressbookCountrySingletonBean extends BaseDatabaseBean implements
                } else if (country.getCountryCode().isEmpty()) {
                        // Code is not set
                        throw new IllegalArgumentException("country.countryCode is empty"); //NOI18N
-               } else if (country.getCountryI18nkey().isEmpty()) {
+               } else if (country.getCountryI18nKey().isEmpty()) {
                        // I18n key is not set
                        throw new IllegalArgumentException("country.countryI18nKey is empty"); //NOI18N
                } else if (country.getCountryId() != null) {
@@ -114,7 +129,7 @@ public class AddressbookCountrySingletonBean extends BaseDatabaseBean implements
 
                // Assign all parameters
                query.setParameter("code", country.getCountryCode()); //NOI18N
-               query.setParameter("key", country.getCountryI18nkey()); //NOI18N
+               query.setParameter("key", country.getCountryI18nKey()); //NOI18N
 
                // Try to get a single result
                try {