Permalink
Browse files

Revert "Upgraded jongo to 1.3.0"

This reverts commit 9e56b1f.

+ Rolled back jongo new annotations usages in MongoResource
  • Loading branch information...
fcamblor committed Feb 25, 2018
1 parent 44084b7 commit 891ab64f5446b0546f4af4694c6d6d766adc8bb9
View
@@ -85,7 +85,7 @@
<!-- Mongo modules -->
<mongo-java-driver.version>2.11.3</mongo-java-driver.version>
<bson4jackson.version>2.3.1</bson4jackson.version>
<jongo.version>1.3.0</jongo.version>
<jongo.version>1.0</jongo.version>
<de.flapdoodle.embed.version>1.42</de.flapdoodle.embed.version>
<!-- Test libs -->
View
@@ -24,7 +24,7 @@
<dependency org="com.fasterxml.jackson.datatype" name="jackson-datatype-joda" rev="2.8.10" conf="default" />
<dependency org="de.undercouch" name="bson4jackson" rev="2.3.1" conf="default" />
<dependency org="org.mongodb" name="mongo-java-driver" rev="2.11.3" conf="default" />
<dependency org="org.jongo" name="jongo" rev="1.3.0" conf="default" />
<dependency org="org.jongo" name="jongo" rev="1.0" conf="default" />
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.5" conf="default" />
<dependency org="junit" name="junit" rev="4.11" conf="test->default" />
<dependency org="org.assertj" name="assertj-core" rev="1.6.0" conf="test->default" />
@@ -3,8 +3,6 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import org.bson.types.ObjectId;
import org.jongo.marshall.jackson.oid.Id;
import org.jongo.marshall.jackson.oid.MongoId;
import org.jongo.marshall.jackson.oid.MongoObjectId;
import restx.annotations.POST;
import restx.annotations.RestxResource;
import restx.factory.Component;
@@ -17,7 +15,7 @@
public class MongoResource {
public static class ObjectWithIdAnnotation {
// @Id // 0.34 -> OK ; 0.35 -> KO!
@MongoId @JsonProperty("_id") // 0.35 -> KO!
@Id @JsonProperty("_id") // 0.35 -> KO!
private String id;
private String label;
@@ -28,7 +26,7 @@
}
public static class ObjectWithObjectIdAnnotation {
// @org.jongo.marshall.jackson.oid.ObjectId @Id // 0.34 -> OK ; 0.35 -> KO!
@MongoId @MongoObjectId @JsonProperty("_id") // 0.35 -> KO!
@Id @org.jongo.marshall.jackson.oid.ObjectId @JsonProperty("_id") // 0.35 -> KO!
private String id;
private String label;
@@ -39,7 +37,7 @@
}
public static class ObjectWithObjectIdType {
// @Id // 0.34 -> OK ; 0.35 -> OK
@MongoId @JsonProperty("_id") // 0.35 -> OK
@Id @JsonProperty("_id") // 0.35 -> OK
private ObjectId id;
private String label;
@@ -29,7 +29,7 @@
"mongo-java-driver.version": "2.11.3",
"bson4jackson.version": "2.3.1",
"jongo.version": "1.3.0",
"jongo.version": "1.0",
"servlet-api.version": "2.5",

0 comments on commit 891ab64

Please sign in to comment.