diff --git a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java index 80cbb3df913..e0a99076103 100644 --- a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java +++ b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java @@ -43,7 +43,7 @@ import org.springframework.util.MultiValueMap; import org.springframework.util.ReflectionUtils; /** - * Factory for collections that is aware of Java 5, Java 6, and Spring collection types. + * Factory for collections that is aware of common Java and Spring collection types. * *

Mainly for internal use within the framework. * diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java index 969d5bf8fd0..5427df20526 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2019 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. @@ -80,7 +80,7 @@ public abstract class AbstractLobStreamingResultSetExtractor implements Resul } } catch (IOException ex) { - throw new LobRetrievalFailureException("Couldn't stream LOB content", ex); + throw new LobRetrievalFailureException("Could not stream LOB content", ex); } } return null; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java index 0811e7206d8..4a4a52f1081 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2019 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. @@ -161,7 +161,7 @@ public class SqlFunction extends MappingSqlQuery { public int run(Object... parameters) { Object obj = super.findObject(parameters); if (!(obj instanceof Number)) { - throw new TypeMismatchDataAccessException("Couldn't convert result object [" + obj + "] to int"); + throw new TypeMismatchDataAccessException("Could not convert result object [" + obj + "] to int"); } return ((Number) obj).intValue(); } diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java index 9ce94ca173d..2f383e402a3 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java @@ -1019,7 +1019,7 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi return FileCopyUtils.copyToByteArray(dataHandler.getInputStream()); } catch (IOException ex) { - throw new UnmarshallingFailureException("Couldn't read attachment", ex); + throw new UnmarshallingFailureException("Could not read attachment", ex); } } diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java index 4355d6818b7..02acd390add 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2019 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. @@ -153,7 +153,7 @@ public class MethodMapTransactionAttributeSource } if (matchingMethods.isEmpty()) { throw new IllegalArgumentException( - "Couldn't find method '" + mappedName + "' on class [" + clazz.getName() + "]"); + "Could not find method '" + mappedName + "' on class [" + clazz.getName() + "]"); } // Register all matching methods