From 76e4cac57ae0737336e58e6087f17e50db33e88e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 9 Aug 2016 11:20:12 +0200
Subject: [PATCH] Moved to proper EJB: (please cherry-pick) - these methods are
 not administrative, they are general and should be used there
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../phone/JobsAdminPhoneSessionBean.java      | 66 -------------------
 .../phone/JobsPhoneSessionBean.java           | 62 +++++++++++++++++
 2 files changed, 62 insertions(+), 66 deletions(-)

diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java
index d8ddfa0..187d1d4 100644
--- a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java
+++ b/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java
@@ -16,17 +16,8 @@
  */
 package org.mxchange.jphone.phonenumbers.phone;
 
-import java.text.MessageFormat;
-import java.util.List;
 import javax.ejb.Stateless;
-import javax.persistence.Query;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
-import org.mxchange.jphone.phonenumbers.cellphone.CellphoneNumber;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
-import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
-import org.mxchange.jphone.phonenumbers.fax.FaxNumber;
-import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
-import org.mxchange.jphone.phonenumbers.landline.LandLineNumber;
 
 /**
  * An EJB for administrative phone purposes
@@ -41,61 +32,4 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A
 	 */
 	private static final long serialVersionUID = 18_597_165_817_401_853L;
 
-	@SuppressWarnings ("unchecked")
-	@Override
-	public List<DialableCellphoneNumber> allCellphoneNumbers () {
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allCellphoneNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
-
-		// Get query
-		Query query = this.getEntityManager().createNamedQuery("AllCellphoneNumbers", CellphoneNumber.class); //NOI18N
-
-		// Get list from it
-		List<DialableCellphoneNumber> list = query.getResultList();
-
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allCellphoneNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
-
-		// Return it
-		return list;
-	}
-
-	@SuppressWarnings ("unchecked")
-	@Override
-	public List<DialableFaxNumber> allFaxNumbers () {
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allFaxNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
-
-		// Get query
-		Query query = this.getEntityManager().createNamedQuery("AllFaxNumbers", FaxNumber.class); //NOI18N
-
-		// Get list from it
-		List<DialableFaxNumber> list = query.getResultList();
-
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allFaxNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
-
-		// Return it
-		return list;
-	}
-
-	@SuppressWarnings ("unchecked")
-	@Override
-	public List<DialableLandLineNumber> allLandLineNumbers () {
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allLandLineNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
-
-		// Get query
-		Query query = this.getEntityManager().createNamedQuery("AllLandLineNumbers", LandLineNumber.class); //NOI18N
-
-		// Get list from it
-		List<DialableLandLineNumber> list = query.getResultList();
-
-		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allLandLineNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
-
-		// Return it
-		return list;
-	}
-
 }
diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/JobsPhoneSessionBean.java
index 4249eed..ea86c99 100644
--- a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsPhoneSessionBean.java
+++ b/src/java/org/mxchange/jphone/phonenumbers/phone/JobsPhoneSessionBean.java
@@ -17,6 +17,7 @@
 package org.mxchange.jphone.phonenumbers.phone;
 
 import java.text.MessageFormat;
+import java.util.List;
 import javax.ejb.Stateless;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
@@ -24,6 +25,10 @@ import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
 import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;
 import org.mxchange.jphone.phonenumbers.cellphone.CellphoneNumber;
 import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.phonenumbers.fax.FaxNumber;
+import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
+import org.mxchange.jphone.phonenumbers.landline.LandLineNumber;
 
 /**
  * A general phone EJB
@@ -83,4 +88,61 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS
 		return cellphone;
 	}
 
+	@SuppressWarnings ("unchecked")
+	@Override
+	public List<DialableCellphoneNumber> allCellphoneNumbers () {
+		// Trace message
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allCellphoneNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
+
+		// Get query
+		Query query = this.getEntityManager().createNamedQuery("AllCellphoneNumbers", CellphoneNumber.class); //NOI18N
+
+		// Get list from it
+		List<DialableCellphoneNumber> list = query.getResultList();
+
+		// Trace message
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allCellphoneNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
+
+		// Return it
+		return list;
+	}
+
+	@SuppressWarnings ("unchecked")
+	@Override
+	public List<DialableFaxNumber> allFaxNumbers () {
+		// Trace message
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allFaxNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
+
+		// Get query
+		Query query = this.getEntityManager().createNamedQuery("AllFaxNumbers", FaxNumber.class); //NOI18N
+
+		// Get list from it
+		List<DialableFaxNumber> list = query.getResultList();
+
+		// Trace message
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allFaxNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
+
+		// Return it
+		return list;
+	}
+
+	@SuppressWarnings ("unchecked")
+	@Override
+	public List<DialableLandLineNumber> allLandLineNumbers () {
+		// Trace message
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allLandLineNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
+
+		// Get query
+		Query query = this.getEntityManager().createNamedQuery("AllLandLineNumbers", LandLineNumber.class); //NOI18N
+
+		// Get list from it
+		List<DialableLandLineNumber> list = query.getResultList();
+
+		// Trace message
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allLandLineNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
+
+		// Return it
+		return list;
+	}
+
 }
-- 
2.39.5