[hibernate/hibernate-core] 2a64bc: HHH-5943 - Make ServiceRegistry mutable
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/hibernate/hibernate-core
Commit: 2a64bcf9a7e616e9f7653d078caeaa4d343d97a2
https://github.com/hibernate/hibernate-core/commit/2a64bcf9a7e616e9f7653d...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
R hibernate-core/src/main/java/org/hibernate/cfg/internal/ServicesRegistryBootstrap.java
M hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java
M hibernate-core/src/main/java/org/hibernate/service/internal/proxy/javassist/ServiceProxyFactoryFactoryImpl.java
M hibernate-core/src/main/java/org/hibernate/service/internal/proxy/javassist/ServiceProxyFactoryImpl.java
M hibernate-core/src/main/java/org/hibernate/service/spi/proxy/ServiceProxyFactory.java
M hibernate-core/src/main/java/org/hibernate/service/spi/proxy/ServiceProxyFactoryFactory.java
M hibernate-core/src/main/java/org/hibernate/service/spi/proxy/ServiceProxyTargetSource.java
R hibernate-core/src/test/java/org/hibernate/test/cfg/internal/ServiceBootstrappingTest.java
R hibernate-core/src/test/java/org/hibernate/test/cfg/internal/TestServicesRegistryBootstrapping.java
M hibernate-core/src/test/java/org/hibernate/test/common/ServiceRegistryHolder.java
A hibernate-core/src/test/java/org/hibernate/test/service/ServiceBootstrappingTest.java
M hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java
Log Message:
-----------
HHH-5943 - Make ServiceRegistry mutable
13 years, 9 months
- 1
- 0
[hibernate/hibernate-core] f53a6c: HHH-5943 - Make ServiceRegistry mutable
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/hibernate/hibernate-core
Commit: f53a6c708af7e89bd3a2f4cc80bdcf30c5febfaa
https://github.com/hibernate/hibernate-core/commit/f53a6c708af7e89bd3a2f4...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java
M hibernate-core/src/main/java/org/hibernate/cfg/internal/ServicesRegistryBootstrap.java
A hibernate-core/src/main/java/org/hibernate/service/internal/ServiceInitializer.java
A hibernate-core/src/main/java/org/hibernate/service/internal/ServiceProxy.java
A hibernate-core/src/main/java/org/hibernate/service/internal/ServiceProxyGenerationException.java
M hibernate-core/src/main/java/org/hibernate/service/internal/ServiceRegistryImpl.java
R hibernate-core/src/main/java/org/hibernate/service/internal/ServicesInitializer.java
A hibernate-core/src/main/java/org/hibernate/service/internal/proxy/javassist/ServiceProxyFactoryFactoryImpl.java
A hibernate-core/src/main/java/org/hibernate/service/internal/proxy/javassist/ServiceProxyFactoryImpl.java
M hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/DatasourceConnectionProviderImpl.java
M hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
M hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
M hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/ConnectionProvider.java
M hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistry.java
A hibernate-core/src/main/java/org/hibernate/service/spi/StandardServiceInitiators.java
A hibernate-core/src/main/java/org/hibernate/service/spi/UnknownUnwrapTypeException.java
A hibernate-core/src/main/java/org/hibernate/service/spi/Wrapped.java
A hibernate-core/src/main/java/org/hibernate/service/spi/proxy/ServiceProxyFactory.java
A hibernate-core/src/main/java/org/hibernate/service/spi/proxy/ServiceProxyFactoryFactory.java
A hibernate-core/src/main/java/org/hibernate/service/spi/proxy/ServiceProxyTargetSource.java
M hibernate-core/src/main/java/org/hibernate/util/CollectionHelper.java
M hibernate-core/src/test/java/org/hibernate/test/cfg/internal/ServiceBootstrappingTest.java
M hibernate-core/src/test/java/org/hibernate/testing/tm/ConnectionProviderImpl.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeConnectionProviderImpl.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaConnectionProvider.java
M hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProvider.java
Log Message:
-----------
HHH-5943 - Make ServiceRegistry mutable
Commit: 73ff2534e25ec52b4625f09f203e3a5fc3a2c3f2
https://github.com/hibernate/hibernate-core/commit/73ff2534e25ec52b4625f0...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java
Log Message:
-----------
HHH-5943 - Make ServiceRegistry mutable
13 years, 9 months
- 1
- 0
[hibernate/hibernate-validator] e6b7a5: HV-429 Populate ValeContext when collecting MetaDa...
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/hibernate/hibernate-validator
Commit: e6b7a53cdedaea347cc5a4ed151935a8705aa736
https://github.com/hibernate/hibernate-validator/commit/e6b7a53cdedaea347...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/ValidatorTest.java
Log Message:
-----------
HV-429 Populate ValeContext when collecting MetaData, add unit tests
Commit: 4c26a0a2cbf0c311eb38781eb5a29a3f27db6130
https://github.com/hibernate/hibernate-validator/commit/4c26a0a2cbf0c311e...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Use ValueContext as parameter in validateValue and validateProperty.
Commit: c7c9320250bea9c5c5b9c0e190fe0907fbe10bf6
https://github.com/hibernate/hibernate-validator/commit/c7c9320250bea9c5c...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Modify generics.
Commit: 78622e4a629fcc101a6641acdd67867f2effa776
https://github.com/hibernate/hibernate-validator/commit/78622e4a629fcc101...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Fix typos.
Commit: df1ad2455a180221bd0b5eb08f706ee44b51563c
https://github.com/hibernate/hibernate-validator/commit/df1ad2455a180221b...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Use ValidationContext as parameter of validatePropertyForGroup method.
Commit: 28dcb53ce023338b15f0c8de8c24ddc790eec44f
https://github.com/hibernate/hibernate-validator/commit/28dcb53ce023338b1...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Return number of constraint violations into validatePropertyForGroup method.
Commit: 88f3b0b48bbe57de70203af5e8407c8add22d512
https://github.com/hibernate/hibernate-validator/commit/88f3b0b48bbe57de7...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Use ValidationContext as parameter for validateValueForGroup method and remove shouldFailFast method.
By using ValidationContext as parameter for methods validateValueForGroup and validatePropertyForGroup, ValidatorImpl#shouldFailFast() is no longer necessary (see HV-434).
Commit: d78039cc754d0953dddc0157d9987389166fca2a
https://github.com/hibernate/hibernate-validator/commit/d78039cc754d0953d...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Fixing Default group sequence used for Validator#validateProperty.
If a class in the hierarchy defines one ore more constraints on the property to validate and the bean hosting the property doesn't redefined the default group sequence, superclass default group sequence redefinition has to be applied.
Commit: f59e35f0c73229b818e180e9a3b4e2a2493bdcb6
https://github.com/hibernate/hibernate-validator/commit/f59e35f0c73229b81...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Fixing Default group sequence used for Validator#validateValue.
Commit: eaa9866faa32ccf4b4a716453000df10494d1d63
https://github.com/hibernate/hibernate-validator/commit/eaa9866faa32ccf4b...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Using ValidationContext as parameter for validateProperty().
Commit: 86c2361a9c84fb240ff578f76536ae9594889d02
https://github.com/hibernate/hibernate-validator/commit/86c2361a9c84fb240...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Using ValidationContext as parameter for validateValue().
Commit: c563639ab6d9be6797e187527e01edff32f1f668
https://github.com/hibernate/hibernate-validator/commit/c563639ab6d9be679...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Fixing bug when Default group is not redefined on main entity.
Commit: 7156f8b762891af87fc9fa81e15e1195c26b197a
https://github.com/hibernate/hibernate-validator/commit/7156f8b762891af87...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Factorize code between validatePropertyInContext() and validateValueInContext().
Commit: e30330146541d5ac77907c5f88060a7fac25ab8d
https://github.com/hibernate/hibernate-validator/commit/e30330146541d5ac7...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Assert that the default group sequence of the property hosting bean is expandable.
Commit: 98977854f6d2a53ce410cd12eac29abb1d850c25
https://github.com/hibernate/hibernate-validator/commit/98977854f6d2a53ce...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/ValidatorTest.java
Log Message:
-----------
HV-429 Adding some tests.
Commit: a005a583c76b423bc74658d439461da85ce48108
https://github.com/hibernate/hibernate-validator/commit/a005a583c76b423bc...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Adding some docs.
Commit: 66240b3f617016859d54c6b83f70a7da4edb2a58
https://github.com/hibernate/hibernate-validator/commit/66240b3f617016859...
Author: Kevin Pollet <pollet.kevin(a)gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-429 Adding method validatePropertyForNonDefaultGroup().
Commit: 8faabf42156ad576a86e112641b42345ae5f09f2
https://github.com/hibernate/hibernate-validator/commit/8faabf42156ad576a...
Author: Hardy Ferentschik <hibernate(a)ferentschik.de>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log Message:
-----------
HV-421 Adding javadocs for constraintValidatorFactory, removing unused method parameter in validateReturnValueInContext, changed the use of generics in collectMetaConstraintsForPath
I am not sure how useful generics in this type of recursive function calls really is. Maybe it would be better to not use generics in this case and let the client do a cast.
13 years, 9 months
- 1
- 0
[hibernate/hibernate-validator] a1e49a: HV-421: Consider runtime type instead of static ty...
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/hibernate/hibernate-validator
Commit: a1e49a531fcb598b9c99e1d4039751c729c7f766
https://github.com/hibernate/hibernate-validator/commit/a1e49a531fcb598b9...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-14 (Mon, 14 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/methodlevel/MethodLevelValidationTest.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/methodlevel/service/CustomerRepository.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/methodlevel/service/CustomerRepositoryImpl.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/methodlevel/service/RepositoryBase.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/group/DefaultGroupSequenceProviderTest.java
Log Message:
-----------
HV-421: Consider runtime type instead of static type when determining the constraints to evaluate for method validation
Commit: 3474fdd4e9d5ceb2dd51bf6840fb45a40bca28b8
https://github.com/hibernate/hibernate-validator/commit/3474fdd4e9d5ceb2d...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-14 (Mon, 14 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/metadata/ParameterMetaData.java
Log Message:
-----------
HV-421: Fixing bug in ParameterMetaData#toString() when there are not constraints
Commit: be407914826c4e91efe1f651596490025d3e0e9e
https://github.com/hibernate/hibernate-validator/commit/be407914826c4e91e...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-14 (Mon, 14 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java
M hibernate-validator/src/main/java/org/hibernate/validator/metadata/MethodMetaData.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/methodlevel/MethodLevelValidationTest.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/methodlevel/service/CustomerRepository.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/metadata/BeanMetaDataImplTest.java
Log Message:
-----------
HV-421: Implemented checking of parameter constraints in type hierarchies
Commit: 7fac375b30f8fa4a5e801c0e2d52aecc7f5e64e1
https://github.com/hibernate/hibernate-validator/commit/7fac375b30f8fa4a5...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-14 (Mon, 14 Feb 2011)
Changed paths:
M hibernate-validator/src/test/java/org/hibernate/validator/test/metadata/BeanMetaDataImplTest.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/util/TestUtil.java
Log Message:
-----------
HV-421: Moved assertSize() to TestUtil
Commit: 06ce087a835e00c4534c098b37b74472c88694d0
https://github.com/hibernate/hibernate-validator/commit/06ce087a835e00c45...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-14 (Mon, 14 Feb 2011)
Changed paths:
M hibernate-validator/src/test/java/org/hibernate/validator/test/group/DefaultGroupSequenceProviderTest.java
Log Message:
-----------
HV-421: Moving test sequence provider from IF to impl as currently only default sequences at the validated type itself are considered for return value validation
Commit: a16b3fd0da5e57a2a4d308713f1716f5ad8f70dc
https://github.com/hibernate/hibernate-validator/commit/a16b3fd0da5e57a2a...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-16 (Wed, 16 Feb 2011)
Changed paths:
A hibernate-validator/src/test/java/org/hibernate/validator/test/engine/methodlevel/IllegalMethodParameterConstraintsTest.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/metadata/BeanMetaDataImplTest.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/util/TestUtil.java
Log Message:
-----------
HV-421: Moving tests related to handling of illegal method parameter constraints to separate test class
Commit: 7c35dfdc4e23db4f8ea57fd7d585a7598ce2114e
https://github.com/hibernate/hibernate-validator/commit/7c35dfdc4e23db4f8...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-16 (Wed, 16 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
M hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaData.java
M hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/methodlevel/IllegalMethodParameterConstraintsTest.java
Log Message:
-----------
HV-421: Throwing ConstraintDeclarationException due to illegal method parameter constraints lazily in order to allow for standard bean/property validation being performed on beans with illegal parameter constraints
Commit: a6ab4d667ecee378087558d14824412c4c346633
https://github.com/hibernate/hibernate-validator/commit/a6ab4d667ecee3780...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-16 (Wed, 16 Feb 2011)
Changed paths:
M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/methodlevel/IllegalMethodParameterConstraintsTest.java
Log Message:
-----------
HV-421: Simplifying test
Commit: d6e25093528f1efb52db33e8db63f9328f3c7797
https://github.com/hibernate/hibernate-validator/commit/d6e25093528f1efb5...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-18 (Fri, 18 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
M hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaData.java
M hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/methodlevel/IllegalMethodParameterConstraintsTest.java
Log Message:
-----------
HV-421: Restructured method parameter constraint check, throwing correct exception type now
Commit: 89d12c6cf26cd4e7451df3b516a1172a8c9dea36
https://github.com/hibernate/hibernate-validator/commit/89d12c6cf26cd4e74...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-18 (Fri, 18 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/methodlevel/IllegalMethodParameterConstraintsTest.java
Log Message:
-----------
HV-421: Adding test for @Valid being added in inherited method, fixing some typos
Commit: 8a285080791ac915b203b3c1cb4ee72a5b3185cd
https://github.com/hibernate/hibernate-validator/commit/8a285080791ac915b...
Author: Gunnar Morling <gunnar.morling(a)googlemail.com>
Date: 2011-02-18 (Fri, 18 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/methodlevel/IllegalMethodParameterConstraintsTest.java
Log Message:
-----------
HV-421: Fixing some typos
Commit: e0bc4e73e0ca5f0de6bacb7e5b31c644c194cd69
https://github.com/hibernate/hibernate-validator/commit/e0bc4e73e0ca5f0de...
Author: Hardy Ferentschik <hibernate(a)ferentschik.de>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/test/java/org/hibernate/validator/test/metadata/BeanMetaDataImplTest.java
M hibernate-validator/src/test/java/org/hibernate/validator/test/util/TestUtil.java
Log Message:
-----------
HV-421 Renaming assertSize to assertIterableSize. This name is more descriptive
Commit: 983393780561903ef0111cf0869838540871600f
https://github.com/hibernate/hibernate-validator/commit/983393780561903ef...
Author: Hardy Ferentschik <hibernate(a)ferentschik.de>
Date: 2011-02-21 (Mon, 21 Feb 2011)
Changed paths:
M hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java
Log Message:
-----------
HV-421 Adding javadocs for methodMetaConstraints for consistency. Removing some blank lines
13 years, 9 months
- 1
- 0
[hibernate/hibernate-search] 1fc68a: HSEARCH-688 remove indirect dependency on JBoss WS...
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/hibernate/hibernate-search
Commit: 1fc68adaa98fdd1e3b1be78ffc69897de8d36ae2
https://github.com/hibernate/hibernate-search/commit/1fc68adaa98fdd1e3b1b...
Author: Emmanuel Bernard <emmanuel(a)hibernate.org>
Date: 2011-02-18 (Fri, 18 Feb 2011)
Changed paths:
M hibernate-search-integrationtest/pom.xml
Log Message:
-----------
HSEARCH-688 remove indirect dependency on JBoss WS Native
JBoss WS Native depends on some SNAPSHOTS
13 years, 9 months
- 1
- 0
[beanvalidation/beanvalidation-api] 5d0f70: BVAL-212 Fixing javadocs for BeanDescriptor
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/beanvalidation/beanvalidation-api
Commit: 5d0f7035e8dcd8345b7b2a6ba080385d70f7aa66
https://github.com/beanvalidation/beanvalidation-api/commit/5d0f7035e8dcd...
Author: Hardy Ferentschik <hardy(a)ferentschik.de>
Date: 2011-02-18 (Fri, 18 Feb 2011)
Changed paths:
M src/main/java/javax/validation/metadata/BeanDescriptor.java
Log Message:
-----------
BVAL-212 Fixing javadocs for BeanDescriptor
13 years, 9 months
- 1
- 0
Hibernate SVN: r20918 - core/patches.
by hibernate-commits＠lists.jboss.org
Author: alessandrolt
Date: 2011-02-15 13:18:59 -0500 (Tue, 15 Feb 2011)
New Revision: 20918
Added:
core/patches/hibernate_3_3_2_CP03_JBPAPP-5939/
Removed:
core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/
Log:
Create Hibernate one off patch for JBPAPP-5939 from 3.3.2 cp03
13 years, 9 months
- 1
- 0
Hibernate SVN: r20917 - in core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/test/java/org/hibernate: id and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: alessandrolt
Date: 2011-02-15 12:56:05 -0500 (Tue, 15 Feb 2011)
New Revision: 20917
Added:
core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/test/java/org/hibernate/id/
core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/test/java/org/hibernate/id/enhanced/
core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/test/java/org/hibernate/id/enhanced/OptimizerUnitTest.java
Log:
Added: core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/test/java/org/hibernate/id/enhanced/OptimizerUnitTest.java
===================================================================
--- core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/test/java/org/hibernate/id/enhanced/OptimizerUnitTest.java (rev 0)
+++ core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/test/java/org/hibernate/id/enhanced/OptimizerUnitTest.java 2011-02-15 17:56:05 UTC (rev 20917)
@@ -0,0 +1,337 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.id.enhanced;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+//
+//import org.hibernate.id.IdentifierGeneratorHelper;
+//import org.hibernate.id.IntegralDataTypeHolder;
+
+/**
+ * {@inheritDoc}
+ *
+ * @author Steve Ebersole
+ */
+@SuppressWarnings({ "deprecation" })
+public class OptimizerUnitTest extends TestCase {
+ public OptimizerUnitTest(String string) {
+ super( string );
+ }
+
+ public static Test suite() {
+ return new TestSuite( OptimizerUnitTest.class );
+ }
+
+ public void testBasicNoOptimizerUsage() {
+ // test historic sequence behavior, where the initial values start at 1...
+ SourceMock sequence = new SourceMock( 1 );
+ Optimizer optimizer = OptimizerFactory.buildOptimizer( OptimizerFactory.NONE, Long.class, 1 );
+ for ( int i = 1; i < 11; i++ ) {
+ final Long next = ( Long ) optimizer.generate( sequence );
+ assertEquals( i, next.intValue() );
+ }
+ assertEquals( 10, sequence.getTimesCalled() );
+ assertEquals( 10, sequence.getCurrentValue() );
+
+ // test historic table behavior, where the initial values started at 0 (we now force 1 to be the first used id value)
+ sequence = new SourceMock( 0 );
+ optimizer = OptimizerFactory.buildOptimizer( OptimizerFactory.NONE, Long.class, 1 );
+ for ( int i = 1; i < 11; i++ ) {
+ final Long next = ( Long ) optimizer.generate( sequence );
+ assertEquals( i, next.intValue() );
+ }
+ assertEquals( 11, sequence.getTimesCalled() ); // an extra time to get to 1 initially
+ assertEquals( 10, sequence.getCurrentValue() );
+ }
+
+ public void testBasicHiLoOptimizerUsage() {
+ int increment = 10;
+ Long next;
+
+ // test historic sequence behavior, where the initial values start at 1...
+ SourceMock sequence = new SourceMock( 1 );
+ Optimizer optimizer = OptimizerFactory.buildOptimizer( OptimizerFactory.HILO, Long.class, increment );
+ for ( int i = 1; i <= increment; i++ ) {
+ next = ( Long ) optimizer.generate( sequence );
+ assertEquals( i, next.intValue() );
+ }
+ assertEquals( 1, sequence.getTimesCalled() ); // once to initialze state
+ assertEquals( 1, sequence.getCurrentValue() );
+ // force a "clock over"
+ next = ( Long ) optimizer.generate( sequence );
+ assertEquals( 11, next.intValue() );
+ assertEquals( 2, sequence.getTimesCalled() );
+ assertEquals( 2, sequence.getCurrentValue() );
+
+ // test historic table behavior, where the initial values started at 0 (we now force 1 to be the first used id value)
+ sequence = new SourceMock( 0 );
+ optimizer = OptimizerFactory.buildOptimizer( OptimizerFactory.HILO, Long.class, increment );
+ for ( int i = 1; i <= increment; i++ ) {
+ next = ( Long ) optimizer.generate( sequence );
+ assertEquals( i, next.intValue() );
+ }
+ assertEquals( 2, sequence.getTimesCalled() ); // here have have an extra call to get to 1 initially
+ assertEquals( 1, sequence.getCurrentValue() );
+ // force a "clock over"
+ next = ( Long ) optimizer.generate( sequence );
+ assertEquals( 11, next.intValue() );
+ assertEquals( 3, sequence.getTimesCalled() );
+ assertEquals( 2, sequence.getCurrentValue() );
+ }
+
+ public void testBasicPooledOptimizerUsage() {
+ Long next;
+ // test historic sequence behavior, where the initial values start at 1...
+ SourceMock sequence = new SourceMock( 1, 10 );
+ Optimizer optimizer = OptimizerFactory.buildOptimizer( OptimizerFactory.POOL, Long.class, 10 );
+ for ( int i = 1; i < 11; i++ ) {
+ next = ( Long ) optimizer.generate( sequence );
+ assertEquals( i, next.intValue() );
+ }
+ assertEquals( 2, sequence.getTimesCalled() ); // twice to initialize state
+ assertEquals( 11, sequence.getCurrentValue() );
+ // force a "clock over"
+ next = ( Long ) optimizer.generate( sequence );
+ assertEquals( 11, next.intValue() );
+ assertEquals( 3, sequence.getTimesCalled() );
+ assertEquals( 21, sequence.getCurrentValue() );
+ }
+
+ public void testSubsequentPooledOptimizerUsage() {
+ // test the pooled optimizer in situation where the sequence is already beyond its initial value on init.
+ // cheat by telling the sequence to start with 1000
+ final SourceMock sequence = new SourceMock( 1001, 3, 5 );
+ // but tell the optimizer the start-with is 1
+ final Optimizer optimizer = OptimizerFactory.buildOptimizer( OptimizerFactory.POOL, Long.class, 3, 1 );
+
+ assertEquals( 5, sequence.getTimesCalled() );
+ assertEquals( 1001, sequence.getCurrentValue() );
+
+ Long next = (Long) optimizer.generate( sequence );
+ assertEquals( 1001, next.intValue() );
+ assertEquals( (5+1), sequence.getTimesCalled() );
+ assertEquals( (1001+3), sequence.getCurrentValue() );
+
+ next = (Long) optimizer.generate( sequence );
+ assertEquals( (1001+1), next.intValue() );
+ assertEquals( (5+1), sequence.getTimesCalled() );
+ assertEquals( (1001+3), sequence.getCurrentValue() );
+
+ next = (Long) optimizer.generate( sequence );
+ assertEquals( (1001+2), next.intValue() );
+ assertEquals( (5+1), sequence.getTimesCalled() );
+ assertEquals( (1001+3), sequence.getCurrentValue() );
+
+ // force a "clock over"
+ next = (Long) optimizer.generate( sequence );
+ assertEquals( (1001+3), next.intValue() );
+ assertEquals( (5+2), sequence.getTimesCalled() );
+ assertEquals( (1001+6), sequence.getCurrentValue() );
+ }
+
+// public void testBasicPooledLoOptimizerUsage() {
+// final SourceMock sequence = new SourceMock( 1, 3 );
+// final Optimizer optimizer = OptimizerFactory.buildOptimizer( OptimizerFactory.POOL_LO, Long.class, 3 );
+//
+// assertEquals( 0, sequence.getTimesCalled() );
+// assertEquals( -1, sequence.getCurrentValue() );
+//
+// Long next = ( Long ) optimizer.generate( sequence );
+// assertEquals( 1, next.intValue() );
+// assertEquals( 1, sequence.getTimesCalled() );
+// assertEquals( 1, sequence.getCurrentValue() );
+//
+// next = ( Long ) optimizer.generate( sequence );
+// assertEquals( 2, next.intValue() );
+// assertEquals( 1, sequence.getTimesCalled() );
+// assertEquals( 1, sequence.getCurrentValue() );
+//
+// next = ( Long ) optimizer.generate( sequence );
+// assertEquals( 3, next.intValue() );
+// assertEquals( 1, sequence.getTimesCalled() );
+// assertEquals( 1, sequence.getCurrentValue() );
+//
+//// // force a "clock over"
+// next = ( Long ) optimizer.generate( sequence );
+// assertEquals( 4, next.intValue() );
+// assertEquals( 2, sequence.getTimesCalled() );
+// assertEquals( (1+3), sequence.getCurrentValue() );
+// }
+
+ public void testSubsequentPooledLoOptimizerUsage() {
+ // test the pooled optimizer in situation where the sequence is already beyond its initial value on init.
+ // cheat by telling the sequence to start with 1000
+ final SourceMock sequence = new SourceMock( 1001, 3, 5 );
+ // but tell the optimizer the start-with is 1
+ final Optimizer optimizer = OptimizerFactory.buildOptimizer( OptimizerFactory.POOL, Long.class, 3, 1 );
+
+ assertEquals( 5, sequence.getTimesCalled() );
+ assertEquals( 1001, sequence.getCurrentValue() );
+
+ Long next = ( Long ) optimizer.generate( sequence );
+ assertEquals( (1001), next.intValue() );
+ assertEquals( (5+1), sequence.getTimesCalled() );
+ assertEquals( (1001+3), sequence.getCurrentValue() );
+
+ next = ( Long ) optimizer.generate( sequence );
+ assertEquals( (1001+1), next.intValue() );
+ assertEquals( (5+1), sequence.getTimesCalled() );
+ assertEquals( (1001+3), sequence.getCurrentValue() );
+
+ next = ( Long ) optimizer.generate( sequence );
+ assertEquals( (1001+2), next.intValue() );
+ assertEquals( (5+1), sequence.getTimesCalled() );
+ assertEquals( (1001+3), sequence.getCurrentValue() );
+
+// // force a "clock over"
+ next = ( Long ) optimizer.generate( sequence );
+ assertEquals( (1001+3), next.intValue() );
+ assertEquals( (5+2), sequence.getTimesCalled() );
+ assertEquals( (1001+6), sequence.getCurrentValue() );
+ }
+
+ public void testRecoveredPooledOptimizerUsage() {
+ final SourceMock sequence = new SourceMock( 1, 3 );
+ final Optimizer optimizer = OptimizerFactory.buildOptimizer( OptimizerFactory.POOL, Long.class, 3, 1 );
+
+ assertEquals( 0, sequence.getTimesCalled() );
+ assertEquals( -1, sequence.getCurrentValue() );
+
+ Long next = ( Long ) optimizer.generate( sequence );
+ assertEquals( 1, next.intValue() );
+ assertEquals( 2, sequence.getTimesCalled() );
+ assertEquals( 4, sequence.getCurrentValue() );
+
+ // app ends, and starts back up (we should "lose" only 2 and 3 as id values)
+ final Optimizer optimizer2 = OptimizerFactory.buildOptimizer( OptimizerFactory.POOL, Long.class, 3, 1 );
+ next = ( Long ) optimizer2.generate( sequence );
+ assertEquals( 4, next.intValue() );
+ assertEquals( 3, sequence.getTimesCalled() );
+ assertEquals( 7, sequence.getCurrentValue() );
+ }
+
+// public void testRecoveredPooledLoOptimizerUsage() {
+// final SourceMock sequence = new SourceMock( 1, 3 );
+// final Optimizer optimizer = OptimizerFactory.buildOptimizer( OptimizerFactory.POOL_LO, Long.class, 3, 1 );
+//
+// assertEquals( 0, sequence.getTimesCalled() );
+// assertEquals( -1, sequence.getCurrentValue() );
+//
+// Long next = ( Long ) optimizer.generate( sequence );
+// assertEquals( 1, next.intValue() );
+// assertEquals( 1, sequence.getTimesCalled() );
+// assertEquals( 1, sequence.getCurrentValue() );
+//
+// // app ends, and starts back up (we should "lose" only 2 and 3 as id values)
+// final Optimizer optimizer2 = OptimizerFactory.buildOptimizer( OptimizerFactory.POOL_LO, Long.class, 3, 1 );
+// next = ( Long ) optimizer2.generate( sequence );
+// assertEquals( 4, next.intValue() );
+// assertEquals( 2, sequence.getTimesCalled() );
+// assertEquals( 4, sequence.getCurrentValue() );
+// }
+
+ private static class SourceMock implements AccessCallback {
+ private long value;
+ private long initialValue;
+ private int increment;
+ private int timesCalled = 0;
+
+ public SourceMock(long initialValue) {
+ this( initialValue, 1 );
+ }
+
+ public SourceMock(long initialValue, int increment) {
+ this( initialValue, increment, 0 );
+ }
+
+ public SourceMock(long initialValue, int increment, int timesCalled) {
+ this.increment = increment;
+ this.timesCalled = timesCalled;
+ if ( timesCalled != 0 ) {
+ this.value=initialValue;
+ this.initialValue = 1;
+ }
+ else {
+ this.value=-1;
+ this.initialValue = initialValue;
+ }
+ }
+
+ public long getNextValue() {
+ try {
+ if ( timesCalled == 0 ) {
+ initValue();
+ return value;
+ }
+ else {
+ return value+=increment;
+ }
+ }
+ finally {
+ timesCalled++;
+ }
+ }
+
+ private void initValue() {
+ this.value = initialValue;
+ }
+
+ public int getTimesCalled() {
+ return timesCalled;
+ }
+
+ public long getCurrentValue() {
+ return value;
+ }
+ }
+
+// public void testNoopDumping() {
+// SourceMock sequence = new SourceMock( 1 );
+// Optimizer optimizer = OptimizerFactory.buildOptimizer( OptimizerFactory.NONE, Long.class, 1 );
+// for ( int i = 1; i <= 41; i++ ) {
+// System.out.println( i + " => " + optimizer.generate( sequence ) + " (" + sequence.getCurrentValue() + ")" );
+// }
+// }
+//
+// public void testHiLoDumping() {
+// int increment = 10;
+// SourceMock sequence = new SourceMock( 1 );
+// Optimizer optimizer = OptimizerFactory.buildOptimizer( OptimizerFactory.HILO, Long.class, increment );
+// for ( int i = 1; i <= 41; i++ ) {
+// System.out.println( i + " => " + optimizer.generate( sequence ) + " (" + sequence.getCurrentValue() + ")" );
+// }
+// }
+//
+// public void testPooledDumping() {
+// int increment = 10;
+// SourceMock sequence = new SourceMock( 1, increment );
+// Optimizer optimizer = OptimizerFactory.buildOptimizer( OptimizerFactory.POOL, Long.class, increment );
+// for ( int i = 1; i <= 41; i++ ) {
+// System.out.println( i + " => " + optimizer.generate( sequence ) + " (" + sequence.getCurrentValue() + ")" );
+// }
+// }
+
+}
13 years, 9 months
- 1
- 0
Hibernate SVN: r20916 - core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/main/java/org/hibernate/id/enhanced.
by hibernate-commits＠lists.jboss.org
Author: alessandrolt
Date: 2011-02-15 12:55:42 -0500 (Tue, 15 Feb 2011)
New Revision: 20916
Modified:
core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
Log:
JBPAPP-5939: backporting the fix of JBPAPP-5763 to on-off patch
Modified: core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
===================================================================
--- core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java 2011-02-15 17:55:17 UTC (rev 20915)
+++ core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java 2011-02-15 17:55:42 UTC (rev 20916)
@@ -1,547 +1,546 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate.id.enhanced;
-
-import java.sql.Types;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.Properties;
-import java.util.HashMap;
-import java.util.Collections;
-import java.util.Map;
-import java.io.Serializable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.hibernate.engine.TransactionHelper;
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.id.PersistentIdentifierGenerator;
-import org.hibernate.id.Configurable;
-import org.hibernate.type.Type;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.HibernateException;
-import org.hibernate.MappingException;
-import org.hibernate.LockMode;
-import org.hibernate.jdbc.util.FormatStyle;
-import org.hibernate.mapping.Table;
-import org.hibernate.util.PropertiesHelper;
-import org.hibernate.util.StringHelper;
-
-/**
- * An enhanced version of table-based id generation.
- * <p/>
- * Unlike the simplistic legacy one (which, btw, was only ever intended for subclassing
- * support) we "segment" the table into multiple values. Thus a single table can
- * actually serve as the persistent storage for multiple independent generators. One
- * approach would be to segment the values by the name of the entity for which we are
- * performing generation, which would mean that we would have a row in the generator
- * table for each entity name. Or any configuration really; the setup is very flexible.
- * <p/>
- * In this respect it is very simliar to the legacy
- * {@link org.hibernate.id.MultipleHiLoPerTableGenerator} in terms of the
- * underlying storage structure (namely a single table capable of holding
- * multiple generator values). The differentiator is, as with
- * {@link SequenceStyleGenerator} as well, the externalized notion
- * of an optimizer.
- * <p/>
- * <b>NOTE</b> that by default we use a single row for all genertators (based
- * on {@link #DEF_SEGMENT_VALUE}). The configuration parameter
- * {@link #CONFIG_PREFER_SEGMENT_PER_ENTITY} can be used to change that to
- * instead default to using a row for each entity name.
- * <p/>
- * Configuration parameters:
- * <table>
- * <tr>
- * <td><b>NAME</b></td>
- * <td><b>DEFAULT</b></td>
- * <td><b>DESCRIPTION</b></td>
- * </tr>
- * <tr>
- * <td>{@link #TABLE_PARAM}</td>
- * <td>{@link #DEF_TABLE}</td>
- * <td>The name of the table to use to store/retrieve values</td>
- * </tr>
- * <tr>
- * <td>{@link #VALUE_COLUMN_PARAM}</td>
- * <td>{@link #DEF_VALUE_COLUMN}</td>
- * <td>The name of column which holds the sequence value for the given segment</td>
- * </tr>
- * <tr>
- * <td>{@link #SEGMENT_COLUMN_PARAM}</td>
- * <td>{@link #DEF_SEGMENT_COLUMN}</td>
- * <td>The name of the column which holds the segment key</td>
- * </tr>
- * <tr>
- * <td>{@link #SEGMENT_VALUE_PARAM}</td>
- * <td>{@link #DEF_SEGMENT_VALUE}</td>
- * <td>The value indicating which segment is used by this generator; refers to values in the {@link #SEGMENT_COLUMN_PARAM} column</td>
- * </tr>
- * <tr>
- * <td>{@link #SEGMENT_LENGTH_PARAM}</td>
- * <td>{@link #DEF_SEGMENT_LENGTH}</td>
- * <td>The data length of the {@link #SEGMENT_COLUMN_PARAM} column; used for schema creation</td>
- * </tr>
- * <tr>
- * <td>{@link #INITIAL_PARAM}</td>
- * <td>{@link #DEFAULT_INITIAL_VALUE}</td>
- * <td>The initial value to be stored for the given segment</td>
- * </tr>
- * <tr>
- * <td>{@link #INCREMENT_PARAM}</td>
- * <td>{@link #DEFAULT_INCREMENT_SIZE}</td>
- * <td>The increment size for the underlying segment; see the discussion on {@link Optimizer} for more details.</td>
- * </tr>
- * <tr>
- * <td>{@link #OPT_PARAM}</td>
- * <td><i>depends on defined increment size</i></td>
- * <td>Allows explicit definition of which optimization strategy to use</td>
- * </tr>
- * </table>
- *
- * @author Steve Ebersole
- */
-public class TableGenerator extends TransactionHelper implements PersistentIdentifierGenerator, Configurable {
- private static final Logger log = LoggerFactory.getLogger( TableGenerator.class );
-
- public static final String CONFIG_PREFER_SEGMENT_PER_ENTITY = "prefer_entity_table_as_segment_value";
-
- public static final String TABLE_PARAM = "table_name";
- public static final String DEF_TABLE = "hibernate_sequences";
-
- public static final String VALUE_COLUMN_PARAM = "value_column_name";
- public static final String DEF_VALUE_COLUMN = "next_val";
-
- public static final String SEGMENT_COLUMN_PARAM = "segment_column_name";
- public static final String DEF_SEGMENT_COLUMN = "sequence_name";
-
- public static final String SEGMENT_VALUE_PARAM = "segment_value";
- public static final String DEF_SEGMENT_VALUE = "default";
-
- public static final String SEGMENT_LENGTH_PARAM = "segment_value_length";
- public static final int DEF_SEGMENT_LENGTH = 255;
-
- public static final String INITIAL_PARAM = "initial_value";
- public static final int DEFAULT_INITIAL_VALUE = 1;
-
- public static final String INCREMENT_PARAM = "increment_size";
- public static final int DEFAULT_INCREMENT_SIZE = 1;
-
- public static final String OPT_PARAM = "optimizer";
-
-
- private Type identifierType;
-
- private String tableName;
-
- private String segmentColumnName;
- private String segmentValue;
- private int segmentValueLength;
-
- private String valueColumnName;
- private int initialValue;
- private int incrementSize;
-
- private String selectQuery;
- private String insertQuery;
- private String updateQuery;
-
- private Optimizer optimizer;
- private long accessCount = 0;
-
- /**
- * Type mapping for the identifier.
- *
- * @return The identifier type mapping.
- */
- public final Type getIdentifierType() {
- return identifierType;
- }
-
- /**
- * The name of the table in which we store this generator's persistent state.
- *
- * @return The table name.
- */
- public final String getTableName() {
- return tableName;
- }
-
- /**
- * The name of the column in which we store the segment to which each row
- * belongs. The value here acts as PK.
- *
- * @return The segment column name
- */
- public final String getSegmentColumnName() {
- return segmentColumnName;
- }
-
- /**
- * The value in {@link #getSegmentColumnName segment column} which
- * corresponding to this generator instance. In other words this value
- * indicates the row in which this generator instance will store values.
- *
- * @return The segment value for this generator instance.
- */
- public final String getSegmentValue() {
- return segmentValue;
- }
-
- /**
- * The size of the {@link #getSegmentColumnName segment column} in the
- * underlying table.
- * <p/>
- * <b>NOTE</b> : should really have been called 'segmentColumnLength' or
- * even better 'segmentColumnSize'
- *
- * @return the column size.
- */
- public final int getSegmentValueLength() {
- return segmentValueLength;
- }
-
- /**
- * The name of the column in which we store our persistent generator value.
- *
- * @return The name of the value column.
- */
- public final String getValueColumnName() {
- return valueColumnName;
- }
-
- /**
- * The initial value to use when we find no previous state in the
- * generator table corresponding to our sequence.
- *
- * @return The initial value to use.
- */
- public final int getInitialValue() {
- return initialValue;
- }
-
- /**
- * The amount of increment to use. The exact implications of this
- * depends on the {@link #getOptimizer() optimizer} being used.
- *
- * @return The increment amount.
- */
- public final int getIncrementSize() {
- return incrementSize;
- }
-
- /**
- * The optimizer being used by this generator.
- *
- * @return Out optimizer.
- */
- public final Optimizer getOptimizer() {
- return optimizer;
- }
-
- /**
- * Getter for property 'tableAccessCount'. Only really useful for unit test
- * assertions.
- *
- * @return Value for property 'tableAccessCount'.
- */
- public final long getTableAccessCount() {
- return accessCount;
- }
-
- /**
- * {@inheritDoc}
- */
- public void configure(Type type, Properties params, Dialect dialect) throws MappingException {
- identifierType = type;
-
- tableName = determneGeneratorTableName( params );
- segmentColumnName = determineSegmentColumnName( params );
- valueColumnName = determineValueColumnName( params );
-
- segmentValue = determineSegmentValue( params );
-
- segmentValueLength = determineSegmentColumnSize( params );
- initialValue = determineInitialValue( params );
- incrementSize = determineIncrementSize( params );
-
- this.selectQuery = buildSelectQuery( dialect );
- this.updateQuery = buildUpdateQuery();
- this.insertQuery = buildInsertQuery();
-
- String defOptStrategy = incrementSize <= 1 ? OptimizerFactory.NONE : OptimizerFactory.POOL;
- String optimizationStrategy = PropertiesHelper.getString( OPT_PARAM, params, defOptStrategy );
- optimizer = OptimizerFactory.buildOptimizer( optimizationStrategy, identifierType.getReturnedClass(), incrementSize );
- }
-
- /**
- * Determine the table name to use for the generator values.
- * <p/>
- * Called during {@link #configure configuration}.
- *
- * @see #getTableName()
- * @param params The params supplied in the generator config (plus some standard useful extras).
- * @return The table name to use.
- */
- protected String determneGeneratorTableName(Properties params) {
- String name = PropertiesHelper.getString( TABLE_PARAM, params, DEF_TABLE );
- boolean isGivenNameUnqualified = name.indexOf( '.' ) < 0;
- if ( isGivenNameUnqualified ) {
- // if the given name is un-qualified we may neen to qualify it
- String schemaName = params.getProperty( SCHEMA );
- String catalogName = params.getProperty( CATALOG );
- name = Table.qualify( catalogName, schemaName, name );
- }
- return name;
- }
-
- /**
- * Determine the name of the column used to indicate the segment for each
- * row. This column acts as the primary key.
- * <p/>
- * Called during {@link #configure configuration}.
- *
- * @see #getSegmentColumnName()
- * @param params The params supplied in the generator config (plus some standard useful extras).
- * @return The name of the segment column
- */
- protected String determineSegmentColumnName(Properties params) {
- return PropertiesHelper.getString( SEGMENT_COLUMN_PARAM, params, DEF_SEGMENT_COLUMN );
- }
-
- /**
- * Determine the name of the column in which we will store the generator persistent value.
- * <p/>
- * Called during {@link #configure configuration}.
- *
- * @see #getValueColumnName()
- * @param params The params supplied in the generator config (plus some standard useful extras).
- * @return The name of the value column
- */
- protected String determineValueColumnName(Properties params) {
- return PropertiesHelper.getString( VALUE_COLUMN_PARAM, params, DEF_VALUE_COLUMN );
- }
-
- /**
- * Determine the segment value corresponding to this generator instance.
- * <p/>
- * Called during {@link #configure configuration}.
- *
- * @see #getSegmentValue()
- * @param params The params supplied in the generator config (plus some standard useful extras).
- * @return The name of the value column
- */
- protected String determineSegmentValue(Properties params) {
- String segmentValue = params.getProperty( SEGMENT_VALUE_PARAM );
- if ( StringHelper.isEmpty( segmentValue ) ) {
- segmentValue = determineDefaultSegmentValue( params );
- }
- return segmentValue;
- }
-
- /**
- * Used in the cases where {@link #determineSegmentValue} is unable to
- * determine the value to use.
- *
- * @param params The params supplied in the generator config (plus some standard useful extras).
- * @return The default segment value to use.
- */
- protected String determineDefaultSegmentValue(Properties params) {
- boolean preferSegmentPerEntity = PropertiesHelper.getBoolean( CONFIG_PREFER_SEGMENT_PER_ENTITY, params, false );
- String defaultToUse = preferSegmentPerEntity ? params.getProperty( TABLE ) : DEF_SEGMENT_VALUE;
- log.info( "explicit segment value for id generator [" + tableName + '.' + segmentColumnName + "] suggested; using default [" + defaultToUse + "]" );
- return defaultToUse;
- }
-
- /**
- * Determine the size of the {@link #getSegmentColumnName segment column}
- * <p/>
- * Called during {@link #configure configuration}.
- *
- * @see #getSegmentValueLength()
- * @param params The params supplied in the generator config (plus some standard useful extras).
- * @return The size of the segment column
- */
- protected int determineSegmentColumnSize(Properties params) {
- return PropertiesHelper.getInt( SEGMENT_LENGTH_PARAM, params, DEF_SEGMENT_LENGTH );
- }
-
- protected int determineInitialValue(Properties params) {
- return PropertiesHelper.getInt( INITIAL_PARAM, params, DEFAULT_INITIAL_VALUE );
- }
-
- protected int determineIncrementSize(Properties params) {
- return PropertiesHelper.getInt( INCREMENT_PARAM, params, DEFAULT_INCREMENT_SIZE );
- }
-
- protected String buildSelectQuery(Dialect dialect) {
- final String alias = "tbl";
- String query = "select " + StringHelper.qualify( alias, valueColumnName ) +
- " from " + tableName + ' ' + alias +
- " where " + StringHelper.qualify( alias, segmentColumnName ) + "=?";
- HashMap lockMap = new HashMap();
- lockMap.put( alias, LockMode.UPGRADE );
- Map updateTargetColumnsMap = Collections.singletonMap( alias, new String[] { valueColumnName } );
- return dialect.applyLocksToSql( query, lockMap, updateTargetColumnsMap );
- }
-
- protected String buildUpdateQuery() {
- return "update " + tableName +
- " set " + valueColumnName + "=? " +
- " where " + valueColumnName + "=? and " + segmentColumnName + "=?";
- }
-
- protected String buildInsertQuery() {
- return "insert into " + tableName + " (" + segmentColumnName + ", " + valueColumnName + ") " + " values (?,?)";
- }
-
- /**
- * {@inheritDoc}
- */
- public synchronized Serializable generate(final SessionImplementor session, Object obj) {
- return optimizer.generate(
- new AccessCallback() {
- public long getNextValue() {
- return ( ( Number ) doWorkInNewTransaction( session ) ).longValue();
- }
- }
- );
- }
-
- /**
- * {@inheritDoc}
- */
- public Serializable doWorkInCurrentTransaction(Connection conn, String sql) throws SQLException {
- int result;
- int rows;
- do {
- SQL_STATEMENT_LOGGER.logStatement( selectQuery, FormatStyle.BASIC );
- PreparedStatement selectPS = conn.prepareStatement( selectQuery );
- try {
- selectPS.setString( 1, segmentValue );
- ResultSet selectRS = selectPS.executeQuery();
- if ( !selectRS.next() ) {
- PreparedStatement insertPS = null;
- try {
- result = initialValue;
- SQL_STATEMENT_LOGGER.logStatement( insertQuery, FormatStyle.BASIC );
- insertPS = conn.prepareStatement( insertQuery );
- insertPS.setString( 1, segmentValue );
- insertPS.setLong( 2, result );
- insertPS.execute();
- }
- finally {
- if ( insertPS != null ) {
- insertPS.close();
- }
- }
- }
- else {
- result = selectRS.getInt( 1 );
- }
- selectRS.close();
- }
- catch ( SQLException sqle ) {
- log.error( "could not read or init a hi value", sqle );
- throw sqle;
- }
- finally {
- selectPS.close();
- }
-
- SQL_STATEMENT_LOGGER.logStatement( updateQuery, FormatStyle.BASIC );
- PreparedStatement updatePS = conn.prepareStatement( updateQuery );
- try {
- long newValue = optimizer.applyIncrementSizeToSourceValues()
- ? result + incrementSize : result + 1;
- updatePS.setLong( 1, newValue );
- updatePS.setLong( 2, result );
- updatePS.setString( 3, segmentValue );
- rows = updatePS.executeUpdate();
- }
- catch ( SQLException sqle ) {
- log.error( "could not updateQuery hi value in: " + tableName, sqle );
- throw sqle;
- }
- finally {
- updatePS.close();
- }
- }
- while ( rows == 0 );
-
- accessCount++;
-
- return new Integer( result );
- }
-
- /**
- * {@inheritDoc}
- */
- public String[] sqlCreateStrings(Dialect dialect) throws HibernateException {
- return new String[] {
- new StringBuffer()
- .append( dialect.getCreateTableString() )
- .append( ' ' )
- .append( tableName )
- .append( " ( " )
- .append( segmentColumnName )
- .append( ' ' )
- .append( dialect.getTypeName( Types.VARCHAR, segmentValueLength, 0, 0 ) )
- .append( " not null " )
- .append( ", " )
- .append( valueColumnName )
- .append( ' ' )
- .append( dialect.getTypeName( Types.BIGINT ) )
- .append( ", primary key ( " )
- .append( segmentColumnName )
- .append( " ) ) " )
- .toString()
- };
- }
-
- /**
- * {@inheritDoc}
- */
- public String[] sqlDropStrings(Dialect dialect) throws HibernateException {
- StringBuffer sqlDropString = new StringBuffer().append( "drop table " );
- if ( dialect.supportsIfExistsBeforeTableName() ) {
- sqlDropString.append( "if exists " );
- }
- sqlDropString.append( tableName ).append( dialect.getCascadeConstraintsString() );
- if ( dialect.supportsIfExistsAfterTableName() ) {
- sqlDropString.append( " if exists" );
- }
- return new String[] { sqlDropString.toString() };
- }
-
- /**
- * {@inheritDoc}
- */
- public Object generatorKey() {
- return tableName;
- }
-}
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ *
+ */
+package org.hibernate.id.enhanced;
+
+import java.io.Serializable;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
+import org.hibernate.MappingException;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.SessionImplementor;
+import org.hibernate.engine.TransactionHelper;
+import org.hibernate.id.Configurable;
+import org.hibernate.id.PersistentIdentifierGenerator;
+import org.hibernate.jdbc.util.FormatStyle;
+import org.hibernate.mapping.Table;
+import org.hibernate.type.Type;
+import org.hibernate.util.PropertiesHelper;
+import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * An enhanced version of table-based id generation.
+ * <p/>
+ * Unlike the simplistic legacy one (which, btw, was only ever intended for subclassing
+ * support) we "segment" the table into multiple values. Thus a single table can
+ * actually serve as the persistent storage for multiple independent generators. One
+ * approach would be to segment the values by the name of the entity for which we are
+ * performing generation, which would mean that we would have a row in the generator
+ * table for each entity name. Or any configuration really; the setup is very flexible.
+ * <p/>
+ * In this respect it is very simliar to the legacy
+ * {@link org.hibernate.id.MultipleHiLoPerTableGenerator} in terms of the
+ * underlying storage structure (namely a single table capable of holding
+ * multiple generator values). The differentiator is, as with
+ * {@link SequenceStyleGenerator} as well, the externalized notion
+ * of an optimizer.
+ * <p/>
+ * <b>NOTE</b> that by default we use a single row for all genertators (based
+ * on {@link #DEF_SEGMENT_VALUE}). The configuration parameter
+ * {@link #CONFIG_PREFER_SEGMENT_PER_ENTITY} can be used to change that to
+ * instead default to using a row for each entity name.
+ * <p/>
+ * Configuration parameters:
+ * <table>
+ * <tr>
+ * <td><b>NAME</b></td>
+ * <td><b>DEFAULT</b></td>
+ * <td><b>DESCRIPTION</b></td>
+ * </tr>
+ * <tr>
+ * <td>{@link #TABLE_PARAM}</td>
+ * <td>{@link #DEF_TABLE}</td>
+ * <td>The name of the table to use to store/retrieve values</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #VALUE_COLUMN_PARAM}</td>
+ * <td>{@link #DEF_VALUE_COLUMN}</td>
+ * <td>The name of column which holds the sequence value for the given segment</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #SEGMENT_COLUMN_PARAM}</td>
+ * <td>{@link #DEF_SEGMENT_COLUMN}</td>
+ * <td>The name of the column which holds the segment key</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #SEGMENT_VALUE_PARAM}</td>
+ * <td>{@link #DEF_SEGMENT_VALUE}</td>
+ * <td>The value indicating which segment is used by this generator; refers to values in the {@link #SEGMENT_COLUMN_PARAM} column</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #SEGMENT_LENGTH_PARAM}</td>
+ * <td>{@link #DEF_SEGMENT_LENGTH}</td>
+ * <td>The data length of the {@link #SEGMENT_COLUMN_PARAM} column; used for schema creation</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #INITIAL_PARAM}</td>
+ * <td>{@link #DEFAULT_INITIAL_VALUE}</td>
+ * <td>The initial value to be stored for the given segment</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #INCREMENT_PARAM}</td>
+ * <td>{@link #DEFAULT_INCREMENT_SIZE}</td>
+ * <td>The increment size for the underlying segment; see the discussion on {@link Optimizer} for more details.</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #OPT_PARAM}</td>
+ * <td><i>depends on defined increment size</i></td>
+ * <td>Allows explicit definition of which optimization strategy to use</td>
+ * </tr>
+ * </table>
+ *
+ * @author Steve Ebersole
+ */
+public class TableGenerator extends TransactionHelper implements PersistentIdentifierGenerator, Configurable {
+ private static final Logger log = LoggerFactory.getLogger( TableGenerator.class );
+
+ public static final String CONFIG_PREFER_SEGMENT_PER_ENTITY = "prefer_entity_table_as_segment_value";
+
+ public static final String TABLE_PARAM = "table_name";
+ public static final String DEF_TABLE = "hibernate_sequences";
+
+ public static final String VALUE_COLUMN_PARAM = "value_column_name";
+ public static final String DEF_VALUE_COLUMN = "next_val";
+
+ public static final String SEGMENT_COLUMN_PARAM = "segment_column_name";
+ public static final String DEF_SEGMENT_COLUMN = "sequence_name";
+
+ public static final String SEGMENT_VALUE_PARAM = "segment_value";
+ public static final String DEF_SEGMENT_VALUE = "default";
+
+ public static final String SEGMENT_LENGTH_PARAM = "segment_value_length";
+ public static final int DEF_SEGMENT_LENGTH = 255;
+
+ public static final String INITIAL_PARAM = "initial_value";
+ public static final int DEFAULT_INITIAL_VALUE = 1;
+
+ public static final String INCREMENT_PARAM = "increment_size";
+ public static final int DEFAULT_INCREMENT_SIZE = 1;
+
+ public static final String OPT_PARAM = "optimizer";
+
+
+ private Type identifierType;
+
+ private String tableName;
+
+ private String segmentColumnName;
+ private String segmentValue;
+ private int segmentValueLength;
+
+ private String valueColumnName;
+ private int initialValue;
+ private int incrementSize;
+
+ private String selectQuery;
+ private String insertQuery;
+ private String updateQuery;
+
+ private Optimizer optimizer;
+ private long accessCount = 0;
+
+ /**
+ * Type mapping for the identifier.
+ *
+ * @return The identifier type mapping.
+ */
+ public final Type getIdentifierType() {
+ return identifierType;
+ }
+
+ /**
+ * The name of the table in which we store this generator's persistent state.
+ *
+ * @return The table name.
+ */
+ public final String getTableName() {
+ return tableName;
+ }
+
+ /**
+ * The name of the column in which we store the segment to which each row
+ * belongs. The value here acts as PK.
+ *
+ * @return The segment column name
+ */
+ public final String getSegmentColumnName() {
+ return segmentColumnName;
+ }
+
+ /**
+ * The value in {@link #getSegmentColumnName segment column} which
+ * corresponding to this generator instance. In other words this value
+ * indicates the row in which this generator instance will store values.
+ *
+ * @return The segment value for this generator instance.
+ */
+ public final String getSegmentValue() {
+ return segmentValue;
+ }
+
+ /**
+ * The size of the {@link #getSegmentColumnName segment column} in the
+ * underlying table.
+ * <p/>
+ * <b>NOTE</b> : should really have been called 'segmentColumnLength' or
+ * even better 'segmentColumnSize'
+ *
+ * @return the column size.
+ */
+ public final int getSegmentValueLength() {
+ return segmentValueLength;
+ }
+
+ /**
+ * The name of the column in which we store our persistent generator value.
+ *
+ * @return The name of the value column.
+ */
+ public final String getValueColumnName() {
+ return valueColumnName;
+ }
+
+ /**
+ * The initial value to use when we find no previous state in the
+ * generator table corresponding to our sequence.
+ *
+ * @return The initial value to use.
+ */
+ public final int getInitialValue() {
+ return initialValue;
+ }
+
+ /**
+ * The amount of increment to use. The exact implications of this
+ * depends on the {@link #getOptimizer() optimizer} being used.
+ *
+ * @return The increment amount.
+ */
+ public final int getIncrementSize() {
+ return incrementSize;
+ }
+
+ /**
+ * The optimizer being used by this generator.
+ *
+ * @return Out optimizer.
+ */
+ public final Optimizer getOptimizer() {
+ return optimizer;
+ }
+
+ /**
+ * Getter for property 'tableAccessCount'. Only really useful for unit test
+ * assertions.
+ *
+ * @return Value for property 'tableAccessCount'.
+ */
+ public final long getTableAccessCount() {
+ return accessCount;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configure(Type type, Properties params, Dialect dialect) throws MappingException {
+ identifierType = type;
+
+ tableName = determneGeneratorTableName( params );
+ segmentColumnName = determineSegmentColumnName( params );
+ valueColumnName = determineValueColumnName( params );
+
+ segmentValue = determineSegmentValue( params );
+
+ segmentValueLength = determineSegmentColumnSize( params );
+ initialValue = determineInitialValue( params );
+ incrementSize = determineIncrementSize( params );
+
+ this.selectQuery = buildSelectQuery( dialect );
+ this.updateQuery = buildUpdateQuery();
+ this.insertQuery = buildInsertQuery();
+
+ String defOptStrategy = incrementSize <= 1 ? OptimizerFactory.NONE : OptimizerFactory.POOL;
+ String optimizationStrategy = PropertiesHelper.getString( OPT_PARAM, params, defOptStrategy );
+ optimizer = OptimizerFactory.buildOptimizer( optimizationStrategy, identifierType.getReturnedClass(), incrementSize, -1 );
+ }
+
+ /**
+ * Determine the table name to use for the generator values.
+ * <p/>
+ * Called during {@link #configure configuration}.
+ *
+ * @see #getTableName()
+ * @param params The params supplied in the generator config (plus some standard useful extras).
+ * @return The table name to use.
+ */
+ protected String determneGeneratorTableName(Properties params) {
+ String name = PropertiesHelper.getString( TABLE_PARAM, params, DEF_TABLE );
+ boolean isGivenNameUnqualified = name.indexOf( '.' ) < 0;
+ if ( isGivenNameUnqualified ) {
+ // if the given name is un-qualified we may neen to qualify it
+ String schemaName = params.getProperty( SCHEMA );
+ String catalogName = params.getProperty( CATALOG );
+ name = Table.qualify( catalogName, schemaName, name );
+ }
+ return name;
+ }
+
+ /**
+ * Determine the name of the column used to indicate the segment for each
+ * row. This column acts as the primary key.
+ * <p/>
+ * Called during {@link #configure configuration}.
+ *
+ * @see #getSegmentColumnName()
+ * @param params The params supplied in the generator config (plus some standard useful extras).
+ * @return The name of the segment column
+ */
+ protected String determineSegmentColumnName(Properties params) {
+ return PropertiesHelper.getString( SEGMENT_COLUMN_PARAM, params, DEF_SEGMENT_COLUMN );
+ }
+
+ /**
+ * Determine the name of the column in which we will store the generator persistent value.
+ * <p/>
+ * Called during {@link #configure configuration}.
+ *
+ * @see #getValueColumnName()
+ * @param params The params supplied in the generator config (plus some standard useful extras).
+ * @return The name of the value column
+ */
+ protected String determineValueColumnName(Properties params) {
+ return PropertiesHelper.getString( VALUE_COLUMN_PARAM, params, DEF_VALUE_COLUMN );
+ }
+
+ /**
+ * Determine the segment value corresponding to this generator instance.
+ * <p/>
+ * Called during {@link #configure configuration}.
+ *
+ * @see #getSegmentValue()
+ * @param params The params supplied in the generator config (plus some standard useful extras).
+ * @return The name of the value column
+ */
+ protected String determineSegmentValue(Properties params) {
+ String segmentValue = params.getProperty( SEGMENT_VALUE_PARAM );
+ if ( StringHelper.isEmpty( segmentValue ) ) {
+ segmentValue = determineDefaultSegmentValue( params );
+ }
+ return segmentValue;
+ }
+
+ /**
+ * Used in the cases where {@link #determineSegmentValue} is unable to
+ * determine the value to use.
+ *
+ * @param params The params supplied in the generator config (plus some standard useful extras).
+ * @return The default segment value to use.
+ */
+ protected String determineDefaultSegmentValue(Properties params) {
+ boolean preferSegmentPerEntity = PropertiesHelper.getBoolean( CONFIG_PREFER_SEGMENT_PER_ENTITY, params, false );
+ String defaultToUse = preferSegmentPerEntity ? params.getProperty( TABLE ) : DEF_SEGMENT_VALUE;
+ log.info( "explicit segment value for id generator [" + tableName + '.' + segmentColumnName + "] suggested; using default [" + defaultToUse + "]" );
+ return defaultToUse;
+ }
+
+ /**
+ * Determine the size of the {@link #getSegmentColumnName segment column}
+ * <p/>
+ * Called during {@link #configure configuration}.
+ *
+ * @see #getSegmentValueLength()
+ * @param params The params supplied in the generator config (plus some standard useful extras).
+ * @return The size of the segment column
+ */
+ protected int determineSegmentColumnSize(Properties params) {
+ return PropertiesHelper.getInt( SEGMENT_LENGTH_PARAM, params, DEF_SEGMENT_LENGTH );
+ }
+
+ protected int determineInitialValue(Properties params) {
+ return PropertiesHelper.getInt( INITIAL_PARAM, params, DEFAULT_INITIAL_VALUE );
+ }
+
+ protected int determineIncrementSize(Properties params) {
+ return PropertiesHelper.getInt( INCREMENT_PARAM, params, DEFAULT_INCREMENT_SIZE );
+ }
+
+ protected String buildSelectQuery(Dialect dialect) {
+ final String alias = "tbl";
+ String query = "select " + StringHelper.qualify( alias, valueColumnName ) +
+ " from " + tableName + ' ' + alias +
+ " where " + StringHelper.qualify( alias, segmentColumnName ) + "=?";
+ HashMap lockMap = new HashMap();
+ lockMap.put( alias, LockMode.UPGRADE );
+ Map updateTargetColumnsMap = Collections.singletonMap( alias, new String[] { valueColumnName } );
+ return dialect.applyLocksToSql( query, lockMap, updateTargetColumnsMap );
+ }
+
+ protected String buildUpdateQuery() {
+ return "update " + tableName +
+ " set " + valueColumnName + "=? " +
+ " where " + valueColumnName + "=? and " + segmentColumnName + "=?";
+ }
+
+ protected String buildInsertQuery() {
+ return "insert into " + tableName + " (" + segmentColumnName + ", " + valueColumnName + ") " + " values (?,?)";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public synchronized Serializable generate(final SessionImplementor session, Object obj) {
+ return optimizer.generate(
+ new AccessCallback() {
+ public long getNextValue() {
+ return ( ( Number ) doWorkInNewTransaction( session ) ).longValue();
+ }
+ }
+ );
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Serializable doWorkInCurrentTransaction(Connection conn, String sql) throws SQLException {
+ int result;
+ int rows;
+ do {
+ SQL_STATEMENT_LOGGER.logStatement( selectQuery, FormatStyle.BASIC );
+ PreparedStatement selectPS = conn.prepareStatement( selectQuery );
+ try {
+ selectPS.setString( 1, segmentValue );
+ ResultSet selectRS = selectPS.executeQuery();
+ if ( !selectRS.next() ) {
+ PreparedStatement insertPS = null;
+ try {
+ result = initialValue;
+ SQL_STATEMENT_LOGGER.logStatement( insertQuery, FormatStyle.BASIC );
+ insertPS = conn.prepareStatement( insertQuery );
+ insertPS.setString( 1, segmentValue );
+ insertPS.setLong( 2, result );
+ insertPS.execute();
+ }
+ finally {
+ if ( insertPS != null ) {
+ insertPS.close();
+ }
+ }
+ }
+ else {
+ result = selectRS.getInt( 1 );
+ }
+ selectRS.close();
+ }
+ catch ( SQLException sqle ) {
+ log.error( "could not read or init a hi value", sqle );
+ throw sqle;
+ }
+ finally {
+ selectPS.close();
+ }
+
+ SQL_STATEMENT_LOGGER.logStatement( updateQuery, FormatStyle.BASIC );
+ PreparedStatement updatePS = conn.prepareStatement( updateQuery );
+ try {
+ long newValue = optimizer.applyIncrementSizeToSourceValues()
+ ? result + incrementSize : result + 1;
+ updatePS.setLong( 1, newValue );
+ updatePS.setLong( 2, result );
+ updatePS.setString( 3, segmentValue );
+ rows = updatePS.executeUpdate();
+ }
+ catch ( SQLException sqle ) {
+ log.error( "could not updateQuery hi value in: " + tableName, sqle );
+ throw sqle;
+ }
+ finally {
+ updatePS.close();
+ }
+ }
+ while ( rows == 0 );
+
+ accessCount++;
+
+ return new Integer( result );
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String[] sqlCreateStrings(Dialect dialect) throws HibernateException {
+ return new String[] {
+ new StringBuffer()
+ .append( dialect.getCreateTableString() )
+ .append( ' ' )
+ .append( tableName )
+ .append( " ( " )
+ .append( segmentColumnName )
+ .append( ' ' )
+ .append( dialect.getTypeName( Types.VARCHAR, segmentValueLength, 0, 0 ) )
+ .append( " not null " )
+ .append( ", " )
+ .append( valueColumnName )
+ .append( ' ' )
+ .append( dialect.getTypeName( Types.BIGINT ) )
+ .append( ", primary key ( " )
+ .append( segmentColumnName )
+ .append( " ) ) " )
+ .toString()
+ };
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String[] sqlDropStrings(Dialect dialect) throws HibernateException {
+ StringBuffer sqlDropString = new StringBuffer().append( "drop table " );
+ if ( dialect.supportsIfExistsBeforeTableName() ) {
+ sqlDropString.append( "if exists " );
+ }
+ sqlDropString.append( tableName ).append( dialect.getCascadeConstraintsString() );
+ if ( dialect.supportsIfExistsAfterTableName() ) {
+ sqlDropString.append( " if exists" );
+ }
+ return new String[] { sqlDropString.toString() };
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object generatorKey() {
+ return tableName;
+ }
+}
\ No newline at end of file
13 years, 9 months
- 1
- 0
Hibernate SVN: r20915 - core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/main/java/org/hibernate/id/enhanced.
by hibernate-commits＠lists.jboss.org
Author: alessandrolt
Date: 2011-02-15 12:55:17 -0500 (Tue, 15 Feb 2011)
New Revision: 20915
Modified:
core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
Log:
JBPAPP-5939: backporting the fix of JBPAPP-5763 to on-off patch
Modified: core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
===================================================================
--- core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java 2011-02-15 17:54:56 UTC (rev 20914)
+++ core/patches/JBOSS_EAP_3_3_2_CP03_JBPAPP-5939/core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java 2011-02-15 17:55:17 UTC (rev 20915)
@@ -24,21 +24,20 @@
*/
package org.hibernate.id.enhanced;
-import java.util.Properties;
import java.io.Serializable;
+import java.util.Properties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.hibernate.id.PersistentIdentifierGenerator;
-import org.hibernate.id.Configurable;
import org.hibernate.HibernateException;
import org.hibernate.MappingException;
+import org.hibernate.dialect.Dialect;
import org.hibernate.engine.SessionImplementor;
+import org.hibernate.id.Configurable;
+import org.hibernate.id.PersistentIdentifierGenerator;
import org.hibernate.mapping.Table;
-import org.hibernate.util.PropertiesHelper;
import org.hibernate.type.Type;
-import org.hibernate.dialect.Dialect;
+import org.hibernate.util.PropertiesHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Generates identifier values based on an sequence-style database structure.
@@ -179,7 +178,7 @@
this.databaseStructure = buildDatabaseStructure( params, dialect, forceTableUse, sequenceName, initialValue, incrementSize );
- this.optimizer = OptimizerFactory.buildOptimizer( optimizationStrategy, identifierType.getReturnedClass(), incrementSize );
+ this.optimizer = OptimizerFactory.buildOptimizer( optimizationStrategy, identifierType.getReturnedClass(), incrementSize, -1 );
this.databaseStructure.prepare( optimizer );
}
@@ -282,7 +281,7 @@
* @param sequenceName The name to use for the sequence or table.
* @param initialValue The initial value.
* @param incrementSize the increment size to use (after any adjustments).
- * @return The db structure representation
+ * @return An abstraction for the actual database structure in use (table vs. sequence).
*/
protected DatabaseStructure buildDatabaseStructure(
Properties params,
@@ -334,4 +333,4 @@
public String[] sqlDropStrings(Dialect dialect) throws HibernateException {
return databaseStructure.sqlDropStrings( dialect );
}
-}
+}
\ No newline at end of file
13 years, 9 months
- 1
- 0