inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged searchapi (5.2.1) to 5.2.N (5.2.1)

Browse Source 
129819 gjames: SEARCH-113: The Json representation is immutable.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2016-09-06 14:18:54 +00:00
parent f3cb1c224d
commit 347aedfa1b
4 changed files with 36 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/java/org/alfresco/rest/api/search/model/Query.java
View File

@@ -26,18 +26,27 @@
package org.alfresco.rest.api.search.model;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
/**
* POJO class representing the query element of the JSON body
**/
public class Query
{
String language;
String query;
String userQuery;
private final String language;
private final String query;
private final String userQuery;
public Query()
@JsonCreator
public Query(@JsonProperty("language") String language,
@JsonProperty("query") String query,
@JsonProperty("userQuery") String userQuery)
{
this.language = language;
this.query = query;
this.userQuery = userQuery;
}
public String getLanguage()
@@ -45,28 +54,14 @@ public class Query
return language;
}
public void setLanguage(String language)
{
this.language = language;
}
public String getQuery()
{
return query;
}
public void setQuery(String query)
{
this.query = query;
}
public String getUserQuery()
{
return userQuery;
}
public void setUserQuery(String userQuery)
{
this.userQuery = userQuery;
}
}

24
source/java/org/alfresco/rest/api/search/model/SearchQuery.java
View File

@@ -27,6 +27,8 @@
package org.alfresco.rest.api.search.model;
import org.alfresco.rest.framework.resource.parameters.Paging;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
/**
* POJO class representing the JSON body for a search request
@@ -35,11 +37,17 @@ import org.alfresco.rest.framework.resource.parameters.Paging;
*/
public class SearchQuery
{
Query query;
Paging paging;
private final Query query;
private final Paging paging;
public SearchQuery()
public static final SearchQuery EMPTY = new SearchQuery(null, null);
@JsonCreator
public SearchQuery(@JsonProperty("query") Query query,
@JsonProperty("paging") Paging paging)
{
this.query = query;
this.paging = paging;
}
public Query getQuery()
@@ -47,18 +55,8 @@ public class SearchQuery
return query;
}
public void setQuery(Query query)
{
this.query = query;
}
public Paging getPaging()
{
return paging;
}
public void setPaging(Paging paging)
{
this.paging = paging;
}
}