From: Roland Haeder <roland@mxchange.org>
Date: Mon, 11 Apr 2016 14:59:17 +0000 (+0200)
Subject: Continued a bit:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e91140e69c19ae7af44f9392720123bec4233d75;p=pizzaservice-mailer-ejb.git

Continued a bit:
- implemented business method addCountry()
- updated jar(s)
---

diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar
index 38df203..3b26377 100644
Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ
diff --git a/lib/jcountry-lib.jar b/lib/jcountry-lib.jar
index a6ce084..6db466e 100644
Binary files a/lib/jcountry-lib.jar and b/lib/jcountry-lib.jar differ
diff --git a/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java b/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java
index 3646dce..fbcdb44 100644
--- a/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java
+++ b/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java
@@ -16,11 +16,15 @@
 */
 package org.mxchange.jcountry.data;
 
+import java.text.MessageFormat;
+import java.util.GregorianCalendar;
 import java.util.List;
 import javax.ejb.Singleton;
 import javax.ejb.Startup;
+import javax.persistence.NoResultException;
 import javax.persistence.Query;
 import org.mxchange.jcoreee.database.BaseDatabaseBean;
+import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException;
 
 /**
  * A singleton bean for country informations
@@ -36,6 +40,36 @@ public class AddressbookCountrySingletonBean extends BaseDatabaseBean implements
 	 */
 	private static final long serialVersionUID = 15_846_983_298_691_207L;
 
+	@Override
+	public void addCountry (final Country country) throws CountryAlreadyAddedException {
+		// Is it already there?
+		if (null == country) {
+			// Throw NPE
+			throw new NullPointerException("country is null"); //NOI18N
+		} else if (country.getCountryCode().isEmpty()) {
+			// Code is not set
+			throw new IllegalArgumentException("country.countryCode is empty"); //NOI18N
+		} else if (country.getCountryI18nkey().isEmpty()) {
+			// I18n key is not set
+			throw new IllegalArgumentException("country.countryI18nKey is empty"); //NOI18N
+		} else if (country.getCountryId() != null) {
+			// Should be null
+			throw new IllegalArgumentException(MessageFormat.format("country.countryId is not null ({0})", country.getCountryId())); //NOI18N
+		} else if (this.isCountryAdded(country)) {
+			// Yes, then abort here
+			throw new CountryAlreadyAddedException(country);
+		}
+
+		// Add timestamp
+		country.setCountryEntryCreated(new GregorianCalendar());
+
+		// It is not added, so persist it
+		this.getEntityManager().persist(country);
+
+		// Flush it to get id number back, maybe it is directly needed?
+		this.getEntityManager().flush();
+	}
+
 	@Override
 	@SuppressWarnings ("unchecked")
 	public List<Country> allCountries () {
@@ -46,4 +80,52 @@ public class AddressbookCountrySingletonBean extends BaseDatabaseBean implements
 		return query.getResultList();
 	}
 
+	/**
+	 * Checks whether given country is already added by i18n key or country
+	 * code, what comes first.
+	 * <p>
+	 * @param country Country instance to check
+	 * <p>
+	 * @return Whether the country was found
+	 */
+	private boolean isCountryAdded (final Country country) {
+		if (null == country) {
+			// Throw NPE
+			throw new NullPointerException("country is null"); //NOI18N
+		} else if (country.getCountryCode().isEmpty()) {
+			// Code is not set
+			throw new IllegalArgumentException("country.countryCode is empty"); //NOI18N
+		} else if (country.getCountryI18nkey().isEmpty()) {
+			// I18n key is not set
+			throw new IllegalArgumentException("country.countryI18nKey is empty"); //NOI18N
+		} else if (country.getCountryId() != null) {
+			// Should be null
+			throw new IllegalArgumentException(MessageFormat.format("country.countryId is not null ({0})", country.getCountryId())); //NOI18N
+		}
+
+		// Default is not found
+		boolean isAdded = false;
+
+		// Get query instance
+		Query query = this.getEntityManager().createNamedQuery("SearchCountryByCodeI18nKey", CountryData.class); //NOI18N
+
+		// Assign all parameters
+		query.setParameter("code", country.getCountryCode()); //NOI18N
+		query.setParameter("key", country.getCountryI18nkey()); //NOI18N
+
+		// Try to get a single result
+		try {
+			// Get single result
+			Country foundCountry = (Country) query.getSingleResult();
+
+			// Found it?
+			isAdded = (foundCountry instanceof Country);
+		} catch (final NoResultException ex) {
+			// Not found, don't log this
+		}
+
+		// Return result
+		return isAdded;
+	}
+
 }