Merge pull request #5 from Cameron-C-Chapman/develop

develop:1.3.0-SNAPSHOT --> master:1.2.0

Author: Cameron-C-Chapman

build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'jacoco'
 
 jar {
 baseName = 'simpleSpringRestService'
-version = '1.2.0'
+version = '1.3.0'
 }
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

src/main/java/org/cameronchapman/github/webservice/data/CustomerDao.java

@@ -11,7 +11,6 @@
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -45,8 +44,7 @@ public Customer getById(Long id) {
  return namedParameterJdbcTemplate.queryForObject(getCustomerById, param, customerRowMapper);
  }
 
- public Number insert(Customer customer) {
- KeyHolder keyHolder = new GeneratedKeyHolder();
+ public Number insert(Customer customer, GeneratedKeyHolder keyHolder) {
  MapSqlParameterSource params = new MapSqlParameterSource();
  params.addValue("name", customer.getName());
  params.addValue("address1", customer.getAddress1());

src/main/java/org/cameronchapman/github/webservice/manager/CustomerManager.java

@@ -10,6 +10,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,7 +44,7 @@ public Customer getCustomerById(Long id) {
 
  @Transactional(readOnly = false)
  public Number insertCustomer(Customer customer) throws Exception {
- Number newId = customerDao.insert(customer);
+ Number newId = customerDao.insert(customer, new GeneratedKeyHolder());
  // if no new id was generated from the insert attempt throw an exception
  if (null == newId) {
  throw new NoNewCustomerIdReturnedException("No new customer id returned.");

src/test/java/org/cameronchapman/github/webservice/data/CustomerDaoTest.java

@@ -0,0 +1,76 @@
+package org.cameronchapman.github.webservice.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.cameronchapman.github.webservice.model.Customer;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Matchers;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CustomerDaoTest {
+
+@Mock
+ JdbcTemplate jdbcTemplate;
+
+ @Mock
+ NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
+ @Mock
+ CustomerRowMapper customerRowMapper;
+ 
+ @InjectMocks
+ CustomerDao customerDao;
+ 
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ }
+ 
+ @Test
+ public void getAllTest() throws Exception {
+ List<Customer> customers = new ArrayList<Customer>();
+ customers.add(new Customer());
+ Mockito.when(jdbcTemplate.query(any(String.class), any(CustomerRowMapper.class))).thenReturn(customers);
+ List<Customer> customersReturned = customerDao.getAll();
+ assertEquals(customers, customersReturned);
+ }
+ 
+ @Test
+ public void getByIdTest() throws Exception {
+ Long customerId = new Long(1);
+ Customer customer = new Customer();
+ customer.setId(customerId);
+ customer.setName("Customer Name");
+ Mockito.when(namedParameterJdbcTemplate.queryForObject(any(String.class), Matchers.<Map<String, Object>>any(), any(CustomerRowMapper.class))).thenReturn(customer);
+ Customer customerReturned = customerDao.getById(customerId);
+ assertEquals(customer, customerReturned);
+ }
+ 
+ @Test
+ public void insertTest() throws Exception {
+ GeneratedKeyHolder keyHolder = Mockito.mock(GeneratedKeyHolder.class);
+ Customer customer = new Customer();
+ Mockito.when(namedParameterJdbcTemplate.update(any(String.class), any(MapSqlParameterSource.class), any(KeyHolder.class))).thenReturn(99);
+ Mockito.when(keyHolder.getKey()).thenReturn(99);
+ Number insertedId = customerDao.insert(customer, keyHolder);
+ assertEquals(insertedId, 99);
+ }
+ 
+}

src/test/java/org/cameronchapman/github/webservice/data/CustomerRowMapperTest.java

@@ -14,17 +14,17 @@
 public class CustomerRowMapperTest {
 
 @Test
-public void mapRowTest() throws Exception {
+public void customerRowMapperTest() throws Exception {
 CustomerRowMapper customerRowMapper = new CustomerRowMapper();
-ResultSet rs = Mockito.mock(ResultSet.class);
 Long id = new Long(1);
+ResultSet rs = Mockito.mock(ResultSet.class);
 Mockito.when(rs.getLong("id")).thenReturn(id);
 Mockito.when(rs.getString("name")).thenReturn("Customer Name");
 Mockito.when(rs.getString("address1")).thenReturn("Address 1");
 Mockito.when(rs.getString("address2")).thenReturn("Address 2");
 Mockito.when(rs.getString("city")).thenReturn("City");
 Mockito.when(rs.getString("state")).thenReturn("State");
-Mockito.when(rs.getString("zip")).thenReturn("Zip");
+Mockito.when(rs.getString("zip")).thenReturn("Zip");
 Customer customer = customerRowMapper.mapRow(rs, 1);
 assertEquals(customer.getId(), id);
 assertEquals(customer.getName(), "Customer Name");
@@ -34,4 +34,5 @@ public void mapRowTest() throws Exception {
 assertEquals(customer.getState(), "State");
 assertEquals(customer.getZip(), "Zip");
 }
-}
+
+}

src/test/java/org/cameronchapman/github/webservice/manager/CustomerManagerTest.java

@@ -19,6 +19,7 @@
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
 
 @RunWith(MockitoJUnitRunner.class)
 public class CustomerManagerTest {
@@ -66,14 +67,14 @@ public void getCustomerByIdNullResultIsValidTest() throws Exception {
 
  @Test
  public void insertCustomerTest() throws Exception {
- Mockito.when(mockCustomerDao.insert(any(Customer.class))).thenReturn(99);
+ Mockito.when(mockCustomerDao.insert(any(Customer.class), any(GeneratedKeyHolder.class))).thenReturn(99);
  Number newId = customerManger.insertCustomer(new Customer());
  assertEquals(newId, 99);
  }
 
  @Test(expected = NoNewCustomerIdReturnedException.class)
  public void insertCustomerNullCustomerThrowsCorrectExceptionTest() throws Exception {
- Mockito.when(mockCustomerDao.insert(any(Customer.class))).thenReturn(null);
+ Mockito.when(mockCustomerDao.insert(any(Customer.class), any(GeneratedKeyHolder.class))).thenReturn(null);
  customerManger.insertCustomer(new Customer());
  }