Added findAll methods to service level.

iluwatar · iluwatar · commit 3d3828933c03 · 2015-04-15T21:39:31.000+03:00
diff --git 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 static void initData() {
     }
     
     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
@@ -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
@@ -1,5 +1,31 @@
 package com.iluwatar;
 
+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
@@ -42,12 +42,12 @@ public void setId(Long id) {
 	@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() {

Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,18 @@ public static void initData() {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`public static void queryData() {`
	`116`	`+ MagicService service = new MagicServiceImpl(new WizardDaoImpl(), new SpellbookDaoImpl(), new SpellDaoImpl());`
	`117`	`+ System.out.println("Enumerating all wizards");`
	`118`	`+ for (Wizard w: service.findAllWizards()) {`
	`119`	`+ System.out.println(w.getName());`
	`120`	`+ }`
	`121`	`+ System.out.println("Enumerating all spellbooks");`
	`122`	`+ for (Spellbook s: service.findAllSpellbooks()) {`
	`123`	`+ System.out.println(s.getName());`
	`124`	`+ }`
	`125`	`+ System.out.println("Enumerating all spells");`
	`126`	`+ for (Spell s: service.findAllSpells()) {`
	`127`	`+ System.out.println(s.getName());`
	`128`	`+ }`
`116`	`129`	`}`
`117`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,12 @@ public void setId(Long id) {`
`42`	`42`	`@ManyToMany(cascade = CascadeType.ALL)`
`43`	`43`	`private Set<Spellbook> spellbooks;`
`44`	`44`
`45`		`- public String getFirstName() {`
	`45`	`+ public String getName() {`
`46`	`46`	`return name;`
`47`	`47`	`}`
`48`	`48`
`49`		`- public void setFirstName(String firstName) {`
`50`		`- this.name = firstName;`
	`49`	`+ public void setName(String name) {`
	`50`	`+ this.name = name;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public Set<Spellbook> getSpellbooks() {`