Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit bc6101b

Browse files
fix build (#529)
1 parent 52fde83 commit bc6101b

File tree

3 files changed

+27
-14
lines changed

3 files changed

+27
-14
lines changed

‎pom.xml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
</licenses>
3838

3939
<properties>
40-
<spring.version>5.2.9.RELEASE</spring.version>
41-
<spring-data.version>2.6.0</spring-data.version>
40+
<spring.version>5.3.15</spring.version>
41+
<spring-data.version>2.4.15</spring-data.version>
4242

43-
<hibernate-validator.version>7.0.1.Final</hibernate-validator.version>
44-
<aws-java-sdk.version>1.11.838</aws-java-sdk.version>
43+
<hibernate-validator.version>6.2.2.Final</hibernate-validator.version>
44+
<aws-java-sdk.version>1.12.150</aws-java-sdk.version>
4545
<junit.version>4.13.2</junit.version>
4646
<mockito.version>2.23.0</mockito.version>
4747
<cdi.version>2.0</cdi.version>
@@ -53,6 +53,7 @@
5353
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5454
<maven.compiler.source>1.8</maven.compiler.source>
5555
<maven.compiler.target>1.8</maven.compiler.target>
56+
<spring-boot-starter-validation.version>2.6.3</spring-boot-starter-validation.version>
5657
</properties>
5758

5859
<dependencyManagement>
@@ -147,6 +148,7 @@
147148
<dependency>
148149
<groupId>org.springframework.boot</groupId>
149150
<artifactId>spring-boot-starter-validation</artifactId>
151+
<version>${spring-boot-starter-validation.version}</version>
150152
</dependency>
151153
<!-- SPRING DATA -->
152154
<dependency>
@@ -251,6 +253,11 @@
251253
<plugin>
252254
<artifactId>maven-surefire-plugin</artifactId>
253255
<version>2.22.2</version>
256+
<configuration>
257+
<classpathDependencyExcludes>
258+
<classpathDependencyExcludes>ch.qos.logback:logback-classic</classpathDependencyExcludes>
259+
</classpathDependencyExcludes>
260+
</configuration>
254261
</plugin>
255262
<plugin>
256263
<artifactId>maven-jar-plugin</artifactId>

‎src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717

1818
import static org.hamcrest.CoreMatchers.instanceOf;
1919
import static org.hamcrest.CoreMatchers.is;
20+
import static org.hamcrest.MatcherAssert.assertThat;
2021
import static org.junit.Assert.assertEquals;
21-
import static org.junit.Assert.assertThat;
22-
import static org.mockito.ArgumentMatchers.any;
23-
import static org.mockito.ArgumentMatchers.anyInt;
22+
import static org.mockito.ArgumentMatchers.*;
2423
import static org.mockito.Mockito.doReturn;
2524
import static org.mockito.Mockito.never;
2625
import static org.mockito.Mockito.spy;
@@ -34,6 +33,7 @@
3433
import org.junit.Before;
3534
import org.junit.Test;
3635
import org.junit.runner.RunWith;
36+
import org.mockito.ArgumentMatchers;
3737
import org.mockito.Mock;
3838
import org.mockito.junit.MockitoJUnitRunner;
3939
import org.socialsignin.spring.data.dynamodb.core.DynamoDBOperations;
@@ -45,12 +45,13 @@
4545
import org.springframework.data.projection.ProjectionFactory;
4646
import org.springframework.data.repository.CrudRepository;
4747
import org.springframework.data.repository.core.RepositoryMetadata;
48+
import org.springframework.data.util.TypeInformation;
4849

4950
@RunWith(MockitoJUnitRunner.class)
5051
public class AbstractDynamoDBQueryTest {
5152

52-
public staticinterface UserRepository extends CrudRepository<User, String> {
53-
publicPage<User> findByName(String name, Pageable pageable);
53+
public interface UserRepository extends CrudRepository<User, String> {
54+
Page<User> findByName(String name, Pageable pageable);
5455
}
5556
@Mock
5657
private Query<User> query;
@@ -110,10 +111,15 @@ protected boolean isSingleEntityResultsRestriction() {
110111
@Mock
111112
private RepositoryMetadata metadata;
112113
@Mock
114+
private TypeInformation typeInformation;
115+
@Mock
113116
private ProjectionFactory factory;
114117

115118
@Before
116119
public void setUp() {
120+
doReturn(Page.class).when(typeInformation).getType();
121+
doReturn(typeInformation).when(metadata)
122+
.getReturnType(ArgumentMatchers.argThat(argument -> "findByName".equals(argument.getName())));
117123
doReturn(UserRepository.class).when(metadata).getRepositoryInterface();
118124
doReturn(User.class).when(metadata).getReturnedDomainClass(any());
119125
}

‎src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
import static org.mockito.Mockito.when;
5252

5353
/**
54-
* Unit tests for {@link DynamoDBSimpleIdRepository}.
55-
*
54+
* Unit tests for {@link SimpleDynamoDBCrudRepository}.
55+
*
5656
* @author Michael Lavelle
5757
* @author Sebastian Just
5858
*/
@@ -161,8 +161,8 @@ public void testFindAll() {
161161

162162
/**
163163
* /**
164-
*
165-
* @see DATAJPA-177
164+
*
165+
* @see <a href="https://jira.spring.io/browse/DATAJPA-177">DATAJPA-177</a>
166166
*/
167167
@Test(expected = EmptyResultDataAccessException.class)
168168
public void throwsExceptionIfEntityOnlyHashKeyToDeleteDoesNotExist() {
@@ -224,7 +224,7 @@ public void testSave() {
224224
}
225225

226226
/**
227-
* @see DATAJPA-177
227+
* @see <a href="https://jira.spring.io/browse/DATAJPA-177">DATAJPA-177</a>
228228
*/
229229
@Test(expected = EmptyResultDataAccessException.class)
230230
public void throwsExceptionIfEntityWithHashAndRangeKeyToDeleteDoesNotExist() {

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /