From 9d3c88f2835852f637ed04ff7a10d49aa480b89a Mon Sep 17 00:00:00 2001 From: rliesenfeld Date: Tue, 13 Feb 2018 13:02:02 -0200 Subject: [PATCH] Source code formatting changes in sample code. --- samples/java8testing/pom.xml | 6 ++--- .../src/java8testing/BusinessService.java | 6 ++--- .../test/java8testing/TestUtils.java | 1 - .../main/java/blog/blogEntry/BlogEntry.java | 3 +-- .../java/blog/blogEntry/BlogEntryDaoBean.java | 6 ++--- .../blog/blogEntry/BlogEntryListService.java | 7 +++-- .../java/blog/blogEntry/BlogEntryService.java | 21 +++++---------- .../blog/blogEntry/CommentListService.java | 3 +-- .../java/blog/blogEntry/CommentService.java | 6 ++--- .../src/main/java/blog/common/Database.java | 21 +++++---------- .../java/blog/security/Authenticator.java | 6 ++--- .../src/main/java/blog/user/User.java | 6 ++--- .../src/main/java/blog/user/UserService.java | 3 +-- .../blogEntry/BlogEntryListServiceTest.java | 15 ++++------- .../blog/blogEntry/BlogEntryServiceTest.java | 24 ++++++----------- .../blog/blogEntry/BlogEntryTestData.java | 6 ++--- .../blogEntry/CommentListServiceTest.java | 6 ++--- .../blog/blogEntry/CommentServiceTest.java | 9 +++---- .../java/blog/blogEntry/CommentTestData.java | 6 ++--- .../test/java/blog/common/BaseTestData.java | 27 +++++++------------ .../java/blog/security/AuthenticatorTest.java | 12 +++------ .../test/java/blog/user/UserServiceTest.java | 6 ++--- .../src/test/java/blog/user/UserTest.java | 6 ++--- .../src/test/java/blog/user/UserTestData.java | 9 +++---- .../src/main/java/petclinic/owners/Owner.java | 10 +++---- .../petclinic/owners/OwnerMaintenance.java | 9 +++---- .../java/petclinic/owners/OwnerScreen.java | 12 +++------ .../src/main/java/petclinic/pets/Pet.java | 3 +-- .../java/petclinic/pets/PetMaintenance.java | 15 ++++------- .../main/java/petclinic/pets/PetScreen.java | 15 ++++------- .../main/java/petclinic/util/BaseEntity.java | 6 ++--- .../main/java/petclinic/util/Database.java | 16 ++++------- .../java/petclinic/vets/VetMaintenance.java | 3 +-- .../main/java/petclinic/vets/VetScreen.java | 3 +-- .../src/main/java/petclinic/visits/Visit.java | 3 +-- .../petclinic/visits/VisitMaintenance.java | 9 +++---- .../java/petclinic/visits/VisitScreen.java | 15 ++++------- .../test/java/petclinic/owners/OwnerData.java | 3 +-- .../petclinic/owners/OwnerScreenTest.java | 18 +++++-------- .../src/test/java/petclinic/pets/PetData.java | 15 ++++------- .../java/petclinic/pets/PetScreenTest.java | 15 ++++------- .../java/petclinic/util/TestDatabase.java | 15 ++++------- .../src/test/java/petclinic/vets/VetData.java | 3 +-- .../java/petclinic/vets/VetScreenTest.java | 3 +-- .../test/java/petclinic/visits/VisitData.java | 6 ++--- .../petclinic/visits/VisitScreenTest.java | 21 +++++---------- .../tutorial/test/META-INF/persistence.xml | 3 +-- 47 files changed, 148 insertions(+), 294 deletions(-) diff --git a/samples/java8testing/pom.xml b/samples/java8testing/pom.xml index 0b70fb813..d940a6a5f 100644 --- a/samples/java8testing/pom.xml +++ b/samples/java8testing/pom.xml @@ -18,11 +18,11 @@ org.junit.platformjunit-platform-surefire-provider - 1.1.0-M1 + 1.1.0-RC1 org.junit.jupiterjunit-jupiter-engine - 5.1.0-M1 + 5.1.0-RC1 @@ -31,7 +31,7 @@ - org.junit.jupiterjunit-jupiter-api5.1.0-M1 + org.junit.jupiterjunit-jupiter-api5.1.0-RC1 test diff --git a/samples/java8testing/src/java8testing/BusinessService.java b/samples/java8testing/src/java8testing/BusinessService.java index 84a2e607c..85b528442 100644 --- a/samples/java8testing/src/java8testing/BusinessService.java +++ b/samples/java8testing/src/java8testing/BusinessService.java @@ -4,15 +4,13 @@ public final class BusinessService { private final Collaborator collaborator; - public BusinessService(Collaborator collaborator) - { + public BusinessService(Collaborator collaborator) { this.collaborator = collaborator; } public Collaborator getCollaborator() { return collaborator; } - public String performBusinessOperation(int value) - { + public String performBusinessOperation(int value) { return collaborator.doSomething(value + 1); } } diff --git a/samples/java8testing/test/java8testing/TestUtils.java b/samples/java8testing/test/java8testing/TestUtils.java index 4a8105cd8..3b8ffabe2 100644 --- a/samples/java8testing/test/java8testing/TestUtils.java +++ b/samples/java8testing/test/java8testing/TestUtils.java @@ -2,5 +2,4 @@ public final class TestUtils { - } diff --git a/samples/needle4j/src/main/java/blog/blogEntry/BlogEntry.java b/samples/needle4j/src/main/java/blog/blogEntry/BlogEntry.java index bdf80f1bf..1dbfcaf11 100644 --- a/samples/needle4j/src/main/java/blog/blogEntry/BlogEntry.java +++ b/samples/needle4j/src/main/java/blog/blogEntry/BlogEntry.java @@ -40,8 +40,7 @@ public class BlogEntry extends BaseEntity public String getContent() { return content; } public void setContent(String content) { this.content = content; } - public String getShortContent() - { + public String getShortContent() { if (content != null && content.length() > 200) { return content.substring(0, 200) + "..."; } diff --git a/samples/needle4j/src/main/java/blog/blogEntry/BlogEntryDaoBean.java b/samples/needle4j/src/main/java/blog/blogEntry/BlogEntryDaoBean.java index 1639e134c..6c381f1d2 100644 --- a/samples/needle4j/src/main/java/blog/blogEntry/BlogEntryDaoBean.java +++ b/samples/needle4j/src/main/java/blog/blogEntry/BlogEntryDaoBean.java @@ -12,14 +12,12 @@ public class BlogEntryDaoBean implements BlogEntryDao @Inject private Database db; @Override - public List find(int maxResults, int firstResult) - { + public List find(int maxResults, int firstResult) { return db.findWithPaging("select b from BlogEntry b order by b.created desc", maxResults, firstResult); } @Override - public Long count() - { + public Long count() { return db.findSingle("select count(b) from BlogEntry b"); } } diff --git a/samples/needle4j/src/main/java/blog/blogEntry/BlogEntryListService.java b/samples/needle4j/src/main/java/blog/blogEntry/BlogEntryListService.java index 2ada5569c..ecfe423f9 100644 --- a/samples/needle4j/src/main/java/blog/blogEntry/BlogEntryListService.java +++ b/samples/needle4j/src/main/java/blog/blogEntry/BlogEntryListService.java @@ -14,8 +14,7 @@ public class BlogEntryListService private List resultList; private int firstResult; - public List getResultList() - { + public List getResultList() { if (resultList == null) { resultList = blogEntryDao.find(MAX_RESULTS, firstResult); } @@ -27,8 +26,8 @@ public List getResultList() public int getPreviousFirstResult() { return firstResult <= MAX_RESULTS ? 0 : firstResult - MAX_RESULTS; } public int getFirstResult() { return firstResult; } - public void setFirstResult(int firstResult) - { + + public void setFirstResult(int firstResult) { this.firstResult = firstResult; resultList = null; } diff --git a/samples/needle4j/src/main/java/blog/blogEntry/BlogEntryService.java b/samples/needle4j/src/main/java/blog/blogEntry/BlogEntryService.java index 29c20e4db..f1b513640 100644 --- a/samples/needle4j/src/main/java/blog/blogEntry/BlogEntryService.java +++ b/samples/needle4j/src/main/java/blog/blogEntry/BlogEntryService.java @@ -25,8 +25,7 @@ public class BlogEntryService implements Serializable public Long getId() { return id; } - public void setId(Long id) - { + public void setId(Long id) { beginConversation(); log.info("set blog entry id " + id); @@ -34,8 +33,7 @@ public void setId(Long id) } @Produces - public BlogEntry getInstance() - { + public BlogEntry getInstance() { if (instance == null || id != null && !id.equals(instance.getId())) { instance = db.find(BlogEntry.class, id); } @@ -44,8 +42,7 @@ public BlogEntry getInstance() return instance; } - public void newInstance() - { + public void newInstance() { beginConversation(); BlogEntry blogEntry = new BlogEntry(); @@ -54,28 +51,24 @@ public void newInstance() id = null; } - private void beginConversation() - { + private void beginConversation() { if (conversation.isTransient()) { conversation.begin(); log.info("beginConversation conversation with id " + conversation.getId()); } } - private void endConversation() - { + private void endConversation() { if (!conversation.isTransient()) { conversation.end(); } } - public void save() - { + public void save() { id = db.save(instance); } - public void delete() - { + public void delete() { log.info("delete blog entry " + instance); db.remove(instance); endConversation(); diff --git a/samples/needle4j/src/main/java/blog/blogEntry/CommentListService.java b/samples/needle4j/src/main/java/blog/blogEntry/CommentListService.java index 8a99f8f68..f0b6792ef 100644 --- a/samples/needle4j/src/main/java/blog/blogEntry/CommentListService.java +++ b/samples/needle4j/src/main/java/blog/blogEntry/CommentListService.java @@ -15,8 +15,7 @@ public class CommentListService implements Serializable @Inject private BlogEntryService blogEntryService; @Inject private Database db; - public List getResultList() - { + public List getResultList() { BlogEntry blogEntry = blogEntryService.getInstance(); return db.find("select c from Comment c where c.blogEntry = ?1 order by c.created", blogEntry); } diff --git a/samples/needle4j/src/main/java/blog/blogEntry/CommentService.java b/samples/needle4j/src/main/java/blog/blogEntry/CommentService.java index 88f0bbf9e..4936718d4 100644 --- a/samples/needle4j/src/main/java/blog/blogEntry/CommentService.java +++ b/samples/needle4j/src/main/java/blog/blogEntry/CommentService.java @@ -15,8 +15,7 @@ public class CommentService @Inject private Database db; private Comment instance; - public Comment getInstance() - { + public Comment getInstance() { if (instance == null) { instance = new Comment(); instance.setAuthor(user); @@ -26,8 +25,7 @@ public Comment getInstance() return instance; } - public void save() - { + public void save() { db.save(instance); instance = null; } diff --git a/samples/needle4j/src/main/java/blog/common/Database.java b/samples/needle4j/src/main/java/blog/common/Database.java index 4725d9a90..cf6635d34 100644 --- a/samples/needle4j/src/main/java/blog/common/Database.java +++ b/samples/needle4j/src/main/java/blog/common/Database.java @@ -9,8 +9,7 @@ public class Database { @PersistenceContext private EntityManager em; - public Long save(BaseEntity instance) - { + public Long save(BaseEntity instance) { if (instance.getId() == null) { em.persist(instance); } @@ -22,8 +21,7 @@ public Long save(BaseEntity instance) return instance.getId(); } - public void remove(BaseEntity instance) - { + public void remove(BaseEntity instance) { if (em.contains(instance)) { em.remove(instance); } @@ -36,13 +34,11 @@ public void remove(BaseEntity instance) } } - public E find(Class entityClass, long id) - { + public E find(Class entityClass, long id) { return em.find(entityClass, id); } - public S findSingle(String ql, Object... args) - { + public S findSingle(String ql, Object... args) { Query query = createQuery(ql, args); try { @@ -54,8 +50,7 @@ public S findSingle(String ql, Object... args) } } - private Query createQuery(String ql, Object... args) - { + private Query createQuery(String ql, Object... args) { Query query = em.createQuery(ql); for (int i = 0; i < args.length; i++) { @@ -66,16 +61,14 @@ private Query createQuery(String ql, Object... args) return query; } - public List find(String ql, Object... args) - { + public List find(String ql, Object... args) { Query query = createQuery(ql, args); @SuppressWarnings("unchecked") List resultList = query.getResultList(); return resultList; } - public List findWithPaging(String ql, int maxResults, int firstResult, Object... args) - { + public List findWithPaging(String ql, int maxResults, int firstResult, Object... args) { Query query = createQuery(ql, args); query.setMaxResults(maxResults).setFirstResult(firstResult); diff --git a/samples/needle4j/src/main/java/blog/security/Authenticator.java b/samples/needle4j/src/main/java/blog/security/Authenticator.java index 1a61c7168..969fb54d8 100644 --- a/samples/needle4j/src/main/java/blog/security/Authenticator.java +++ b/samples/needle4j/src/main/java/blog/security/Authenticator.java @@ -24,8 +24,7 @@ public class Authenticator implements Serializable public String getPassword() { return password; } public void setPassword(String password) { this.password = password; } - public boolean login() - { + public boolean login() { User user = userService.findByUsername(username); if (user != null && user.verifyPassword(password)) { @@ -37,8 +36,7 @@ public boolean login() return false; } - public void logout() - { + public void logout() { session.invalidate(); } } diff --git a/samples/needle4j/src/main/java/blog/user/User.java b/samples/needle4j/src/main/java/blog/user/User.java index a685cb344..98296ac0b 100644 --- a/samples/needle4j/src/main/java/blog/user/User.java +++ b/samples/needle4j/src/main/java/blog/user/User.java @@ -36,13 +36,11 @@ public class User extends BaseEntity public String getUsername() { return username; } public void setUsername(String username) { this.username = username; } - public void setPassword(String password) - { + public void setPassword(String password) { this.password = new BasicPasswordEncryptor().encryptPassword(password); } - public boolean verifyPassword(String passwordToVerify) - { + public boolean verifyPassword(String passwordToVerify) { return new BasicPasswordEncryptor().checkPassword(passwordToVerify, password); } } diff --git a/samples/needle4j/src/main/java/blog/user/UserService.java b/samples/needle4j/src/main/java/blog/user/UserService.java index c19cc4817..0d66df2ac 100644 --- a/samples/needle4j/src/main/java/blog/user/UserService.java +++ b/samples/needle4j/src/main/java/blog/user/UserService.java @@ -10,8 +10,7 @@ public class UserService { @Inject private Database db; - public User findByUsername(String username) - { + public User findByUsername(String username) { return db.findSingle("select u from User u where u.username = ?1", username); } } diff --git a/samples/needle4j/src/test/java/blog/blogEntry/BlogEntryListServiceTest.java b/samples/needle4j/src/test/java/blog/blogEntry/BlogEntryListServiceTest.java index 76506e35f..874e18d6c 100644 --- a/samples/needle4j/src/test/java/blog/blogEntry/BlogEntryListServiceTest.java +++ b/samples/needle4j/src/test/java/blog/blogEntry/BlogEntryListServiceTest.java @@ -14,8 +14,7 @@ public final class BlogEntryListServiceTest @ObjectUnderTest BlogEntryListService blogEntryListService; @Test - public void getResultList() - { + public void getResultList() { BlogEntry blogEntry = blogEntryData.buildAndSave(); List resultList = blogEntryListService.getResultList(); @@ -24,8 +23,7 @@ public void getResultList() } @Test - public void pagination() - { + public void pagination() { createBlogEntries(MAX_RESULTS + 1); assertEquals(0, blogEntryListService.getFirstResult()); @@ -43,16 +41,14 @@ public void pagination() assertTrue(blogEntryListService.isPreviousExists()); } - void createBlogEntries(int quantity) - { + void createBlogEntries(int quantity) { for (int i = 0; i < quantity; i++) { blogEntryData.buildAndSave(); } } @Test - public void findEntriesUpToMaximumQuantity() - { + public void findEntriesUpToMaximumQuantity() { createBlogEntries(MAX_RESULTS + 1); List found = blogEntryListService.getResultList(); @@ -61,8 +57,7 @@ public void findEntriesUpToMaximumQuantity() } @Test - public void previousFirstResult() - { + public void previousFirstResult() { blogEntryListService.setFirstResult(10); assertEquals(15, blogEntryListService.getNextFirstResult()); diff --git a/samples/needle4j/src/test/java/blog/blogEntry/BlogEntryServiceTest.java b/samples/needle4j/src/test/java/blog/blogEntry/BlogEntryServiceTest.java index dde94313c..676046063 100644 --- a/samples/needle4j/src/test/java/blog/blogEntry/BlogEntryServiceTest.java +++ b/samples/needle4j/src/test/java/blog/blogEntry/BlogEntryServiceTest.java @@ -15,8 +15,7 @@ public final class BlogEntryServiceTest @Dependency Conversation conversation; @Test - public void beginNewBlogEntry() - { + public void beginNewBlogEntry() { assertTrue(conversation.isTransient()); blogEntryService.newInstance(); @@ -29,8 +28,7 @@ public void beginNewBlogEntry() } @Test - public void persistNewBlogEntry() - { + public void persistNewBlogEntry() { blogEntryService.newInstance(); BlogEntry instance = blogEntryService.getInstance(); String title = "title"; @@ -50,8 +48,7 @@ public void persistNewBlogEntry() } @Test(expected = ConstraintViolationException.class) - public void attemptToSaveWithoutAuthor() - { + public void attemptToSaveWithoutAuthor() { blogEntryService.newInstance(); BlogEntry instance = blogEntryService.getInstance(); instance.setAuthor(null); @@ -60,8 +57,7 @@ public void attemptToSaveWithoutAuthor() } @Test - public void selectBlogEntryById() - { + public void selectBlogEntryById() { BlogEntry blogEntry = blogEntryData.buildAndSave(); assertTrue(conversation.isTransient()); @@ -76,8 +72,7 @@ public void selectBlogEntryById() } @Test - public void selectADifferentBlogEntry() - { + public void selectADifferentBlogEntry() { BlogEntry blogEntry1 = blogEntryData.withTitle("Blog entry 1").buildAndSave(); BlogEntry blogEntry2 = blogEntryData.withTitle("Blog entry 2").buildAndSave(); @@ -92,8 +87,7 @@ public void selectADifferentBlogEntry() } @Test - public void modifyABlogEntry() - { + public void modifyABlogEntry() { BlogEntry blogEntry = blogEntryData.buildAndSave(); blogEntryService.setId(blogEntry.getId()); BlogEntry instance = blogEntryService.getInstance(); @@ -108,8 +102,7 @@ public void modifyABlogEntry() } @Test - public void deleteSelectedBlogEntry() - { + public void deleteSelectedBlogEntry() { BlogEntry blogEntry = blogEntryData.buildAndSave(); blogEntryService.setId(blogEntry.getId()); blogEntryService.getInstance(); @@ -121,8 +114,7 @@ public void deleteSelectedBlogEntry() } @Test - public void deleteSelectedBlogEntry_withDetachedInstance() - { + public void deleteSelectedBlogEntry_withDetachedInstance() { BlogEntry blogEntry = blogEntryData.buildAndSave(); blogEntryService.setId(blogEntry.getId()); BlogEntry instance = blogEntryService.getInstance(); diff --git a/samples/needle4j/src/test/java/blog/blogEntry/BlogEntryTestData.java b/samples/needle4j/src/test/java/blog/blogEntry/BlogEntryTestData.java index 42242142c..9bc815927 100644 --- a/samples/needle4j/src/test/java/blog/blogEntry/BlogEntryTestData.java +++ b/samples/needle4j/src/test/java/blog/blogEntry/BlogEntryTestData.java @@ -14,15 +14,13 @@ public final class BlogEntryTestData extends BaseTestData @Inject private BlogEntry currentBlogEntry; private String withTitle; - public BlogEntryTestData withTitle(String title) - { + public BlogEntryTestData withTitle(String title) { withTitle = title; return this; } @Override - public BlogEntry build() - { + public BlogEntry build() { User author = userData.buildAndSave(); String title = withTitle != null ? withTitle : "Lorem ipsum dolor sit amet"; diff --git a/samples/needle4j/src/test/java/blog/blogEntry/CommentListServiceTest.java b/samples/needle4j/src/test/java/blog/blogEntry/CommentListServiceTest.java index b7b7b0592..a4ffd0bae 100644 --- a/samples/needle4j/src/test/java/blog/blogEntry/CommentListServiceTest.java +++ b/samples/needle4j/src/test/java/blog/blogEntry/CommentListServiceTest.java @@ -15,8 +15,7 @@ public final class CommentListServiceTest @ObjectUnderTest BlogEntryService blogEntryService; @Test - public void getResultListForBlogEntryWithComments() - { + public void getResultListForBlogEntryWithComments() { BlogEntry blogEntry = blogEntryData.buildAndSave(); Comment comment = commentData.withBlogEntry(blogEntry).buildAndSave(); blogEntryService.setId(blogEntry.getId()); @@ -28,8 +27,7 @@ public void getResultListForBlogEntryWithComments() } @Test - public void getResultListForBlogEntryHavingNoComments() - { + public void getResultListForBlogEntryHavingNoComments() { BlogEntry blogEntry = blogEntryData.buildAndSave(); blogEntryService.setId(blogEntry.getId()); diff --git a/samples/needle4j/src/test/java/blog/blogEntry/CommentServiceTest.java b/samples/needle4j/src/test/java/blog/blogEntry/CommentServiceTest.java index 76a09fe64..1707edafc 100644 --- a/samples/needle4j/src/test/java/blog/blogEntry/CommentServiceTest.java +++ b/samples/needle4j/src/test/java/blog/blogEntry/CommentServiceTest.java @@ -13,14 +13,12 @@ public final class CommentServiceTest @ObjectUnderTest CommentService commentService; @Before - public void createBlogEntry() - { + public void createBlogEntry() { blogEntry = blogEntryData.buildAndSave(); } @Test - public void createNewPartiallyInitializedComment() - { + public void createNewPartiallyInitializedComment() { Comment instance = commentService.getInstance(); assertNull(instance.getId()); @@ -31,8 +29,7 @@ public void createNewPartiallyInitializedComment() } @Test - public void saveNewComment() - { + public void saveNewComment() { Comment instance = commentService.getInstance(); instance.setContent("comment"); diff --git a/samples/needle4j/src/test/java/blog/blogEntry/CommentTestData.java b/samples/needle4j/src/test/java/blog/blogEntry/CommentTestData.java index 3f33200b4..408e0da46 100644 --- a/samples/needle4j/src/test/java/blog/blogEntry/CommentTestData.java +++ b/samples/needle4j/src/test/java/blog/blogEntry/CommentTestData.java @@ -11,15 +11,13 @@ public final class CommentTestData extends BaseTestData @Inject private BlogEntryTestData blogEntryData; private BlogEntry withBlogEntry; - public CommentTestData withBlogEntry(BlogEntry blogEntry) - { + public CommentTestData withBlogEntry(BlogEntry blogEntry) { withBlogEntry = blogEntry; return this; } @Override - public Comment build() - { + public Comment build() { User author = userData.buildAndSave(); BlogEntry blogEntry = withBlogEntry != null ? withBlogEntry : blogEntryData.buildAndSave(); diff --git a/samples/needle4j/src/test/java/blog/common/BaseTestData.java b/samples/needle4j/src/test/java/blog/common/BaseTestData.java index 056008df3..360300049 100644 --- a/samples/needle4j/src/test/java/blog/common/BaseTestData.java +++ b/samples/needle4j/src/test/java/blog/common/BaseTestData.java @@ -13,14 +13,12 @@ public abstract class BaseTestData private int id; @SuppressWarnings("unchecked") - protected BaseTestData() - { + protected BaseTestData() { entityClass = (Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0]; } @PostConstruct - private void beginTransaction() - { + private void beginTransaction() { EntityTransaction transaction = em.getTransaction(); if (!transaction.isActive()) { @@ -29,8 +27,7 @@ private void beginTransaction() } @PreDestroy - private void endTransaction() - { + private void endTransaction() { EntityTransaction transaction = em.getTransaction(); if (transaction.isActive()) { @@ -40,8 +37,7 @@ private void endTransaction() protected final int getId() { return id++; } - public final void save(BaseEntity entity) - { + public final void save(BaseEntity entity) { if (entity.getId() == null) { em.persist(entity); } @@ -49,18 +45,15 @@ public final void save(BaseEntity entity) em.flush(); } - public final E find(Long entityId) - { + public final E find(Long entityId) { return em.find(entityClass, entityId); } - public final void detachFromPersistenceContext(BaseEntity entity) - { + public final void detachFromPersistenceContext(BaseEntity entity) { em.detach(entity); } - public final E assertSavedToDB(E entity) - { + public final E assertSavedToDB(E entity) { if (em.contains(entity)) { em.detach(entity); } @@ -72,14 +65,12 @@ public final E assertSavedToDB(E entity) return fromDb; } - public final void assertDeletedFromDB(BaseEntity entity) - { + public final void assertDeletedFromDB(BaseEntity entity) { BaseEntity deletedEntity = find(entity.getId()); assertNull(deletedEntity); } - public final E buildAndSave() - { + public final E buildAndSave() { E entity = build(); save(entity); return entity; diff --git a/samples/needle4j/src/test/java/blog/security/AuthenticatorTest.java b/samples/needle4j/src/test/java/blog/security/AuthenticatorTest.java index b2ecb9d65..4b6290458 100644 --- a/samples/needle4j/src/test/java/blog/security/AuthenticatorTest.java +++ b/samples/needle4j/src/test/java/blog/security/AuthenticatorTest.java @@ -19,8 +19,7 @@ public final class AuthenticatorTest @Dependency Identity identity; @Test - public void loginWithNoUsername() - { + public void loginWithNoUsername() { boolean login = authenticator.login(); assertFalse(login); @@ -28,8 +27,7 @@ public void loginWithNoUsername() } @Test - public void loginWithWrongPassword() - { + public void loginWithWrongPassword() { String username = "username"; User user = userData.withUsername(username).buildAndSave(); authenticator.setUsername(username); @@ -43,8 +41,7 @@ public void loginWithWrongPassword() } @Test - public void loginSuccess() - { + public void loginSuccess() { String username = "username"; User user = userData.withUsername(username).buildAndSave(); authenticator.setUsername(username); @@ -61,8 +58,7 @@ public void loginSuccess() } @Test - public void logout() - { + public void logout() { authenticator.logout(); try { diff --git a/samples/needle4j/src/test/java/blog/user/UserServiceTest.java b/samples/needle4j/src/test/java/blog/user/UserServiceTest.java index 8da992a1b..863e3d861 100644 --- a/samples/needle4j/src/test/java/blog/user/UserServiceTest.java +++ b/samples/needle4j/src/test/java/blog/user/UserServiceTest.java @@ -11,8 +11,7 @@ public final class UserServiceTest @ObjectUnderTest UserService userService; @Test - public void findExistingByUsername() - { + public void findExistingByUsername() { User user = userData.buildAndSave(); User foundByUsername = userService.findByUsername(user.getUsername()); @@ -21,8 +20,7 @@ public void findExistingByUsername() } @Test - public void findNonExistingByUsername() - { + public void findNonExistingByUsername() { User user = userService.findByUsername("name"); assertNull(user); diff --git a/samples/needle4j/src/test/java/blog/user/UserTest.java b/samples/needle4j/src/test/java/blog/user/UserTest.java index d2f2aadff..2ad92cff9 100644 --- a/samples/needle4j/src/test/java/blog/user/UserTest.java +++ b/samples/needle4j/src/test/java/blog/user/UserTest.java @@ -12,15 +12,13 @@ public final class UserTest @TestData UserTestData userData; @Test(expected = PersistenceException.class) - public void attemptToSaveWithDuplicateUsername() - { + public void attemptToSaveWithDuplicateUsername() { userData.withUsername("username").buildAndSave(); userData.withUsername("username").buildAndSave(); } @Test - public void verifyPassword() - { + public void verifyPassword() { User user = userData.buildAndSave(); assertFalse(user.getFirstName().isEmpty()); diff --git a/samples/needle4j/src/test/java/blog/user/UserTestData.java b/samples/needle4j/src/test/java/blog/user/UserTestData.java index 7f5b87540..40c84386c 100644 --- a/samples/needle4j/src/test/java/blog/user/UserTestData.java +++ b/samples/needle4j/src/test/java/blog/user/UserTestData.java @@ -11,8 +11,7 @@ public final class UserTestData extends BaseTestData private String withUsername; @PostConstruct - private void defineCurrentUser() - { + private void defineCurrentUser() { currentUser.setFirstName("Test"); currentUser.setSurname("User"); currentUser.setUsername("tester"); @@ -20,15 +19,13 @@ private void defineCurrentUser() save(currentUser); } - public UserTestData withUsername(String username) - { + public UserTestData withUsername(String username) { withUsername = username; return this; } @Override - public User build() - { + public User build() { String username = withUsername != null ? withUsername : "mmuster" + getId(); User user = new User(); diff --git a/samples/petclinic/src/main/java/petclinic/owners/Owner.java b/samples/petclinic/src/main/java/petclinic/owners/Owner.java index d0b84bbe9..87b6e438e 100644 --- a/samples/petclinic/src/main/java/petclinic/owners/Owner.java +++ b/samples/petclinic/src/main/java/petclinic/owners/Owner.java @@ -16,9 +16,7 @@ public class Owner extends Person { private String address; private String city; - - @NotNull - private String telephone; + @NotNull private String telephone; @OneToMany(cascade = CascadeType.ALL, mappedBy = "owner") @OrderBy("name") @@ -35,8 +33,7 @@ public class Owner extends Person public List getPets() { return pets; } - public void addPet(@Nonnull Pet pet) - { + public void addPet(@Nonnull Pet pet) { pets.add(pet); pet.setOwner(this); } @@ -45,8 +42,7 @@ public void addPet(@Nonnull Pet pet) * Return the Pet with the given name, or null if none found for this Owner. */ @Nullable - public Pet getPet(@Nonnull String name) - { + public Pet getPet(@Nonnull String name) { return pets.stream().filter(pet -> pet.getName().equalsIgnoreCase(name)).findFirst().orElse(null); } } diff --git a/samples/petclinic/src/main/java/petclinic/owners/OwnerMaintenance.java b/samples/petclinic/src/main/java/petclinic/owners/OwnerMaintenance.java index 0255d1599..099221c2f 100644 --- a/samples/petclinic/src/main/java/petclinic/owners/OwnerMaintenance.java +++ b/samples/petclinic/src/main/java/petclinic/owners/OwnerMaintenance.java @@ -16,8 +16,7 @@ public class OwnerMaintenance @Inject private Database db; @Nullable - public Owner findById(int ownerId) - { + public Owner findById(int ownerId) { return db.findById(Owner.class, ownerId); } @@ -29,13 +28,11 @@ public Owner findById(int ownerId) * @return list of matching owners (empty if none found) */ @Nonnull - public List findByLastName(@Nonnull String lastName) - { + public List findByLastName(@Nonnull String lastName) { return db.find("select o from Owner o where o.lastName like ?1", lastName + '%'); } - public void createOrUpdate(@Nonnull Owner newData) - { + public void createOrUpdate(@Nonnull Owner newData) { db.save(newData); } } diff --git a/samples/petclinic/src/main/java/petclinic/owners/OwnerScreen.java b/samples/petclinic/src/main/java/petclinic/owners/OwnerScreen.java index 301c00d79..6376d60c9 100644 --- a/samples/petclinic/src/main/java/petclinic/owners/OwnerScreen.java +++ b/samples/petclinic/src/main/java/petclinic/owners/OwnerScreen.java @@ -23,8 +23,7 @@ public class OwnerScreen @Nullable public Owner getOwner() { return owner; } @Nullable public List getOwners() { return owners; } - public void findOwners() - { + public void findOwners() { if (lastName == null) { lastName = ""; } @@ -32,18 +31,15 @@ public void findOwners() owners = ownerMaintenance.findByLastName(lastName); } - public void requestNewOwner() - { + public void requestNewOwner() { owner = new Owner(); } - public void selectOwner(int ownerId) - { + public void selectOwner(int ownerId) { owner = ownerMaintenance.findById(ownerId); } - public void createOrUpdateOwner() - { + public void createOrUpdateOwner() { assert owner != null; ownerMaintenance.createOrUpdate(owner); } diff --git a/samples/petclinic/src/main/java/petclinic/pets/Pet.java b/samples/petclinic/src/main/java/petclinic/pets/Pet.java index aadb18889..5b404b039 100644 --- a/samples/petclinic/src/main/java/petclinic/pets/Pet.java +++ b/samples/petclinic/src/main/java/petclinic/pets/Pet.java @@ -45,8 +45,7 @@ public class Pet extends BaseEntity public List getVisits() { return visits; } - public void addVisit(Visit visit) - { + public void addVisit(Visit visit) { visits.add(visit); visit.setPet(this); } diff --git a/samples/petclinic/src/main/java/petclinic/pets/PetMaintenance.java b/samples/petclinic/src/main/java/petclinic/pets/PetMaintenance.java index 39d5eaade..743f6a930 100644 --- a/samples/petclinic/src/main/java/petclinic/pets/PetMaintenance.java +++ b/samples/petclinic/src/main/java/petclinic/pets/PetMaintenance.java @@ -18,8 +18,7 @@ public class PetMaintenance @Inject private Database db; @Nullable - public Pet findById(int id) - { + public Pet findById(int id) { return db.findById(Pet.class, id); } @@ -29,14 +28,12 @@ public Pet findById(int id) * @return the types found, in order of name */ @Nonnull - public List findPetTypes() - { + public List findPetTypes() { List petTypes = db.find("select t from PetType t order by t.name"); return petTypes; } - public void createPet(@Nonnull Owner owner, @Nonnull Pet data) - { + public void createPet(@Nonnull Owner owner, @Nonnull Pet data) { validate(owner, data); data.setOwner(owner); @@ -44,8 +41,7 @@ public void createPet(@Nonnull Owner owner, @Nonnull Pet data) db.save(data); } - private void validate(@Nonnull Owner owner, @Nonnull Pet pet) - { + private void validate(@Nonnull Owner owner, @Nonnull Pet pet) { Pet existingPetOfSameName = owner.getPet(pet.getName()); if (existingPetOfSameName != null) { @@ -53,8 +49,7 @@ private void validate(@Nonnull Owner owner, @Nonnull Pet pet) } } - public void updatePet(@Nonnull Pet data) - { + public void updatePet(@Nonnull Pet data) { db.save(data); } } diff --git a/samples/petclinic/src/main/java/petclinic/pets/PetScreen.java b/samples/petclinic/src/main/java/petclinic/pets/PetScreen.java index 12b928d7c..c6502b5bc 100644 --- a/samples/petclinic/src/main/java/petclinic/pets/PetScreen.java +++ b/samples/petclinic/src/main/java/petclinic/pets/PetScreen.java @@ -21,8 +21,7 @@ public class PetScreen @Nullable private Pet pet; @Nonnull - public List getTypes() - { + public List getTypes() { if (types == null) { types = petMaintenance.findPetTypes(); } @@ -33,24 +32,20 @@ public List getTypes() @Nullable public Pet getPet() { return pet; } - public void requestNewPet() - { + public void requestNewPet() { pet = new Pet(); } - public void selectOwner(int ownerId) - { + public void selectOwner(int ownerId) { owner = ownerMaintenance.findById(ownerId); pet = new Pet(); } - public void selectPet(int petId) - { + public void selectPet(int petId) { pet = petMaintenance.findById(petId); } - public void createOrUpdatePet() - { + public void createOrUpdatePet() { if (pet != null) { if (pet.isNew()) { //noinspection ConstantConditions diff --git a/samples/petclinic/src/main/java/petclinic/util/BaseEntity.java b/samples/petclinic/src/main/java/petclinic/util/BaseEntity.java index 7270dc969..07551f8d8 100644 --- a/samples/petclinic/src/main/java/petclinic/util/BaseEntity.java +++ b/samples/petclinic/src/main/java/petclinic/util/BaseEntity.java @@ -22,8 +22,7 @@ public class BaseEntity implements Serializable @SuppressWarnings("NonFinalFieldReferenceInEquals") @Override - public final boolean equals(Object other) - { + public final boolean equals(Object other) { if (this == other) return true; if (!(other instanceof BaseEntity)) return false; @@ -34,8 +33,7 @@ public final boolean equals(Object other) @SuppressWarnings("NonFinalFieldReferencedInHashCode") @Override - public final int hashCode() - { + public final int hashCode() { return id == null ? -1 : id; } } diff --git a/samples/petclinic/src/main/java/petclinic/util/Database.java b/samples/petclinic/src/main/java/petclinic/util/Database.java index 5dfacf289..bbf55237c 100644 --- a/samples/petclinic/src/main/java/petclinic/util/Database.java +++ b/samples/petclinic/src/main/java/petclinic/util/Database.java @@ -20,8 +20,7 @@ public class Database * @return the persistent entity if found, or null if not found */ @Nullable - public E findById(@Nonnull Class entityClass, int id) - { + public E findById(@Nonnull Class entityClass, int id) { E entity = em.find(entityClass, id); return entity; } @@ -39,8 +38,7 @@ public E findById(@Nonnull Class entityClass, int id) * @see #find(int, String, Object...) */ @Nonnull - public List find(@Nonnull String qlStatement, @Nonnull Object... qlArgs) - { + public List find(@Nonnull String qlStatement, @Nonnull Object... qlArgs) { return find(0, qlStatement, qlArgs); } @@ -57,9 +55,7 @@ public List find(@Nonnull String qlStatement, @Nonnull * clause (if any) */ @Nonnull - public List find( - @Nonnegative int maxResults, @Nonnull String qlStatement, @Nonnull Object... qlArgs) - { + public List find(@Nonnegative int maxResults, @Nonnull String qlStatement, @Nonnull Object... qlArgs) { Query query = em.createQuery(qlStatement); query.setMaxResults(maxResults); @@ -78,8 +74,7 @@ public List find( * In either case, the persistence context is synchronized to the application database, so that any pending * "inserts", "updates" or "deletes" get executed at this time. */ - public void save(@Nonnull BaseEntity entity) - { + public void save(@Nonnull BaseEntity entity) { if (entity.isNew()) { em.persist(entity); } @@ -93,8 +88,7 @@ else if (!em.contains(entity)) { // in case it is a detached entity /** * Removes a given persistent entity from the application database. */ - public void remove(@Nonnull BaseEntity entity) - { + public void remove(@Nonnull BaseEntity entity) { em.remove(entity); } } diff --git a/samples/petclinic/src/main/java/petclinic/vets/VetMaintenance.java b/samples/petclinic/src/main/java/petclinic/vets/VetMaintenance.java index 403fd6c28..a0326621b 100644 --- a/samples/petclinic/src/main/java/petclinic/vets/VetMaintenance.java +++ b/samples/petclinic/src/main/java/petclinic/vets/VetMaintenance.java @@ -16,8 +16,7 @@ public class VetMaintenance @Inject private Database db; @Nonnull - public List findAll() - { + public List findAll() { return db.find("select v from Vet v order by v.lastName, v.firstName"); } } diff --git a/samples/petclinic/src/main/java/petclinic/vets/VetScreen.java b/samples/petclinic/src/main/java/petclinic/vets/VetScreen.java index 9eea3a2b2..4da237e2e 100644 --- a/samples/petclinic/src/main/java/petclinic/vets/VetScreen.java +++ b/samples/petclinic/src/main/java/petclinic/vets/VetScreen.java @@ -18,8 +18,7 @@ public class VetScreen @Nullable public List getVets() { return vets; } - public void showVetList() - { + public void showVetList() { vets = vetMaintenance.findAll(); } } diff --git a/samples/petclinic/src/main/java/petclinic/visits/Visit.java b/samples/petclinic/src/main/java/petclinic/visits/Visit.java index 9e3833ddd..af95767e4 100644 --- a/samples/petclinic/src/main/java/petclinic/visits/Visit.java +++ b/samples/petclinic/src/main/java/petclinic/visits/Visit.java @@ -25,8 +25,7 @@ public class Visit extends BaseEntity /** * Creates a new instance of Visit for the current date. */ - public Visit() - { + public Visit() { date = new Date(); } diff --git a/samples/petclinic/src/main/java/petclinic/visits/VisitMaintenance.java b/samples/petclinic/src/main/java/petclinic/visits/VisitMaintenance.java index 0215cc5db..3169c0c5c 100644 --- a/samples/petclinic/src/main/java/petclinic/visits/VisitMaintenance.java +++ b/samples/petclinic/src/main/java/petclinic/visits/VisitMaintenance.java @@ -16,23 +16,20 @@ public class VisitMaintenance { @Inject private Database db; - public void create(@Nonnull Pet visitedPet, @Nonnull Visit visitData) - { + public void create(@Nonnull Pet visitedPet, @Nonnull Visit visitData) { visitData.setPet(visitedPet); visitedPet.addVisit(visitData); db.save(visitData); } @Nullable - public Visit findById(int visitId) - { + public Visit findById(int visitId) { Visit visit = db.findById(Visit.class, visitId); return visit; } @Nonnull - public List findByPetId(int petId) - { + public List findByPetId(int petId) { List visits = db.find("select v from Visit v where v.pet.id = ?1", petId); return visits; } diff --git a/samples/petclinic/src/main/java/petclinic/visits/VisitScreen.java b/samples/petclinic/src/main/java/petclinic/visits/VisitScreen.java index a465e703b..dcf4d6d36 100644 --- a/samples/petclinic/src/main/java/petclinic/visits/VisitScreen.java +++ b/samples/petclinic/src/main/java/petclinic/visits/VisitScreen.java @@ -24,31 +24,26 @@ public class VisitScreen @Nullable public Visit getVisit() { return visit; } @Nullable public List getVisits() { return visits; } - public void selectPet(int petId) - { + public void selectPet(int petId) { pet = petMaintenance.findById(petId); } - public void selectVisit(int visitId) - { + public void selectVisit(int visitId) { visit = visitMaintenance.findById(visitId); pet = visit == null ? null : visit.getPet(); } - public void requestNewVisit() - { + public void requestNewVisit() { visit = new Visit(); } - public void createOrUpdateVisit() - { + public void createOrUpdateVisit() { if (pet != null && visit != null) { visitMaintenance.create(pet, visit); } } - public void showVisits() - { + public void showVisits() { if (pet != null) { visits = visitMaintenance.findByPetId(pet.getId()); } diff --git a/samples/petclinic/src/test/java/petclinic/owners/OwnerData.java b/samples/petclinic/src/test/java/petclinic/owners/OwnerData.java index 6ae3875e4..cdb16f7e9 100644 --- a/samples/petclinic/src/test/java/petclinic/owners/OwnerData.java +++ b/samples/petclinic/src/test/java/petclinic/owners/OwnerData.java @@ -10,8 +10,7 @@ public final class OwnerData extends TestDatabase { @Nonnull - public Owner create(@Nonnull String fullName) - { + public Owner create(@Nonnull String fullName) { String[] names = fullName.split(" "); Owner owner = new Owner(); diff --git a/samples/petclinic/src/test/java/petclinic/owners/OwnerScreenTest.java b/samples/petclinic/src/test/java/petclinic/owners/OwnerScreenTest.java index aac46efe1..cab43e449 100644 --- a/samples/petclinic/src/test/java/petclinic/owners/OwnerScreenTest.java +++ b/samples/petclinic/src/test/java/petclinic/owners/OwnerScreenTest.java @@ -17,8 +17,7 @@ public final class OwnerScreenTest @SUT OwnerScreen ownerScreen; @Test - public void findOwnersByFullLastName() - { + public void findOwnersByFullLastName() { Owner davis = ownerData.create("Tom Davis"); ownerScreen.setLastName(davis.getLastName()); @@ -30,8 +29,7 @@ public void findOwnersByFullLastName() } @Test - public void findOwnersByLastNamePrefix() - { + public void findOwnersByLastNamePrefix() { Owner esteban = ownerData.create("Jaime Esteban"); ownerScreen.setLastName("Es"); @@ -42,8 +40,7 @@ public void findOwnersByLastNamePrefix() } @Test - public void findOwnersByLastNameWithNoSuchOwners() - { + public void findOwnersByLastNameWithNoSuchOwners() { ownerScreen.setLastName("Daviss"); ownerScreen.findOwners(); List ownersWithNonExistingLastName = ownerScreen.getOwners(); @@ -52,8 +49,7 @@ public void findOwnersByLastNameWithNoSuchOwners() } @Test - public void findOwnersWithAnyLastName() - { + public void findOwnersWithAnyLastName() { Owner davis = ownerData.create("Tom Davis"); Owner esteban = ownerData.create("Jaime Esteban"); @@ -65,8 +61,7 @@ public void findOwnersWithAnyLastName() } @Test - public void createNewOwner() - { + public void createNewOwner() { ownerScreen.requestNewOwner(); Owner owner = ownerScreen.getOwner(); owner.setFirstName("Sam"); @@ -81,8 +76,7 @@ public void createNewOwner() } @Test - public void updateExistingOwner() - { + public void updateExistingOwner() { Owner owner = ownerData.create("An owner"); ownerScreen.selectOwner(owner.getId()); diff --git a/samples/petclinic/src/test/java/petclinic/pets/PetData.java b/samples/petclinic/src/test/java/petclinic/pets/PetData.java index dd78894af..1b6889f76 100644 --- a/samples/petclinic/src/test/java/petclinic/pets/PetData.java +++ b/samples/petclinic/src/test/java/petclinic/pets/PetData.java @@ -16,8 +16,7 @@ public final class PetData extends TestDatabase @Inject private OwnerData ownerData; @Nonnull - public Pet findOrCreate(@Nonnull String name, @Nullable Date birthDate, @Nonnull String petType) - { + public Pet findOrCreate(@Nonnull String name, @Nullable Date birthDate, @Nonnull String petType) { Pet pet = findOne("select p from Pet p where p.name = ?1", name); if (pet == null) { @@ -28,15 +27,13 @@ public Pet findOrCreate(@Nonnull String name, @Nullable Date birthDate, @Nonnull } @Nonnull - public Pet create(@Nonnull String name, @Nullable Date birthDate, @Nonnull String petType) - { + public Pet create(@Nonnull String name, @Nullable Date birthDate, @Nonnull String petType) { Owner owner = ownerData.create("Pet Owner"); return create(owner, name, birthDate, petType); } @Nonnull - public Pet create(@Nonnull Owner owner, @Nonnull String name, @Nullable Date birthDate, @Nonnull String petType) - { + public Pet create(@Nonnull Owner owner, @Nonnull String name, @Nullable Date birthDate, @Nonnull String petType) { PetType type = findOrCreatePetType(petType); Pet pet = new Pet(); @@ -50,8 +47,7 @@ public Pet create(@Nonnull Owner owner, @Nonnull String name, @Nullable Date bir } @Nonnull - PetType findOrCreatePetType(@Nonnull String petType) - { + PetType findOrCreatePetType(@Nonnull String petType) { PetType type = findOne("select t from PetType t where t.name = ?1", petType); if (type == null) { @@ -62,8 +58,7 @@ PetType findOrCreatePetType(@Nonnull String petType) } @Nonnull - PetType createType(@Nonnull String name) - { + PetType createType(@Nonnull String name) { PetType type = new PetType(); type.setName(name); db.save(type); diff --git a/samples/petclinic/src/test/java/petclinic/pets/PetScreenTest.java b/samples/petclinic/src/test/java/petclinic/pets/PetScreenTest.java index 1fc8a21ea..42485e901 100644 --- a/samples/petclinic/src/test/java/petclinic/pets/PetScreenTest.java +++ b/samples/petclinic/src/test/java/petclinic/pets/PetScreenTest.java @@ -24,8 +24,7 @@ public final class PetScreenTest @SUT PetScreen petScreen; @Test - public void findAllPetTypes() - { + public void findAllPetTypes() { PetType type1 = petData.createType("type1"); PetType type2 = petData.createType("Another type"); @@ -39,8 +38,7 @@ public void findAllPetTypes() } @Test - public void createPetWithGeneratedId() - { + public void createPetWithGeneratedId() { String petName = "bowser"; Owner owner = ownerData.create("The Owner"); assumeTrue(owner.getPet(petName) == null); @@ -63,8 +61,7 @@ public void createPetWithGeneratedId() } @Test - public void attemptToCreatePetWithDuplicateNameForSameOwner() - { + public void attemptToCreatePetWithDuplicateNameForSameOwner() { Owner owner = ownerData.create("The Owner"); petScreen.selectOwner(owner.getId()); Date birthDate = new GregorianCalendar(2005, Calendar.AUGUST, 6).getTime(); @@ -81,16 +78,14 @@ public void attemptToCreatePetWithDuplicateNameForSameOwner() } @Test - public void attemptToCreatePetWithoutAnOwnerHavingBeenSelected() - { + public void attemptToCreatePetWithoutAnOwnerHavingBeenSelected() { petScreen.createOrUpdatePet(); assertNull(petScreen.getPet()); } @Test - public void updatePetName() - { + public void updatePetName() { Date birthDate = new GregorianCalendar(2005, Calendar.AUGUST, 6).getTime(); Pet pet = petData.create("Pet", birthDate, "cat"); petScreen.selectPet(pet.getId()); diff --git a/samples/petclinic/src/test/java/petclinic/util/TestDatabase.java b/samples/petclinic/src/test/java/petclinic/util/TestDatabase.java index bdd3af24f..e1f641b0c 100644 --- a/samples/petclinic/src/test/java/petclinic/util/TestDatabase.java +++ b/samples/petclinic/src/test/java/petclinic/util/TestDatabase.java @@ -19,8 +19,7 @@ public class TestDatabase @Inject protected Database db; @PostConstruct - private void beginTransactionIfNotYet() - { + private void beginTransactionIfNotYet() { EntityTransaction transaction = em.getTransaction(); if (!transaction.isActive()) { @@ -29,8 +28,7 @@ private void beginTransactionIfNotYet() } @PreDestroy - private void endTransactionWithRollbackIfStillActive() - { + private void endTransactionWithRollbackIfStillActive() { EntityTransaction transaction = em.getTransaction(); if (transaction.isActive()) { @@ -42,8 +40,7 @@ private void endTransactionWithRollbackIfStillActive() * Refreshes the persistent state of a given entity from the database, so that a test can verify * that persistent state was modified as expected. */ - public final void refresh(BaseEntity entity) - { + public final void refresh(BaseEntity entity) { em.refresh(entity); } @@ -57,8 +54,7 @@ public final void refresh(BaseEntity entity) * @return the first entity found, if any, or null if none */ @SuppressWarnings("unchecked") - public final E findOne(String qlStatement, Object... qlArgs) - { + public final E findOne(String qlStatement, Object... qlArgs) { List entities = db.find(1, qlStatement, qlArgs); return entities.isEmpty() ? null : (E) entities.get(0); } @@ -74,8 +70,7 @@ public final E findOne(String qlStatement, Object... qlAr * @throws AssertionError if the new entity has a null or negative id, or if it is not among the entities found * by executing the given JPQL statement */ - public final void assertCreated(BaseEntity newEntity, String qlStatement, Object... qlArgs) - { + public final void assertCreated(BaseEntity newEntity, String qlStatement, Object... qlArgs) { Integer newId = newEntity.getId(); assertNotNull("id is still null", newId); assertTrue(newId >= 0); diff --git a/samples/petclinic/src/test/java/petclinic/vets/VetData.java b/samples/petclinic/src/test/java/petclinic/vets/VetData.java index d39128447..6a422a9be 100644 --- a/samples/petclinic/src/test/java/petclinic/vets/VetData.java +++ b/samples/petclinic/src/test/java/petclinic/vets/VetData.java @@ -10,8 +10,7 @@ public final class VetData extends TestDatabase { @Nonnull - public Vet create(@Nonnull String fullName, @Nonnull String... specialtyNames) - { + public Vet create(@Nonnull String fullName, @Nonnull String... specialtyNames) { String[] names = fullName.split(" "); Vet vet = new Vet(); diff --git a/samples/petclinic/src/test/java/petclinic/vets/VetScreenTest.java b/samples/petclinic/src/test/java/petclinic/vets/VetScreenTest.java index c0ce025af..05f63a962 100644 --- a/samples/petclinic/src/test/java/petclinic/vets/VetScreenTest.java +++ b/samples/petclinic/src/test/java/petclinic/vets/VetScreenTest.java @@ -18,8 +18,7 @@ public final class VetScreenTest @SUT VetScreen vetScreen; @Test - public void findVets() - { + public void findVets() { Vet vet2 = vetData.create("Helen Leary", "radiology"); Vet vet0 = vetData.create("James Carter"); Vet vet1 = vetData.create("Linda Douglas", "surgery", "dentistry"); diff --git a/samples/petclinic/src/test/java/petclinic/visits/VisitData.java b/samples/petclinic/src/test/java/petclinic/visits/VisitData.java index dba581b69..643878858 100644 --- a/samples/petclinic/src/test/java/petclinic/visits/VisitData.java +++ b/samples/petclinic/src/test/java/petclinic/visits/VisitData.java @@ -15,8 +15,7 @@ public final class VisitData extends TestDatabase @Inject private PetData petData; @Nonnull - public Visit create(@Nonnull String description) - { + public Visit create(@Nonnull String description) { Pet pet = petData.findOrCreate("Test", null, "mouse"); Visit visit = new Visit(); @@ -28,8 +27,7 @@ public Visit create(@Nonnull String description) } @Nonnull - public Visit create() - { + public Visit create() { return create("Testing"); } } diff --git a/samples/petclinic/src/test/java/petclinic/visits/VisitScreenTest.java b/samples/petclinic/src/test/java/petclinic/visits/VisitScreenTest.java index 0b93233e4..87236a820 100644 --- a/samples/petclinic/src/test/java/petclinic/visits/VisitScreenTest.java +++ b/samples/petclinic/src/test/java/petclinic/visits/VisitScreenTest.java @@ -20,8 +20,7 @@ public final class VisitScreenTest @SUT VisitScreen visitScreen; @Test - public void showVisitsForSelectedPet() - { + public void showVisitsForSelectedPet() { Visit v1 = visitData.create("Visit 1 for pet"); Visit v2 = visitData.create("Visit 2 for pet"); visitScreen.selectPet(v1.getPet().getId()); @@ -33,16 +32,14 @@ public void showVisitsForSelectedPet() } @Test - public void attemptToShowVisitsWithoutFirstSelectingAPet() - { + public void attemptToShowVisitsWithoutFirstSelectingAPet() { visitScreen.showVisits(); assertNull(visitScreen.getVisits()); } @Test - public void attemptToSelectVisitWithNonExistingId() - { + public void attemptToSelectVisitWithNonExistingId() { Visit visit = visitData.create("Visit 1 for pet"); visitScreen.selectVisit(visit.getId()); @@ -53,8 +50,7 @@ public void attemptToSelectVisitWithNonExistingId() } @Test - public void addNewVisitForPet() - { + public void addNewVisitForPet() { Pet pet = petData.create("Samantha", null, "hamster"); visitScreen.requestNewVisit(); @@ -74,8 +70,7 @@ public void addNewVisitForPet() } @Test - public void updateExistingVisit() - { + public void updateExistingVisit() { Visit visit = visitData.create(); visitScreen.selectVisit(visit.getId()); @@ -91,16 +86,14 @@ public void updateExistingVisit() } @Test - public void attemptToCreateOrUpdateVisitWithoutFirstSelectingAPet() - { + public void attemptToCreateOrUpdateVisitWithoutFirstSelectingAPet() { visitScreen.createOrUpdateVisit(); assertNull(visitScreen.getVisit()); } @Test - public void attemptToUpdateVisitWithoutFirstSelectingAVisit() - { + public void attemptToUpdateVisitWithoutFirstSelectingAVisit() { Pet pet = petData.create("Samantha", null, "hamster"); visitScreen.selectPet(pet.getId()); diff --git a/samples/tutorial/test/META-INF/persistence.xml b/samples/tutorial/test/META-INF/persistence.xml index 907650670..eb8b33197 100644 --- a/samples/tutorial/test/META-INF/persistence.xml +++ b/samples/tutorial/test/META-INF/persistence.xml @@ -1,8 +1,7 @@ + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd" version="2.1"> tutorial.domain.EntityX