From d28f51384943bdfa4f4002190f4237a8f6e63e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Karlstr=C3=B6m?= Date: Wed, 19 Feb 2020 14:45:24 +0100 Subject: [PATCH] HHH-13179 Fixed code formatting issue --- .../source/internal/hbm/ModelBinder.java | 6 +- .../test/cache/hhh13179/HHH13179Test.java | 57 ++++++++++--------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java index ca796d2dec..3efebf2d3f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java @@ -523,7 +523,7 @@ public class ModelBinder { PersistentClass superEntityDescriptor) { for ( IdentifiableTypeSource subType : entitySource.getSubTypes() ) { final SingleTableSubclass subEntityDescriptor = new SingleTableSubclass( superEntityDescriptor, metadataBuildingContext ); - subEntityDescriptor.setCached(superEntityDescriptor.isCached()); + subEntityDescriptor.setCached( superEntityDescriptor.isCached() ); bindDiscriminatorSubclassEntity( (SubclassEntitySourceImpl) subType, subEntityDescriptor ); superEntityDescriptor.addSubclass( subEntityDescriptor ); entitySource.getLocalMetadataBuildingContext().getMetadataCollector().addEntityBinding( subEntityDescriptor ); @@ -582,7 +582,7 @@ public class ModelBinder { PersistentClass superEntityDescriptor) { for ( IdentifiableTypeSource subType : entitySource.getSubTypes() ) { final JoinedSubclass subEntityDescriptor = new JoinedSubclass( superEntityDescriptor, metadataBuildingContext ); - subEntityDescriptor.setCached(superEntityDescriptor.isCached()); + subEntityDescriptor.setCached( superEntityDescriptor.isCached() ); bindJoinedSubclassEntity( (JoinedSubclassEntitySourceImpl) subType, subEntityDescriptor ); superEntityDescriptor.addSubclass( subEntityDescriptor ); entitySource.getLocalMetadataBuildingContext().getMetadataCollector().addEntityBinding( subEntityDescriptor ); @@ -659,7 +659,7 @@ public class ModelBinder { PersistentClass superEntityDescriptor) { for ( IdentifiableTypeSource subType : entitySource.getSubTypes() ) { final UnionSubclass subEntityDescriptor = new UnionSubclass( superEntityDescriptor, metadataBuildingContext ); - subEntityDescriptor.setCached(superEntityDescriptor.isCached()); + subEntityDescriptor.setCached( superEntityDescriptor.isCached() ); bindUnionSubclassEntity( (SubclassEntitySourceImpl) subType, subEntityDescriptor ); superEntityDescriptor.addSubclass( subEntityDescriptor ); entitySource.getLocalMetadataBuildingContext().getMetadataCollector().addEntityBinding( subEntityDescriptor ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/HHH13179Test.java b/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/HHH13179Test.java index c05451dfba..dab2bab030 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/HHH13179Test.java +++ b/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/HHH13179Test.java @@ -20,6 +20,7 @@ import org.hibernate.Transaction; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; import org.hibernate.stat.CacheRegionStatistics; + import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Assert; @@ -28,7 +29,7 @@ import org.junit.Test; /** * Check that second level caching works for hbm mapped joined subclass inheritance structures */ -@TestForIssue( jiraKey = "HHH-13179") +@TestForIssue(jiraKey = "HHH-13179") public class HHH13179Test extends BaseCoreFunctionalTestCase { // Add your entities here. @@ -56,6 +57,7 @@ public class HHH13179Test extends BaseCoreFunctionalTestCase { "org/hibernate/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml" }; } + // If those mappings reside somewhere other than resources/org/hibernate/test, change this. @Override protected String getBaseForMappings() { @@ -79,14 +81,15 @@ public class HHH13179Test extends BaseCoreFunctionalTestCase { Transaction tx = s.beginTransaction(); String regionName = "org.hibernate.test.cache.hhh13179.JoinedSubclassPerson"; - + // sanity check - CacheRegionStatistics cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics(regionName); - Assert.assertEquals("Cache put should be 0", 0, cacheRegionStatistics.getPutCount()); + CacheRegionStatistics cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( + regionName ); + Assert.assertEquals( "Cache put should be 0", 0, cacheRegionStatistics.getPutCount() ); JoinedSubclassPerson person1 = new JoinedSubclassUIPerson(); - person1.setOid(1L); - s.save(person1); + person1.setOid( 1L ); + s.save( person1 ); tx.commit(); @@ -95,11 +98,11 @@ public class HHH13179Test extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - JoinedSubclassPerson person2 = s.get(JoinedSubclassPerson.class, 1L); + JoinedSubclassPerson person2 = s.get( JoinedSubclassPerson.class, 1L ); - cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics(regionName); - Assert.assertEquals("Cache hit should be 1", 1, cacheRegionStatistics.getHitCount()); - Assert.assertEquals("Cache put should be 1", 1, cacheRegionStatistics.getPutCount()); + cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( regionName ); + Assert.assertEquals( "Cache hit should be 1", 1, cacheRegionStatistics.getHitCount() ); + Assert.assertEquals( "Cache put should be 1", 1, cacheRegionStatistics.getPutCount() ); tx.commit(); s.close(); @@ -114,12 +117,13 @@ public class HHH13179Test extends BaseCoreFunctionalTestCase { String regionName = "org.hibernate.test.cache.hhh13179.UnionSubclassPerson"; // sanity check - CacheRegionStatistics cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics(regionName); - Assert.assertEquals("Cache put should be 0", 0, cacheRegionStatistics.getPutCount()); + CacheRegionStatistics cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( + regionName ); + Assert.assertEquals( "Cache put should be 0", 0, cacheRegionStatistics.getPutCount() ); UnionSubclassPerson person1 = new UnionSubclassUIPerson(); - person1.setOid(1L); - s.save(person1); + person1.setOid( 1L ); + s.save( person1 ); tx.commit(); @@ -128,11 +132,11 @@ public class HHH13179Test extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - UnionSubclassPerson person2 = s.get(UnionSubclassPerson.class, 1L); + UnionSubclassPerson person2 = s.get( UnionSubclassPerson.class, 1L ); - cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics(regionName); - Assert.assertEquals("Cache hit should be 1", 1, cacheRegionStatistics.getHitCount()); - Assert.assertEquals("Cache put should be 1", 1, cacheRegionStatistics.getPutCount()); + cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( regionName ); + Assert.assertEquals( "Cache hit should be 1", 1, cacheRegionStatistics.getHitCount() ); + Assert.assertEquals( "Cache put should be 1", 1, cacheRegionStatistics.getPutCount() ); tx.commit(); s.close(); @@ -147,12 +151,13 @@ public class HHH13179Test extends BaseCoreFunctionalTestCase { String regionName = "org.hibernate.test.cache.hhh13179.DiscriminatorSubclassPerson"; // sanity check - CacheRegionStatistics cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics(regionName); - Assert.assertEquals("Cache put should be 0", 0, cacheRegionStatistics.getPutCount()); + CacheRegionStatistics cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( + regionName ); + Assert.assertEquals( "Cache put should be 0", 0, cacheRegionStatistics.getPutCount() ); DiscriminatorSubclassPerson person1 = new DiscriminatorSubclassUIPerson(); - person1.setOid(1L); - s.save(person1); + person1.setOid( 1L ); + s.save( person1 ); tx.commit(); @@ -161,11 +166,11 @@ public class HHH13179Test extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - DiscriminatorSubclassPerson person2 = s.get(DiscriminatorSubclassPerson.class, 1L); + DiscriminatorSubclassPerson person2 = s.get( DiscriminatorSubclassPerson.class, 1L ); - cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics(regionName); - Assert.assertEquals("Cache hit should be 1", 1, cacheRegionStatistics.getHitCount()); - Assert.assertEquals("Cache put should be 1", 1, cacheRegionStatistics.getPutCount()); + cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( regionName ); + Assert.assertEquals( "Cache hit should be 1", 1, cacheRegionStatistics.getHitCount() ); + Assert.assertEquals( "Cache put should be 1", 1, cacheRegionStatistics.getPutCount() ); tx.commit(); s.close();