diff --git a/CI.adoc b/CI.adoc index 8d895fc5..aba8edf1 100644 --- a/CI.adoc +++ b/CI.adoc @@ -8,7 +8,7 @@ image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-jdbc%2F1.0.x&su Since this pipeline is purely Docker-based, it's easy to: * Debug what went wrong on your local machine. -* Test out a a tweak to your `test.sh` script before sending it out. +* Test out a tweak to your `test.sh` script before sending it out. * Experiment against a new image before submitting your pull request. All of these use cases are great reasons to essentially run what the CI server does on your local machine. diff --git a/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java index b0bb9e62..6d37bc0d 100644 --- a/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java +++ b/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java @@ -118,7 +118,7 @@ public interface DataAccessStrategy { * passed in matches the number of entities returned. * * @param ids the Ids of the entities to load. Must not be {@code null}. - * @param domainType the type of entities to laod. Must not be {@code null}. + * @param domainType the type of entities to load. Must not be {@code null}. * @param type of entities to load. * @return the loaded entities. Guaranteed to be not {@code null}. */ diff --git a/src/main/java/org/springframework/data/jdbc/core/IterableOfEntryToMapConverter.java b/src/main/java/org/springframework/data/jdbc/core/IterableOfEntryToMapConverter.java index 9fe20e37..43e425c0 100644 --- a/src/main/java/org/springframework/data/jdbc/core/IterableOfEntryToMapConverter.java +++ b/src/main/java/org/springframework/data/jdbc/core/IterableOfEntryToMapConverter.java @@ -54,7 +54,7 @@ class IterableOfEntryToMapConverter implements ConditionalConverter, Converter additonalValues; + private final Map additionalValues; - public MyBatisContext(@Nullable Object id, @Nullable Object instance, Class domainType, Map additonalValues) { + public MyBatisContext(@Nullable Object id, @Nullable Object instance, Class domainType, Map additionalValues) { this.id = id; this.instance = instance; this.domainType = domainType; - this.additonalValues = additonalValues; + this.additionalValues = additionalValues; } /** @@ -79,6 +79,6 @@ public class MyBatisContext { */ @Nullable public Object get(String key) { - return additonalValues.get(key); + return additionalValues.get(key); } } diff --git a/src/main/java/org/springframework/data/jdbc/repository/config/ConfigurableRowMapperMap.java b/src/main/java/org/springframework/data/jdbc/repository/config/ConfigurableRowMapperMap.java index c719dfaa..28da5e0e 100644 --- a/src/main/java/org/springframework/data/jdbc/repository/config/ConfigurableRowMapperMap.java +++ b/src/main/java/org/springframework/data/jdbc/repository/config/ConfigurableRowMapperMap.java @@ -44,7 +44,7 @@ public class ConfigurableRowMapperMap implements RowMapperMap { } /** - * Returs a {@link RowMapper} for the given type if such a {@link RowMapper} is present. If an exact match is found + * Returns a {@link RowMapper} for the given type if such a {@link RowMapper} is present. If an exact match is found * that is returned. If not a {@link RowMapper} is returned that produces subtypes of the requested type. If no such * {@link RowMapper} is found the method returns {@code null}. * diff --git a/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java index ded0bf65..98e7a161 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java @@ -171,7 +171,7 @@ public class QueryAnnotationHsqlIntegrationTests { } @Test // DATAJDBC-175 - public void executeCustomQueryWithReturnTypeIsNubmer() { + public void executeCustomQueryWithReturnTypeIsNumber() { repository.save(dummyEntity("aaa")); repository.save(dummyEntity("bbb")); @@ -199,7 +199,7 @@ public class QueryAnnotationHsqlIntegrationTests { public void executeCustomQueryWithReturnTypeIsDate() { // Since Timestamp extends Date the repository returns the Timestamp as it comes from the database. - // Trying to compare that to an actual Date results in non determistic results, so we have to use an actual + // Trying to compare that to an actual Date results in non deterministic results, so we have to use an actual // Timestamp. Date now = new Timestamp(System.currentTimeMillis()); assertThat(repository.nowWithDate()).isAfterOrEqualsTo(now); diff --git a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java index bb0bacc3..a94809bd 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java @@ -81,7 +81,7 @@ public class JdbcRepositoryFactoryBeanUnitTests { } @Test(expected = IllegalStateException.class) // DATAJDBC-155 - public void afterPropertiesThowsExceptionWhenNoMappingContextSet() { + public void afterPropertiesThrowsExceptionWhenNoMappingContextSet() { factoryBean.setMappingContext(null); factoryBean.setApplicationEventPublisher(publisher);