diff --git a/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java b/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java index 57f886f6533..6c33d76817b 100644 --- a/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java +++ b/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java @@ -59,8 +59,8 @@ public abstract class SpringFactoriesLoader { /** - * Loads the factory implementations of the given type from the default location, using - * the given class loader. + * Load the factory implementations of the given type from the default location, + * using the given class loader. *

The returned factories are ordered in accordance with the {@link OrderComparator}. * @param factoryClass the interface or abstract class representing the factory * @param classLoader the ClassLoader to use for loading (can be {@code null} to use the default) diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java index 4ef7fc4332f..39067a0cd9c 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java @@ -53,20 +53,21 @@ import org.springframework.expression.spel.SpelMessage; */ public class ReflectiveMethodResolver implements MethodResolver { - private Map, MethodFilter> filters = null; - // Using distance will ensure a more accurate match is discovered, // more closely following the Java rules. - private boolean useDistance = false; + private final boolean useDistance; + + private Map, MethodFilter> filters; public ReflectiveMethodResolver() { + this.useDistance = false; } /** * This constructors allows the ReflectiveMethodResolver to be configured such that it will * use a distance computation to check which is the better of two close matches (when there - * are multiple matches). Using the distance computation is intended to ensure matches + * are multiple matches). Using the distance computation is intended to ensure matches * are more closely representative of what a Java compiler would do when taking into * account boxing/unboxing and whether the method candidates are declared to handle a * supertype of the type (of the argument) being passed in. @@ -77,6 +78,19 @@ public class ReflectiveMethodResolver implements MethodResolver { } + public void registerMethodFilter(Class type, MethodFilter filter) { + if (this.filters == null) { + this.filters = new HashMap, MethodFilter>(); + } + if (filter != null) { + this.filters.put(type, filter); + } + else { + this.filters.remove(type); + } + } + + /** * Locate a method on a type. There are three kinds of match that might occur: *

    @@ -187,18 +201,6 @@ public class ReflectiveMethodResolver implements MethodResolver { } } - public void registerMethodFilter(Class type, MethodFilter filter) { - if (this.filters == null) { - this.filters = new HashMap, MethodFilter>(); - } - if (filter == null) { - this.filters.remove(type); - } - else { - this.filters.put(type,filter); - } - } - private Method[] getMethods(Class type, Object targetObject) { if (targetObject instanceof Class) { Set methods = new HashSet(); diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java index fcd0861d2df..f26e54569bd 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java @@ -57,10 +57,10 @@ import org.springframework.orm.jpa.JpaDialect; */ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter { - private final PersistenceProvider persistenceProvider; - private final JpaDialect jpaDialect = new HibernateJpaDialect(); + private final PersistenceProvider persistenceProvider; + private final Class entityManagerFactoryInterface; private final Class entityManagerInterface; diff --git a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java index 37c923e72fa..a3e7ffb5dcb 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java @@ -45,10 +45,9 @@ import org.springframework.web.context.request.SessionScope; import org.springframework.web.context.request.WebRequest; /** - * Convenience methods for retrieving the root - * {@link org.springframework.web.context.WebApplicationContext} for a given - * {@code ServletContext}. This is useful for programmatically accessing a - * Spring application context from within custom web views or MVC actions. + * Convenience methods for retrieving the root {@link WebApplicationContext} for + * a given {@link ServletContext}. This is useful for programmatically accessing + * a Spring application context from within custom web views or MVC actions. * *

    Note that there are more convenient ways of accessing the root context for * many web frameworks, either part of Spring or available as an external library. @@ -232,6 +231,7 @@ public abstract class WebApplicationContextUtils { */ public static void initServletPropertySources( MutablePropertySources propertySources, ServletContext servletContext) { + initServletPropertySources(propertySources, servletContext, null); } diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java index bd3a9a0716a..31c5affaa10 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java @@ -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"); * you may not use this file except in compliance with the License. @@ -21,7 +21,6 @@ import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; - import javax.portlet.PortletConfig; import javax.portlet.PortletContext; import javax.portlet.PortletRequest; @@ -42,9 +41,9 @@ import org.springframework.web.context.request.WebRequest; import org.springframework.web.context.support.WebApplicationContextUtils; /** - * Convenience methods for retrieving the root WebApplicationContext for a given - * PortletContext. This is e.g. useful for accessing a Spring context from - * within custom Portlet implementations. + * Convenience methods for retrieving the root {@link WebApplicationContext} for + * a given {@link PortletContext}. This is useful for programmatically accessing + * a Spring application context from within custom Portlet implementations. * * @author Juergen Hoeller * @author John A. Lewis @@ -98,7 +97,7 @@ public abstract class PortletApplicationContextUtils { * @see org.springframework.web.context.WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE */ public static ApplicationContext getRequiredWebApplicationContext(PortletContext pc) - throws IllegalStateException { + throws IllegalStateException { ApplicationContext wac = getWebApplicationContext(pc); if (wac == null) { @@ -211,15 +210,15 @@ public abstract class PortletApplicationContextUtils { */ public static void initPortletPropertySources(MutablePropertySources propertySources, ServletContext servletContext, PortletContext portletContext, PortletConfig portletConfig) { - Assert.notNull(propertySources, "propertySources must not be null"); + Assert.notNull(propertySources, "propertySources must not be null"); WebApplicationContextUtils.initServletPropertySources(propertySources, servletContext); - if(portletContext != null && propertySources.contains(StandardPortletEnvironment.PORTLET_CONTEXT_PROPERTY_SOURCE_NAME)) { + if (portletContext != null && propertySources.contains(StandardPortletEnvironment.PORTLET_CONTEXT_PROPERTY_SOURCE_NAME)) { propertySources.replace(StandardPortletEnvironment.PORTLET_CONTEXT_PROPERTY_SOURCE_NAME, new PortletContextPropertySource(StandardPortletEnvironment.PORTLET_CONTEXT_PROPERTY_SOURCE_NAME, portletContext)); } - if(portletConfig != null && propertySources.contains(StandardPortletEnvironment.PORTLET_CONFIG_PROPERTY_SOURCE_NAME)) { + if (portletConfig != null && propertySources.contains(StandardPortletEnvironment.PORTLET_CONFIG_PROPERTY_SOURCE_NAME)) { propertySources.replace(StandardPortletEnvironment.PORTLET_CONFIG_PROPERTY_SOURCE_NAME, new PortletConfigPropertySource(StandardPortletEnvironment.PORTLET_CONFIG_PROPERTY_SOURCE_NAME, portletConfig)); }