diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java index df3963dc85..56e29cb0bd 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java @@ -24,7 +24,7 @@ import org.springframework.aop.Pointcut; * Convenient superclass when we want to force subclasses to * implement MethodMatcher interface, but subclasses * will want to be pointcuts. The getClassFilter() method can - * be overriden to customize ClassFilter behaviour as well. + * be overridden to customize ClassFilter behaviour as well. * * @author Rod Johnson */ diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java index f547c026d9..60d0d4627a 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java @@ -218,7 +218,7 @@ public class MethodInvocationProceedingJoinPointTests { itb.unreliableFileOperation(); } catch (IOException ex) { - // we don't realy care... + // we don't really care... } } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java index 49c5f9f7b5..2a32e6750f 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java @@ -52,7 +52,7 @@ import org.springframework.beans.factory.config.BeanReference; * all {@link BeanReference BeanReferences} that are required to validate the configuration of the * overall logical entity as well as those required to provide full user visualisation of the configuration. * It is expected that certain {@link BeanReference BeanReferences} will not be important to - * validation or to the user view of the configuration and as such these may be ommitted. A tool may wish to + * validation or to the user view of the configuration and as such these may be omitted. A tool may wish to * display any additional {@link BeanReference BeanReferences} sourced through the supplied * {@link BeanDefinition BeanDefinitions} but this is not considered to be a typical case. * diff --git a/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java b/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java index 171ed95672..48f7c02151 100644 --- a/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java +++ b/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java @@ -29,7 +29,7 @@ import org.springframework.util.Assert; * PagedListHolder is a simple state holder for handling lists of objects, * separating them into pages. Page numbering starts with 0. * - *

This is mainly targetted at usage in web UIs. Typically, an instance will be + *

This is mainly targeted at usage in web UIs. Typically, an instance will be * instantiated with a list of beans, put into the session, and exported as model. * The properties can all be set/get programmatically, but the most common way will * be data binding, i.e. populating the bean from request parameters. The getters diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java index 70e192a5ef..17e9c5dc17 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java @@ -177,7 +177,7 @@ public class ScheduledTimerListener { * Set the period between repeated task executions, in milliseconds. *

Default is -1, leading to one-time execution. In case of zero or a * positive value, the task will be executed repeatedly, with the given - * interval inbetween executions. + * interval in-between executions. *

Note that the semantics of the period value vary between fixed-rate * and fixed-delay execution. *

Note: A period of 0 (for example as fixed delay) is diff --git a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java index d6d9016afd..8fab425d2a 100644 --- a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java +++ b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java @@ -168,7 +168,7 @@ public class SpringValidatorAdapterTests { @Test // SPR-16177 public void testWithSet() { Parent parent = new Parent(); - parent.setName("Parent whith set"); + parent.setName("Parent with set"); parent.getChildSet().addAll(createChildren(parent)); BeanPropertyBindingResult errors = new BeanPropertyBindingResult(parent, "parent"); diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartz-hsql.sql b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartz-hsql.sql index 9f8b9d4788..57e05e860a 100644 --- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartz-hsql.sql +++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartz-hsql.sql @@ -2,7 +2,7 @@ -- In your Quartz properties file, you'll need to set -- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.HSQLDBDelegate -- --- Column lenghts are only suggestions. For names, groups, use at least 40 chars. +-- Column lengths are only suggestions. For names, groups, use at least 40 chars. -- for blobs (VARBINARY) use a size that is sure to meet the needs of the amount of data -- you place in job data maps, etc.. -- diff --git a/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java b/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java index 3d8d6cb3f1..d282003280 100644 --- a/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java @@ -197,7 +197,7 @@ public interface ConfigurableApplicationContext extends ApplicationContext, Life * will already have been instantiated before. Use a BeanFactoryPostProcessor * to intercept the BeanFactory setup process before beans get touched. *

Generally, this internal factory will only be accessible while the context - * is active, that is, inbetween {@link #refresh()} and {@link #close()}. + * is active, that is, in-between {@link #refresh()} and {@link #close()}. * The {@link #isActive()} flag can be used to check whether the context * is in an appropriate state. * @return the underlying bean factory diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java index 4ce31e218c..5417eabc00 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java @@ -339,7 +339,7 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean /** * Iterate through all methods on the MBean class and gives subclasses the chance * to vote on their inclusion. If a particular method corresponds to the accessor - * or mutator of an attribute that is inclued in the managment interface, then + * or mutator of an attribute that is inclued in the management interface, then * the corresponding operation is exposed with the "role" descriptor * field set to the appropriate value. * @param managedBean the bean instance (might be an AOP proxy) diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java index 14222b882a..65eb14df58 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java @@ -132,7 +132,7 @@ public class ScheduledExecutorTask { /** * Set the period between repeated task executions, in milliseconds. *

Default is -1, leading to one-time execution. In case of a positive value, - * the task will be executed repeatedly, with the given interval inbetween executions. + * the task will be executed repeatedly, with the given interval in-between executions. *

Note that the semantics of the period value vary between fixed-rate and * fixed-delay execution. *

Note: A period of 0 (for example as fixed delay) is not supported, diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java index 736c707558..ca6cfd58ad 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java @@ -398,7 +398,7 @@ public class ProxyFactoryBeanTests { config.removeAdvice(debugInterceptor); it.getSpouse(); - // Still invoked wiht old reference + // Still invoked with old reference assertEquals(2, debugInterceptor.getCount()); // not invoked with new object diff --git a/spring-context/src/test/java/org/springframework/context/index/CandidateComponentsTestClassLoader.java b/spring-context/src/test/java/org/springframework/context/index/CandidateComponentsTestClassLoader.java index 10697608d0..4fbdf6d182 100644 --- a/spring-context/src/test/java/org/springframework/context/index/CandidateComponentsTestClassLoader.java +++ b/spring-context/src/test/java/org/springframework/context/index/CandidateComponentsTestClassLoader.java @@ -48,7 +48,7 @@ public class CandidateComponentsTestClassLoader extends ClassLoader { /** * Create a test {@link ClassLoader} that creates an index with the - * specifed {@link Resource} instances + * specified {@link Resource} instances * @param classLoader the classloader to use for all other operations * @return a test {@link ClassLoader} with an index built based on the * specified resources. diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java index 85e09bdbb1..f8c131bcd3 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java @@ -185,7 +185,7 @@ public class SpringValidatorAdapterTests { @Test // SPR-16177 public void testWithSet() { Parent parent = new Parent(); - parent.setName("Parent whith set"); + parent.setName("Parent with set"); parent.getChildSet().addAll(createChildren(parent)); BeanPropertyBindingResult errors = new BeanPropertyBindingResult(parent, "parent"); diff --git a/spring-context/src/test/resources/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml b/spring-context/src/test/resources/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml index 929f26c0d7..4f4ec8d592 100644 --- a/spring-context/src/test/resources/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml +++ b/spring-context/src/test/resources/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml @@ -3,7 +3,7 @@ diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java index c78102e108..b225e07619 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java @@ -192,7 +192,7 @@ public interface DataBuffer { * Write at most {@code length} bytes of the given source into this buffer, starting * at the current writing position of this buffer. * @param source the bytes to be written into this buffer - * @param offset the index withing {@code source} to start writing from + * @param offset the index within {@code source} to start writing from * @param length the maximum number of bytes to be written from {@code source} * @return this buffer */ diff --git a/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java b/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java index 7f1531b65a..e3f1e2b427 100644 --- a/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java +++ b/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java @@ -33,7 +33,7 @@ import org.springframework.util.Assert; */ public class LocalizedResourceHelper { - /** The default separator to use inbetween file name parts: an underscore. */ + /** The default separator to use in-between file name parts: an underscore. */ public static final String DEFAULT_SEPARATOR = "_"; @@ -60,7 +60,7 @@ public class LocalizedResourceHelper { } /** - * Set the separator to use inbetween file name parts. + * Set the separator to use in-between file name parts. * Default is an underscore ("_"). */ public void setSeparator(@Nullable String separator) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java index 58b76ec2ce..0523c452b1 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java @@ -47,7 +47,7 @@ import org.springframework.jdbc.core.BatchPreparedStatementSetter; public class BatchSqlUpdate extends SqlUpdate { /** - * Default number of inserts to accumulate before commiting a batch (5000). + * Default number of inserts to accumulate before committing a batch (5000). */ public static final int DEFAULT_BATCH_SIZE = 5000; diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java index ca216377dd..acee088d08 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java @@ -59,7 +59,7 @@ import org.springframework.util.Assert; * {@link org.springframework.transaction.PlatformTransactionManager} into the * {@link #setTransactionManager "transactionManager"} property. This will usually * be a {@link org.springframework.transaction.jta.JtaTransactionManager} in a - * Java EE enviroment, in combination with a JTA-aware JMS ConnectionFactory + * Java EE environment, in combination with a JTA-aware JMS ConnectionFactory * obtained from JNDI (check your application server's documentation). * *

This base class does not assume any specific mechanism for asynchronous diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java index 8c654e8069..a1e2b6e762 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java @@ -81,7 +81,7 @@ public class BeanFactoryDestinationResolver implements DestinationResolver, Bean } catch (BeansException ex) { throw new DestinationResolutionException( - "Failed to look up Destinaton bean with name '" + destinationName + "'", ex); + "Failed to look up Destination bean with name '" + destinationName + "'", ex); } } diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/support/package-info.java index e97762a891..e421943a51 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/support/package-info.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/support/package-info.java @@ -1,7 +1,7 @@ /** * Provides generic support classes for using Spring's O/X Mapping integration * within various scenario's. Includes the MarshallingSource for compatibility - * with TrAX, MarshallingView for use withing Spring Web MVC, and the + * with TrAX, MarshallingView for use within Spring Web MVC, and the * MarshallingMessageConverter for use within Spring's JMS support. */ @NonNullApi diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java index 114bbe89c4..6cfc149cca 100644 --- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java +++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java @@ -199,7 +199,7 @@ public interface WebTestClient { * without an HTTP server using a mock request and response. *

Consider using the TestContext framework and * {@link org.springframework.test.context.ContextConfiguration @ContextConfiguration} - * in order to efficently load and inject the Spring configuration into the + * in order to efficiently load and inject the Spring configuration into the * test class. * @param applicationContext the Spring context * @return chained API to customize server and client config; use diff --git a/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java b/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java index 82cd00574b..e9df692b8f 100644 --- a/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java +++ b/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java @@ -17,7 +17,7 @@ package org.springframework.dao; /** - * Exception thrown on failure to aquire a lock during an update, + * Exception thrown on failure to acquire a lock during an update, * for example during a "select for update" statement. * * @author Rod Johnson diff --git a/spring-web/src/main/java/org/springframework/http/codec/xml/JaxbContextContainer.java b/spring-web/src/main/java/org/springframework/http/codec/xml/JaxbContextContainer.java index 163ba8478b..2abe432d3b 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/xml/JaxbContextContainer.java +++ b/spring-web/src/main/java/org/springframework/http/codec/xml/JaxbContextContainer.java @@ -26,7 +26,7 @@ import javax.xml.bind.Unmarshaller; import org.springframework.util.Assert; /** - * Holder for {@link JAXBContext} isntances. + * Holder for {@link JAXBContext} instances. * * @author Arjen Poutsma * @since 5.0 diff --git a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ExtensionRegistryInitializer.java b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ExtensionRegistryInitializer.java index 95b5d430b2..4c04597c3f 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ExtensionRegistryInitializer.java +++ b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ExtensionRegistryInitializer.java @@ -29,7 +29,7 @@ import com.google.protobuf.ExtensionRegistry; * @since 4.1 * @see * com.google.protobuf.ExtensionRegistry - * @deprecated as of Spring Framework 5.1, use {@link ExtensionRegistry} based contructors instead + * @deprecated as of Spring Framework 5.1, use {@link ExtensionRegistry} based constructors instead */ @Deprecated public interface ExtensionRegistryInitializer { diff --git a/spring-web/src/main/java/org/springframework/web/cors/CorsProcessor.java b/spring-web/src/main/java/org/springframework/web/cors/CorsProcessor.java index 2e85839928..1e870d7587 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/CorsProcessor.java +++ b/spring-web/src/main/java/org/springframework/web/cors/CorsProcessor.java @@ -34,7 +34,7 @@ import org.springframework.lang.Nullable; * @author Sebastien Deleuze * @author Rossen Stoyanchev * @since 4.2 - * @see CORS W3C recommandation + * @see CORS W3C recommendation * @see org.springframework.web.servlet.handler.AbstractHandlerMapping#setCorsProcessor */ public interface CorsProcessor { diff --git a/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java b/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java index c46f6956cf..bcbfdbe364 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java +++ b/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java @@ -23,7 +23,7 @@ import org.springframework.http.HttpMethod; /** * Utility class for CORS request handling based on the - * CORS W3C recommandation. + * CORS W3C recommendation. * * @author Sebastien Deleuze * @since 4.2 diff --git a/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsProcessor.java b/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsProcessor.java index 0b6d4dc7a1..c712c9df47 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsProcessor.java +++ b/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsProcessor.java @@ -28,7 +28,7 @@ import org.springframework.web.server.ServerWebExchange; * @author Sebastien Deleuze * @author Rossen Stoyanchev * @since 5.0 - * @see CORS W3C recommandation + * @see CORS W3C recommendation */ public interface CorsProcessor { diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PatternParseException.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PatternParseException.java index dbc8c71f64..4f06e9404b 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/PatternParseException.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PatternParseException.java @@ -95,7 +95,7 @@ public class PatternParseException extends IllegalArgumentException { public enum PatternMessage { MISSING_CLOSE_CAPTURE("Expected close capture character after variable name '}'"), - MISSING_OPEN_CAPTURE("Missing preceeding open capture character before variable name'{'"), + MISSING_OPEN_CAPTURE("Missing preceding open capture character before variable name'{'"), ILLEGAL_NESTED_CAPTURE("Not allowed to nest variable captures"), CANNOT_HAVE_ADJACENT_CAPTURES("Adjacent captures are not allowed"), ILLEGAL_CHARACTER_AT_START_OF_CAPTURE_DESCRIPTOR("Char ''{0}'' not allowed at start of captured variable name"), @@ -105,7 +105,7 @@ public class PatternParseException extends IllegalArgumentException { MISSING_REGEX_CONSTRAINT("Missing regex constraint on capture"), ILLEGAL_DOUBLE_CAPTURE("Not allowed to capture ''{0}'' twice in the same pattern"), REGEX_PATTERN_SYNTAX_EXCEPTION("Exception occurred in regex pattern compilation"), - CAPTURE_ALL_IS_STANDALONE_CONSTRUCT("'{*...}' can only be preceeded by a path separator"); + CAPTURE_ALL_IS_STANDALONE_CONSTRUCT("'{*...}' can only be preceded by a path separator"); private final String message; diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java index 05dbfd78cd..d9f5bae125 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java @@ -204,7 +204,7 @@ public class ServletRequestDataBinderTests { request.addParameter("test_age", "" + 50); ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request); - assertTrue("Didn't fidn normal when given prefix", !pvs.contains("forname")); + assertTrue("Didn't find normal when given prefix", !pvs.contains("forname")); assertTrue("Did treat prefix as normal when not given prefix", pvs.contains("test_forname")); pvs = new ServletRequestParameterPropertyValues(request, "test"); diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java index 38c986d79b..7a2d8a2a23 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java @@ -301,7 +301,7 @@ public class WebRequestDataBinderTests { request.addParameter("test_age", "" + 50); ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request); - assertTrue("Didn't fidn normal when given prefix", !pvs.contains("forname")); + assertTrue("Didn't find normal when given prefix", !pvs.contains("forname")); assertTrue("Did treat prefix as normal when not given prefix", pvs.contains("test_forname")); pvs = new ServletRequestParameterPropertyValues(request, "test"); diff --git a/spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java b/spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java index ccd0b54a1e..fa1ab5318b 100644 --- a/spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java @@ -156,7 +156,7 @@ public class HtmlCharacterEntityReferencesTests { return false; } catch (IOException ex) { - throw new IllegalStateException("Could not parse defintion resource: " + ex.getMessage()); + throw new IllegalStateException("Could not parse definition resource: " + ex.getMessage()); } } diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd index df49cfe09a..1ec6c84049 100644 --- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd +++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd @@ -1119,7 +1119,7 @@ diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/ref1.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/ref1.xml index 60f521c91c..0aa46fe286 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/context/ref1.xml +++ b/spring-webmvc/src/test/resources/org/springframework/web/context/ref1.xml @@ -3,7 +3,7 @@ diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractTransportHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractTransportHandler.java index 2d70d505cf..f57ed8cffa 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractTransportHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractTransportHandler.java @@ -25,7 +25,7 @@ import org.springframework.web.socket.sockjs.transport.SockJsServiceConfig; import org.springframework.web.socket.sockjs.transport.TransportHandler; /** - * Common base class for {@link TransportHandler} inplementations. + * Common base class for {@link TransportHandler} implementations. * * @author Rossen Stoyanchev * @since 4.0 diff --git a/src/docs/asciidoc/core/core-databuffer-codec.adoc b/src/docs/asciidoc/core/core-databuffer-codec.adoc index 6d7f18544f..1c965f2488 100644 --- a/src/docs/asciidoc/core/core-databuffer-codec.adoc +++ b/src/docs/asciidoc/core/core-databuffer-codec.adoc @@ -96,7 +96,7 @@ In practice, this means that the reserved memory captured by the buffer will be the memory pool, ready to be used for future allocations. In general, _the last component to access a `DataBuffer` is responsible for releasing it_. -Withing Spring, there are two sorts of components that release buffers: decoders and transports. +Within Spring, there are two sorts of components that release buffers: decoders and transports. Decoders are responsible for transforming a stream of buffers into other types (see <> below), and transports are responsible for sending buffers across a network boundary, typically as an HTTP message. This means that if you allocate data buffers for the purpose of putting them into an outbound HTTP @@ -167,7 +167,7 @@ Note that a decoder instance needs to consider < ----- \ No newline at end of file +---- diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc index 019306fe67..3b0ea7e2bf 100644 --- a/src/docs/asciidoc/web/webmvc.adoc +++ b/src/docs/asciidoc/web/webmvc.adoc @@ -3911,7 +3911,7 @@ for optimal performance. See section on configuring <>. +response content and thus saving bandwidth but not CPU time. See <>. diff --git a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java index a792b7a6be..305f8e8be1 100644 --- a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java +++ b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java @@ -43,7 +43,7 @@ import org.springframework.transaction.interceptor.TransactionInterceptor; /** * Integration tests for auto proxy creation by advisor recognition working in - * conjunction with transaction managment resources. + * conjunction with transaction management resources. * * @see org.springframework.aop.framework.autoproxy.AdvisorAutoProxyCreatorTests *