diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/config/TestDataServiceImpl.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/config/TestDataServiceImpl.java
index 0c3af6cfa..26f8bbcd1 100644
--- a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/config/TestDataServiceImpl.java
+++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/config/TestDataServiceImpl.java
@@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 
 @Transactional
-public class TestDataServiceImpl implements TestDataService{
+public class TestDataServiceImpl implements TestDataService {
 
     @Resource CustomerDao customerDao;
     @Resource OrderDao orderDao;
@@ -36,15 +36,15 @@ public class TestDataServiceImpl implements TestDataService{
         product.setPrice(12.0);
         product.setSupplier(supplier);
 
-        ProductL10n l10n_en = new ProductL10n();
-        l10n_en.setLang("en");
-        l10n_en.setName("Screwdriver");
+        ProductL10n l10nEn = new ProductL10n();
+        l10nEn.setLang("en");
+        l10nEn.setName("Screwdriver");
 
-        ProductL10n l10n_de = new ProductL10n();
-        l10n_de.setLang("de");
-        l10n_de.setName("Schraubenzieher");
+        ProductL10n l10nDe = new ProductL10n();
+        l10nDe.setLang("de");
+        l10nDe.setName("Schraubenzieher");
 
-        product.setLocalizations(ImmutableSet.of(l10n_en, l10n_de));
+        product.setLocalizations(ImmutableSet.of(l10nEn, l10nDe));
         productDao.save(product);
 
         Product product2 = new Product();
@@ -52,11 +52,11 @@ public class TestDataServiceImpl implements TestDataService{
         product2.setPrice(5.0);
         product2.setSupplier(supplier2);
 
-        l10n_en = new ProductL10n();
-        l10n_en.setLang("en");
-        l10n_en.setName("Hammer");
+        l10nEn = new ProductL10n();
+        l10nEn.setLang("en");
+        l10nEn.setName("Hammer");
 
-        product2.setLocalizations(ImmutableSet.of(l10n_en));
+        product2.setLocalizations(ImmutableSet.of(l10nEn));
         productDao.save(product2);
 
         // persons
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java
index 842d3c9f0..56f25892c 100644
--- a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java
+++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java
@@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes={TestConfiguration.class})
+@ContextConfiguration(classes = {TestConfiguration.class})
 @TransactionConfiguration(defaultRollback = true)
 @Transactional
 public abstract class AbstractDaoTest {
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/OrderDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/OrderDaoTest.java
index b115fc763..81b5b849a 100644
--- a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/OrderDaoTest.java
+++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/OrderDaoTest.java
@@ -35,7 +35,7 @@ public class OrderDaoTest extends AbstractDaoTest {
     @Test
     public void Delete() {
         OrderProduct orderProduct = new OrderProduct();
-        orderProduct.setProductId(1l);
+        orderProduct.setProductId(1L);
         orderProduct.setQuantity(1);
 
         // FIXME