Work on v2 API

Author: emmanuel-keller

src/main/java/com/opensearchserver/client/common/search/result/AbstractDocumentResult.java

@@ -32,7 +32,7 @@
 public abstract class AbstractDocumentResult {
 
 	@XmlAttribute
-	public Integer pos;
+	public Long pos;
 
 	@XmlAttribute
 	public Float score;
@@ -66,7 +66,7 @@ public AbstractDocumentResult() {
 	 * @param pos
 	 *            the pos to set
 	 */
-	public void setPos(Integer pos) {
+	public void setPos(Long pos) {
 		this.pos = pos;
 	}
 

src/main/java/com/opensearchserver/client/common/search/result/AbstractSearchResult.java

@@ -37,7 +37,7 @@ public abstract class AbstractSearchResult extends CommonResult {
 	public Integer rows;
 
 	@XmlAttribute
-	public Integer start;
+	public Long start;
 
 	@XmlAttribute
 	public Long numFound;
@@ -83,7 +83,7 @@ public AbstractSearchResult setRows(Integer rows) {
 	 * @param start
 	 *            the start to set
 	 */
-	public AbstractSearchResult setStart(Integer start) {
+	public AbstractSearchResult setStart(Long start) {
 		this.start = start;
 		return this;
 	}

…erver/client/v2/search/FacetResult2.java …r/client/v2/search/DocumentsResult2.javasrc/main/java/com/opensearchserver/client/v2/search/FacetResult2.java renamed to src/main/java/com/opensearchserver/client/v2/search/DocumentsResult2.java src/main/java/com/opensearchserver/client/v2/search/FacetResult2.java renamed to src/main/java/com/opensearchserver/client/v2/search/DocumentsResult2.java

@@ -15,48 +15,26 @@
  */
 package com.opensearchserver.client.v2.search;
 
-import java.util.Map;
+import java.util.List;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
-@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "result")
+@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
 @JsonInclude(Include.NON_EMPTY)
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class FacetResult2 {
+public class DocumentsResult2 {
 
-	@XmlElement(name = "fieldName")
-	public String fieldName;
+	@XmlElement(name = "document")
+	public List<DocumentResult2> documents;
 
-	@XmlElement(name = "terms")
-	public Map<String, Long> terms;
-
-	public FacetResult2() {
-		terms = null;
-		fieldName = null;
-	}
-
-	/**
-	 * @param fieldName
-	 *            the fieldName to set
-	 */
-	public FacetResult2 setFieldName(String fieldName) {
-		this.fieldName = fieldName;
-		return this;
-	}
-
-	/**
-	 * @param terms
-	 *            the terms to set
-	 */
-	public FacetResult2 setTerms(Map<String, Long> terms) {
-		this.terms = terms;
-		return this;
+	public DocumentsResult2() {
+		documents = null;
 	}
 
-}
+}

src/main/java/com/opensearchserver/client/v2/search/SearchResult2.java

@@ -16,7 +16,9 @@
 package com.opensearchserver.client.v2.search;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -44,7 +46,7 @@ public class SearchResult2 extends AbstractSearchResult {
 	public List<DocumentResult2> documents;
 
 	@XmlElement(name = "facet")
-	public List<FacetResult2> facets;
+	public Map<String, Map<String, Long>> facets;
 
 	public SearchResult2() {
 		documents = null;
@@ -74,18 +76,18 @@ public SearchResult2 addDocument(DocumentResult2 document) {
 	 */
 	@XmlTransient
 	@JsonIgnore
-	public SearchResult2 addFacet(FacetResult2 facet) {
+	public SearchResult2 addFacet(String name, LinkedHashMap<String, Long> terms) {
 		if (facets == null)
-			facets = new ArrayList<FacetResult2>(1);
-		facets.add(facet);
+			facets = new LinkedHashMap<String, Map<String, Long>>();
+		facets.put(name.intern(), terms);
 		return this;
 	}
 
 	/**
 	 * @param facets
 	 *            the facets to set
 	 */
-	public SearchResult2 setFacets(List<FacetResult2> facets) {
+	public SearchResult2 setFacets(Map<String, Map<String, Long>> facets) {
 		this.facets = facets;
 		return this;
 	}