More model work and new tests

Author: Jotschi

common/src/test/java/io/metaloom/qdrant/client/AbstractContainerTest.java

@@ -1,12 +1,12 @@
 package io.metaloom.qdrant.client;
 
-import org.junit.ClassRule;
+import org.junit.Rule;
 
 import io.metaloom.qdrant.container.QDrantContainer;
 
 public abstract class AbstractContainerTest {
 
-	@ClassRule
-	public static QDrantContainer qdrant = new QDrantContainer();
+	@Rule
+	public QDrantContainer qdrant = new QDrantContainer();
 
 }

http/src/main/java/io/metaloom/qdrant/client/http/model/collection/filter/Filter.java

@@ -3,6 +3,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import io.metaloom.qdrant.client.http.model.RestModel;
@@ -37,6 +38,7 @@ public Filter setShould(List<? extends Condition> should) {
 		return this;
 	}
 
+	@JsonIgnore
 	public Filter setShould(Condition... should) {
 		this.should = Arrays.asList(should);
 		return this;
@@ -51,6 +53,7 @@ public Filter setMust(List<? extends Condition> must) {
 		return this;
 	}
 
+	@JsonIgnore
 	public Filter setMust(Condition... must) {
 		this.must = Arrays.asList(must);
 		return this;
@@ -65,6 +68,7 @@ public Filter setMustNot(List<? extends Condition> mustNot) {
 		return this;
 	}
 
+	@JsonIgnore
 	public Filter setMustNot(Condition... mustNot) {
 		this.mustNot = Arrays.asList(mustNot);
 		return this;

http/src/main/java/io/metaloom/qdrant/client/http/model/collection/filter/condition/HasIdCondition.java

@@ -4,6 +4,7 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class HasIdCondition implements Condition {
@@ -20,6 +21,7 @@ public HasIdCondition setIds(List<Long> ids) {
 		return this;
 	}
 
+	@JsonIgnore
 	public HasIdCondition setIds(long... ids) {
 		this.ids = toList(ids);
 		return this;

http/src/main/java/io/metaloom/qdrant/client/http/model/point/PointDeletePayloadRequest.java

@@ -5,6 +5,9 @@
 import java.util.Arrays;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import io.metaloom.qdrant.client.http.model.RestRequestModel;
 import io.metaloom.qdrant.client.http.model.collection.filter.Filter;
 
@@ -13,16 +16,19 @@ public class PointDeletePayloadRequest implements RestRequestModel {
 	/**
 	 * List of payload keys to remove from payload
 	 */
+	@JsonProperty("keys")
 	private List<String> keys;
 
 	/**
 	 * Deletes values from each point in this list
 	 */
+	@JsonProperty("points")
 	private List<Long> points;
 
 	/**
 	 * Deletes values from points that satisfy this filter condition
 	 */
+	@JsonProperty("filter")
 	private Filter filter;
 
 	public List<String> getKeys() {
@@ -34,6 +40,7 @@ public PointDeletePayloadRequest setKeys(List<String> keys) {
 		return this;
 	}
 
+	@JsonIgnore
 	public PointDeletePayloadRequest setKeys(String... keys) {
 		this.keys = Arrays.asList(keys);
 		return this;
@@ -48,6 +55,7 @@ public PointDeletePayloadRequest setPoints(List<Long> points) {
 		return this;
 	}
 
+	@JsonIgnore
 	public PointDeletePayloadRequest setPoints(long... ids) {
 		this.points = toList(ids);
 		return this;

http/src/main/java/io/metaloom/qdrant/client/http/model/point/PointSetPayloadRequest.java

@@ -4,15 +4,21 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import io.metaloom.qdrant.client.http.model.RestRequestModel;
 import io.metaloom.qdrant.client.http.model.collection.filter.Filter;
 
 public class PointSetPayloadRequest implements RestRequestModel {
 
+	@JsonProperty("payload")
 	private Payload payload;
 
+	@JsonProperty("points")
 	private List<Long> points;
 
+	@JsonProperty("filter")
 	private Filter filter;
 
 	public Payload getPayload() {
@@ -33,6 +39,7 @@ public PointSetPayloadRequest setPoints(List<Long> points) {
 		return this;
 	}
 
+	@JsonIgnore
 	public PointSetPayloadRequest setPoints(long... values) {
 		this.points = toList(values);
 		return this;

http/src/main/java/io/metaloom/qdrant/client/http/model/point/PointStruct.java

@@ -2,8 +2,8 @@
 
 import static io.metaloom.qdrant.client.util.QDrantClientUtil.toList;
 
-import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.databind.JsonNode;
 
@@ -12,8 +12,13 @@
 
 public class PointStruct implements RestModel {
 
+	@JsonProperty("id")
 	private int id;
-	private List<Float> vector;
+
+	@JsonProperty("vector")
+	private VectorData vector;
+
+	@JsonProperty("payload")
 	private Payload payload;
 
 	public int getId() {
@@ -25,17 +30,20 @@ public PointStruct setId(int id) {
 		return this;
 	}
 
-	public List<Float> getVector() {
+	public VectorData getVector() {
 		return vector;
 	}
 
-	public PointStruct setVector(List<Float> vector) {
+	public PointStruct setVector(VectorData vector) {
 		this.vector = vector;
 		return this;
 	}
 
+	@JsonIgnore
 	public PointStruct setVector(float... vector) {
-		this.vector = toList(vector);
+		VectorDataPlain data = new VectorDataPlain();
+		data.setVector(toList(vector));
+		this.vector = data;
 		return this;
 	}
 
@@ -48,16 +56,19 @@ public PointStruct setPayload(Payload payload) {
 		return this;
 	}
 
+	@JsonIgnore
 	public PointStruct setPayload(JsonNode json) {
 		this.payload = new Payload().setJson(json);
 		return this;
 	}
 
+	@JsonIgnore
 	public PointStruct setPayload(String json) throws JacksonException {
 		setPayload(Json.toJson(json));
 		return this;
 	}
 
+	@JsonIgnore
 	public static PointStruct of(float... vectorComponent) {
 		PointStruct p = new PointStruct();
 		p.setVector(vectorComponent);

http/src/main/java/io/metaloom/qdrant/client/http/model/point/PointsBatch.java

@@ -5,12 +5,20 @@
 import java.util.Arrays;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import io.metaloom.qdrant.client.http.model.RestModel;
 
 public class PointsBatch implements RestModel {
 
+	@JsonProperty("ids")
 	private List<Long> ids;
+
+	@JsonProperty("vectors")
 	private List<Vector> vectors;
+
+	@JsonProperty("payloads")
 	private List<Payload> payloads;
 
 	public List<Long> getIds() {
@@ -31,6 +39,7 @@ public PointsBatch setVectors(List<Vector> vectors) {
 		return this;
 	}
 
+	@JsonIgnore
 	public PointsBatch setVectors(Vector... vectors) {
 		this.vectors = Arrays.asList(vectors);
 		return this;
@@ -45,11 +54,13 @@ public PointsBatch setPayloads(List<Payload> payloads) {
 		return this;
 	}
 
+	@JsonIgnore
 	public PointsBatch setIds(long... ids) {
 		this.ids = toList(ids);
 		return this;
 	}
 
+	@JsonIgnore
 	public PointsBatch setPayloads(Payload... payloads) {
 		this.payloads = Arrays.asList(payloads);
 		return this;

http/src/main/java/io/metaloom/qdrant/client/http/model/point/PointsListUpsertRequest.java

@@ -3,8 +3,12 @@
 import java.util.Arrays;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class PointsListUpsertRequest implements PointsUpsertRequest {
 
+	@JsonProperty("points")
 	private List<PointStruct> points;
 
 	public List<PointStruct> getPoints() {
@@ -16,6 +20,7 @@ public PointsListUpsertRequest setPoints(List<PointStruct> points) {
 		return this;
 	}
 
+	@JsonIgnore
 	public PointsListUpsertRequest setPoints(PointStruct... points) {
 		this.points = Arrays.asList(points);
 		return this;

http/src/main/java/io/metaloom/qdrant/client/http/model/point/PointsSearchResponse.java

@@ -1,17 +1,20 @@
 package io.metaloom.qdrant.client.http.model.point;
 
+import java.util.List;
+
 import io.metaloom.qdrant.client.http.model.AbstractResponse;
 
 public class PointsSearchResponse extends AbstractResponse {
 
-	private ScoredPoint result;
+	private List<ScoredPoint> result;
 
-	public ScoredPoint getResult() {
+	public List<ScoredPoint> getResult() {
 		return result;
 	}
 
-	public PointsSearchResponse setResult(ScoredPoint result) {
+	public PointsSearchResponse setResult(List<ScoredPoint> result) {
 		this.result = result;
 		return this;
 	}
+
 }

http/src/main/java/io/metaloom/qdrant/client/http/model/point/ScoredPoint.java

@@ -4,4 +4,54 @@
 
 public class ScoredPoint implements RestModel {
 
+	private int id;
+	private long version;
+	private float score;
+	private Payload payload;
+	private Vector vector;
+
+	public int getId() {
+		return id;
+	}
+
+	public ScoredPoint setId(int id) {
+		this.id = id;
+		return this;
+	}
+
+	public long getVersion() {
+		return version;
+	}
+
+	public ScoredPoint setVersion(long version) {
+		this.version = version;
+		return this;
+	}
+
+	public float getScore() {
+		return score;
+	}
+
+	public ScoredPoint setScore(float score) {
+		this.score = score;
+		return this;
+	}
+
+	public Payload getPayload() {
+		return payload;
+	}
+
+	public ScoredPoint setPayload(Payload payload) {
+		this.payload = payload;
+		return this;
+	}
+
+	public Vector getVector() {
+		return vector;
+	}
+
+	public ScoredPoint setVector(Vector vector) {
+		this.vector = vector;
+		return this;
+	}
 }