fix build (#529)

boostchicken · Jan 17, 2023 · bc6101b · bc6101b
1 parent 52fde83
commit bc6101b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,11 +37,11 @@
     </licenses>
 
     <properties>
-        <spring.version>5.2.9.RELEASE</spring.version>
-        <spring-data.version>2.6.0</spring-data.version>
+        <spring.version>5.3.15</spring.version>
+        <spring-data.version>2.4.15</spring-data.version>
 
-        <hibernate-validator.version>7.0.1.Final</hibernate-validator.version>
-        <aws-java-sdk.version>1.11.838</aws-java-sdk.version>
+        <hibernate-validator.version>6.2.2.Final</hibernate-validator.version>
+        <aws-java-sdk.version>1.12.150</aws-java-sdk.version>
         <junit.version>4.13.2</junit.version>
         <mockito.version>2.23.0</mockito.version>
         <cdi.version>2.0</cdi.version>
@@ -53,6 +53,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <spring-boot-starter-validation.version>2.6.3</spring-boot-starter-validation.version>
     </properties>
 
     <dependencyManagement>
@@ -147,6 +148,7 @@
 	    <dependency>
 		  <groupId>org.springframework.boot</groupId>
 		  <artifactId>spring-boot-starter-validation</artifactId>
+            <version>${spring-boot-starter-validation.version}</version>
 	    </dependency>
         <!-- SPRING DATA -->
         <dependency>
@@ -251,6 +253,11 @@
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>2.22.2</version>
+                    <configuration>
+                        <classpathDependencyExcludes>
+                            <classpathDependencyExcludes>ch.qos.logback:logback-classic</classpathDependencyExcludes>
+                        </classpathDependencyExcludes>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>

diff --git a/...ava/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java b/...ava/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java
@@ -17,10 +17,9 @@
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -34,6 +33,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.socialsignin.spring.data.dynamodb.core.DynamoDBOperations;
@@ -45,12 +45,13 @@
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.util.TypeInformation;
 
 @RunWith(MockitoJUnitRunner.class)
 public class AbstractDynamoDBQueryTest {
 
-	public static interface UserRepository extends CrudRepository<User, String> {
-		public Page<User> findByName(String name, Pageable pageable);
+	public interface UserRepository extends CrudRepository<User, String> {
+		Page<User> findByName(String name, Pageable pageable);
 	}
 	@Mock
 	private Query<User> query;
@@ -110,10 +111,15 @@ protected boolean isSingleEntityResultsRestriction() {
 	@Mock
 	private RepositoryMetadata metadata;
 	@Mock
+	private TypeInformation typeInformation;
+	@Mock
 	private ProjectionFactory factory;
 
 	@Before
 	public void setUp() {
+		doReturn(Page.class).when(typeInformation).getType();
+		doReturn(typeInformation).when(metadata)
+			.getReturnType(ArgumentMatchers.argThat(argument -> "findByName".equals(argument.getName())));
 		doReturn(UserRepository.class).when(metadata).getRepositoryInterface();
 		doReturn(User.class).when(metadata).getReturnedDomainClass(any());
 	}

diff --git a/...ocialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java b/...ocialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java
@@ -51,8 +51,8 @@
 import static org.mockito.Mockito.when;
 
 /**
- * Unit tests for {@link DynamoDBSimpleIdRepository}.
- * 
+ * Unit tests for {@link SimpleDynamoDBCrudRepository}.
+ *
  * @author Michael Lavelle
  * @author Sebastian Just
  */
@@ -161,8 +161,8 @@ public void testFindAll() {
 
 	/**
 	 * /**
-	 * 
-	 * @see DATAJPA-177
+	 *
+	 * @see <a href="https://jira.spring.io/browse/DATAJPA-177">DATAJPA-177</a>
 	 */
 	@Test(expected = EmptyResultDataAccessException.class)
 	public void throwsExceptionIfEntityOnlyHashKeyToDeleteDoesNotExist() {
@@ -224,7 +224,7 @@ public void testSave() {
 	}
 
 	/**
-	 * @see DATAJPA-177
+	 * @see <a href="https://jira.spring.io/browse/DATAJPA-177">DATAJPA-177</a>
 	 */
 	@Test(expected = EmptyResultDataAccessException.class)
 	public void throwsExceptionIfEntityWithHashAndRangeKeyToDeleteDoesNotExist() {