Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

"packagesToScan" feature for Hibernate 3 and Hibernate 4 detects annotated packages as well

Browse Source 
Issue: SPR-7748
Issue: SPR-10288
This commit is contained in:
Juergen Hoeller
2013-02-13 17:43:22 +01:00
committed by unknown
parent 39c6341cea
commit 5334ac59f6
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -68,6 +68,8 @@ public class LocalSessionFactoryBuilder extends Configuration {
private static final String RESOURCE_PATTERN = "/**/*.class"; private static final String RESOURCE_PATTERN = "/**/*.class";
private static final String PACKAGE_INFO_SUFFIX = ".package-info";
private static final TypeFilter[] ENTITY_TYPE_FILTERS = new TypeFilter[] { private static final TypeFilter[] ENTITY_TYPE_FILTERS = new TypeFilter[] {
new AnnotationTypeFilter(Entity.class, false), new AnnotationTypeFilter(Entity.class, false),
new AnnotationTypeFilter(Embeddable.class, false), new AnnotationTypeFilter(Embeddable.class, false),
@@ -194,8 +196,11 @@ public class LocalSessionFactoryBuilder extends Configuration {
if (resource.isReadable()) { if (resource.isReadable()) {
MetadataReader reader = readerFactory.getMetadataReader(resource); MetadataReader reader = readerFactory.getMetadataReader(resource);
String className = reader.getClassMetadata().getClassName(); String className = reader.getClassMetadata().getClassName();
if (matchesFilter(reader, readerFactory)) { if (matchesEntityTypeFilter(reader, readerFactory)) {
addAnnotatedClasses(this.resourcePatternResolver.getClassLoader().loadClass(className)); addAnnotatedClass(this.resourcePatternResolver.getClassLoader().loadClass(className));
}
else if (className.endsWith(PACKAGE_INFO_SUFFIX)) {
addPackage(className.substring(0, className.length() - PACKAGE_INFO_SUFFIX.length()));
} }
} }
} }
@@ -214,7 +219,7 @@ public class LocalSessionFactoryBuilder extends Configuration {
* Check whether any of the configured entity type filters matches * Check whether any of the configured entity type filters matches
* the current class descriptor contained in the metadata reader. * the current class descriptor contained in the metadata reader.
*/ */
private boolean matchesFilter(MetadataReader reader, MetadataReaderFactory readerFactory) throws IOException { private boolean matchesEntityTypeFilter(MetadataReader reader, MetadataReaderFactory readerFactory) throws IOException {
for (TypeFilter filter : ENTITY_TYPE_FILTERS) { for (TypeFilter filter : ENTITY_TYPE_FILTERS) {
if (filter.match(reader, readerFactory)) { if (filter.match(reader, readerFactory)) {
return true; return true;

13
spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -79,6 +79,8 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem
private static final String RESOURCE_PATTERN = "/**/*.class"; private static final String RESOURCE_PATTERN = "/**/*.class";
private static final String PACKAGE_INFO_SUFFIX = ".package-info";
private Class[] annotatedClasses; private Class[] annotatedClasses;
@@ -101,7 +103,7 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem
@Override @Override
public void setConfigurationClass(Class configurationClass) { public void setConfigurationClass(Class<?> configurationClass) {
if (configurationClass == null || !AnnotationConfiguration.class.isAssignableFrom(configurationClass)) { if (configurationClass == null || !AnnotationConfiguration.class.isAssignableFrom(configurationClass)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"AnnotationSessionFactoryBean only supports AnnotationConfiguration or subclasses"); "AnnotationSessionFactoryBean only supports AnnotationConfiguration or subclasses");
@@ -191,9 +193,12 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem
if (resource.isReadable()) { if (resource.isReadable()) {
MetadataReader reader = readerFactory.getMetadataReader(resource); MetadataReader reader = readerFactory.getMetadataReader(resource);
String className = reader.getClassMetadata().getClassName(); String className = reader.getClassMetadata().getClassName();
if (matchesFilter(reader, readerFactory)) { if (matchesEntityTypeFilter(reader, readerFactory)) {
config.addAnnotatedClass(this.resourcePatternResolver.getClassLoader().loadClass(className)); config.addAnnotatedClass(this.resourcePatternResolver.getClassLoader().loadClass(className));
} }
else if (className.endsWith(PACKAGE_INFO_SUFFIX)) {
config.addPackage(className.substring(0, className.length() - PACKAGE_INFO_SUFFIX.length()));
}
} }
} }
} }
@@ -211,7 +216,7 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem
* Check whether any of the configured entity type filters matches * Check whether any of the configured entity type filters matches
* the current class descriptor contained in the metadata reader. * the current class descriptor contained in the metadata reader.
*/ */
private boolean matchesFilter(MetadataReader reader, MetadataReaderFactory readerFactory) throws IOException { private boolean matchesEntityTypeFilter(MetadataReader reader, MetadataReaderFactory readerFactory) throws IOException {
if (this.entityTypeFilters != null) { if (this.entityTypeFilters != null) {
for (TypeFilter filter : this.entityTypeFilters) { for (TypeFilter filter : this.entityTypeFilters) {
if (filter.match(reader, readerFactory)) { if (filter.match(reader, readerFactory)) {