From 3d3828933c03b26934225aafa1daaec80d1e3e71 Mon Sep 17 00:00:00 2001
From: Ilkka Seppala <iluwatar@gmail.com>
Date: Wed, 15 Apr 2015 21:39:31 +0300
Subject: [PATCH] Added findAll methods to service level.

---
 .../src/main/java/com/iluwatar/App.java       | 13 +++++++++
 .../main/java/com/iluwatar/MagicService.java  |  8 ++++++
 .../java/com/iluwatar/MagicServiceImpl.java   | 28 ++++++++++++++++++-
 .../src/main/java/com/iluwatar/Wizard.java    |  6 ++--
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/service-layer/src/main/java/com/iluwatar/App.java b/service-layer/src/main/java/com/iluwatar/App.java
index 050c370c4..2500a98fc 100644
--- a/service-layer/src/main/java/com/iluwatar/App.java
+++ b/service-layer/src/main/java/com/iluwatar/App.java
@@ -113,5 +113,18 @@ public class App {
     }
     
     public static void queryData() {
+    	MagicService service = new MagicServiceImpl(new WizardDaoImpl(), new SpellbookDaoImpl(), new SpellDaoImpl());
+    	System.out.println("Enumerating all wizards");
+    	for (Wizard w: service.findAllWizards()) {
+    		System.out.println(w.getName());
+    	}
+    	System.out.println("Enumerating all spellbooks");
+    	for (Spellbook s: service.findAllSpellbooks()) {
+    		System.out.println(s.getName());
+    	}
+    	System.out.println("Enumerating all spells");
+    	for (Spell s: service.findAllSpells()) {
+    		System.out.println(s.getName());
+    	}
     }
 }
diff --git a/service-layer/src/main/java/com/iluwatar/MagicService.java b/service-layer/src/main/java/com/iluwatar/MagicService.java
index 296ace83c..a93af08c9 100644
--- a/service-layer/src/main/java/com/iluwatar/MagicService.java
+++ b/service-layer/src/main/java/com/iluwatar/MagicService.java
@@ -1,6 +1,14 @@
 package com.iluwatar;
 
+import java.util.List;
+
 
 public interface MagicService {
+
+	List<Wizard> findAllWizards();
+
+	List<Spellbook> findAllSpellbooks();
+	
+	List<Spell> findAllSpells();
 	
 }
diff --git a/service-layer/src/main/java/com/iluwatar/MagicServiceImpl.java b/service-layer/src/main/java/com/iluwatar/MagicServiceImpl.java
index f7fce36ba..ff2434491 100644
--- a/service-layer/src/main/java/com/iluwatar/MagicServiceImpl.java
+++ b/service-layer/src/main/java/com/iluwatar/MagicServiceImpl.java
@@ -1,5 +1,31 @@
 package com.iluwatar;
 
-public class MagicServiceImpl implements MagicService {
+import java.util.List;
 
+public class MagicServiceImpl implements MagicService {
+	
+	private WizardDao wizardDao;
+	private SpellbookDao spellbookDao;
+	private SpellDao spellDao;
+
+	public MagicServiceImpl(WizardDao wizardDao, SpellbookDao spellbookDao, SpellDao spellDao) {
+		this.wizardDao = wizardDao;
+		this.spellbookDao = spellbookDao;
+		this.spellDao = spellDao;
+	}
+
+	@Override
+	public List<Wizard> findAllWizards() {
+		return wizardDao.findAll();
+	}
+
+	@Override
+	public List<Spellbook> findAllSpellbooks() {
+		return spellbookDao.findAll();
+	}
+
+	@Override
+	public List<Spell> findAllSpells() {
+		return spellDao.findAll();
+	}
 }
diff --git a/service-layer/src/main/java/com/iluwatar/Wizard.java b/service-layer/src/main/java/com/iluwatar/Wizard.java
index d7d91f4fc..c7854c60e 100644
--- a/service-layer/src/main/java/com/iluwatar/Wizard.java
+++ b/service-layer/src/main/java/com/iluwatar/Wizard.java
@@ -42,12 +42,12 @@ public class Wizard extends BaseEntity {
 	@ManyToMany(cascade = CascadeType.ALL)
 	private Set<Spellbook> spellbooks;
 	
-	public String getFirstName() {
+	public String getName() {
 		return name;
 	}
 
-	public void setFirstName(String firstName) {
-		this.name = firstName;
+	public void setName(String name) {
+		this.name = name;
 	}
 
 	public Set<Spellbook> getSpellbooks() {