root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2016-12-23 12:27:07 +01:00
parent e788b8467d
commit f51fe5fd39
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
View File

@ -167,8 +167,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
private static final String[] EXPRESSION_PROPERTIES = new String[] {"value", "pointcut"}; private static final String[] EXPRESSION_PROPERTIES = new String[] {"value", "pointcut"};
private static Map<Class<?>, AspectJAnnotationType> annotationTypes = private static Map<Class<?>, AspectJAnnotationType> annotationTypes = new HashMap<>();
new HashMap<>();
static { static {
annotationTypes.put(Pointcut.class,AspectJAnnotationType.AtPointcut); annotationTypes.put(Pointcut.class,AspectJAnnotationType.AtPointcut);

10
spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2016 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.
@ -29,7 +29,8 @@ import org.springframework.core.io.Resource;
* *
* <p>In case of multiple configuration files, bean definitions in later files * <p>In case of multiple configuration files, bean definitions in later files
* will override those defined in earlier files. This can be leveraged to * will override those defined in earlier files. This can be leveraged to
* deliberately override certain bean definitions via an extra configuration file. * intentionally override certain bean definitions via an extra configuration
* file appended to the list.
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Chris Beams * @author Chris Beams
@ -108,6 +109,11 @@ public class GenericXmlApplicationContext extends GenericApplicationContext {
this.reader.setEnvironment(getEnvironment()); this.reader.setEnvironment(getEnvironment());
} }
//---------------------------------------------------------------------
// Convenient methods for loading XML bean definition files
//---------------------------------------------------------------------
/** /**
* Load bean definitions from the given XML resources. * Load bean definitions from the given XML resources.
* @param resources one or more resources to load from * @param resources one or more resources to load from