From 3301270dace7024b6e596193c8849455f3337913 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 10 Oct 2015 22:28:19 +0200
Subject: [PATCH] The country code is now handled by jcountry-core

---
 .../branch/BranchOffice.java                  |  5 ++--
 .../branch/CompanyBranchOffice.java           | 19 ++++++++------
 .../headquarters/CompanyHeadQuartersData.java | 25 +++++++++++--------
 .../headquarters/HeadQuartersData.java        |  5 ++--
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/org/mxchange/jcontactsbusiness/branch/BranchOffice.java b/src/org/mxchange/jcontactsbusiness/branch/BranchOffice.java
index d531669..b7cde6e 100644
--- a/src/org/mxchange/jcontactsbusiness/branch/BranchOffice.java
+++ b/src/org/mxchange/jcontactsbusiness/branch/BranchOffice.java
@@ -17,6 +17,7 @@
 package org.mxchange.jcontactsbusiness.branch;
 
 import java.io.Serializable;
+import org.mxchange.jcountry.data.Country;
 
 /**
  * A POJI for branch offices
@@ -170,12 +171,12 @@ public interface BranchOffice extends Serializable {
 	 * <p>
 	 * @return Branch office's country code
 	 */
-	public String getBranchCountryCode ();
+	public Country getBranchCountry ();
 
 	/**
 	 * Setter for branch office's country code
 	 * <p>
 	 * @param branchCountryCode Branch office's country code
 	 */
-	public void setBranchCountryCode (final String branchCountryCode);
+	public void setBranchCountry (final Country branchCountryCode);
 }
diff --git a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java
index 09628bd..3dc4584 100644
--- a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java
+++ b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java
@@ -17,12 +17,17 @@
 package org.mxchange.jcontactsbusiness.branch;
 
 import javax.persistence.Basic;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
+import org.mxchange.jcountry.data.Country;
+import org.mxchange.jcountry.data.CountryData;
 
 /**
  * A POJO for company branch offices
@@ -89,9 +94,9 @@ public class CompanyBranchOffice implements BranchOffice, Comparable<BranchOffic
 	/**
 	 * Branch office's country code
 	 */
-	@Basic (optional = false)
-	@Column (name = "branch_country_code", length = 100, nullable = false)
-	private String branchCountryCode;
+	@JoinColumn (name = "branch_country_code", nullable = false)
+	@OneToOne(targetEntity = CountryData.class, cascade = CascadeType.ALL, optional = false)
+	private Country branchCountry;
 
 	/**
 	 * Branch office's main phone number: +ccxxxxxxxxxx
@@ -127,13 +132,13 @@ public class CompanyBranchOffice implements BranchOffice, Comparable<BranchOffic
 	}
 
 	@Override
-	public String getBranchCountryCode () {
-		return this.branchCountryCode;
+	public Country getBranchCountry () {
+		return this.branchCountry;
 	}
 
 	@Override
-	public void setBranchCountryCode (final String branchCountryCode) {
-		this.branchCountryCode = branchCountryCode;
+	public void setBranchCountry (final Country branchCountry) {
+		this.branchCountry = branchCountry;
 	}
 
 	@Override
diff --git a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java b/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java
index 46ca20e..4962511 100644
--- a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java
+++ b/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java
@@ -17,20 +17,25 @@
 package org.mxchange.jcontactsbusiness.headquarters;
 
 import javax.persistence.Basic;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
+import org.mxchange.jcountry.data.Country;
+import org.mxchange.jcountry.data.CountryData;
 
 /**
  * A POJO for company headquarts data
  * <p>
  * @author Roland Haeder
  */
-@Entity (name = "headquarters")
-@Table (name = "headquarters")
+@Entity (name = "company_headquarters")
+@Table (name = "company_headquarters")
 public class CompanyHeadQuartersData implements HeadQuartersData, Comparable<HeadQuartersData> {
 
 	/**
@@ -48,9 +53,9 @@ public class CompanyHeadQuartersData implements HeadQuartersData, Comparable<Hea
 	/**
 	 * Headquarter's country code
 	 */
-	@Basic (optional = false)
-	@Column (name = "headquarters_country_code", length = 2, nullable = false)
-	private String headquartersCountryCode;
+	@JoinColumn (name = "headquarters_country_code", nullable = false)
+	@OneToOne(targetEntity = CountryData.class, cascade = CascadeType.ALL, optional = false)
+	private Country headquartersCountry;
 
 	/**
 	 * Headquarters' house number
@@ -63,8 +68,8 @@ public class CompanyHeadQuartersData implements HeadQuartersData, Comparable<Hea
 	 * Id number
 	 */
 	@Id
-	@Column (name = "headquarters_id", length = 20, nullable = false, updatable = false)
 	@GeneratedValue (strategy = GenerationType.IDENTITY)
+	@Column (name = "headquarters_id", length = 20, nullable = false, updatable = false)
 	private Long headquartersId;
 
 	/**
@@ -109,13 +114,13 @@ public class CompanyHeadQuartersData implements HeadQuartersData, Comparable<Hea
 	}
 
 	@Override
-	public String getHeadquartersCountryCode () {
-		return this.headquartersCountryCode;
+	public Country getHeadquartersCountry () {
+		return this.headquartersCountry;
 	}
 
 	@Override
-	public void setHeadquartersCountryCode (final String headquartersCountryCode) {
-		this.headquartersCountryCode = headquartersCountryCode;
+	public void setHeadquartersCountry (final Country headquartersCountry) {
+		this.headquartersCountry = headquartersCountry;
 	}
 
 	@Override
diff --git a/src/org/mxchange/jcontactsbusiness/headquarters/HeadQuartersData.java b/src/org/mxchange/jcontactsbusiness/headquarters/HeadQuartersData.java
index ae6690f..0073062 100644
--- a/src/org/mxchange/jcontactsbusiness/headquarters/HeadQuartersData.java
+++ b/src/org/mxchange/jcontactsbusiness/headquarters/HeadQuartersData.java
@@ -17,6 +17,7 @@
 package org.mxchange.jcontactsbusiness.headquarters;
 
 import java.io.Serializable;
+import org.mxchange.jcountry.data.Country;
 
 /**
  * A POJI for headquarters data
@@ -44,14 +45,14 @@ public interface HeadQuartersData extends Serializable {
 	 * <p>
 	 * @return Headquarters' country code
 	 */
-	public String getHeadquartersCountryCode ();
+	public Country getHeadquartersCountry ();
 
 	/**
 	 * Setter for headquarters' country code
 	 * <p>
 	 * @param headquartersCountryCode Headquarters' country code
 	 */
-	public void setHeadquartersCountryCode (final String headquartersCountryCode);
+	public void setHeadquartersCountry (final Country headquartersCountryCode);
 
 	/**
 	 * Getter for headquarters' house number
-- 
2.39.5