spring-framework

Commit Graph

Author	SHA1	Message	Date
Chris Beams	9e8259198f	Introduce (Annotation)SessionFactoryBuilder types Large refactoring of existing SessionFactoryBean hierarchy designed to support configuration of Hibernate SessionFactory objects within @Configuration class @Bean methods without forcing use of a FactoryBean type, which is generally discouraged due to awkwardness of programming model and lifecycle issues. Refactored and new types include: Removal of AbstractSessionFactoryBean, replacing it with SessionFactoryBeanSupport abstract base class * Introduction of SessionFactoryBuilder and AnnotationSessionFactoryBuilder types, both direct subclasses of SessionFactoryBuilderSupport. These types are intended for direct use within @Bean methods. They expose method-chainable set* methods allowing for concise and convenient use. See JavaDoc on both types for usage examples. * LocalSessionFactoryBean and AnnotationSessionFactoryBean types are now subclasses, respectively, of the Builder types above. LSFB and ASFB backward-compatibility has been maintained almost entirely. The one exception is that there is no longer a protected convertHibernateAccessException() method available in the hierarchy. This method was not likely often used anyway and has been replaced by the new (and public) setPersistenceExceptionTranslator() which accepts instances of type HibernateExceptionTranslator as introduced in SPR-8076. LSFB and ASFB setter method signatures have changed. They no longer return void in standard JavaBeans style but rather, and due to extending the Builder types above, return the 'this' reference. This posed a problem because the Spring container has to date been unable to detect and provide dependency injection against non-void returning setter methods. This limitation was due to the way that the default JavaBeans Introspector class and its getBeanInfo() method works, and prompted the introduction and intergration of ExtendedBeanInfo, already completed in SPR-8079. So have no concern if you notice this signature change - it all works. Certain deprecations have been made: * All LSFB/ASFB methods related to Hibernate's CacheProvider SPI, reflecting its deprecation in Hibernate 3.3 in favor of the new RegionFactory SPI. Note these methods have been preserved only on the FactoryBean types. The new SessionFactoryBuilder supertypes do not expose CacheProvider services at all. All protected LSFB/ASFB methods that accept a Hibernate Configuration parameter, such as newSessionFactory(Configuration), postProcessMappings(Configuration) and postProcessConfiguration(Configuation), in favor of no-arg methods with the same names. Due to the nature of the hierarchy refactoring mentioned above, the Configuration instance is always available when these methods are called, thus no need to pass it in as a parameter. In the process, our approach to automatic detection of Hibernate dialect has been improved (it was in fact broken before). Thanks to James Roper for his suggestion in SPR-7936 as to how to fix this. See HibernateSessionFactoryConfigurationTests as a starting point for understanding the new builder-style approach to SessionFactory creation. Note especially use of the SessionFactoryBuilder#doWithConfiguration method which allows for direct programmatic configuration of the Native Hibernate (Annotation)Configuration API. As a final note, AnnotationConfiguration has been deprecated in Hibernate 3.6, and great pains have been taken to ensure that users of any supported Hibernate version (3.2 -> 3.6) will never need to (a) cast from Configuration to AnnotationConfiguration or (b) experience deprecation warnings due to being forced to use the AnnotationConfiguration API. Explore the JavaDoc around the doWithConfiguration() method and HibernateConfigurationCallback type for complete details. Issue: SPR-8066, SPR-7936, SPR-8076, SPR-8098 git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4147 50f2f4bb-b051-0410-bef5-90022cba6387	15 years ago
Chris Beams	29764a98b9	Resolve or eliminate Environment-related TODOs Issue: SPR-8031, SPR-7508 git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4096 50f2f4bb-b051-0410-bef5-90022cba6387	15 years ago
Juergen Hoeller	4bd265f0a4	removed ConversionService/TypeConverter convenience methods in order to restore 3.0's SPI (for backwards compatibility with implementers) git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3983 50f2f4bb-b051-0410-bef5-90022cba6387	15 years ago
Chris Beams	3fbe9d5a55	Fix STS compatibility issues; other improvements Revert changes to ParserContext, ReaderContext, and XmlReaderContext These changes cause cross-version incompatibilities at tooling time -- for instance, an STS version that ships with Spring 3.0.5 classloads the ParserContext defined in that version, whereas it classloads NamespaceHandlers and BeanDefinitionParsers (by default) from the user application classpath, which may be building against 3.1.0. If so, the changes introduced to these types in 3.1.0 are incompatible with expectations in the 3.0.5 world and cause all manner of problems. In this case, it was NoSuchMethodError due to the newly-added XmlReaderContext.getProblemReporter() method; also IncompatibleClassChangeError due to the introduction of the ComponentRegistrar interface on ParserContext. Each of these problems have been mitigated, though the solutions are not ideal. The method mentioned has been removed, and instead the problemReporter field is now accessed reflectively. ParserContext now no longer implements ComponentRegistrar, and rather a ComponentRegistrarAdapter class has been introduced that passes method calls through to a ParserContext delegate. Introduce AbstractSpecificationBeanDefinitionParser AbstractSpecificationBeanDefinitionParser has been introduced in order to improve the programming model for BeanDefinitionParsers that have been refactored to the new FeatureSpecification model. This new base class and it's template method implementation of parse/doParse ensure that common concerns like (1) adapting a ParserContext into a SpecificationContext, (2) setting source and source name on the specification, and (3) actually executing the specification are all managed by the base class. The subclass implementation of doParse need only actually parse XML, populate and return the FeatureSpecification object. This change removed the many duplicate 'createSpecificationContext' methods that had been lingering. Minor improvement to BeanDefinitionReaderUtils API Introduced new BeanDefinitionReaderUtils#registerWithGeneratedName variant that accepts BeanDefinition as opposed to AbstractBeanDefinition, as BeanDefinition is all that is actually necessary to satisfy the needs of the method implementation. The latter variant accepting AbstractBeanDefinition has been deprecated but remains intact and delegates to the new variant in order to maintain binary compatibility. git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3980 50f2f4bb-b051-0410-bef5-90022cba6387	15 years ago
Chris Beams	8fcce02cde	Add FeatureMethodErrorTests Capture common mistakes with @Feature method declarations and ensure that useful error messages are produced. git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3966 50f2f4bb-b051-0410-bef5-90022cba6387	15 years ago
Chris Beams	dc22760978	Introduce FeatureSpecification support Introduce FeatureSpecification interface and implementations FeatureSpecification objects decouple the configuration of spring container features from the concern of parsing XML namespaces, allowing for reuse in code-based configuration (see @Feature* annotations below). * ComponentScanSpec * TxAnnotationDriven * MvcAnnotationDriven * MvcDefaultServletHandler * MvcResources * MvcViewControllers Refactor associated BeanDefinitionParsers to delegate to new impls above The following BeanDefinitionParser implementations now deal only with the concern of XML parsing. Validation is handled by their corresponding FeatureSpecification object. Bean definition creation and registration is handled by their corresponding FeatureSpecificationExecutor type. * ComponentScanBeanDefinitionParser * AnnotationDrivenBeanDefinitionParser (tx) * AnnotationDrivenBeanDefinitionParser (mvc) * DefaultServletHandlerBeanDefinitionParser * ResourcesBeanDefinitionParser * ViewControllerBeanDefinitionParser Update AopNamespaceUtils to decouple from XML (DOM API) Methods necessary for executing TxAnnotationDriven specification (and eventually, the AspectJAutoProxy specification) have been added that accept boolean arguments for whether to proxy target classes and whether to expose the proxy via threadlocal. Methods that accepted and introspected DOM Element objects still exist but have been deprecated. Introduce @FeatureConfiguration classes and @Feature methods Allow for creation and configuration of FeatureSpecification objects at the user level. A companion for @Configuration classes allowing for completely code-driven configuration of the Spring container. See changes in ConfigurationClassPostProcessor for implementation details. See FeatureTests for usage examples. FeatureTestSuite in .integration-tests is a JUnit test suite designed to aggregate all BDP and Feature related tests for a convenient way to confirm that Feature-related changes don't break anything. Uncomment this test and execute from Eclipse / IDEA. Due to classpath issues, this cannot be compiled by Ant/Ivy at the command line. Introduce @FeatureAnnotation meta-annotation and @ComponentScan impl @FeatureAnnotation provides an alternate mechanism for creating and executing FeatureSpecification objects. See @ComponentScan and its corresponding ComponentScanAnnotationParser implementation for details. See ComponentScanAnnotationIntegrationTests for usage examples Introduce Default[Formatting]ConversionService implementations Allows for convenient instantiation of ConversionService objects containing defaults appropriate for most environments. Replaces similar support originally in ConversionServiceFactory (which is now deprecated). This change was justified by the need to avoid use of FactoryBeans in @Configuration classes (such as FormattingConversionServiceFactoryBean). It is strongly preferred that users simply instantiate and configure the objects that underlie our FactoryBeans. In the case of the ConversionService types, the easiest way to do this is to create Default* subtypes. This also follows convention with the rest of the framework. Minor updates to util classes All in service of changes above. See diffs for self-explanatory details. * BeanUtils * ObjectUtils * ReflectionUtils git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3954 50f2f4bb-b051-0410-bef5-90022cba6387	15 years ago
Keith Donald	61d54ae436	Favor convertValue(Object, TypeDescriptor) where possible and TypedValue(Object); check with Andy on Selection and Projection TypedValue usage git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3881 50f2f4bb-b051-0410-bef5-90022cba6387	15 years ago
Chris Beams	0821b2c6c2	Polish (Mutable)PropertySources * PropertySources is now an Iterable<PropertySource> in favor of exposing an asList() method * Otherwise reduced the set of methods exposed by PropertySources to the absolute minimum * Added Javadoc for both types and all methods git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3865 50f2f4bb-b051-0410-bef5-90022cba6387	15 years ago
Chris Beams	835a3f8d64	Refactor Environment and PropertySource * Environment now extends PropertyResolver * Environment no longer exposes resolver and sources * PropertySource is String,Object instead of String,String * PropertySource no longer assumes enumerability of property names * Introduced EnumerablePropertySource for those that do have enumerable property names git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3862 50f2f4bb-b051-0410-bef5-90022cba6387	15 years ago
Chris Beams	1ac7b56caf	M1 cut of environment, profiles and property work (SPR-7508) Decomposed Environment interface into PropertySources, PropertyResolver objects Environment interface and implementations are still present, but simpler. PropertySources container aggregates PropertySource objects; PropertyResolver provides search, conversion, placeholder replacement. Single implementation for now is PropertySourcesPlaceholderResolver Renamed EnvironmentAwarePropertyPlaceholderConfigurer to PropertySourcesPlaceholderConfigurer <context:property-placeholder/> now registers PSPC by default, else PPC if systemPropertiesMode* settings are involved Refined configuration and behavior of default profiles See Environment interface Javadoc for details Added Portlet implementations of relevant interfaces: * DefaultPortletEnvironment * PortletConfigPropertySource, PortletContextPropertySource * Integrated each appropriately throughout Portlet app contexts Added protected 'createEnvironment()' method to AbstractApplicationContext Subclasses can override at will to supply a custom Environment implementation. In practice throughout the framework, this is how Web- and Portlet-related ApplicationContexts override use of the DefaultEnvironment and swap in DefaultWebEnvironment or DefaultPortletEnvironment as appropriate. Introduced "stub-and-replace" behavior for Servlet- and Portlet-based PropertySource implementations Allows for early registration and ordering of the stub, then replacement with actual backing object at refresh() time. Added AbstractApplicationContext.initPropertySources() method to support stub-and-replace behavior. Called from within existing prepareRefresh() method so as to avoid impact with ApplicationContext implementations that copy and modify AAC's refresh() method (e.g.: Spring DM). Added methods to WebApplicationContextUtils and PortletApplicationContextUtils to support stub-and-replace behavior Added comprehensive Javadoc for all new or modified types and members Added XSD documentation for all new or modified elements and attributes Including nested <beans>, <beans profile="..."/>, and changes for certain attributes type from xsd:IDREF to xsd:string Improved fix for detecting non-file based Resources in PropertiesLoaderSupport (SPR-7547, SPR-7552) Technically unrelated to environment work, but grouped in with this changeset for convenience. Deprecated (removed) context:property-placeholder 'system-properties-mode' attribute from spring-context-3.1.xsd Functionality is preserved for those using schemas up to and including spring-context-3.0. For 3.1, system-properties-mode is no longer supported as it conflicts with the idea of managing a set of property sources within the context's Environment object. See Javadoc in PropertyPlaceholderConfigurer, AbstractPropertyPlaceholderConfigurer and PropertySourcesPlaceholderConfigurer for details. Introduced CollectionUtils.toArray(Enumeration<E>, A[]) Work items remaining for 3.1 M2: Consider repackaging PropertySource* types; eliminate internal use of SystemPropertyUtils and deprecate Further work on composition of Environment interface; consider repurposing existing PlaceholderResolver interface to obviate need for resolve[Required]Placeholder() methods currently in Environment. Ensure configurability of placeholder prefix, suffix, and value separator when working against an AbstractPropertyResolver Add JNDI-based Environment / PropertySource implementatinos Consider support for @Profile at the @Bean level Provide consistent logging for the entire property resolution lifecycle; consider issuing all such messages against a dedicated logger with a single category. Add reference documentation to cover the featureset. git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3839 50f2f4bb-b051-0410-bef5-90022cba6387	15 years ago
Chris Beams	45e5b46fc2	Merge 3.1.0 development branch into trunk Branch in question is 'env' branch from git://git.springsource.org/sandbox/cbeams.git; merged into git-svn repository with: git merge -s recursive -Xtheirs --no-commit env No merge conflicts, but did need to git rm spring-build prior to committing. With this change, Spring 3.1.0 development is now happening on SVN trunk. Further commits to the 3.0.x line will happen in an as-yet uncreated SVN branch. 3.1.0 snapshots will be available per the usual nightly CI build from trunk. git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3782 50f2f4bb-b051-0410-bef5-90022cba6387	15 years ago
Chris Beams	5871cb4f35	Add @Ignored repro test for SPR-7538 git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3677 50f2f4bb-b051-0410-bef5-90022cba6387	16 years ago
Chris Beams	9cc8d7ef91	SPR-7009, SPR-6972: backed out unintentionally committed tests git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3145 50f2f4bb-b051-0410-bef5-90022cba6387	16 years ago
Chris Beams	0041848f1b	SPR-7009: TransactionInterceptor now extracts ultimate target class before evaluating @Transactional metadata to accommodate double-proxying cases git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3144 50f2f4bb-b051-0410-bef5-90022cba6387	16 years ago
Costin Leau	b77d06e903	+ fix test by disabling autowiring git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2979 50f2f4bb-b051-0410-bef5-90022cba6387	16 years ago
Juergen Hoeller	4ae829da56	component-scan's scoped-proxy attribute applies to scope-annotated singleton beans as well (SPR-6683) git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2895 50f2f4bb-b051-0410-bef5-90022cba6387	16 years ago
Juergen Hoeller	e94bf69c1a	@Scope annotations not sufficient for scanning anymore git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1895 50f2f4bb-b051-0410-bef5-90022cba6387	17 years ago
Juergen Hoeller	a65d974b14	initial JSR-330 injection support git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1894 50f2f4bb-b051-0410-bef5-90022cba6387	17 years ago
Juergen Hoeller	1d1dba1693	Servlet/Portlet ApplicationContexts use a specific id based on servlet/portlet name; DefaultListableBeanFactory references are serializable now when initialized with an id; scoped proxies are serializable now, for web scopes as well as for singleton beans; injected request/session references are serializable proxies for the current request now git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1127 50f2f4bb-b051-0410-bef5-90022cba6387	17 years ago
Juergen Hoeller	b1ecb0de45	polishing git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1030 50f2f4bb-b051-0410-bef5-90022cba6387	17 years ago
Chris Beams	91d7b44c47	renamed .testsuite -> .integration-tests git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@492 50f2f4bb-b051-0410-bef5-90022cba6387	17 years ago

21 Commits (fb40ff59abd4b1570001c2d493358311e3b13138)