From e91140e69c19ae7af44f9392720123bec4233d75 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Mon, 11 Apr 2016 16:59:17 +0200
Subject: [PATCH] Continued a bit: - implemented business method addCountry() -
 updated jar(s)

---
 lib/jcountry-core.jar                         | Bin 7870 -> 9970 bytes
 lib/jcountry-lib.jar                          | Bin 1446 -> 1542 bytes
 .../data/AddressbookCountrySingletonBean.java |  82 ++++++++++++++++++
 3 files changed, 82 insertions(+)

diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar
index 38df2036331e7e4b7a90686ddb8d425f98de1623..3b26377fa896aaca3df2df69ef7b74c4533e677a 100644
GIT binary patch
delta 1727
zcma)6U2GIp6#nkaZfAEo+n+7$58Z9IMVH-e*)1)!_GhIFX#`tJlOjodfJ}EM%fhfr
z+HIpTT21tcm`KLQeK64w9|e?(#5N%zCL{#oi!sp<pA8UvFfm5p+?mCl-B#mF?mg$;
z`ObIGIdksWNdJCJnVS|JGT;Kzl}k!on5bMD`Gn6uMfm&|-!Y<Wkc-#ZNc%+P;t|-M
zu<<Jkc4(_wvAmqBkrCQpX)?O@19Lk_e)@~kYZ|vE-hcN`BH&|`8_!maGr9AHVkVc<
za)(PR#q!ddQ=BxJ)z#(YJ5RpZAp8)TCAcKGCCCh|d97^6Gel$Y8RN0vXWW%rjdMXy
zcjv#5o>f;>h9ScGLze5?1C6JSktB04IN+r78JcJoAlU=Gc%<utN9rhjHwO>tj6EbX
zjA}@xyA2^_WXO0?LezylGLgrc5l6y>J{kSkD<SDZO2UAQeHfJKN5$M|!H|Ug5)K%r
z0`azeW8Ys*O$Heh)y$qT5lk5$1<nWucryIcwg9*IGS1+cFRR&e$J7fa)J0u0d58Z`
za@VZnZlO%_<SOuEgrSS;DP1k*Q?o0&K36If%i7Y^8(Hl_xlk%H?66$6et4v?94Qiv
z8^0uBSiva9h{TRbW-aW|+}d-vgmDEENHg@-jytOBT3*#NOZk=aR7SQVW82fE-x_$^
zWGs~<tEyheB^lake8(5hYT2@cmlYhuq=KDr_^K7u{a*>*29s&5adNy`wMr9%7>l1Y
z!kq!*v=Z%Usd+F{D&`s7I*F62zM`4PSB;Hbr`OO!B_UIJwo?7<LL1si_nM{JL2@U2
zrp_p@0s0c8)g~mu0w)sdV65*lJU1aMc*S)%Hv4YC$?#outEski9g_TU1>u`;EqL9I
zZy_&;1YRTb{MTq+hq9UI`wE^bL@bgcKooA8`|189NgF^1RdI;!aTNRM9mXuiFpqI`
z63S;eMBl@-BG*jE>Hm}74)G}&3lh2|L;&v|ilYa;W;E20Qlv1#ITK&P^93n951{MH
zHxHWhiUp|BGwe1|FW9g0wfp{uqL8i__c}*;!;?dkT+D<9xOgXIZr%tT;;X+yuWZu{
zUkk?ut#X)~X2K59YORe;vxknho;Ezl++xNf|L*=qgU|oC=e{ihe8isPNq+Vo6UZPy
zO-?a>412jVzlB4B()7>n-Y#E+pIO&y>nK_R1P;#HDtAj&T5YP)tGZrSM|mpPNV&B&
on9aPAa(!`1`H+I-<8U42!!Dwn^36><dEbSHUaBPg+{;(b02VW(U;qFB

delta 219
zcmez5yU&&<z?+$ci-CcIfkCouB9A7MMB7C31x$Qx6K^Vj$lsbka<Uqu5r~RnGzU@V
z7;S;nW?m*v79hP?f=vj-{U!H~nMty3@+&1vpdpi0l^sB8)0GWC)J$bd5Oqb_2}DV#
zxPz!QDl(I6Rir0xP~)2XR)q&7^jk%S@z~^#%94{E*mx$}s)9_O9H=V8bdhzkftmzR
lRBZBGRj|@ZH5sPM;y_VJpaCX)Tnt<c&zTq)4oWis0RXL@JwN~e

diff --git a/lib/jcountry-lib.jar b/lib/jcountry-lib.jar
index a6ce084a8bc9febc8e0a4d5a09f42b7d5302b73e..6db466e10ab2585c09d819ebe2e10bcbc7039f99 100644
GIT binary patch
delta 290
zcmZ3+-NwTc;LXg!#lXP9z~DP?B9A7M&%BA|3z$;oPQ0lAB7bWF$;oPrMnH+lQH<t%
zKJ&UgSpP>aFkoU}FkqTIpV3QNgq=Zvok5VDL5PuoD={U-IlnZoq^OdS!AoOuJ(CKf
zCWsUO%DGk~rxuiC=I0f&GYC(%Vwz(l83a_CnVTAxS)7@alj@k4mtT?yR>8<1<dc<H
zmRO;mnw6v<l$x7gl4{M!U^=;hNon#=rgh3p3_J`B3``8X417SEje(JYpMfF3n~_O`
w8RnnK`<N|3?*7T_0P=-3ivftrWw8WND_ERBa&K7N(f#De8qX%c0yLBX0HUT$rvLx|

delta 233
zcmZqUS;oy1;LXg!#lXP9!0@nTB9A81gO-Wr3z%-UOuVT8B7bWF$;oPrMj$GR(VXvQ
zOSi}OYa6vLFfuS)V4OUk(Mv{%oq>;?fuEg0fRTYKF(t)0zcjC;sFIOEUBhQ`4x{vB
z1tw0xFrb`kMRICENoIatF*}3c<XEOTjHY1u1B_CW6PRa<GcxcnFfcGN@CJA@GKnz5
voHbdF#S-YQ$&oA$AXm(0F#u6#fr3DagVhN{`LMd9J8dCrJlh6lpn(hks6a%i

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;
+	}
+
 }
-- 
2.39.5