diff --git a/src/main/antora/modules/ROOT/pages/object-mapping.adoc b/src/main/antora/modules/ROOT/pages/object-mapping.adoc index 380966c536..a383d8a418 100644 --- a/src/main/antora/modules/ROOT/pages/object-mapping.adoc +++ b/src/main/antora/modules/ROOT/pages/object-mapping.adoc @@ -223,7 +223,7 @@ It's an established pattern to rather use static factory methods to expose these [[mapping.general-recommendations.override.properties]] === Overriding Properties -Java's allows a flexible design of domain classes where a subclass could define a property that is already declared with the same name in its superclass. +Java allows a flexible design of domain classes where a subclass could define a property that is already declared with the same name in its superclass. Consider the following example: [source,java] @@ -326,7 +326,7 @@ data class Person(var id: String, val name: String) { ---- Kotlin supports parameter optionality by allowing default values to be used if a parameter is not provided. -When Spring Data detects a constructor with parameter defaulting, then it leaves these parameters absent if the data store does not provide a value (or simply returns `null`) so Kotlin can apply parameter defaulting.Consider the following class that applies parameter defaulting for `name` +When Spring Data detects a constructor with parameter defaulting, then it leaves these parameters absent if the data store does not provide a value (or simply returns `null`) so Kotlin can apply parameter defaulting. Consider the following class that applies parameter defaulting for `name` [source,kotlin] ---- diff --git a/src/main/java/org/springframework/data/convert/PropertyValueConverterRegistrar.java b/src/main/java/org/springframework/data/convert/PropertyValueConverterRegistrar.java index f67e1f2642..c450292c4e 100644 --- a/src/main/java/org/springframework/data/convert/PropertyValueConverterRegistrar.java +++ b/src/main/java/org/springframework/data/convert/PropertyValueConverterRegistrar.java @@ -192,7 +192,7 @@ public PropertyValueConverterRegistrar

reading(Function reader) { * Describes how to read a database value into a domain object's property value. * * @param reader must not be {@literal null}. - * @return the confiured {@link PropertyValueConverterRegistrar}. + * @return the configured {@link PropertyValueConverterRegistrar}. */ @SuppressWarnings({ "rawtypes", "unchecked" }) public PropertyValueConverterRegistrar

reading(BiFunction, S> reader) { diff --git a/src/main/java/org/springframework/data/mapping/model/BeanWrapper.java b/src/main/java/org/springframework/data/mapping/model/BeanWrapper.java index 31172016a4..ab07142a0a 100644 --- a/src/main/java/org/springframework/data/mapping/model/BeanWrapper.java +++ b/src/main/java/org/springframework/data/mapping/model/BeanWrapper.java @@ -118,7 +118,7 @@ public Object getProperty(PersistentProperty property) { * @param property must not be {@literal null}. * @param type can be {@literal null}. * @return - * @throws MappingException in case an exception occured when accessing the property. + * @throws MappingException in case an exception occurred when accessing the property. */ @Nullable public Object getProperty(PersistentProperty property, Class type) { diff --git a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java index 5751c15bd8..bcc79220aa 100644 --- a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java +++ b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java @@ -102,7 +102,7 @@ public CdiRepositoryBean(Set qualifiers, Class repositoryType, Be Assert.notNull(qualifiers, "Qualifiers must not be null"); Assert.notNull(beanManager, "BeanManager must not be null"); - Assert.notNull(repositoryType, "Repoitory type must not be null"); + Assert.notNull(repositoryType, "Repository type must not be null"); Assert.isTrue(repositoryType.isInterface(), "RepositoryType must be an interface"); this.qualifiers = qualifiers; @@ -127,7 +127,7 @@ public CdiRepositoryBean(Set qualifiers, Class repositoryType, Be Assert.notNull(qualifiers, "Qualifiers must not be null"); Assert.notNull(beanManager, "BeanManager must not be null"); - Assert.notNull(repositoryType, "Repoitory type must not be null"); + Assert.notNull(repositoryType, "Repository type must not be null"); Assert.isTrue(repositoryType.isInterface(), "RepositoryType must be an interface"); this.qualifiers = qualifiers; diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryComponentProvider.java b/src/main/java/org/springframework/data/repository/config/RepositoryComponentProvider.java index 9c1c644ce8..b9f7b1796e 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryComponentProvider.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryComponentProvider.java @@ -191,7 +191,7 @@ private static class AllTypeFilter implements TypeFilter { */ public AllTypeFilter(List delegates) { - Assert.notNull(delegates, "TypeFilter deleages must not be null"); + Assert.notNull(delegates, "TypeFilter delegates must not be null"); this.delegates = delegates; } diff --git a/src/main/java/org/springframework/data/util/AnnotatedTypeScanner.java b/src/main/java/org/springframework/data/util/AnnotatedTypeScanner.java index 2b5c1435c1..777f03a591 100644 --- a/src/main/java/org/springframework/data/util/AnnotatedTypeScanner.java +++ b/src/main/java/org/springframework/data/util/AnnotatedTypeScanner.java @@ -44,7 +44,7 @@ */ public class AnnotatedTypeScanner implements ResourceLoaderAware, EnvironmentAware { - private final Iterable> annotationTypess; + private final Iterable> annotationTypes; private final boolean considerInterfaces; private @Nullable ResourceLoader resourceLoader; @@ -83,7 +83,7 @@ public AnnotatedTypeScanner(boolean considerInterfaces, Class> annotationTypes) { this.considerInterfaces = considerInterfaces; - this.annotationTypess = annotationTypes; + this.annotationTypes = annotationTypes; } @Override @@ -146,7 +146,7 @@ Set> findTypes(Iterable basePackages, Collection fi } public Set> findTypes(Iterable basePackages) { - return findTypes(basePackages, Streamable.of(annotationTypess).stream().map(annotation -> new AnnotationTypeFilter(annotation, true, considerInterfaces)).collect(Collectors.toSet())); + return findTypes(basePackages, Streamable.of(annotationTypes).stream().map(annotation -> new AnnotationTypeFilter(annotation, true, considerInterfaces)).collect(Collectors.toSet())); } /**