Skip to content

Commit

Permalink
bumped dependency versions. fixed nasty spring-data serialization bug…
Browse files Browse the repository at this point in the history
… caused by lack of noargs constructor.
  • Loading branch information
agoston committed Dec 1, 2023
1 parent df4722e commit a530884
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 11 deletions.
8 changes: 8 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: '3.1'

services:
mongo:
image: mongo
restart: always
ports:
- 27017:27017
12 changes: 4 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
<developer>
<name>Ágoston Horváth</name>
<url>github.com/agoston</url>
<email>[email protected]</email>
<organization>bol.com</organization>
<timezone>1</timezone>
<organizationUrl>http://bol.com</organizationUrl>
</developer>
</developers>

Expand All @@ -48,27 +44,27 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<version>4.5.0</version>
<version>[4.5.0,)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb</artifactId>
<version>3.3.5</version>
<version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>2.6.15</version>
<version>3.2.0</version>
<scope>provided</scope>
</dependency>

<!-- test -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.6.4</version>
<version>3.2.0</version>
<scope>test</scope>
</dependency>
<!-- <dependency>-->
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/bol/system/EncryptSystemTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.bol.system.model.*;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import jakarta.annotation.PostConstruct;
import org.bson.Document;
import org.bson.types.Binary;
import org.bson.types.ObjectId;
Expand All @@ -17,7 +18,6 @@
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.util.ReflectionTestUtils;

import javax.annotation.PostConstruct;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.bol.crypt.CryptVault;
import com.bol.system.CryptAssert;
import com.bol.system.model.PlainBean;
import jakarta.annotation.PostConstruct;
import org.bson.Document;
import org.bson.types.ObjectId;
import org.junit.Before;
Expand All @@ -13,7 +14,6 @@
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.test.context.junit4.SpringRunner;

import javax.annotation.PostConstruct;
import java.util.Collections;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/com/bol/system/model/MySubBeanNotEncrypted.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ public class MySubBeanNotEncrypted {
@Field
public String nonSensitiveData2;

public MySubBeanNotEncrypted() {
}

public MySubBeanNotEncrypted(String nonSensitiveData1, String nonSensitiveData2) {
this.nonSensitiveData1 = nonSensitiveData1;
this.nonSensitiveData2 = nonSensitiveData2;
Expand Down
1 change: 0 additions & 1 deletion src/test/java/com/bol/system/model/PlainBean.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ public PlainSubBean(String nonSensitiveData, String sensitiveData) {
this.sensitiveData = sensitiveData;
}
}

}

0 comments on commit a530884

Please sign in to comment.