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

Develop:1.2.0-SNAPSHOT --> Master:1.1.0

Author: Cameron-C-Chapman

build.gradle

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

src/main/java/org/cameronchapman/github/webservice/config/SimpleSpringRestServiceAppConfig.java

@@ -1,15 +1,17 @@
 package org.cameronchapman.github.webservice.config;
 
+import javax.sql.DataSource;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-
-import javax.sql.DataSource;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 
 @Configuration
+@EnableTransactionManagement
 public class SimpleSpringRestServiceAppConfig {
 
  @Autowired

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

@@ -1,5 +1,9 @@
 package org.cameronchapman.github.webservice.data;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.cameronchapman.github.webservice.model.Customer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -10,10 +14,6 @@
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 @Component
 public class CustomerDao {
 

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

@@ -1,5 +1,8 @@
 package org.cameronchapman.github.webservice.manager;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.cameronchapman.github.webservice.data.CustomerDao;
 import org.cameronchapman.github.webservice.exception.NoNewCustomerIdReturnedException;
 import org.cameronchapman.github.webservice.model.Customer;
@@ -10,19 +13,15 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Component
-@Transactional(timeout=5)
+@Transactional(timeout = 5, readOnly = true)
 public class CustomerManager {
 
  private static Logger LOGGER = LoggerFactory.getLogger(CustomerManager.class);
 
  @Autowired
  private CustomerDao customerDao;
 
- @Transactional(readOnly = true)
  public List<Customer> getAll() {
  List<Customer> customers = customerDao.getAll();
  if (null == customers) {
@@ -31,7 +30,6 @@ public List<Customer> getAll() {
  return customers;
  }
 
- @Transactional(readOnly = true)
  public Customer getCustomerById(Long id) {
  Customer customer = null;
  try {
@@ -43,6 +41,7 @@ public Customer getCustomerById(Long id) {
  return customer;
  }
 
+ @Transactional(readOnly = false)
  public Number insertCustomer(Customer customer) throws Exception {
  Number newId = customerDao.insert(customer);
  // if no new id was generated from the insert attempt throw an exception

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

@@ -1,8 +1,15 @@
 package org.cameronchapman.github.webservice.manager;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Matchers.any;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import org.cameronchapman.github.webservice.data.CustomerDao;
 import org.cameronchapman.github.webservice.exception.NoNewCustomerIdReturnedException;
-import org.cameronchapman.github.webservice.manager.CustomerManager;
 import org.cameronchapman.github.webservice.model.Customer;
 import org.junit.Before;
 import org.junit.Test;
@@ -13,12 +20,6 @@
 import org.mockito.MockitoAnnotations;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-
 @RunWith(MockitoJUnitRunner.class)
 public class CustomerManagerTest {
 
@@ -39,6 +40,8 @@ public void getAllTest() throws Exception {
  List<Customer> customers = customerManger.getAll();
  assertNotNull(customers);
  }
+ 
+ // @TODO add timeout test
 
  @Test
  public void getAllReturnsNullConvertsToEmptyListTest() throws Exception {