Skip to content

Commit 891ab64

Browse files
committed
Revert "Upgraded jongo to 1.3.0"
This reverts commit 9e56b1f. + Rolled back jongo new annotations usages in MongoResource
1 parent 44084b7 commit 891ab64

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<!-- Mongo modules -->
8686
<mongo-java-driver.version>2.11.3</mongo-java-driver.version>
8787
<bson4jackson.version>2.3.1</bson4jackson.version>
88-
<jongo.version>1.3.0</jongo.version>
88+
<jongo.version>1.0</jongo.version>
8989
<de.flapdoodle.embed.version>1.42</de.flapdoodle.embed.version>
9090

9191
<!-- Test libs -->

restx-jongo/module.ivy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<dependency org="com.fasterxml.jackson.datatype" name="jackson-datatype-joda" rev="2.8.10" conf="default" />
2525
<dependency org="de.undercouch" name="bson4jackson" rev="2.3.1" conf="default" />
2626
<dependency org="org.mongodb" name="mongo-java-driver" rev="2.11.3" conf="default" />
27-
<dependency org="org.jongo" name="jongo" rev="1.3.0" conf="default" />
27+
<dependency org="org.jongo" name="jongo" rev="1.0" conf="default" />
2828
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.5" conf="default" />
2929
<dependency org="junit" name="junit" rev="4.11" conf="test->default" />
3030
<dependency org="org.assertj" name="assertj-core" rev="1.6.0" conf="test->default" />

restx-samplest/src/main/java/samplest/jongo/MongoResource.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import org.bson.types.ObjectId;
55
import org.jongo.marshall.jackson.oid.Id;
6-
import org.jongo.marshall.jackson.oid.MongoId;
7-
import org.jongo.marshall.jackson.oid.MongoObjectId;
86
import restx.annotations.POST;
97
import restx.annotations.RestxResource;
108
import restx.factory.Component;
@@ -17,7 +15,7 @@
1715
public class MongoResource {
1816
public static class ObjectWithIdAnnotation {
1917
// @Id // 0.34 -> OK ; 0.35 -> KO!
20-
@MongoId @JsonProperty("_id") // 0.35 -> KO!
18+
@Id @JsonProperty("_id") // 0.35 -> KO!
2119
private String id;
2220
private String label;
2321

@@ -28,7 +26,7 @@ public static class ObjectWithIdAnnotation {
2826
}
2927
public static class ObjectWithObjectIdAnnotation {
3028
// @org.jongo.marshall.jackson.oid.ObjectId @Id // 0.34 -> OK ; 0.35 -> KO!
31-
@MongoId @MongoObjectId @JsonProperty("_id") // 0.35 -> KO!
29+
@Id @org.jongo.marshall.jackson.oid.ObjectId @JsonProperty("_id") // 0.35 -> KO!
3230
private String id;
3331
private String label;
3432

@@ -39,7 +37,7 @@ public static class ObjectWithObjectIdAnnotation {
3937
}
4038
public static class ObjectWithObjectIdType {
4139
// @Id // 0.34 -> OK ; 0.35 -> OK
42-
@MongoId @JsonProperty("_id") // 0.35 -> OK
40+
@Id @JsonProperty("_id") // 0.35 -> OK
4341
private ObjectId id;
4442
private String label;
4543

restx.build.properties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
"mongo-java-driver.version": "2.11.3",
3131
"bson4jackson.version": "2.3.1",
32-
"jongo.version": "1.3.0",
32+
"jongo.version": "1.0",
3333

3434
"servlet-api.version": "2.5",
3535

0 commit comments

Comments
 (0)