From fdeab133a55135e718372cefc1ea9a308f4b7a4a Mon Sep 17 00:00:00 2001 From: chaos2418 <> Date: Tue, 23 Nov 2021 09:38:47 +0530 Subject: [PATCH] JAVA-8638: addressing PR review comments. --- .../EnversFooBarAuditIntegrationTest.java | 37 ++++++------------- .../persistence/hibernate/FooFixtures.java | 9 ++--- .../FooSortingPersistenceIntegrationTest.java | 21 ++++------- .../query/UserRepositoryIntegrationTest.java | 23 +++++++----- .../immutable/util/HibernateUtil.java | 3 +- 5 files changed, 36 insertions(+), 57 deletions(-) diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java index 7397a61cac..444324dafc 100644 --- a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java +++ b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java @@ -123,39 +123,24 @@ public class EnversFooBarAuditIntegrationTest { assertNotNull(barRevisionList); assertEquals(4, barRevisionList.size()); - assertEquals("BAR", barRevisionList.get(0) - .getName()); - assertEquals("BAR", barRevisionList.get(1) - .getName()); - assertEquals("BAR1", barRevisionList.get(2) - .getName()); - assertEquals("BAR1", barRevisionList.get(3) - .getName()); + assertEquals("BAR", barRevisionList.get(0).getName()); + assertEquals("BAR", barRevisionList.get(1).getName()); + assertEquals("BAR1", barRevisionList.get(2).getName()); + assertEquals("BAR1", barRevisionList.get(3).getName()); - assertEquals(1, barRevisionList.get(0) - .getFooSet() - .size()); - assertEquals(2, barRevisionList.get(1) - .getFooSet() - .size()); - assertEquals(2, barRevisionList.get(2) - .getFooSet() - .size()); - assertEquals(3, barRevisionList.get(3) - .getFooSet() - .size()); + assertEquals(1, barRevisionList.get(0).getFooSet().size()); + assertEquals(2, barRevisionList.get(1).getFooSet().size()); + assertEquals(2, barRevisionList.get(2).getFooSet().size()); + assertEquals(3, barRevisionList.get(3).getFooSet().size()); // test Foo revisions fooRevisionList = fooService.getRevisions(); assertNotNull(fooRevisionList); assertEquals(3, fooRevisionList.size()); - assertEquals("FOO1", fooRevisionList.get(0) - .getName()); - assertEquals("FOO2", fooRevisionList.get(1) - .getName()); - assertEquals("FOO3", fooRevisionList.get(2) - .getName()); + assertEquals("FOO1", fooRevisionList.get(0).getName()); + assertEquals("FOO2", fooRevisionList.get(1).getName()); + assertEquals("FOO3", fooRevisionList.get(2).getName()); } } diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooFixtures.java b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooFixtures.java index e0bd8a4f98..a7763bb0f8 100644 --- a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooFixtures.java +++ b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooFixtures.java @@ -46,10 +46,8 @@ public class FooFixtures { } foo2.setBar(bar); session.save(foo2); - bar.getFooSet() - .add(foo); - bar.getFooSet() - .add(foo2); + bar.getFooSet().add(foo); + bar.getFooSet().add(foo2); session.merge(bar); } tx.commit(); @@ -80,8 +78,7 @@ public class FooFixtures { final Foo foo = new Foo(); foo.setName("Foo_" + (i + 120)); final Bar bar = new Bar("bar_" + i); - bar.getFooSet() - .add(foo); + bar.getFooSet().add(foo); foo.setBar(bar); fooList.add(foo); diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooSortingPersistenceIntegrationTest.java b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooSortingPersistenceIntegrationTest.java index fe73ddba3f..6078eb3af0 100644 --- a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooSortingPersistenceIntegrationTest.java +++ b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooSortingPersistenceIntegrationTest.java @@ -50,8 +50,7 @@ public class FooSortingPersistenceIntegrationTest { @After public void after() { - session.getTransaction() - .commit(); + session.getTransaction().commit(); session.close(); } @@ -71,8 +70,7 @@ public class FooSortingPersistenceIntegrationTest { final Query query = session.createQuery(hql); final List fooList = query.list(); - assertNull(fooList.get(fooList.toArray().length - 1) - .getName()); + assertNull(fooList.get(fooList.toArray().length - 1).getName()); for (final Foo foo : fooList) { LOGGER.debug("Name: {}, Id: {}", foo.getName(), foo.getId()); } @@ -83,8 +81,7 @@ public class FooSortingPersistenceIntegrationTest { final String hql = "FROM Foo f ORDER BY f.name NULLS FIRST"; final Query query = session.createQuery(hql); final List fooList = query.list(); - assertNull(fooList.get(0) - .getName()); + assertNull(fooList.get(0).getName()); for (final Foo foo : fooList) { LOGGER.debug("Name: {}", foo.getName()); @@ -145,11 +142,9 @@ public class FooSortingPersistenceIntegrationTest { @Test public final void whenCriteriaSortingStringNullsLastAsc_thenNullsLast() { final Criteria criteria = session.createCriteria(Foo.class, "FOO"); - criteria.addOrder(Order.asc("name") - .nulls(NullPrecedence.LAST)); + criteria.addOrder(Order.asc("name").nulls(NullPrecedence.LAST)); final List fooList = criteria.list(); - assertNull(fooList.get(fooList.toArray().length - 1) - .getName()); + assertNull(fooList.get(fooList.toArray().length - 1).getName()); for (final Foo foo : fooList) { LOGGER.debug("Id: {}, FirstName: {}", foo.getId(), foo.getName()); } @@ -158,11 +153,9 @@ public class FooSortingPersistenceIntegrationTest { @Test public final void whenCriteriaSortingStringNullsFirstDesc_thenNullsFirst() { final Criteria criteria = session.createCriteria(Foo.class, "FOO"); - criteria.addOrder(Order.desc("name") - .nulls(NullPrecedence.FIRST)); + criteria.addOrder(Order.desc("name").nulls(NullPrecedence.FIRST)); final List fooList = criteria.list(); - assertNull(fooList.get(0) - .getName()); + assertNull(fooList.get(0).getName()); for (final Foo foo : fooList) { LOGGER.debug("Id: {}, FirstName: {}", foo.getId(), foo.getName()); } diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/UserRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/UserRepositoryIntegrationTest.java index df07c74c5a..19760f2bfe 100644 --- a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/UserRepositoryIntegrationTest.java +++ b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/UserRepositoryIntegrationTest.java @@ -40,42 +40,46 @@ public class UserRepositoryIntegrationTest { @Test public void whenFindAllSortedByNameThenAllSorted() { List allUsersSortedByName = userRepository.findAll(Sort.by(Sort.Direction.ASC, "name")); - assertThat(allUsersSortedByName).extracting("name") + assertThat(allUsersSortedByName) + .extracting("name") .containsSequence("Bob", "Cindy", "John"); } @Test public void whenFindAllSortedByNameLengthThenException() { - assertThatThrownBy(() -> userRepository.findAll(Sort.by("LENGTH(name)"))).isInstanceOf(PropertyReferenceException.class); + assertThatThrownBy(() -> userRepository.findAll(Sort.by("LENGTH(name)"))) + .isInstanceOf(PropertyReferenceException.class); } @Test public void whenFindAllUsersSortedByNameThenAllSorted() { List allUsersSortedByName = userRepository.findAllUsers(Sort.by(Sort.Direction.ASC, "name")); - assertThat(allUsersSortedByName).extracting("name") + assertThat(allUsersSortedByName) + .extracting("name") .containsSequence("Bob", "Cindy", "John"); } @Test public void whenFindAllUsersSortedByNameLengthThenAllSorted() { List allUsersSortedByName = userRepository.findAllUsers(JpaSort.unsafe("LENGTH(name)")); - assertThat(allUsersSortedByName).extracting("name") + assertThat(allUsersSortedByName) + .extracting("name") .containsSequence("Bob", "John", "Cindy"); } @Test public void whenFindAllUsersWithPaginationThenPaginated() { Page page = userRepository.findAllUsersWithPagination(PageRequest.of(0, 1)); - assertThat(page.stream() - .map(User::getId)).hasSize(1) + assertThat(page.stream().map(User::getId)) + .hasSize(1) .containsOnly(1); } @Test public void whenFindAllUsersWithPaginationNativeThenPaginated() { Page page = userRepository.findAllUsersWithPaginationNative(PageRequest.of(1, 1)); - assertThat(page.stream() - .map(User::getId)).hasSize(1) + assertThat(page.stream().map(User::getId)) + .hasSize(1) .containsOnly(2); } @@ -122,7 +126,8 @@ public class UserRepositoryIntegrationTest { @Test public void whenFindUserByNameListThenAllFound() { List users = userRepository.findUserByNameList(Arrays.asList("Bob", "Cindy")); - assertThat(users).extracting("name") + assertThat(users) + .extracting("name") .containsOnly("Bob", "Cindy"); } diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/immutable/util/HibernateUtil.java b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/immutable/util/HibernateUtil.java index 25d7de4b07..aee4206e53 100644 --- a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/immutable/util/HibernateUtil.java +++ b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/immutable/util/HibernateUtil.java @@ -21,8 +21,7 @@ public class HibernateUtil { configuration.addAnnotatedClass(Event.class); configuration.addAnnotatedClass(EventGeneratedId.class); configuration.configure("immutable.cfg.xml"); - ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties()) - .build(); + ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties()).build(); return configuration.buildSessionFactory(serviceRegistry); } catch (Throwable ex) { LOGGER.debug("Initial SessionFactory creation failed.", ex);