mappers

src/main/java/io/zipcoder/persistenceapp/controller/mappers/HomeRowMapper.java

@@ -0,0 +1,18 @@
+package io.zipcoder.persistenceapp.controller.mappers;
+
+import io.zipcoder.persistenceapp.model.Home;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class HomeRowMapper implements RowMapper<Home> {
+    @Override
+    public Home mapRow(ResultSet rs, int rowNum) throws SQLException {
+        Home home = new Home();
+        home.setAddress(rs.getString("ADDRESS"));
+        home.setHomeNumber(rs.getString("HOMENUMBER"));
+        home.setId(rs.getInt("id"));
+        return home;
+    }
+}

src/main/java/io/zipcoder/persistenceapp/controller/PersonRowMapper.java → src/main/java/io/zipcoder/persistenceapp/controller/mappers/PersonRowMapper.java

@@ -1,4 +1,4 @@
-package io.zipcoder.persistenceapp.controller;
+package io.zipcoder.persistenceapp.controller.mappers;
 
 import io.zipcoder.persistenceapp.model.Person;
 import org.springframework.jdbc.core.RowMapper;
@@ -6,7 +6,7 @@ import org.springframework.jdbc.core.RowMapper;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-class PersonRowMapper implements RowMapper<Person> {
+public class PersonRowMapper implements RowMapper<Person> {
     @Override
     public Person mapRow(ResultSet rs, int rowNum) throws SQLException {
         Person person = new Person();

src/main/java/io/zipcoder/persistenceapp/service/HomeService.java

@@ -1,15 +1,12 @@
 package io.zipcoder.persistenceapp.service;
 
+import io.zipcoder.persistenceapp.controller.mappers.HomeRowMapper;
+import io.zipcoder.persistenceapp.controller.mappers.PersonRowMapper;
 import io.zipcoder.persistenceapp.model.Home;
 import io.zipcoder.persistenceapp.model.Person;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.List;
 
 public class HomeService {
@@ -23,17 +20,6 @@ public class HomeService {
     public HomeService() {
     }
 
-    class HomeRowMapper implements RowMapper<Home> {
-        @Override
-        public Home mapRow(ResultSet rs, int rowNum) throws SQLException {
-            Home home = new Home();
-            home.setAddress(rs.getString("ADDRESS"));
-            home.setHomeNumber(rs.getString("HOMENUMBER"));
-            home.setId(rs.getInt("id"));
-            return home;
-        }
-    }
-
     public void addHome(Home home) {
         jdbcTemplate.update(
                 "INSERT INTO home(address, homenumber)" +
@@ -70,7 +56,7 @@ public class HomeService {
     public Home findHomeById(Integer id) {
         return jdbcTemplate.queryForObject(
                 "SELECT * FROM home WHERE ID = ?",
-                new Object[] {id}, new BeanPropertyRowMapper<>(Home.class));
+                new Object[]{id}, new BeanPropertyRowMapper<>(Home.class));
     }
 
     public Home findHomeByHomeNumber(String homeNumber) {
@@ -94,5 +80,6 @@ public class HomeService {
     public List<Person> generatePeopleInHome(Integer id) {
         return jdbcTemplate.query(
                 "SELECT * FROM person INNER JOIN home on person.home_id = home.id WHERE home.id = ?",
-                new Object[]{id}, new PersonService.PersonRowMapper());
+                new Object[]{id}, new PersonRowMapper());
+    }
 }

src/main/java/io/zipcoder/persistenceapp/service/PersonService.java

@@ -1,6 +1,6 @@
 package io.zipcoder.persistenceapp.service;
 
-import io.zipcoder.persistenceapp.controller.PersonRowMapper;
+import io.zipcoder.persistenceapp.controller.mappers.PersonRowMapper;
 import io.zipcoder.persistenceapp.model.Person;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;