From 23ea67deb1b343bcba41fce11476fba5a3cd538b Mon Sep 17 00:00:00 2001 From: Chatura Dilan Date: Fri, 26 May 2017 15:15:36 +0530 Subject: [PATCH] Fixes for filter properties --- .../impl/ApplicationManagementAPIImpl.java | 9 ++- .../device/application/mgt/common/Filter.java | 7 +- .../mgt/common/FilterProperty.java | 77 +++++++++++++++++++ 3 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/FilterProperty.java diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ApplicationManagementAPIImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ApplicationManagementAPIImpl.java index 856cae1d2b..e17a2985e6 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ApplicationManagementAPIImpl.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ApplicationManagementAPIImpl.java @@ -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; } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Filter.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Filter.java index a72dfe3120..5a83306ea0 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Filter.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Filter.java @@ -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 filterProperties; + private List filterProperties; private String searchQuery; @@ -64,11 +65,11 @@ public class Filter { this.filter = filter; } - public Map getFilterProperties() { + public List getFilterProperties() { return filterProperties; } - public void setFilterProperties(Map filterProperties) { + public void setFilterProperties(List filterProperties) { this.filterProperties = filterProperties; } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/FilterProperty.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/FilterProperty.java new file mode 100644 index 0000000000..5dc2b907ff --- /dev/null +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/FilterProperty.java @@ -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; + } + +}