Fixes for filter properties

feature/appm-store/pbac
Chatura Dilan 8 years ago
parent dd07101e3d
commit 23ea67deb1

@ -30,10 +30,11 @@ import org.wso2.carbon.device.application.mgt.core.services.impl.ApplicationMana
import javax.ws.rs.*;
import javax.ws.rs.core.Response;
import static org.wso2.carbon.device.application.mgt.core.services.impl.ApplicationManagementServiceFactory.ManagerService.APPLICATION_MANAGER;
import static org.wso2.carbon.device.application.mgt.core.services.impl.ApplicationManagementServiceFactory
.ManagerService.APPLICATION_MANAGER;
@Produces({ "application/json"})
@Consumes({ "application/json"})
@Produces({"application/json"})
@Consumes({"application/json"})
public class ApplicationManagementAPIImpl {
public static final int DEFAULT_LIMIT = 20;
@ -51,7 +52,7 @@ public class ApplicationManagementAPIImpl {
.getApplicationManagementService(APPLICATION_MANAGER);
try {
if(limit == 0){
if (limit == 0) {
limit = DEFAULT_LIMIT;
}

@ -18,6 +18,7 @@
*/
package org.wso2.carbon.device.application.mgt.common;
import java.util.List;
import java.util.Map;
public class Filter {
@ -32,7 +33,7 @@ public class Filter {
private String filter;
private Map<String, String> filterProperties;
private List<FilterProperty> filterProperties;
private String searchQuery;
@ -64,11 +65,11 @@ public class Filter {
this.filter = filter;
}
public Map<String, String> getFilterProperties() {
public List<FilterProperty> getFilterProperties() {
return filterProperties;
}
public void setFilterProperties(Map<String, String> filterProperties) {
public void setFilterProperties(List<FilterProperty> filterProperties) {
this.filterProperties = filterProperties;
}

@ -0,0 +1,77 @@
/*
* Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*/
package org.wso2.carbon.device.application.mgt.common;
public class FilterProperty {
public enum Operator {
EQUALS ("="),
GRATER_THAN (">"),
GREATER_THAN_AND_EQUAL(">="),
LESS_THAN ("<"),
LESS_THAN_AND_EQUAL ("<=");
private final String value;
Operator(String value) {
this.value = value;
}
public String getValue() {
return value;
}
}
public FilterProperty(String key, Operator operator, String value) {
this.key = key;
this.operator = operator;
this.value = value;
}
private String key;
private Operator operator;
private String value;
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public Operator getOperator() {
return operator;
}
public void setOperator(Operator operator) {
this.operator = operator;
}
}
Loading…
Cancel
Save