diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml index 6715d66cbe..9b4bb2043c 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml @@ -17,20 +17,18 @@ ~ under the License. --> - + apimgt-extensions org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.apimgt.annotations - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle WSO2 Carbon - API Management Annotations WSO2 Carbon - API Management Custom Annotation Module diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml index 14379e2e3b..f4d54e7492 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml @@ -17,18 +17,16 @@ ~ under the License. --> - + apimgt-extensions org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT org.wso2.carbon.apimgt.application.extension.api war WSO2 Carbon - API Application Management API diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml index f67063067f..d9f371913a 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml @@ -17,18 +17,17 @@ ~ under the License. --> - + apimgt-extensions org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT org.wso2.carbon.apimgt.application.extension bundle WSO2 Carbon - API Application Management diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml index 7da850e7a9..082a4817ff 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml @@ -17,20 +17,18 @@ ~ under the License. --> - + apimgt-extensions org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.apimgt.webapp.publisher - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle WSO2 Carbon - API Management Webapp Publisher WSO2 Carbon - API Management Webapp Publisher @@ -105,6 +103,10 @@ org.wso2.carbon.governance org.wso2.carbon.governance.lcm + + javax.ws.rs + javax.ws.rs-api + @@ -152,6 +154,7 @@ org.wso2.carbon.registry.core.* + javax.ws.rs-api, scribe;scope=compile|runtime;inline=false; * diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherStartupHandler.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherStartupHandler.java index 30f7900153..02f75607fd 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherStartupHandler.java +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherStartupHandler.java @@ -25,9 +25,17 @@ import org.wso2.carbon.apimgt.api.model.API; import org.wso2.carbon.apimgt.webapp.publisher.internal.APIPublisherDataHolder; import org.wso2.carbon.core.ServerStartupObserver; +import java.util.Stack; + public class APIPublisherStartupHandler implements ServerStartupObserver { private static final Log log = LogFactory.getLog(APIPublisherStartupHandler.class); + private static int retryTime = 2000; + private static final int CONNECTION_RETRY_FACTOR = 2; + private static Stack failedAPIsStack = new Stack<>(); + private static Stack currentAPIsStack; + + private APIPublisherService publisher; @Override public void completingServerStartup() { @@ -36,32 +44,45 @@ public class APIPublisherStartupHandler implements ServerStartupObserver { @Override public void completedServerStartup() { - // adding temporary due to a bug in the platform + APIPublisherDataHolder.getInstance().setServerStarted(true); + currentAPIsStack = APIPublisherDataHolder.getInstance().getUnpublishedApis(); Thread t = new Thread(new Runnable() { @Override public void run() { - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - log.error("Error occurred while sleeping", e); - } - APIPublisherDataHolder.getInstance().setServerStarted(true); - log.info("Server has just started, hence started publishing unpublished APIs"); if (log.isDebugEnabled()) { + log.debug("Server has just started, hence started publishing unpublished APIs"); log.debug("Total number of unpublished APIs: " + APIPublisherDataHolder.getInstance().getUnpublishedApis().size()); } - APIPublisherService publisher = APIPublisherDataHolder.getInstance().getApiPublisherService(); - while (!APIPublisherDataHolder.getInstance().getUnpublishedApis().isEmpty()) { - API api = APIPublisherDataHolder.getInstance().getUnpublishedApis().pop(); + publisher = APIPublisherDataHolder.getInstance().getApiPublisherService(); + while (!failedAPIsStack.isEmpty() || !currentAPIsStack.isEmpty()) { try { - publisher.publishAPI(api); - } catch (java.lang.Exception e) { - log.error("Error occurred while publishing API '" + api.getId().getApiName(), e); + retryTime = retryTime * CONNECTION_RETRY_FACTOR; + Thread.sleep(retryTime); + } catch (InterruptedException te) { + log.error("Error occurred while sleeping", te); + } + if (!APIPublisherDataHolder.getInstance().getUnpublishedApis().isEmpty()) { + publishAPIs(currentAPIsStack, failedAPIsStack); + } else { + publishAPIs(failedAPIsStack, currentAPIsStack); } } } }); t.start(); } + + private void publishAPIs(Stack apis, Stack failedStack) { + while (!apis.isEmpty()) { + API api = apis.pop(); + try { + publisher.publishAPI(api); + } catch (Exception e) { + log.error("Error occurred while publishing API '" + api.getId().getApiName() + "'"); + failedStack.push(api); + } + } + } + } diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java index af773d6df3..a88fe00e9f 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java @@ -55,6 +55,7 @@ public class AnnotationProcessor { private static final String PACKAGE_ORG_APACHE = "org.apache"; private static final String PACKAGE_ORG_CODEHAUS = "org.codehaus"; private static final String PACKAGE_ORG_SPRINGFRAMEWORK = "org.springframework"; + private static final String WILD_CARD = "/*"; private static final String AUTH_TYPE = "Any"; private static final String PROTOCOL_HTTP = "http"; @@ -227,7 +228,7 @@ public class AnnotationProcessor { if (methodContextAnno != null) { subCtx = invokeMethod(pathClazzMethods[0], methodContextAnno, STRING); } else { - subCtx = "/*"; + subCtx = WILD_CARD; } resource.setUriTemplate(makeContextURLReady(subCtx)); diff --git a/components/apimgt-extensions/pom.xml b/components/apimgt-extensions/pom.xml index c17a81051c..875390e1f7 100644 --- a/components/apimgt-extensions/pom.xml +++ b/components/apimgt-extensions/pom.xml @@ -22,13 +22,13 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml 4.0.0 apimgt-extensions - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon - API Management Extensions Component http://wso2.org diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml index 2f8d129a4f..c49fd515ef 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml @@ -21,13 +21,13 @@ org.wso2.carbon.devicemgt certificate-mgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.certificate.mgt.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle WSO2 Carbon - Certificate Management Core WSO2 Carbon - Certificate Management Core diff --git a/components/certificate-mgt/pom.xml b/components/certificate-mgt/pom.xml index 8ad1e783c7..41fdc5ca14 100644 --- a/components/certificate-mgt/pom.xml +++ b/components/certificate-mgt/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt certificate-mgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon - Certificate Management Component http://wso2.org diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml index a15fcce6ef..e83f180ef3 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml @@ -22,7 +22,7 @@ device-mgt-extensions org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml index d06f9e6417..2fa383eeb1 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml @@ -22,7 +22,7 @@ device-mgt-extensions org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/InvalidConfigurationException.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/InvalidConfigurationException.java new file mode 100644 index 0000000000..337ef72644 --- /dev/null +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/InvalidConfigurationException.java @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2016, 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.mgt.extensions.push.notification.provider.mqtt; + +public class InvalidConfigurationException { +} diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml index 8c16fa3a4b..3ca844b271 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml @@ -22,7 +22,7 @@ device-mgt-extensions org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml diff --git a/components/device-mgt-extensions/pom.xml b/components/device-mgt-extensions/pom.xml index c1210f488a..dedf78615a 100644 --- a/components/device-mgt-extensions/pom.xml +++ b/components/device-mgt-extensions/pom.xml @@ -22,7 +22,7 @@ carbon-devicemgt org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml index 35aa312a0f..4d93cbc66d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml @@ -1,11 +1,9 @@ - + org.wso2.carbon.devicemgt device-mgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml @@ -64,8 +62,8 @@ org.wso2.carbon.device.mgt.analytics.dashboard, - org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception, - org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean + org.wso2.carbon.device.mgt.analytics.dashboard.exception, + org.wso2.carbon.device.mgt.analytics.dashboard.bean org.osgi.framework, diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/GadgetDataService.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/GadgetDataService.java index 6cd23d2727..c2b1b55a75 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/GadgetDataService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/GadgetDataService.java @@ -18,11 +18,11 @@ package org.wso2.carbon.device.mgt.analytics.dashboard; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DetailedDeviceEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DeviceCountByGroupEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.FilterSet; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.DataAccessLayerException; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterValueException; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.BasicFilterSet; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.ExtendedFilterSet; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceCountByGroup; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceWithDetails; +import org.wso2.carbon.device.mgt.analytics.dashboard.exception.*; import org.wso2.carbon.device.mgt.common.PaginationResult; import java.util.List; @@ -35,214 +35,227 @@ public interface GadgetDataService { /** * This method is used to get a count of devices based on a defined filter set. - * @param filterSet An abstract representation of possible filtering options. - * if this value is simply "null" or no values are set for the defined filtering options, - * this method would return total device count in the system - * wrapped with in the defined return format. - * @return An object of type DeviceCountByGroupEntry. - * @throws InvalidParameterValueException This can occur if and only if potentialVulnerability value of filterSet - * is set with some value other than "NON_COMPLIANT" or "UNMONITORED". + * @param extendedFilterSet An abstract representation of possible filtering options. + * if this value is simply "null" or no values are set for the defined filtering + * options, this method would return total device count in the system + * wrapped by the defined return format. + * @return An object of type DeviceCountByGroup. + * @throws InvalidPotentialVulnerabilityValueException This can occur if potentialVulnerability + * value of extendedFilterSet is set with some + * value other than "NON_COMPLIANT" or "UNMONITORED". * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. */ @SuppressWarnings("unused") - DeviceCountByGroupEntry getDeviceCount(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException; + DeviceCountByGroup getDeviceCount(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, DataAccessLayerException; /** * This method is used to get a count of devices non-compliant upon on a particular feature * and a defined filter set. - * @param nonCompliantFeatureCode Code name of the non-compliant feature. - * @param filterSet An abstract representation of possible filtering options. - * if this value is simply "null" or no values are set for the defined filtering options, - * this method would return total device count in the system - * wrapped with in the defined return format. - * @return An object of type DeviceCountByGroupEntry. - * @throws InvalidParameterValueException This can occur if and only if potentialVulnerability value of filterSet - * is set with some value other than "NON_COMPLIANT" or "UNMONITORED". + * @param featureCode Code name of the non-compliant feature. + * @param basicFilterSet An abstract representation of possible filtering options. + * if this value is simply "null" or no values are set for the defined filtering + * options, this method would return total non-compliant device count in the system + * for the given feature-code, wrapped by the defined return format. + * @return An object of type DeviceCountByGroup. + * @throws InvalidFeatureCodeValueException This can occur if featureCode is set to null or empty. * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. */ @SuppressWarnings("unused") - DeviceCountByGroupEntry getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException; + DeviceCountByGroup getFeatureNonCompliantDeviceCount(String featureCode, BasicFilterSet basicFilterSet) + throws InvalidFeatureCodeValueException, DataAccessLayerException; /** * This method is used to get total count of devices currently enrolled under a particular tenant. - * @return An object of type DeviceCountByGroupEntry. + * @return An object of type DeviceCountByGroup. * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. */ @SuppressWarnings("unused") - DeviceCountByGroupEntry getTotalDeviceCount() throws DataAccessLayerException; + DeviceCountByGroup getTotalDeviceCount() throws DataAccessLayerException; /** * This method is used to get device counts classified by connectivity statuses. - * @return A list of objects of type DeviceCountByGroupEntry. + * @return A list of objects of type DeviceCountByGroup. * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. */ @SuppressWarnings("unused") - List getDeviceCountsByConnectivityStatuses() throws DataAccessLayerException; + List getDeviceCountsByConnectivityStatuses() throws DataAccessLayerException; /** * This method is used to get device counts classified by potential vulnerabilities. - * @return A list of objects of type DeviceCountByGroupEntry. + * @return A list of objects of type DeviceCountByGroup. * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. */ @SuppressWarnings("unused") - List getDeviceCountsByPotentialVulnerabilities() throws DataAccessLayerException; + List getDeviceCountsByPotentialVulnerabilities() throws DataAccessLayerException; /** * This method is used to get non-compliant device counts classified by individual features. * @param startIndex Starting index of the data set to be retrieved. * @param resultCount Total count of the result set retrieved. * @return An object of type PaginationResult. - * @throws InvalidParameterValueException This can occur if and only if potentialVulnerability value of filterSet - * is set with some value other than "NON_COMPLIANT" or "UNMONITORED". + * @throws InvalidStartIndexValueException This can occur if startIndex value is lesser than its minimum (0). + * @throws InvalidResultCountValueException This can occur if resultCount value is lesser than its minimum (5). * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. */ @SuppressWarnings("unused") - PaginationResult getNonCompliantDeviceCountsByFeatures(int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException; + PaginationResult getNonCompliantDeviceCountsByFeatures(int startIndex, int resultCount) throws + InvalidStartIndexValueException, InvalidResultCountValueException, DataAccessLayerException; /** * This method is used to get device counts classified by platforms. - * @param filterSet An abstract representation of possible filtering options. - * if this value is simply "null" or no values are set for the defined filtering options, - * this method would return total device count in the system - * wrapped with in the defined return format. - * @return An object of type DeviceCountByGroupEntry. - * @throws InvalidParameterValueException This can occur if and only if potentialVulnerability value of filterSet - * is set with some value other than "NON_COMPLIANT" or "UNMONITORED". + * @param extendedFilterSet An abstract representation of possible filtering options. + * if this value is simply "null" or no values are set for the defined filtering + * options, this method would return total device counts per each platform in + * the system, wrapped by the defined return format. + * @return An object of type DeviceCountByGroup. + * @throws InvalidPotentialVulnerabilityValueException This can occur if potentialVulnerability + * value of extendedFilterSet is set with some + * value other than "NON_COMPLIANT" or "UNMONITORED". * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. */ @SuppressWarnings("unused") - List getDeviceCountsByPlatforms(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException; + List getDeviceCountsByPlatforms(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, DataAccessLayerException; /** * This method is used to get device counts non-compliant upon a particular feature classified by platforms. - * @param nonCompliantFeatureCode Code name of the non-compliant feature. - * @param filterSet An abstract representation of possible filtering options. - * if this value is simply "null" or no values are set for the defined filtering options, - * this method would return total device count in the system - * wrapped with in the defined return format. - * @return A list of objects of type DeviceCountByGroupEntry. - * @throws InvalidParameterValueException This can occur if and only if potentialVulnerability value of filterSet - * is set with some value other than "NON_COMPLIANT" or "UNMONITORED". + * @param featureCode Code name of the non-compliant feature. + * @param basicFilterSet An abstract representation of possible filtering options. + * if this value is simply "null" or no values are set for the defined filtering + * options, this method would return total non-compliant device counts per each platform + * in the system, wrapped by the defined return format. + * @return A list of objects of type DeviceCountByGroup. + * @throws InvalidFeatureCodeValueException This can occur if featureCode is set to null or empty. * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. */ @SuppressWarnings("unused") - List getFeatureNonCompliantDeviceCountsByPlatforms(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException; + List getFeatureNonCompliantDeviceCountsByPlatforms(String featureCode, + BasicFilterSet basicFilterSet) throws InvalidFeatureCodeValueException, + DataAccessLayerException; /** * This method is used to get device counts classified by ownership types. - * @param filterSet An abstract representation of possible filtering options. - * if this value is simply "null" or no values are set for the defined filtering options, - * this method would return total device count in the system - * wrapped with in the defined return format. - * @return A list of objects of type DeviceCountByGroupEntry. - * @throws InvalidParameterValueException This can occur if and only if potentialVulnerability value of filterSet - * is set with some value other than "NON_COMPLIANT" or "UNMONITORED". + * @param extendedFilterSet An abstract representation of possible filtering options. + * if this value is simply "null" or no values are set for the defined filtering + * options, this method would return total device counts per each ownership + * type in the system, wrapped by the defined return format. + * @return A list of objects of type DeviceCountByGroup. + * @throws InvalidPotentialVulnerabilityValueException This can occur if potentialVulnerability + * value of extendedFilterSet is set with some + * value other than "NON_COMPLIANT" or "UNMONITORED". * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. */ @SuppressWarnings("unused") - List getDeviceCountsByOwnershipTypes(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException; + List getDeviceCountsByOwnershipTypes(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, DataAccessLayerException; /** - * This method is used to get device counts non-compliant upon a particular feature classified by ownership types. - * @param nonCompliantFeatureCode Code name of the non-compliant feature. - * @param filterSet An abstract representation of possible filtering options. - * if this value is simply "null" or no values are set for the defined filtering options, - * this method would return total device count in the system - * wrapped with in the defined return format. - * @return A list of objects of type DeviceCountByGroupEntry. - * @throws InvalidParameterValueException This can occur if and only if potentialVulnerability value of filterSet - * is set with some value other than "NON_COMPLIANT" or "UNMONITORED". + * This method is used to get device counts non-compliant upon a particular feature + * classified by ownership types. + * @param featureCode Code name of the non-compliant feature. + * @param basicFilterSet An abstract representation of possible filtering options. + * if this value is simply "null" or no values are set for the defined filtering + * options, this method would return total non-compliant device counts per each + * ownership type in the system, wrapped by the defined return format. + * @return A list of objects of type DeviceCountByGroup. + * @throws InvalidFeatureCodeValueException This can occur if featureCode is set to null or empty. * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. */ @SuppressWarnings("unused") - List getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException; + List getFeatureNonCompliantDeviceCountsByOwnershipTypes(String featureCode, + BasicFilterSet basicFilterSet) throws InvalidFeatureCodeValueException, + DataAccessLayerException; /** * This method is used to get a paginated list of devices with details, based on a defined filter set. - * @param filterSet An abstract representation of possible filtering options. - * if this value is simply "null" or no values are set for the defined filtering options, - * this method would return total device count in the system - * wrapped with in the defined return format. + * @param extendedFilterSet An abstract representation of possible filtering options. + * if this value is simply "null" or no values are set for the defined + * filtering options, this method would return a paginated device list in the + * system specified by result count, starting from specified start index, and + * wrapped by the defined return format. * @param startIndex Starting index of the data set to be retrieved. * @param resultCount Total count of the result set retrieved. * @return An object of type PaginationResult. - * @throws InvalidParameterValueException This can occur if and only if potentialVulnerability value of filterSet - * is set with some value other than "NON_COMPLIANT" or "UNMONITORED". + * @throws InvalidPotentialVulnerabilityValueException This can occur if potentialVulnerability + * value of extendedFilterSet is set with some + * value other than "NON_COMPLIANT" or "UNMONITORED". * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. + * @throws InvalidStartIndexValueException This can occur if startIndex value is lesser than its minimum (0). + * @throws InvalidResultCountValueException This can occur if resultCount value is lesser than its minimum (5). */ @SuppressWarnings("unused") - PaginationResult getDevicesWithDetails(FilterSet filterSet, int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException; + PaginationResult getDevicesWithDetails(ExtendedFilterSet extendedFilterSet, int startIndex, int resultCount) + throws InvalidPotentialVulnerabilityValueException, DataAccessLayerException, + InvalidStartIndexValueException, InvalidResultCountValueException; /** - * This method is used to get a paginated list of non-compliant devices with details, upon a particular feature. - * @param nonCompliantFeatureCode Code name of the non-compliant feature. - * @param filterSet An abstract representation of possible filtering options. - * if this value is simply "null" or no values are set for the defined filtering options, - * this method would return total device count in the system - * wrapped with in the defined return format. + * This method is used to get a paginated list of non-compliant devices with details, + * upon a particular feature. + * @param featureCode Code name of the non-compliant feature. + * @param basicFilterSet An abstract representation of possible filtering options. + * if this value is simply "null" or no values are set for the defined filtering + * options, this method would return a paginated device list in the system, + * non-compliant by specified feature-code, result count, starting from specified + * start index, and wrapped by the defined return format. * @param startIndex Starting index of the data set to be retrieved. * @param resultCount Total count of the result set retrieved. * @return An object of type PaginationResult. - * @throws InvalidParameterValueException This can occur if and only if potentialVulnerability value of filterSet - * is set with some value other than "NON_COMPLIANT" or "UNMONITORED". + * @throws InvalidFeatureCodeValueException This can occur if featureCode is set to null or empty. * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. + * @throws InvalidStartIndexValueException This can occur if startIndex value is lesser than its minimum (0). + * @throws InvalidResultCountValueException This can occur if resultCount value is lesser than its minimum (5). */ @SuppressWarnings("unused") - PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, - FilterSet filterSet, int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException; + PaginationResult getFeatureNonCompliantDevicesWithDetails(String featureCode, BasicFilterSet basicFilterSet, + int startIndex, int resultCount) throws InvalidFeatureCodeValueException, + DataAccessLayerException, InvalidStartIndexValueException, + InvalidResultCountValueException; /** * This method is used to get a list of devices with details, based on a defined filter set. - * @param filterSet An abstract representation of possible filtering options. - * if this value is simply "null" or no values are set for the defined filtering options, - * this method would return total device count in the system - * wrapped with in the defined return format. - * @return A list of objects of type DetailedDeviceEntry. - * @throws InvalidParameterValueException This can occur if and only if potentialVulnerability value of filterSet - * is set with some value other than "NON_COMPLIANT" or "UNMONITORED". + * @param extendedFilterSet An abstract representation of possible filtering options. + * if this value is simply "null" or no values are set for the defined filtering + * options, this method would return total device list in the system + * wrapped by the defined return format. + * @return A list of objects of type DeviceWithDetails. + * @throws InvalidPotentialVulnerabilityValueException This can occur if potentialVulnerability + * value of extendedFilterSet is set with some + * value other than "NON_COMPLIANT" or "UNMONITORED". * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. */ @SuppressWarnings("unused") - List getDevicesWithDetails(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException; + List getDevicesWithDetails(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, DataAccessLayerException; /** * This method is used to get a list of non-compliant devices with details, upon a particular feature. - * @param nonCompliantFeatureCode Code name of the non-compliant feature. - * @param filterSet An abstract representation of possible filtering options. - * if this value is simply "null" or no values are set for the defined filtering options, - * this method would return total device count in the system - * wrapped with in the defined return format. - * @return A list of objects of type DetailedDeviceEntry. - * @throws InvalidParameterValueException This can occur if and only if potentialVulnerability value of filterSet - * is set with some value other than "NON_COMPLIANT" or "UNMONITORED". + * @param featureCode Code name of the non-compliant feature. + * @param basicFilterSet An abstract representation of possible filtering options. + * if this value is simply "null" or no values are set for the defined filtering + * options, this method would return total set of non-compliant devices in the + * system upon given feature-code, wrapped by the defined return format. + * @return A list of objects of type DeviceWithDetails. + * @throws InvalidFeatureCodeValueException This can occur if featureCode is set to null or empty. * @throws DataAccessLayerException This can occur due to errors connecting to database, * executing SQL query and retrieving data. */ @SuppressWarnings("unused") - List getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException; + List getFeatureNonCompliantDevicesWithDetails(String featureCode, + BasicFilterSet basicFilterSet) throws InvalidFeatureCodeValueException, + DataAccessLayerException; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/FilterSet.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/bean/BasicFilterSet.java similarity index 78% rename from components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/FilterSet.java rename to components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/bean/BasicFilterSet.java index a9a775a08e..901949ea84 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/FilterSet.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/bean/BasicFilterSet.java @@ -16,12 +16,11 @@ * under the License. */ -package org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean; +package org.wso2.carbon.device.mgt.analytics.dashboard.bean; -public class FilterSet { +public class BasicFilterSet { private String connectivityStatus; - private String potentialVulnerability; private String platform; private String ownership; @@ -33,14 +32,6 @@ public class FilterSet { this.connectivityStatus = connectivityStatus; } - public String getPotentialVulnerability() { - return potentialVulnerability; - } - - public void setPotentialVulnerability(String potentialVulnerability) { - this.potentialVulnerability = potentialVulnerability; - } - public String getPlatform() { return platform; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/DeviceCountByGroupEntry.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/bean/DeviceCountByGroup.java similarity index 93% rename from components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/DeviceCountByGroupEntry.java rename to components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/bean/DeviceCountByGroup.java index e7dc9909f6..43076fb0de 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/DeviceCountByGroupEntry.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/bean/DeviceCountByGroup.java @@ -16,9 +16,9 @@ * under the License. */ -package org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean; +package org.wso2.carbon.device.mgt.analytics.dashboard.bean; -public class DeviceCountByGroupEntry { +public class DeviceCountByGroup { private String group; private String displayNameForGroup; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/DetailedDeviceEntry.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/bean/DeviceWithDetails.java similarity index 95% rename from components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/DetailedDeviceEntry.java rename to components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/bean/DeviceWithDetails.java index 307a202ba3..becadff9c9 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/DetailedDeviceEntry.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/bean/DeviceWithDetails.java @@ -16,9 +16,9 @@ * under the License. */ -package org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean; +package org.wso2.carbon.device.mgt.analytics.dashboard.bean; -public class DetailedDeviceEntry { +public class DeviceWithDetails { private int deviceId; private String deviceIdentification; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/bean/ExtendedFilterSet.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/bean/ExtendedFilterSet.java new file mode 100644 index 0000000000..b68a441a90 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/bean/ExtendedFilterSet.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2016, 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.mgt.analytics.dashboard.bean; + +public class ExtendedFilterSet extends BasicFilterSet { + + /* + * Following property is an abstract filter, introduced @ service layer, + * wrapping few (actual) low level database properties. + */ + private String potentialVulnerability; + + public String getPotentialVulnerability() { + return potentialVulnerability; + } + + public void setPotentialVulnerability(String potentialVulnerability) { + this.potentialVulnerability = potentialVulnerability; + } + +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/AbstractGadgetDataServiceDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/AbstractGadgetDataServiceDAO.java index c5e2b8398a..9781512064 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/AbstractGadgetDataServiceDAO.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/AbstractGadgetDataServiceDAO.java @@ -19,11 +19,12 @@ package org.wso2.carbon.device.mgt.analytics.dashboard.dao; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DetailedDeviceEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DeviceCountByGroupEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.FilterSet; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.DataAccessLayerException; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterValueException; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.BasicFilterSet; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceWithDetails; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceCountByGroup; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.ExtendedFilterSet; +import org.wso2.carbon.device.mgt.analytics.dashboard.exception.InvalidFeatureCodeValueException; +import org.wso2.carbon.device.mgt.analytics.dashboard.exception.InvalidPotentialVulnerabilityValueException; import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil; import java.sql.Connection; @@ -38,40 +39,40 @@ import java.util.Map; public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceDAO { @Override - public DeviceCountByGroupEntry getTotalDeviceCount() throws DataAccessLayerException { + public DeviceCountByGroup getTotalDeviceCount() throws SQLException { int totalDeviceCount; try { totalDeviceCount = this.getFilteredDeviceCount(null); - } catch (InvalidParameterValueException e) { + } catch (InvalidPotentialVulnerabilityValueException e) { throw new AssertionError(e); } - DeviceCountByGroupEntry deviceCountByGroupEntry = new DeviceCountByGroupEntry(); - deviceCountByGroupEntry.setGroup("total"); - deviceCountByGroupEntry.setDisplayNameForGroup("Total"); - deviceCountByGroupEntry.setDeviceCount(totalDeviceCount); + DeviceCountByGroup deviceCountByGroup = new DeviceCountByGroup(); + deviceCountByGroup.setGroup("total"); + deviceCountByGroup.setDisplayNameForGroup("Total"); + deviceCountByGroup.setDeviceCount(totalDeviceCount); - return deviceCountByGroupEntry; + return deviceCountByGroup; } @Override - public DeviceCountByGroupEntry getDeviceCount(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException { + public DeviceCountByGroup getDeviceCount(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, SQLException { - int filteredDeviceCount = this.getFilteredDeviceCount(filterSet); + int filteredDeviceCount = this.getFilteredDeviceCount(extendedFilterSet); - DeviceCountByGroupEntry deviceCountByGroupEntry = new DeviceCountByGroupEntry(); - deviceCountByGroupEntry.setGroup("filtered"); - deviceCountByGroupEntry.setDisplayNameForGroup("Filtered"); - deviceCountByGroupEntry.setDeviceCount(filteredDeviceCount); + DeviceCountByGroup deviceCountByGroup = new DeviceCountByGroup(); + deviceCountByGroup.setGroup("filtered"); + deviceCountByGroup.setDisplayNameForGroup("Filtered"); + deviceCountByGroup.setDeviceCount(filteredDeviceCount); - return deviceCountByGroupEntry; + return deviceCountByGroup; } - private int getFilteredDeviceCount(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException { + private int getFilteredDeviceCount(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, SQLException { - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(extendedFilterSet); Connection con; PreparedStatement stmt = null; @@ -80,8 +81,8 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD int filteredDeviceCount = 0; try { con = this.getConnection(); - String sql = "SELECT COUNT(DEVICE_ID) AS DEVICE_COUNT FROM " + GadgetDataServiceDAOConstants.DatabaseView. - DEVICES_VIEW_1 + " WHERE TENANT_ID = ?"; + String sql = "SELECT COUNT(DEVICE_ID) AS DEVICE_COUNT FROM " + + GadgetDataServiceDAOConstants.DatabaseView.DEVICES_VIEW_1 + " WHERE TENANT_ID = ?"; // appending filters to support advanced filtering options // [1] appending filter columns if (filters != null && filters.size() > 0) { @@ -109,9 +110,6 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD while (rs.next()) { filteredDeviceCount = rs.getInt("DEVICE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -119,14 +117,14 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD } @Override - public DeviceCountByGroupEntry getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException { + public DeviceCountByGroup getFeatureNonCompliantDeviceCount(String featureCode, + BasicFilterSet basicFilterSet) throws InvalidFeatureCodeValueException, SQLException { - if (nonCompliantFeatureCode == null || nonCompliantFeatureCode.isEmpty()) { - throw new InvalidParameterValueException("Non-compliant feature code should not be either null or empty."); + if (featureCode == null || featureCode.isEmpty()) { + throw new InvalidFeatureCodeValueException("Feature code should not be either null or empty."); } - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(basicFilterSet); Connection con; PreparedStatement stmt = null; @@ -135,8 +133,8 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD int filteredDeviceCount = 0; try { con = this.getConnection(); - String sql = "SELECT COUNT(DEVICE_ID) AS DEVICE_COUNT FROM " + GadgetDataServiceDAOConstants.DatabaseView. - DEVICES_VIEW_2 + " WHERE TENANT_ID = ? AND FEATURE_CODE = ?"; + String sql = "SELECT COUNT(DEVICE_ID) AS DEVICE_COUNT FROM " + + GadgetDataServiceDAOConstants.DatabaseView.DEVICES_VIEW_2 + " WHERE TENANT_ID = ? AND FEATURE_CODE = ?"; // appending filters to support advanced filtering options // [1] appending filter columns if (filters != null && filters.size() > 0) { @@ -147,7 +145,7 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD stmt = con.prepareStatement(sql); // [2] appending filter column values, if exist stmt.setInt(1, tenantId); - stmt.setString(2, nonCompliantFeatureCode); + stmt.setString(2, featureCode); if (filters != null && filters.values().size() > 0) { int i = 3; for (Object value : filters.values()) { @@ -165,28 +163,25 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD while (rs.next()) { filteredDeviceCount = rs.getInt("DEVICE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } - DeviceCountByGroupEntry deviceCountByGroupEntry = new DeviceCountByGroupEntry(); - deviceCountByGroupEntry.setGroup("feature-non-compliant-and-filtered"); - deviceCountByGroupEntry.setDisplayNameForGroup("Feature-non-compliant-and-filtered"); - deviceCountByGroupEntry.setDeviceCount(filteredDeviceCount); + DeviceCountByGroup deviceCountByGroup = new DeviceCountByGroup(); + deviceCountByGroup.setGroup("feature-non-compliant-and-filtered"); + deviceCountByGroup.setDisplayNameForGroup("Feature-non-compliant-and-filtered"); + deviceCountByGroup.setDeviceCount(filteredDeviceCount); - return deviceCountByGroupEntry; + return deviceCountByGroup; } @Override - public List getDeviceCountsByConnectivityStatuses() throws DataAccessLayerException { + public List getDeviceCountsByConnectivityStatuses() throws SQLException { Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List deviceCountsByConnectivityStatuses = new ArrayList<>(); + List deviceCountsByConnectivityStatuses = new ArrayList<>(); try { con = this.getConnection(); String sql = "SELECT CONNECTIVITY_STATUS, COUNT(DEVICE_ID) AS DEVICE_COUNT FROM " + @@ -198,17 +193,14 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD // executing query rs = stmt.executeQuery(); // fetching query results - DeviceCountByGroupEntry deviceCountByConnectivityStatus; + DeviceCountByGroup deviceCountByConnectivityStatus; while (rs.next()) { - deviceCountByConnectivityStatus = new DeviceCountByGroupEntry(); + deviceCountByConnectivityStatus = new DeviceCountByGroup(); deviceCountByConnectivityStatus.setGroup(rs.getString("CONNECTIVITY_STATUS")); deviceCountByConnectivityStatus.setDisplayNameForGroup(rs.getString("CONNECTIVITY_STATUS")); deviceCountByConnectivityStatus.setDeviceCount(rs.getInt("DEVICE_COUNT")); deviceCountsByConnectivityStatuses.add(deviceCountByConnectivityStatus); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -216,57 +208,59 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD } @Override - public List getDeviceCountsByPotentialVulnerabilities() throws DataAccessLayerException { + public List getDeviceCountsByPotentialVulnerabilities() throws SQLException { // getting non-compliant device count - DeviceCountByGroupEntry nonCompliantDeviceCount = new DeviceCountByGroupEntry(); + DeviceCountByGroup nonCompliantDeviceCount = new DeviceCountByGroup(); nonCompliantDeviceCount.setGroup(GadgetDataServiceDAOConstants.PotentialVulnerability.NON_COMPLIANT); nonCompliantDeviceCount.setDisplayNameForGroup("Non-compliant"); nonCompliantDeviceCount.setDeviceCount(getNonCompliantDeviceCount()); // getting unmonitored device count - DeviceCountByGroupEntry unmonitoredDeviceCount = new DeviceCountByGroupEntry(); + DeviceCountByGroup unmonitoredDeviceCount = new DeviceCountByGroup(); unmonitoredDeviceCount.setGroup(GadgetDataServiceDAOConstants.PotentialVulnerability.UNMONITORED); unmonitoredDeviceCount.setDisplayNameForGroup("Unmonitored"); unmonitoredDeviceCount.setDeviceCount(getUnmonitoredDeviceCount()); - List deviceCountsByPotentialVulnerabilities = new ArrayList<>(); + List deviceCountsByPotentialVulnerabilities = new ArrayList<>(); deviceCountsByPotentialVulnerabilities.add(nonCompliantDeviceCount); deviceCountsByPotentialVulnerabilities.add(unmonitoredDeviceCount); return deviceCountsByPotentialVulnerabilities; } - private int getNonCompliantDeviceCount() throws DataAccessLayerException { - FilterSet filterSet = new FilterSet(); - filterSet.setPotentialVulnerability(GadgetDataServiceDAOConstants.PotentialVulnerability.NON_COMPLIANT); + private int getNonCompliantDeviceCount() throws SQLException { + ExtendedFilterSet extendedFilterSet = new ExtendedFilterSet(); + extendedFilterSet.setPotentialVulnerability(GadgetDataServiceDAOConstants. + PotentialVulnerability.NON_COMPLIANT); try { - return this.getFilteredDeviceCount(filterSet); - } catch (InvalidParameterValueException e) { + return this.getFilteredDeviceCount(extendedFilterSet); + } catch (InvalidPotentialVulnerabilityValueException e) { throw new AssertionError(e); } } - private int getUnmonitoredDeviceCount() throws DataAccessLayerException { - FilterSet filterSet = new FilterSet(); - filterSet.setPotentialVulnerability(GadgetDataServiceDAOConstants.PotentialVulnerability.UNMONITORED); + private int getUnmonitoredDeviceCount() throws SQLException { + ExtendedFilterSet extendedFilterSet = new ExtendedFilterSet(); + extendedFilterSet.setPotentialVulnerability(GadgetDataServiceDAOConstants. + PotentialVulnerability.UNMONITORED); try { - return this.getFilteredDeviceCount(filterSet); - } catch (InvalidParameterValueException e) { + return this.getFilteredDeviceCount(extendedFilterSet); + } catch (InvalidPotentialVulnerabilityValueException e) { throw new AssertionError(e); } } @Override - public List getDeviceCountsByPlatforms(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException { + public List getDeviceCountsByPlatforms(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, SQLException { - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(extendedFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDeviceCountsByPlatforms = new ArrayList<>(); + List filteredDeviceCountsByPlatforms = new ArrayList<>(); try { con = this.getConnection(); String sql, advancedSqlFiltering = ""; @@ -296,17 +290,14 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD // executing query rs = stmt.executeQuery(); // fetching query results - DeviceCountByGroupEntry filteredDeviceCountByPlatform; + DeviceCountByGroup filteredDeviceCountByPlatform; while (rs.next()) { - filteredDeviceCountByPlatform = new DeviceCountByGroupEntry(); + filteredDeviceCountByPlatform = new DeviceCountByGroup(); filteredDeviceCountByPlatform.setGroup(rs.getString("PLATFORM")); filteredDeviceCountByPlatform.setDisplayNameForGroup(rs.getString("PLATFORM").toUpperCase()); filteredDeviceCountByPlatform.setDeviceCount(rs.getInt("DEVICE_COUNT")); filteredDeviceCountsByPlatforms.add(filteredDeviceCountByPlatform); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -314,21 +305,21 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD } @Override - public List - getFeatureNonCompliantDeviceCountsByPlatforms(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException { + public List + getFeatureNonCompliantDeviceCountsByPlatforms(String featureCode, + BasicFilterSet basicFilterSet) throws InvalidFeatureCodeValueException, SQLException { - if (nonCompliantFeatureCode == null || nonCompliantFeatureCode.isEmpty()) { - throw new InvalidParameterValueException("Non-compliant feature code should not be either null or empty."); + if (featureCode == null || featureCode.isEmpty()) { + throw new InvalidFeatureCodeValueException("Feature code should not be either null or empty."); } - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(basicFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDeviceCountsByPlatforms = new ArrayList<>(); + List filteredDeviceCountsByPlatforms = new ArrayList<>(); try { con = this.getConnection(); String sql, advancedSqlFiltering = ""; @@ -345,7 +336,7 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD stmt = con.prepareStatement(sql); // [2] appending filter column values, if exist stmt.setInt(1, tenantId); - stmt.setString(2, nonCompliantFeatureCode); + stmt.setString(2, featureCode); if (filters != null && filters.values().size() > 0) { int i = 3; for (Object value : filters.values()) { @@ -360,17 +351,14 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD // executing query rs = stmt.executeQuery(); // fetching query results - DeviceCountByGroupEntry filteredDeviceCountByPlatform; + DeviceCountByGroup filteredDeviceCountByPlatform; while (rs.next()) { - filteredDeviceCountByPlatform = new DeviceCountByGroupEntry(); + filteredDeviceCountByPlatform = new DeviceCountByGroup(); filteredDeviceCountByPlatform.setGroup(rs.getString("PLATFORM")); filteredDeviceCountByPlatform.setDisplayNameForGroup(rs.getString("PLATFORM").toUpperCase()); filteredDeviceCountByPlatform.setDeviceCount(rs.getInt("DEVICE_COUNT")); filteredDeviceCountsByPlatforms.add(filteredDeviceCountByPlatform); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -378,16 +366,16 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD } @Override - public List getDeviceCountsByOwnershipTypes(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException { + public List getDeviceCountsByOwnershipTypes(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, SQLException { - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(extendedFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDeviceCountsByOwnershipTypes = new ArrayList<>(); + List filteredDeviceCountsByOwnershipTypes = new ArrayList<>(); try { con = this.getConnection(); String sql, advancedSqlFiltering = ""; @@ -418,17 +406,14 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD // executing query rs = stmt.executeQuery(); // fetching query results - DeviceCountByGroupEntry filteredDeviceCountByOwnershipType; + DeviceCountByGroup filteredDeviceCountByOwnershipType; while (rs.next()) { - filteredDeviceCountByOwnershipType = new DeviceCountByGroupEntry(); + filteredDeviceCountByOwnershipType = new DeviceCountByGroup(); filteredDeviceCountByOwnershipType.setGroup(rs.getString("OWNERSHIP")); filteredDeviceCountByOwnershipType.setDisplayNameForGroup(rs.getString("OWNERSHIP")); filteredDeviceCountByOwnershipType.setDeviceCount(rs.getInt("DEVICE_COUNT")); filteredDeviceCountsByOwnershipTypes.add(filteredDeviceCountByOwnershipType); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -436,21 +421,21 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD } @Override - public List - getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException { + public List + getFeatureNonCompliantDeviceCountsByOwnershipTypes(String featureCode, + BasicFilterSet basicFilterSet) throws InvalidFeatureCodeValueException, SQLException { - if (nonCompliantFeatureCode == null || nonCompliantFeatureCode.isEmpty()) { - throw new InvalidParameterValueException("Non-compliant feature code should not be either null or empty."); + if (featureCode == null || featureCode.isEmpty()) { + throw new InvalidFeatureCodeValueException("Feature code should not be either null or empty."); } - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(basicFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDeviceCountsByOwnershipTypes = new ArrayList<>(); + List filteredDeviceCountsByOwnershipTypes = new ArrayList<>(); try { con = this.getConnection(); String sql, advancedSqlFiltering = ""; @@ -467,7 +452,7 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD stmt = con.prepareStatement(sql); // [2] appending filter column values, if exist stmt.setInt(1, tenantId); - stmt.setString(2, nonCompliantFeatureCode); + stmt.setString(2, featureCode); if (filters != null && filters.values().size() > 0) { int i = 3; for (Object value : filters.values()) { @@ -482,17 +467,14 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD // executing query rs = stmt.executeQuery(); // fetching query results - DeviceCountByGroupEntry filteredDeviceCountByOwnershipType; + DeviceCountByGroup filteredDeviceCountByOwnershipType; while (rs.next()) { - filteredDeviceCountByOwnershipType = new DeviceCountByGroupEntry(); + filteredDeviceCountByOwnershipType = new DeviceCountByGroup(); filteredDeviceCountByOwnershipType.setGroup(rs.getString("OWNERSHIP")); filteredDeviceCountByOwnershipType.setDisplayNameForGroup(rs.getString("OWNERSHIP")); filteredDeviceCountByOwnershipType.setDeviceCount(rs.getInt("DEVICE_COUNT")); filteredDeviceCountsByOwnershipTypes.add(filteredDeviceCountByOwnershipType); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -500,16 +482,16 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD } @Override - public List getDevicesWithDetails(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException { + public List getDevicesWithDetails(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, SQLException { - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(extendedFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDevicesWithDetails = new ArrayList<>(); + List filteredDevicesWithDetails = new ArrayList<>(); try { con = this.getConnection(); String sql; @@ -539,9 +521,9 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD // executing query rs = stmt.executeQuery(); // fetching query results - DetailedDeviceEntry filteredDeviceWithDetails; + DeviceWithDetails filteredDeviceWithDetails; while (rs.next()) { - filteredDeviceWithDetails = new DetailedDeviceEntry(); + filteredDeviceWithDetails = new DeviceWithDetails(); filteredDeviceWithDetails.setDeviceId(rs.getInt("DEVICE_ID")); filteredDeviceWithDetails.setDeviceIdentification(rs.getString("DEVICE_IDENTIFICATION")); filteredDeviceWithDetails.setPlatform(rs.getString("PLATFORM")); @@ -549,9 +531,6 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD filteredDeviceWithDetails.setConnectivityStatus(rs.getString("CONNECTIVITY_STATUS")); filteredDevicesWithDetails.add(filteredDeviceWithDetails); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -559,20 +538,20 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD } @Override - public List getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException { + public List getFeatureNonCompliantDevicesWithDetails(String featureCode, + BasicFilterSet basicFilterSet) throws InvalidFeatureCodeValueException, SQLException { - if (nonCompliantFeatureCode == null || nonCompliantFeatureCode.isEmpty()) { - throw new InvalidParameterValueException("Non-compliant feature code should not be either null or empty."); + if (featureCode == null || featureCode.isEmpty()) { + throw new InvalidFeatureCodeValueException("Feature code should not be either null or empty."); } - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(basicFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDevicesWithDetails = new ArrayList<>(); + List filteredDevicesWithDetails = new ArrayList<>(); try { con = this.getConnection(); String sql; @@ -589,7 +568,7 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD stmt = con.prepareStatement(sql); // [2] appending filter column values, if exist stmt.setInt(1, tenantId); - stmt.setString(2, nonCompliantFeatureCode); + stmt.setString(2, featureCode); if (filters != null && filters.values().size() > 0) { int i = 3; for (Object value : filters.values()) { @@ -604,9 +583,9 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD // executing query rs = stmt.executeQuery(); // fetching query results - DetailedDeviceEntry filteredDeviceWithDetails; + DeviceWithDetails filteredDeviceWithDetails; while (rs.next()) { - filteredDeviceWithDetails = new DetailedDeviceEntry(); + filteredDeviceWithDetails = new DeviceWithDetails(); filteredDeviceWithDetails.setDeviceId(rs.getInt("DEVICE_ID")); filteredDeviceWithDetails.setDeviceIdentification(rs.getString("DEVICE_IDENTIFICATION")); filteredDeviceWithDetails.setPlatform(rs.getString("PLATFORM")); @@ -614,55 +593,62 @@ public abstract class AbstractGadgetDataServiceDAO implements GadgetDataServiceD filteredDeviceWithDetails.setConnectivityStatus(rs.getString("CONNECTIVITY_STATUS")); filteredDevicesWithDetails.add(filteredDeviceWithDetails); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } return filteredDevicesWithDetails; } - protected Map extractDatabaseFiltersFromBean(FilterSet filterSet) - throws InvalidParameterValueException { - if (filterSet == null) { + protected Map extractDatabaseFiltersFromBean(BasicFilterSet basicFilterSet) { + if (basicFilterSet == null) { return null; } Map filters = new LinkedHashMap<>(); - String connectivityStatus = filterSet.getConnectivityStatus(); - if (connectivityStatus != null) { + String connectivityStatus = basicFilterSet.getConnectivityStatus(); + if (connectivityStatus != null && !connectivityStatus.isEmpty()) { filters.put("CONNECTIVITY_STATUS", connectivityStatus); } - String potentialVulnerability = filterSet.getPotentialVulnerability(); - if (potentialVulnerability != null) { + String platform = basicFilterSet.getPlatform(); + if (platform != null && !platform.isEmpty()) { + filters.put("PLATFORM", platform); + } + + String ownership = basicFilterSet.getOwnership(); + if (ownership != null && !ownership.isEmpty()) { + filters.put("OWNERSHIP", ownership); + } + + return filters; + } + + protected Map extractDatabaseFiltersFromBean(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException { + if (extendedFilterSet == null) { + return null; + } + + Map filters = this.extractDatabaseFiltersFromBean((BasicFilterSet) extendedFilterSet); + + String potentialVulnerability = extendedFilterSet.getPotentialVulnerability(); + if (potentialVulnerability != null && !potentialVulnerability.isEmpty()) { if (GadgetDataServiceDAOConstants.PotentialVulnerability.NON_COMPLIANT.equals(potentialVulnerability) || - GadgetDataServiceDAOConstants.PotentialVulnerability.UNMONITORED.equals(potentialVulnerability)) { + GadgetDataServiceDAOConstants.PotentialVulnerability.UNMONITORED.equals(potentialVulnerability)) { if (GadgetDataServiceDAOConstants.PotentialVulnerability.NON_COMPLIANT.equals(potentialVulnerability)) { filters.put("IS_COMPLIANT", 0); } else { filters.put("POLICY_ID", -1); } } else { - throw new InvalidParameterValueException("Invalid use of value for potential vulnerability. " + - "Value of potential vulnerability could only be either " + + throw new InvalidPotentialVulnerabilityValueException("Invalid use of value for potential " + + "vulnerability. Value of potential vulnerability could only be either " + GadgetDataServiceDAOConstants.PotentialVulnerability.NON_COMPLIANT + " or " + GadgetDataServiceDAOConstants.PotentialVulnerability.UNMONITORED + "."); } } - String platform = filterSet.getPlatform(); - if (platform != null) { - filters.put("PLATFORM", platform); - } - - String ownership = filterSet.getOwnership(); - if (ownership != null) { - filters.put("OWNERSHIP", ownership); - } - return filters; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAO.java index 9bb3b26b32..c5c1638fba 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAO.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAO.java @@ -18,55 +18,57 @@ package org.wso2.carbon.device.mgt.analytics.dashboard.dao; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DetailedDeviceEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DeviceCountByGroupEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.FilterSet; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.DataAccessLayerException; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterValueException; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceWithDetails; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceCountByGroup; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.BasicFilterSet; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.ExtendedFilterSet; +import org.wso2.carbon.device.mgt.analytics.dashboard.exception.*; import org.wso2.carbon.device.mgt.common.PaginationResult; +import java.sql.SQLException; import java.util.List; public interface GadgetDataServiceDAO { - DeviceCountByGroupEntry getDeviceCount(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException; + DeviceCountByGroup getDeviceCount(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, SQLException; - DeviceCountByGroupEntry getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException; + DeviceCountByGroup getFeatureNonCompliantDeviceCount(String featureCode, BasicFilterSet basicFilterSet) + throws InvalidFeatureCodeValueException, SQLException; - DeviceCountByGroupEntry getTotalDeviceCount() throws DataAccessLayerException; + DeviceCountByGroup getTotalDeviceCount() throws SQLException; - List getDeviceCountsByConnectivityStatuses() throws DataAccessLayerException; + List getDeviceCountsByConnectivityStatuses() throws SQLException; - List getDeviceCountsByPotentialVulnerabilities() throws DataAccessLayerException; + List getDeviceCountsByPotentialVulnerabilities() throws SQLException; - PaginationResult getNonCompliantDeviceCountsByFeatures(int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException; + PaginationResult getNonCompliantDeviceCountsByFeatures(int startIndex, int resultCount) throws + InvalidStartIndexValueException, InvalidResultCountValueException, SQLException; - List getDeviceCountsByPlatforms(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException; + List getDeviceCountsByPlatforms(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, SQLException; - List getFeatureNonCompliantDeviceCountsByPlatforms(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException; + List getFeatureNonCompliantDeviceCountsByPlatforms(String featureCode, + BasicFilterSet basicFilterSet) throws InvalidFeatureCodeValueException, SQLException; - List getDeviceCountsByOwnershipTypes(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException; + List getDeviceCountsByOwnershipTypes(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, SQLException; - List getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException; + List getFeatureNonCompliantDeviceCountsByOwnershipTypes(String featureCode, + BasicFilterSet basicFilterSet) throws InvalidFeatureCodeValueException, SQLException; - PaginationResult getDevicesWithDetails(FilterSet filterSet, int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException; + PaginationResult getDevicesWithDetails(ExtendedFilterSet extendedFilterSet, int startIndex, int resultCount) + throws InvalidPotentialVulnerabilityValueException, + InvalidStartIndexValueException, InvalidResultCountValueException, SQLException; - PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, - FilterSet filterSet, int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException; + PaginationResult getFeatureNonCompliantDevicesWithDetails(String featureCode, BasicFilterSet basicFilterSet, + int startIndex, int resultCount) throws InvalidFeatureCodeValueException, + InvalidStartIndexValueException, InvalidResultCountValueException, SQLException; - List getDevicesWithDetails(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException; + List getDevicesWithDetails(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, SQLException; - List getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException; + List getFeatureNonCompliantDevicesWithDetails(String featureCode, + BasicFilterSet basicFilterSet) throws InvalidFeatureCodeValueException, SQLException; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAOFactory.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAOFactory.java index 7848c78905..d202b685c1 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAOFactory.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAOFactory.java @@ -90,11 +90,7 @@ public class GadgetDataServiceDAOFactory { "this particular thread. Therefore, calling 'beginTransaction/openConnection' while another " + "transaction is already active is a sign of improper transaction handling."); } - try { - conn = dataSource.getConnection(); - } catch (SQLException e) { - - } + conn = dataSource.getConnection(); currentConnection.set(conn); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/GenericGadgetDataServiceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/GenericGadgetDataServiceDAOImpl.java index de4eb05fae..4a0deb7d24 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/GenericGadgetDataServiceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/GenericGadgetDataServiceDAOImpl.java @@ -19,13 +19,13 @@ package org.wso2.carbon.device.mgt.analytics.dashboard.dao.impl; import org.wso2.carbon.context.PrivilegedCarbonContext; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceWithDetails; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceCountByGroup; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.BasicFilterSet; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.ExtendedFilterSet; import org.wso2.carbon.device.mgt.analytics.dashboard.dao.AbstractGadgetDataServiceDAO; import org.wso2.carbon.device.mgt.analytics.dashboard.dao.GadgetDataServiceDAOConstants; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DetailedDeviceEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DeviceCountByGroupEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.FilterSet; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.DataAccessLayerException; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterValueException; +import org.wso2.carbon.device.mgt.analytics.dashboard.exception.*; import org.wso2.carbon.device.mgt.common.PaginationResult; import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil; @@ -41,15 +41,15 @@ public class GenericGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDA @Override public PaginationResult getNonCompliantDeviceCountsByFeatures(int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + throws InvalidStartIndexValueException, InvalidResultCountValueException, SQLException { if (startIndex < GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX) { - throw new InvalidParameterValueException("Start index should be equal to " + + throw new InvalidStartIndexValueException("Start index should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX + " or greater than that."); } if (resultCount < GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT) { - throw new InvalidParameterValueException("Result count should be equal to " + + throw new InvalidResultCountValueException("Result count should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT + " or greater than that."); } @@ -57,7 +57,7 @@ public class GenericGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDA PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredNonCompliantDeviceCountsByFeatures = new ArrayList<>(); + List filteredNonCompliantDeviceCountsByFeatures = new ArrayList<>(); int totalRecordsCount = 0; try { con = this.getConnection(); @@ -72,9 +72,9 @@ public class GenericGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDA // executing query rs = stmt.executeQuery(); // fetching query results - DeviceCountByGroupEntry filteredNonCompliantDeviceCountByFeature; + DeviceCountByGroup filteredNonCompliantDeviceCountByFeature; while (rs.next()) { - filteredNonCompliantDeviceCountByFeature = new DeviceCountByGroupEntry(); + filteredNonCompliantDeviceCountByFeature = new DeviceCountByGroup(); filteredNonCompliantDeviceCountByFeature.setGroup(rs.getString("FEATURE_CODE")); filteredNonCompliantDeviceCountByFeature.setDisplayNameForGroup(rs.getString("FEATURE_CODE")); filteredNonCompliantDeviceCountByFeature.setDeviceCount(rs.getInt("DEVICE_COUNT")); @@ -94,9 +94,6 @@ public class GenericGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDA while (rs.next()) { totalRecordsCount = rs.getInt("NON_COMPLIANT_FEATURE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -107,26 +104,27 @@ public class GenericGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDA } @Override - public PaginationResult getDevicesWithDetails(FilterSet filterSet, int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + public PaginationResult getDevicesWithDetails(ExtendedFilterSet extendedFilterSet, int startIndex, + int resultCount) throws InvalidPotentialVulnerabilityValueException, + InvalidStartIndexValueException, InvalidResultCountValueException, SQLException { if (startIndex < GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX) { - throw new InvalidParameterValueException("Start index should be equal to " + + throw new InvalidStartIndexValueException("Start index should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX + " or greater than that."); } if (resultCount < GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT) { - throw new InvalidParameterValueException("Result count should be equal to " + + throw new InvalidResultCountValueException("Result count should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT + " or greater than that."); } - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(extendedFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDevicesWithDetails = new ArrayList<>(); + List filteredDevicesWithDetails = new ArrayList<>(); int totalRecordsCount = 0; try { con = this.getConnection(); @@ -163,9 +161,9 @@ public class GenericGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDA // executing query rs = stmt.executeQuery(); // fetching query results - DetailedDeviceEntry filteredDeviceWithDetails; + DeviceWithDetails filteredDeviceWithDetails; while (rs.next()) { - filteredDeviceWithDetails = new DetailedDeviceEntry(); + filteredDeviceWithDetails = new DeviceWithDetails(); filteredDeviceWithDetails.setDeviceId(rs.getInt("DEVICE_ID")); filteredDeviceWithDetails.setDeviceIdentification(rs.getString("DEVICE_IDENTIFICATION")); filteredDeviceWithDetails.setPlatform(rs.getString("PLATFORM")); @@ -187,9 +185,6 @@ public class GenericGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDA while (rs.next()) { totalRecordsCount = rs.getInt("DEVICE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -200,31 +195,32 @@ public class GenericGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDA } @Override - public PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, - FilterSet filterSet, int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + public PaginationResult getFeatureNonCompliantDevicesWithDetails(String featureCode, + BasicFilterSet basicFilterSet, int startIndex, int resultCount) + throws InvalidFeatureCodeValueException, InvalidStartIndexValueException, + InvalidResultCountValueException, SQLException { - if (nonCompliantFeatureCode == null || nonCompliantFeatureCode.isEmpty()) { - throw new InvalidParameterValueException("Non-compliant feature code should not be either null or empty."); + if (featureCode == null || featureCode.isEmpty()) { + throw new InvalidFeatureCodeValueException("Feature code should not be either null or empty."); } if (startIndex < GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX) { - throw new InvalidParameterValueException("Start index should be equal to " + + throw new InvalidStartIndexValueException("Start index should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX + " or greater than that."); } if (resultCount < GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT) { - throw new InvalidParameterValueException("Result count should be equal to " + + throw new InvalidResultCountValueException("Result count should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT + " or greater than that."); } - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(basicFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDevicesWithDetails = new ArrayList<>(); + List filteredDevicesWithDetails = new ArrayList<>(); int totalRecordsCount = 0; try { con = this.getConnection(); @@ -243,7 +239,7 @@ public class GenericGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDA stmt = con.prepareStatement(sql); // [2] appending filter column values, if exist stmt.setInt(1, tenantId); - stmt.setString(2, nonCompliantFeatureCode); + stmt.setString(2, featureCode); if (filters != null && filters.values().size() > 0) { int i = 3; for (Object value : filters.values()) { @@ -263,9 +259,9 @@ public class GenericGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDA // executing query rs = stmt.executeQuery(); // fetching query results - DetailedDeviceEntry filteredDeviceWithDetails; + DeviceWithDetails filteredDeviceWithDetails; while (rs.next()) { - filteredDeviceWithDetails = new DetailedDeviceEntry(); + filteredDeviceWithDetails = new DeviceWithDetails(); filteredDeviceWithDetails.setDeviceId(rs.getInt("DEVICE_ID")); filteredDeviceWithDetails.setDeviceIdentification(rs.getString("DEVICE_IDENTIFICATION")); filteredDeviceWithDetails.setPlatform(rs.getString("PLATFORM")); @@ -280,7 +276,7 @@ public class GenericGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDA stmt = con.prepareStatement(sql); stmt.setInt(1, tenantId); - stmt.setString(2, nonCompliantFeatureCode); + stmt.setString(2, featureCode); // executing query rs = stmt.executeQuery(); @@ -288,9 +284,6 @@ public class GenericGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDA while (rs.next()) { totalRecordsCount = rs.getInt("DEVICE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/MSSQLGadgetDataServiceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/MSSQLGadgetDataServiceDAOImpl.java index 97e8c48cc2..396a596c9b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/MSSQLGadgetDataServiceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/MSSQLGadgetDataServiceDAOImpl.java @@ -19,13 +19,13 @@ package org.wso2.carbon.device.mgt.analytics.dashboard.dao.impl; import org.wso2.carbon.context.PrivilegedCarbonContext; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceWithDetails; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceCountByGroup; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.BasicFilterSet; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.ExtendedFilterSet; import org.wso2.carbon.device.mgt.analytics.dashboard.dao.AbstractGadgetDataServiceDAO; import org.wso2.carbon.device.mgt.analytics.dashboard.dao.GadgetDataServiceDAOConstants; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DetailedDeviceEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DeviceCountByGroupEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.FilterSet; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.DataAccessLayerException; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterValueException; +import org.wso2.carbon.device.mgt.analytics.dashboard.exception.*; import org.wso2.carbon.device.mgt.common.PaginationResult; import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil; @@ -41,15 +41,15 @@ public class MSSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO @Override public PaginationResult getNonCompliantDeviceCountsByFeatures(int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + throws InvalidStartIndexValueException, InvalidResultCountValueException, SQLException { if (startIndex < GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX) { - throw new InvalidParameterValueException("Start index should be equal to " + + throw new InvalidStartIndexValueException("Start index should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX + " or greater than that."); } if (resultCount < GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT) { - throw new InvalidParameterValueException("Result count should be equal to " + + throw new InvalidResultCountValueException("Result count should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT + " or greater than that."); } @@ -57,7 +57,7 @@ public class MSSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredNonCompliantDeviceCountsByFeatures = new ArrayList<>(); + List filteredNonCompliantDeviceCountsByFeatures = new ArrayList<>(); int totalRecordsCount = 0; try { con = this.getConnection(); @@ -72,9 +72,9 @@ public class MSSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO // executing query rs = stmt.executeQuery(); // fetching query results - DeviceCountByGroupEntry filteredNonCompliantDeviceCountByFeature; + DeviceCountByGroup filteredNonCompliantDeviceCountByFeature; while (rs.next()) { - filteredNonCompliantDeviceCountByFeature = new DeviceCountByGroupEntry(); + filteredNonCompliantDeviceCountByFeature = new DeviceCountByGroup(); filteredNonCompliantDeviceCountByFeature.setGroup(rs.getString("FEATURE_CODE")); filteredNonCompliantDeviceCountByFeature.setDisplayNameForGroup(rs.getString("FEATURE_CODE")); filteredNonCompliantDeviceCountByFeature.setDeviceCount(rs.getInt("DEVICE_COUNT")); @@ -94,9 +94,6 @@ public class MSSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO while (rs.next()) { totalRecordsCount = rs.getInt("NON_COMPLIANT_FEATURE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -107,26 +104,29 @@ public class MSSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO } @Override - public PaginationResult getDevicesWithDetails(FilterSet filterSet, int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + public PaginationResult getDevicesWithDetails(ExtendedFilterSet extendedFilterSet, int startIndex, int resultCount) + throws InvalidPotentialVulnerabilityValueException, + InvalidStartIndexValueException, + InvalidResultCountValueException, + SQLException { if (startIndex < GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX) { - throw new InvalidParameterValueException("Start index should be equal to " + + throw new InvalidStartIndexValueException("Start index should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX + " or greater than that."); } if (resultCount < GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT) { - throw new InvalidParameterValueException("Result count should be equal to " + + throw new InvalidResultCountValueException("Result count should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT + " or greater than that."); } - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(extendedFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDevicesWithDetails = new ArrayList<>(); + List filteredDevicesWithDetails = new ArrayList<>(); int totalRecordsCount = 0; try { con = this.getConnection(); @@ -163,9 +163,9 @@ public class MSSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO // executing query rs = stmt.executeQuery(); // fetching query results - DetailedDeviceEntry filteredDeviceWithDetails; + DeviceWithDetails filteredDeviceWithDetails; while (rs.next()) { - filteredDeviceWithDetails = new DetailedDeviceEntry(); + filteredDeviceWithDetails = new DeviceWithDetails(); filteredDeviceWithDetails.setDeviceId(rs.getInt("DEVICE_ID")); filteredDeviceWithDetails.setDeviceIdentification(rs.getString("DEVICE_IDENTIFICATION")); filteredDeviceWithDetails.setPlatform(rs.getString("PLATFORM")); @@ -187,9 +187,6 @@ public class MSSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO while (rs.next()) { totalRecordsCount = rs.getInt("DEVICE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -200,31 +197,32 @@ public class MSSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO } @Override - public PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, - FilterSet filterSet, int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + public PaginationResult getFeatureNonCompliantDevicesWithDetails(String featureCode, + BasicFilterSet basicFilterSet, int startIndex, int resultCount) + throws InvalidFeatureCodeValueException, InvalidStartIndexValueException, + InvalidResultCountValueException, SQLException { - if (nonCompliantFeatureCode == null || nonCompliantFeatureCode.isEmpty()) { - throw new InvalidParameterValueException("Non-compliant feature code should not be either null or empty."); + if (featureCode == null || featureCode.isEmpty()) { + throw new InvalidFeatureCodeValueException("Feature code should not be either null or empty."); } if (startIndex < GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX) { - throw new InvalidParameterValueException("Start index should be equal to " + + throw new InvalidStartIndexValueException("Start index should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX + " or greater than that."); } if (resultCount < GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT) { - throw new InvalidParameterValueException("Result count should be equal to " + + throw new InvalidResultCountValueException("Result count should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT + " or greater than that."); } - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(basicFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDevicesWithDetails = new ArrayList<>(); + List filteredDevicesWithDetails = new ArrayList<>(); int totalRecordsCount = 0; try { con = this.getConnection(); @@ -243,7 +241,7 @@ public class MSSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO stmt = con.prepareStatement(sql); // [2] appending filter column values, if exist stmt.setInt(1, tenantId); - stmt.setString(2, nonCompliantFeatureCode); + stmt.setString(2, featureCode); if (filters != null && filters.values().size() > 0) { int i = 3; for (Object value : filters.values()) { @@ -263,9 +261,9 @@ public class MSSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO // executing query rs = stmt.executeQuery(); // fetching query results - DetailedDeviceEntry filteredDeviceWithDetails; + DeviceWithDetails filteredDeviceWithDetails; while (rs.next()) { - filteredDeviceWithDetails = new DetailedDeviceEntry(); + filteredDeviceWithDetails = new DeviceWithDetails(); filteredDeviceWithDetails.setDeviceId(rs.getInt("DEVICE_ID")); filteredDeviceWithDetails.setDeviceIdentification(rs.getString("DEVICE_IDENTIFICATION")); filteredDeviceWithDetails.setPlatform(rs.getString("PLATFORM")); @@ -280,7 +278,7 @@ public class MSSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO stmt = con.prepareStatement(sql); stmt.setInt(1, tenantId); - stmt.setString(2, nonCompliantFeatureCode); + stmt.setString(2, featureCode); // executing query rs = stmt.executeQuery(); @@ -288,9 +286,6 @@ public class MSSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO while (rs.next()) { totalRecordsCount = rs.getInt("DEVICE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/OracleGadgetDataServiceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/OracleGadgetDataServiceDAOImpl.java index 7761200762..7fdc731b47 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/OracleGadgetDataServiceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/OracleGadgetDataServiceDAOImpl.java @@ -19,13 +19,13 @@ package org.wso2.carbon.device.mgt.analytics.dashboard.dao.impl; import org.wso2.carbon.context.PrivilegedCarbonContext; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceWithDetails; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceCountByGroup; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.BasicFilterSet; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.ExtendedFilterSet; import org.wso2.carbon.device.mgt.analytics.dashboard.dao.AbstractGadgetDataServiceDAO; import org.wso2.carbon.device.mgt.analytics.dashboard.dao.GadgetDataServiceDAOConstants; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DetailedDeviceEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DeviceCountByGroupEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.FilterSet; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.DataAccessLayerException; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterValueException; +import org.wso2.carbon.device.mgt.analytics.dashboard.exception.*; import org.wso2.carbon.device.mgt.common.PaginationResult; import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil; @@ -41,15 +41,15 @@ public class OracleGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO @Override public PaginationResult getNonCompliantDeviceCountsByFeatures(int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + throws InvalidStartIndexValueException, InvalidResultCountValueException, SQLException { if (startIndex < GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX) { - throw new InvalidParameterValueException("Start index should be equal to " + + throw new InvalidStartIndexValueException("Start index should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX + " or greater than that."); } if (resultCount < GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT) { - throw new InvalidParameterValueException("Result count should be equal to " + + throw new InvalidResultCountValueException("Result count should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT + " or greater than that."); } @@ -57,7 +57,7 @@ public class OracleGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredNonCompliantDeviceCountsByFeatures = new ArrayList<>(); + List filteredNonCompliantDeviceCountsByFeatures = new ArrayList<>(); int totalRecordsCount = 0; try { con = this.getConnection(); @@ -74,9 +74,9 @@ public class OracleGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO // executing query rs = stmt.executeQuery(); // fetching query results - DeviceCountByGroupEntry filteredNonCompliantDeviceCountByFeature; + DeviceCountByGroup filteredNonCompliantDeviceCountByFeature; while (rs.next()) { - filteredNonCompliantDeviceCountByFeature = new DeviceCountByGroupEntry(); + filteredNonCompliantDeviceCountByFeature = new DeviceCountByGroup(); filteredNonCompliantDeviceCountByFeature.setGroup(rs.getString("FEATURE_CODE")); filteredNonCompliantDeviceCountByFeature.setDisplayNameForGroup(rs.getString("FEATURE_CODE")); filteredNonCompliantDeviceCountByFeature.setDeviceCount(rs.getInt("DEVICE_COUNT")); @@ -96,9 +96,6 @@ public class OracleGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO while (rs.next()) { totalRecordsCount = rs.getInt("NON_COMPLIANT_FEATURE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -109,26 +106,27 @@ public class OracleGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO } @Override - public PaginationResult getDevicesWithDetails(FilterSet filterSet, int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + public PaginationResult getDevicesWithDetails(ExtendedFilterSet extendedFilterSet, int startIndex, int resultCount) + throws InvalidPotentialVulnerabilityValueException, InvalidStartIndexValueException, + InvalidResultCountValueException, SQLException { if (startIndex < GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX) { - throw new InvalidParameterValueException("Start index should be equal to " + + throw new InvalidStartIndexValueException("Start index should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX + " or greater than that."); } if (resultCount < GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT) { - throw new InvalidParameterValueException("Result count should be equal to " + + throw new InvalidResultCountValueException("Result count should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT + " or greater than that."); } - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(extendedFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDevicesWithDetails = new ArrayList<>(); + List filteredDevicesWithDetails = new ArrayList<>(); int totalRecordsCount = 0; try { con = this.getConnection(); @@ -167,9 +165,9 @@ public class OracleGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO // executing query rs = stmt.executeQuery(); // fetching query results - DetailedDeviceEntry filteredDeviceWithDetails; + DeviceWithDetails filteredDeviceWithDetails; while (rs.next()) { - filteredDeviceWithDetails = new DetailedDeviceEntry(); + filteredDeviceWithDetails = new DeviceWithDetails(); filteredDeviceWithDetails.setDeviceId(rs.getInt("DEVICE_ID")); filteredDeviceWithDetails.setDeviceIdentification(rs.getString("DEVICE_IDENTIFICATION")); filteredDeviceWithDetails.setPlatform(rs.getString("PLATFORM")); @@ -191,9 +189,6 @@ public class OracleGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO while (rs.next()) { totalRecordsCount = rs.getInt("DEVICE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -204,31 +199,31 @@ public class OracleGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO } @Override - public PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, - FilterSet filterSet, int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + public PaginationResult getFeatureNonCompliantDevicesWithDetails(String featureCode, BasicFilterSet basicFilterSet, + int startIndex, int resultCount) throws InvalidFeatureCodeValueException, + InvalidStartIndexValueException, InvalidResultCountValueException, SQLException { - if (nonCompliantFeatureCode == null || nonCompliantFeatureCode.isEmpty()) { - throw new InvalidParameterValueException("Non-compliant feature code should not be either null or empty."); + if (featureCode == null || featureCode.isEmpty()) { + throw new InvalidFeatureCodeValueException("Feature code should not be either null or empty."); } if (startIndex < GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX) { - throw new InvalidParameterValueException("Start index should be equal to " + + throw new InvalidStartIndexValueException("Start index should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX + " or greater than that."); } if (resultCount < GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT) { - throw new InvalidParameterValueException("Result count should be equal to " + + throw new InvalidResultCountValueException("Result count should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT + " or greater than that."); } - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(basicFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDevicesWithDetails = new ArrayList<>(); + List filteredDevicesWithDetails = new ArrayList<>(); int totalRecordsCount = 0; try { con = this.getConnection(); @@ -247,7 +242,7 @@ public class OracleGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO stmt = con.prepareStatement(sql); // [2] appending filter column values, if exist stmt.setInt(1, tenantId); - stmt.setString(2, nonCompliantFeatureCode); + stmt.setString(2, featureCode); if (filters != null && filters.values().size() > 0) { int i = 3; for (Object value : filters.values()) { @@ -267,9 +262,9 @@ public class OracleGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO // executing query rs = stmt.executeQuery(); // fetching query results - DetailedDeviceEntry filteredDeviceWithDetails; + DeviceWithDetails filteredDeviceWithDetails; while (rs.next()) { - filteredDeviceWithDetails = new DetailedDeviceEntry(); + filteredDeviceWithDetails = new DeviceWithDetails(); filteredDeviceWithDetails.setDeviceId(rs.getInt("DEVICE_ID")); filteredDeviceWithDetails.setDeviceIdentification(rs.getString("DEVICE_IDENTIFICATION")); filteredDeviceWithDetails.setPlatform(rs.getString("PLATFORM")); @@ -284,7 +279,7 @@ public class OracleGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO stmt = con.prepareStatement(sql); stmt.setInt(1, tenantId); - stmt.setString(2, nonCompliantFeatureCode); + stmt.setString(2, featureCode); // executing query rs = stmt.executeQuery(); @@ -292,9 +287,6 @@ public class OracleGadgetDataServiceDAOImpl extends AbstractGadgetDataServiceDAO while (rs.next()) { totalRecordsCount = rs.getInt("DEVICE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/PostgreSQLGadgetDataServiceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/PostgreSQLGadgetDataServiceDAOImpl.java index 3fb005c1fb..d44ad929ee 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/PostgreSQLGadgetDataServiceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/PostgreSQLGadgetDataServiceDAOImpl.java @@ -19,13 +19,13 @@ package org.wso2.carbon.device.mgt.analytics.dashboard.dao.impl; import org.wso2.carbon.context.PrivilegedCarbonContext; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceWithDetails; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceCountByGroup; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.BasicFilterSet; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.ExtendedFilterSet; import org.wso2.carbon.device.mgt.analytics.dashboard.dao.AbstractGadgetDataServiceDAO; import org.wso2.carbon.device.mgt.analytics.dashboard.dao.GadgetDataServiceDAOConstants; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DetailedDeviceEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DeviceCountByGroupEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.FilterSet; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.DataAccessLayerException; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterValueException; +import org.wso2.carbon.device.mgt.analytics.dashboard.exception.*; import org.wso2.carbon.device.mgt.common.PaginationResult; import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil; @@ -41,15 +41,15 @@ public class PostgreSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServic @Override public PaginationResult getNonCompliantDeviceCountsByFeatures(int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + throws InvalidStartIndexValueException, InvalidResultCountValueException, SQLException { if (startIndex < GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX) { - throw new InvalidParameterValueException("Start index should be equal to " + + throw new InvalidStartIndexValueException("Start index should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX + " or greater than that."); } if (resultCount < GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT) { - throw new InvalidParameterValueException("Result count should be equal to " + + throw new InvalidResultCountValueException("Result count should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT + " or greater than that."); } @@ -57,7 +57,7 @@ public class PostgreSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServic PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredNonCompliantDeviceCountsByFeatures = new ArrayList<>(); + List filteredNonCompliantDeviceCountsByFeatures = new ArrayList<>(); int totalRecordsCount = 0; try { con = this.getConnection(); @@ -73,9 +73,9 @@ public class PostgreSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServic // executing query rs = stmt.executeQuery(); // fetching query results - DeviceCountByGroupEntry filteredNonCompliantDeviceCountByFeature; + DeviceCountByGroup filteredNonCompliantDeviceCountByFeature; while (rs.next()) { - filteredNonCompliantDeviceCountByFeature = new DeviceCountByGroupEntry(); + filteredNonCompliantDeviceCountByFeature = new DeviceCountByGroup(); filteredNonCompliantDeviceCountByFeature.setGroup(rs.getString("FEATURE_CODE")); filteredNonCompliantDeviceCountByFeature.setDisplayNameForGroup(rs.getString("FEATURE_CODE")); filteredNonCompliantDeviceCountByFeature.setDeviceCount(rs.getInt("DEVICE_COUNT")); @@ -95,9 +95,6 @@ public class PostgreSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServic while (rs.next()) { totalRecordsCount = rs.getInt("NON_COMPLIANT_FEATURE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -108,26 +105,27 @@ public class PostgreSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServic } @Override - public PaginationResult getDevicesWithDetails(FilterSet filterSet, int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + public PaginationResult getDevicesWithDetails(ExtendedFilterSet extendedFilterSet, int startIndex, int resultCount) + throws InvalidPotentialVulnerabilityValueException, InvalidStartIndexValueException, + InvalidResultCountValueException, SQLException { if (startIndex < GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX) { - throw new InvalidParameterValueException("Start index should be equal to " + + throw new InvalidStartIndexValueException("Start index should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX + " or greater than that."); } if (resultCount < GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT) { - throw new InvalidParameterValueException("Result count should be equal to " + + throw new InvalidResultCountValueException("Result count should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT + " or greater than that."); } - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(extendedFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDevicesWithDetails = new ArrayList<>(); + List filteredDevicesWithDetails = new ArrayList<>(); int totalRecordsCount = 0; try { con = this.getConnection(); @@ -165,9 +163,9 @@ public class PostgreSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServic // executing query rs = stmt.executeQuery(); // fetching query results - DetailedDeviceEntry filteredDeviceWithDetails; + DeviceWithDetails filteredDeviceWithDetails; while (rs.next()) { - filteredDeviceWithDetails = new DetailedDeviceEntry(); + filteredDeviceWithDetails = new DeviceWithDetails(); filteredDeviceWithDetails.setDeviceId(rs.getInt("DEVICE_ID")); filteredDeviceWithDetails.setDeviceIdentification(rs.getString("DEVICE_IDENTIFICATION")); filteredDeviceWithDetails.setPlatform(rs.getString("PLATFORM")); @@ -189,9 +187,6 @@ public class PostgreSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServic while (rs.next()) { totalRecordsCount = rs.getInt("DEVICE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } @@ -202,31 +197,31 @@ public class PostgreSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServic } @Override - public PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, - FilterSet filterSet, int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + public PaginationResult getFeatureNonCompliantDevicesWithDetails(String featureCode, BasicFilterSet basicFilterSet, + int startIndex, int resultCount) throws InvalidFeatureCodeValueException, + InvalidStartIndexValueException, InvalidResultCountValueException, SQLException { - if (nonCompliantFeatureCode == null || nonCompliantFeatureCode.isEmpty()) { - throw new InvalidParameterValueException("Non-compliant feature code should not be either null or empty."); + if (featureCode == null || featureCode.isEmpty()) { + throw new InvalidFeatureCodeValueException("Feature code should not be either null or empty."); } if (startIndex < GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX) { - throw new InvalidParameterValueException("Start index should be equal to " + + throw new InvalidStartIndexValueException("Start index should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_START_INDEX + " or greater than that."); } if (resultCount < GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT) { - throw new InvalidParameterValueException("Result count should be equal to " + + throw new InvalidResultCountValueException("Result count should be equal to " + GadgetDataServiceDAOConstants.Pagination.MIN_RESULT_COUNT + " or greater than that."); } - Map filters = this.extractDatabaseFiltersFromBean(filterSet); + Map filters = this.extractDatabaseFiltersFromBean(basicFilterSet); Connection con; PreparedStatement stmt = null; ResultSet rs = null; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - List filteredDevicesWithDetails = new ArrayList<>(); + List filteredDevicesWithDetails = new ArrayList<>(); int totalRecordsCount = 0; try { con = this.getConnection(); @@ -245,7 +240,7 @@ public class PostgreSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServic stmt = con.prepareStatement(sql); // [2] appending filter column values, if exist stmt.setInt(1, tenantId); - stmt.setString(2, nonCompliantFeatureCode); + stmt.setString(2, featureCode); if (filters != null && filters.values().size() > 0) { int i = 3; for (Object value : filters.values()) { @@ -265,9 +260,9 @@ public class PostgreSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServic // executing query rs = stmt.executeQuery(); // fetching query results - DetailedDeviceEntry filteredDeviceWithDetails; + DeviceWithDetails filteredDeviceWithDetails; while (rs.next()) { - filteredDeviceWithDetails = new DetailedDeviceEntry(); + filteredDeviceWithDetails = new DeviceWithDetails(); filteredDeviceWithDetails.setDeviceId(rs.getInt("DEVICE_ID")); filteredDeviceWithDetails.setDeviceIdentification(rs.getString("DEVICE_IDENTIFICATION")); filteredDeviceWithDetails.setPlatform(rs.getString("PLATFORM")); @@ -282,7 +277,7 @@ public class PostgreSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServic stmt = con.prepareStatement(sql); stmt.setInt(1, tenantId); - stmt.setString(2, nonCompliantFeatureCode); + stmt.setString(2, featureCode); // executing query rs = stmt.executeQuery(); @@ -290,9 +285,6 @@ public class PostgreSQLGadgetDataServiceDAOImpl extends AbstractGadgetDataServic while (rs.next()) { totalRecordsCount = rs.getInt("DEVICE_COUNT"); } - } catch (SQLException e) { - throw new DataAccessLayerException("Error in either getting database connection, " + - "running SQL query or fetching results.", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, rs); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/exception/DataAccessLayerException.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/DataAccessLayerException.java similarity index 97% rename from components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/exception/DataAccessLayerException.java rename to components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/DataAccessLayerException.java index ff03f413d4..69bd5a9f6a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/exception/DataAccessLayerException.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/DataAccessLayerException.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception; +package org.wso2.carbon.device.mgt.analytics.dashboard.exception; /** * Custom exception class for communicating data access layer issues diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/InvalidFeatureCodeValueException.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/InvalidFeatureCodeValueException.java new file mode 100644 index 0000000000..0ba644a611 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/InvalidFeatureCodeValueException.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2016, 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.mgt.analytics.dashboard.exception; + +/** + * Custom exception class for catching invalid parameter values, + * relevant to Gadget Data Service DAO layer. + */ +public class InvalidFeatureCodeValueException extends Exception { + + private String errorMessage; + private static final long serialVersionUID = 2021891706072918864L; + + /** + * Constructs a new exception with the specific error message and nested exception. + * @param errorMessage specific error message. + * @param nestedException Nested exception. + */ + @SuppressWarnings("unused") + public InvalidFeatureCodeValueException(String errorMessage, Exception nestedException) { + super(errorMessage, nestedException); + setErrorMessage(errorMessage); + } + + /** + * Constructs a new exception with the specific error message and cause. + * @param errorMessage Specific error message. + * @param cause Cause of this exception. + */ + @SuppressWarnings("unused") + public InvalidFeatureCodeValueException(String errorMessage, Throwable cause) { + super(errorMessage, cause); + setErrorMessage(errorMessage); + } + + /** + * Constructs a new exception with the specific error message. + * @param errorMessage Specific error message. + */ + public InvalidFeatureCodeValueException(String errorMessage) { + super(errorMessage); + setErrorMessage(errorMessage); + } + + /** + * Constructs a new exception with the specific error message and cause. + * @param cause Cause of this exception. + */ + @SuppressWarnings("unused") + public InvalidFeatureCodeValueException(Throwable cause) { + super(cause); + } + + @SuppressWarnings("unused") + public String getErrorMessage() { + return errorMessage; + } + + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } + +} + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/InvalidPotentialVulnerabilityValueException.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/InvalidPotentialVulnerabilityValueException.java new file mode 100644 index 0000000000..a31b68f8fa --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/InvalidPotentialVulnerabilityValueException.java @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2016, 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.mgt.analytics.dashboard.exception; + +/** + * Custom exception class for catching invalid parameter values, + * relevant to Gadget Data Service DAO layer. + */ +public class InvalidPotentialVulnerabilityValueException extends Exception { + + private String errorMessage; + private static final long serialVersionUID = 2021891706072918864L; + + /** + * Constructs a new exception with the specific error message and nested exception. + * @param errorMessage specific error message. + * @param nestedException Nested exception. + */ + @SuppressWarnings("unused") + public InvalidPotentialVulnerabilityValueException(String errorMessage, Exception nestedException) { + super(errorMessage, nestedException); + setErrorMessage(errorMessage); + } + + /** + * Constructs a new exception with the specific error message and cause. + * @param errorMessage Specific error message. + * @param cause Cause of this exception. + */ + @SuppressWarnings("unused") + public InvalidPotentialVulnerabilityValueException(String errorMessage, Throwable cause) { + super(errorMessage, cause); + setErrorMessage(errorMessage); + } + + /** + * Constructs a new exception with the specific error message. + * @param errorMessage Specific error message. + */ + public InvalidPotentialVulnerabilityValueException(String errorMessage) { + super(errorMessage); + setErrorMessage(errorMessage); + } + + /** + * Constructs a new exception with the specific error message and cause. + * @param cause Cause of this exception. + */ + @SuppressWarnings("unused") + public InvalidPotentialVulnerabilityValueException(Throwable cause) { + super(cause); + } + + @SuppressWarnings("unused") + public String getErrorMessage() { + return errorMessage; + } + + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } + +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/InvalidResultCountValueException.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/InvalidResultCountValueException.java new file mode 100644 index 0000000000..9d20a6971d --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/InvalidResultCountValueException.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2016, 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.mgt.analytics.dashboard.exception; + +/** + * Custom exception class for catching invalid parameter values, + * relevant to Gadget Data Service DAO layer. + */ +public class InvalidResultCountValueException extends Exception { + + private String errorMessage; + private static final long serialVersionUID = 2021891706072918864L; + + /** + * Constructs a new exception with the specific error message and nested exception. + * @param errorMessage specific error message. + * @param nestedException Nested exception. + */ + @SuppressWarnings("unused") + public InvalidResultCountValueException(String errorMessage, Exception nestedException) { + super(errorMessage, nestedException); + setErrorMessage(errorMessage); + } + + /** + * Constructs a new exception with the specific error message and cause. + * @param errorMessage Specific error message. + * @param cause Cause of this exception. + */ + @SuppressWarnings("unused") + public InvalidResultCountValueException(String errorMessage, Throwable cause) { + super(errorMessage, cause); + setErrorMessage(errorMessage); + } + + /** + * Constructs a new exception with the specific error message. + * @param errorMessage Specific error message. + */ + public InvalidResultCountValueException(String errorMessage) { + super(errorMessage); + setErrorMessage(errorMessage); + } + + /** + * Constructs a new exception with the specific error message and cause. + * @param cause Cause of this exception. + */ + @SuppressWarnings("unused") + public InvalidResultCountValueException(Throwable cause) { + super(cause); + } + + @SuppressWarnings("unused") + public String getErrorMessage() { + return errorMessage; + } + + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } + +} + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/exception/InvalidParameterValueException.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/InvalidStartIndexValueException.java similarity index 80% rename from components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/exception/InvalidParameterValueException.java rename to components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/InvalidStartIndexValueException.java index a6ae0189f5..39370c0ab1 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/exception/InvalidParameterValueException.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/exception/InvalidStartIndexValueException.java @@ -16,13 +16,13 @@ * under the License. */ -package org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception; +package org.wso2.carbon.device.mgt.analytics.dashboard.exception; /** - * Custom exception class for catching invalid parameter issues, + * Custom exception class for catching invalid parameter values, * relevant to Gadget Data Service DAO layer. */ -public class InvalidParameterValueException extends Exception { +public class InvalidStartIndexValueException extends Exception { private String errorMessage; private static final long serialVersionUID = 2021891706072918864L; @@ -33,7 +33,7 @@ public class InvalidParameterValueException extends Exception { * @param nestedException Nested exception. */ @SuppressWarnings("unused") - public InvalidParameterValueException(String errorMessage, Exception nestedException) { + public InvalidStartIndexValueException(String errorMessage, Exception nestedException) { super(errorMessage, nestedException); setErrorMessage(errorMessage); } @@ -44,7 +44,7 @@ public class InvalidParameterValueException extends Exception { * @param cause Cause of this exception. */ @SuppressWarnings("unused") - public InvalidParameterValueException(String errorMessage, Throwable cause) { + public InvalidStartIndexValueException(String errorMessage, Throwable cause) { super(errorMessage, cause); setErrorMessage(errorMessage); } @@ -53,7 +53,7 @@ public class InvalidParameterValueException extends Exception { * Constructs a new exception with the specific error message. * @param errorMessage Specific error message. */ - public InvalidParameterValueException(String errorMessage) { + public InvalidStartIndexValueException(String errorMessage) { super(errorMessage); setErrorMessage(errorMessage); } @@ -63,7 +63,7 @@ public class InvalidParameterValueException extends Exception { * @param cause Cause of this exception. */ @SuppressWarnings("unused") - public InvalidParameterValueException(Throwable cause) { + public InvalidStartIndexValueException(Throwable cause) { super(cause); } @@ -77,3 +77,4 @@ public class InvalidParameterValueException extends Exception { } } + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/impl/GadgetDataServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/impl/GadgetDataServiceImpl.java index a7a635427d..495172e3e0 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/impl/GadgetDataServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/impl/GadgetDataServiceImpl.java @@ -19,12 +19,12 @@ package org.wso2.carbon.device.mgt.analytics.dashboard.impl; import org.wso2.carbon.device.mgt.analytics.dashboard.GadgetDataService; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceCountByGroup; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceWithDetails; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.ExtendedFilterSet; import org.wso2.carbon.device.mgt.analytics.dashboard.dao.GadgetDataServiceDAOFactory; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DetailedDeviceEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.DeviceCountByGroupEntry; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.FilterSet; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.DataAccessLayerException; -import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterValueException; +import org.wso2.carbon.device.mgt.analytics.dashboard.bean.BasicFilterSet; +import org.wso2.carbon.device.mgt.analytics.dashboard.exception.*; import org.wso2.carbon.device.mgt.common.PaginationResult; import java.sql.SQLException; @@ -36,14 +36,16 @@ import java.util.List; public class GadgetDataServiceImpl implements GadgetDataService { @Override - public DeviceCountByGroupEntry getDeviceCount(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException { - DeviceCountByGroupEntry filteredDeviceCount; + public DeviceCountByGroup getDeviceCount(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, DataAccessLayerException { + DeviceCountByGroup filteredDeviceCount; try { GadgetDataServiceDAOFactory.openConnection(); - filteredDeviceCount = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getDeviceCount(filterSet); + filteredDeviceCount = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO(). + getDeviceCount(extendedFilterSet); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } @@ -51,15 +53,16 @@ public class GadgetDataServiceImpl implements GadgetDataService { } @Override - public DeviceCountByGroupEntry getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException { - DeviceCountByGroupEntry featureNonCompliantDeviceCount; + public DeviceCountByGroup getFeatureNonCompliantDeviceCount(String featureCode, BasicFilterSet basicFilterSet) + throws InvalidFeatureCodeValueException, DataAccessLayerException { + DeviceCountByGroup featureNonCompliantDeviceCount; try { GadgetDataServiceDAOFactory.openConnection(); featureNonCompliantDeviceCount = GadgetDataServiceDAOFactory. - getGadgetDataServiceDAO().getFeatureNonCompliantDeviceCount(nonCompliantFeatureCode, filterSet); + getGadgetDataServiceDAO().getFeatureNonCompliantDeviceCount(featureCode, basicFilterSet); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } @@ -67,13 +70,14 @@ public class GadgetDataServiceImpl implements GadgetDataService { } @Override - public DeviceCountByGroupEntry getTotalDeviceCount() throws DataAccessLayerException { - DeviceCountByGroupEntry totalDeviceCount; + public DeviceCountByGroup getTotalDeviceCount() throws DataAccessLayerException { + DeviceCountByGroup totalDeviceCount; try { GadgetDataServiceDAOFactory.openConnection(); totalDeviceCount = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getTotalDeviceCount(); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } @@ -81,14 +85,15 @@ public class GadgetDataServiceImpl implements GadgetDataService { } @Override - public List getDeviceCountsByConnectivityStatuses() throws DataAccessLayerException { - List deviceCountsByConnectivityStatuses; + public List getDeviceCountsByConnectivityStatuses() throws DataAccessLayerException { + List deviceCountsByConnectivityStatuses; try { GadgetDataServiceDAOFactory.openConnection(); deviceCountsByConnectivityStatuses = GadgetDataServiceDAOFactory. getGadgetDataServiceDAO().getDeviceCountsByConnectivityStatuses(); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } @@ -96,14 +101,15 @@ public class GadgetDataServiceImpl implements GadgetDataService { } @Override - public List getDeviceCountsByPotentialVulnerabilities() throws DataAccessLayerException { - List deviceCountsByPotentialVulnerabilities; + public List getDeviceCountsByPotentialVulnerabilities() throws DataAccessLayerException { + List deviceCountsByPotentialVulnerabilities; try { GadgetDataServiceDAOFactory.openConnection(); deviceCountsByPotentialVulnerabilities = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO(). getDeviceCountsByPotentialVulnerabilities(); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } @@ -112,14 +118,16 @@ public class GadgetDataServiceImpl implements GadgetDataService { @Override public PaginationResult getNonCompliantDeviceCountsByFeatures(int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + throws InvalidStartIndexValueException, InvalidResultCountValueException, + DataAccessLayerException { PaginationResult paginationResult; try { GadgetDataServiceDAOFactory.openConnection(); paginationResult = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO(). getNonCompliantDeviceCountsByFeatures(startIndex, resultCount); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } @@ -127,15 +135,16 @@ public class GadgetDataServiceImpl implements GadgetDataService { } @Override - public List getDeviceCountsByPlatforms(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException { - List deviceCountsByPlatforms; + public List getDeviceCountsByPlatforms(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, DataAccessLayerException { + List deviceCountsByPlatforms; try { GadgetDataServiceDAOFactory.openConnection(); deviceCountsByPlatforms = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO(). - getDeviceCountsByPlatforms(filterSet); + getDeviceCountsByPlatforms(extendedFilterSet); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } @@ -143,15 +152,17 @@ public class GadgetDataServiceImpl implements GadgetDataService { } @Override - public List getFeatureNonCompliantDeviceCountsByPlatforms(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException { - List featureNonCompliantDeviceCountsByPlatforms; + public List getFeatureNonCompliantDeviceCountsByPlatforms(String featureCode, + BasicFilterSet basicFilterSet) throws InvalidFeatureCodeValueException, + DataAccessLayerException { + List featureNonCompliantDeviceCountsByPlatforms; try { GadgetDataServiceDAOFactory.openConnection(); featureNonCompliantDeviceCountsByPlatforms = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO(). - getFeatureNonCompliantDeviceCountsByPlatforms(nonCompliantFeatureCode, filterSet); + getFeatureNonCompliantDeviceCountsByPlatforms(featureCode, basicFilterSet); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } @@ -159,15 +170,17 @@ public class GadgetDataServiceImpl implements GadgetDataService { } @Override - public List getDeviceCountsByOwnershipTypes(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException { - List deviceCountsByOwnershipTypes; + public List getDeviceCountsByOwnershipTypes(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, + DataAccessLayerException { + List deviceCountsByOwnershipTypes; try { GadgetDataServiceDAOFactory.openConnection(); deviceCountsByOwnershipTypes = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO(). - getDeviceCountsByOwnershipTypes(filterSet); + getDeviceCountsByOwnershipTypes(extendedFilterSet); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } @@ -175,16 +188,17 @@ public class GadgetDataServiceImpl implements GadgetDataService { } @Override - public List - getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException { - List featureNonCompliantDeviceCountsByOwnershipTypes; + public List + getFeatureNonCompliantDeviceCountsByOwnershipTypes(String featureCode, BasicFilterSet basicFilterSet) + throws InvalidFeatureCodeValueException, DataAccessLayerException { + List featureNonCompliantDeviceCountsByOwnershipTypes; try { GadgetDataServiceDAOFactory.openConnection(); featureNonCompliantDeviceCountsByOwnershipTypes = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO(). - getFeatureNonCompliantDeviceCountsByOwnershipTypes(nonCompliantFeatureCode, filterSet); + getFeatureNonCompliantDeviceCountsByOwnershipTypes(featureCode, basicFilterSet); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } @@ -192,15 +206,17 @@ public class GadgetDataServiceImpl implements GadgetDataService { } @Override - public PaginationResult getDevicesWithDetails(FilterSet filterSet, - int startIndex, int resultCount) throws InvalidParameterValueException, DataAccessLayerException { + public PaginationResult getDevicesWithDetails(ExtendedFilterSet extendedFilterSet, int startIndex, int resultCount) + throws InvalidPotentialVulnerabilityValueException, DataAccessLayerException, + InvalidStartIndexValueException, InvalidResultCountValueException { PaginationResult paginationResult; try { GadgetDataServiceDAOFactory.openConnection(); paginationResult = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO(). - getDevicesWithDetails(filterSet, startIndex, resultCount); + getDevicesWithDetails(extendedFilterSet, startIndex, resultCount); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } @@ -208,16 +224,18 @@ public class GadgetDataServiceImpl implements GadgetDataService { } @Override - public PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, - FilterSet filterSet, int startIndex, int resultCount) - throws InvalidParameterValueException, DataAccessLayerException { + public PaginationResult getFeatureNonCompliantDevicesWithDetails(String featureCode, BasicFilterSet basicFilterSet, + int startIndex, int resultCount) throws InvalidFeatureCodeValueException, + DataAccessLayerException, InvalidStartIndexValueException, + InvalidResultCountValueException { PaginationResult paginationResult; try { GadgetDataServiceDAOFactory.openConnection(); paginationResult = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO(). - getFeatureNonCompliantDevicesWithDetails(nonCompliantFeatureCode, filterSet, startIndex, resultCount); + getFeatureNonCompliantDevicesWithDetails(featureCode, basicFilterSet, startIndex, resultCount); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } @@ -225,15 +243,16 @@ public class GadgetDataServiceImpl implements GadgetDataService { } @Override - public List getDevicesWithDetails(FilterSet filterSet) - throws InvalidParameterValueException, DataAccessLayerException { - List devicesWithDetails; + public List getDevicesWithDetails(ExtendedFilterSet extendedFilterSet) + throws InvalidPotentialVulnerabilityValueException, DataAccessLayerException { + List devicesWithDetails; try { GadgetDataServiceDAOFactory.openConnection(); devicesWithDetails = GadgetDataServiceDAOFactory. - getGadgetDataServiceDAO().getDevicesWithDetails(filterSet); + getGadgetDataServiceDAO().getDevicesWithDetails(extendedFilterSet); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } @@ -241,15 +260,17 @@ public class GadgetDataServiceImpl implements GadgetDataService { } @Override - public List getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, - FilterSet filterSet) throws InvalidParameterValueException, DataAccessLayerException { - List featureNonCompliantDevicesWithDetails; + public List getFeatureNonCompliantDevicesWithDetails(String featureCode, + BasicFilterSet basicFilterSet) throws InvalidFeatureCodeValueException, + DataAccessLayerException { + List featureNonCompliantDevicesWithDetails; try { GadgetDataServiceDAOFactory.openConnection(); featureNonCompliantDevicesWithDetails = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO(). - getFeatureNonCompliantDevicesWithDetails(nonCompliantFeatureCode, filterSet); + getFeatureNonCompliantDevicesWithDetails(featureCode, basicFilterSet); } catch (SQLException e) { - throw new DataAccessLayerException("Error in opening database connection.", e); + throw new DataAccessLayerException("Error in either opening a database connection or " + + "accessing the database to fetch corresponding results.", e); } finally { GadgetDataServiceDAOFactory.closeConnection(); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml index d5b807adb7..80cc16d18c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml @@ -17,14 +17,12 @@ ~ under the License. --> - + org.wso2.carbon.devicemgt device-mgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml index ced2b64f42..932f4894eb 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml @@ -17,14 +17,12 @@ ~ under the License. --> - + device-mgt org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml @@ -72,10 +70,9 @@ - + - + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Operation.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Operation.java index 3004378df4..01ebb45709 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Operation.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Operation.java @@ -186,7 +186,9 @@ public interface Operation { @ApiResponses(value = {@ApiResponse(code = 200, message = "Activity details provided successfully.."), @ApiResponse(code = 500, message = "Error occurred while fetching the activity for the supplied id.")}) @Permission(scope = "operation-view", permissions = {"/permission/admin/device-mgt/admin/devices/view"}) - Response getActivity(@ApiParam(name = "id", value = "Provide activity id {id} as ACTIVITY_(number)", + Response getActivity( + @ApiParam(name = "id", value = "Provide activity id {id} as ACTIVITY_(number)", required = true) @PathParam("id") String id) throws MDMAPIException; + } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/impl/OperationImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/impl/OperationImpl.java index f4631514c9..686b684456 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/impl/OperationImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/impl/OperationImpl.java @@ -249,4 +249,5 @@ public class OperationImpl implements org.wso2.carbon.device.mgt.jaxrs.api.Opera } return Response.status(Response.Status.OK).entity(operation).build(); } + } \ No newline at end of file diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml index be584f36b0..14c8072106 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml @@ -17,12 +17,11 @@ ~ under the License. --> - + device-mgt org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml index 4ce3faf47b..9f3b0bee45 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt device-mgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml index a0484f63cd..9f4918442b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml @@ -22,7 +22,7 @@ device-mgt org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml index c33c7202ff..109acc5885 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml @@ -22,7 +22,7 @@ device-mgt org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml index b79e9cf5d8..185aabc6d7 100644 --- a/components/device-mgt/pom.xml +++ b/components/device-mgt/pom.xml @@ -17,13 +17,12 @@ ~ under the License. --> - + org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml b/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml index 55ce1417fc..2293630331 100644 --- a/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml +++ b/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt email-sender - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml diff --git a/components/email-sender/pom.xml b/components/email-sender/pom.xml index 69aee4aaf8..b5c6f41256 100644 --- a/components/email-sender/pom.xml +++ b/components/email-sender/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml b/components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml index fc5aa9065f..0348963989 100644 --- a/components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml +++ b/components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml @@ -21,14 +21,14 @@ dynamic-client-registration org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.mdm dynamic-client-web-proxy - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - Proxy endpoint of Dynamic Client Registration Web Service WSO2 Carbon - Dynamic Client Registration Web Proxy war diff --git a/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml b/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml index 9e10b16307..cb04fac4e1 100644 --- a/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml +++ b/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml @@ -21,14 +21,14 @@ dynamic-client-registration org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.mdm dynamic-client-web - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - Dynamic Client Registration Web Service WSO2 Carbon - Dynamic Client Registration Web war diff --git a/components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml b/components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml index 80ac539064..fb7cf07a52 100644 --- a/components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml +++ b/components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml @@ -21,13 +21,13 @@ dynamic-client-registration org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.dynamic.client.registration - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle WSO2 Carbon - Dynamic client registration service WSO2 Carbon - Dynamic Client Registration Service diff --git a/components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml b/components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml index 4446a5b45a..c05e521b81 100644 --- a/components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml +++ b/components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml @@ -21,13 +21,13 @@ dynamic-client-registration org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.dynamic.client.web.app.registration - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle WSO2 Carbon - Dynamic client web app registration WSO2 Carbon - Dynamic Client Web-app Registration Service diff --git a/components/identity-extensions/dynamic-client-registration/pom.xml b/components/identity-extensions/dynamic-client-registration/pom.xml index 4df82d9856..7a8611708f 100644 --- a/components/identity-extensions/dynamic-client-registration/pom.xml +++ b/components/identity-extensions/dynamic-client-registration/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt identity-extensions - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.devicemgt dynamic-client-registration - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon - Dynamic client registration http://wso2.org diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml index 3859ae3e58..1b3f46322c 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml +++ b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml @@ -17,19 +17,18 @@ ~ under the License. --> - + org.wso2.carbon.devicemgt identity-extensions - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.oauth.extensions - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle WSO2 Carbon - OAuth Extensions http://wso2.org diff --git a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml index d6c808c4ea..c5a6d6e0aa 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml +++ b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml @@ -21,7 +21,7 @@ identity-extensions org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT 4.0.0 diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml index 5592ee46a3..f387524033 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml +++ b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt identity-extensions - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml diff --git a/components/identity-extensions/pom.xml b/components/identity-extensions/pom.xml index 51bb557117..e101d5cc16 100644 --- a/components/identity-extensions/pom.xml +++ b/components/identity-extensions/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml b/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml index eae2aae4c3..942524b9bb 100644 --- a/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt policy-mgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.devicemgt org.wso2.carbon.complex.policy.decision.point - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle WSO2 Carbon - Policy Decision Point WSO2 Carbon - Policy Decision Point diff --git a/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml index ad8b1570d7..747704d760 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml @@ -3,7 +3,7 @@ org.wso2.carbon.devicemgt policy-mgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml @@ -11,7 +11,7 @@ 4.0.0 org.wso2.carbon.devicemgt org.wso2.carbon.policy.information.point - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle WSO2 Carbon - Policy Information Point WSO2 Carbon - Policy Information Point diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml index 597ea8239a..502b112c74 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt policy-mgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.devicemgt org.wso2.carbon.policy.mgt.common - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle WSO2 Carbon - Policy Management Common WSO2 Carbon - Policy Management Common diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml index 6663a8f9cf..6a5147d772 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt policy-mgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.devicemgt org.wso2.carbon.policy.mgt.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle WSO2 Carbon - Policy Management Core WSO2 Carbon - Policy Management Core diff --git a/components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/pom.xml b/components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/pom.xml index 3fdac21744..dccee0db93 100644 --- a/components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/pom.xml @@ -3,14 +3,14 @@ org.wso2.carbon.devicemgt policy-mgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.devicemgt org.wso2.carbon.simple.policy.decision.point - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle WSO2 Carbon - Simple Policy Decision Point WSO2 Carbon - Simple Policy Decision Point diff --git a/components/policy-mgt/pom.xml b/components/policy-mgt/pom.xml index 4d1c8edb69..e884905ad6 100644 --- a/components/policy-mgt/pom.xml +++ b/components/policy-mgt/pom.xml @@ -23,13 +23,13 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml 4.0.0 policy-mgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon - Policy Management Component http://wso2.org diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml index eced0aba7d..d9bf6ff65a 100644 --- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml +++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml @@ -21,14 +21,14 @@ org.wso2.carbon.devicemgt webapp-authenticator-framework - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.devicemgt org.wso2.carbon.webapp.authenticator.framework - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle WSO2 Carbon - Web Application Authenticator Framework Bundle WSO2 Carbon - Web Application Authenticator Framework Bundle diff --git a/components/webapp-authenticator-framework/pom.xml b/components/webapp-authenticator-framework/pom.xml index a506680d28..1b1ad5fd55 100644 --- a/components/webapp-authenticator-framework/pom.xml +++ b/components/webapp-authenticator-framework/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt webapp-authenticator-framework - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon - Webapp Authenticator Framework http://wso2.org diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml index 63046f0ebd..9e1457ed9b 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml +++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml @@ -17,20 +17,18 @@ ~ under the License. --> - + org.wso2.carbon.devicemgt apimgt-extensions-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.apimgt.application.extension.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - API Management Application Extension Feature http://wso2.org This feature contains an implementation of a api application registration, which takes care of subscription diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml index 36d8339dda..bdf0eede29 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml +++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml @@ -21,14 +21,14 @@ org.wso2.carbon.devicemgt apimgt-extensions-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.apimgt.webapp.publisher.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - API Management Webapp Publisher Feature http://wso2.org This feature contains an implementation of a Tomcat lifecycle listener, which takes care of publishing diff --git a/features/apimgt-extensions/pom.xml b/features/apimgt-extensions/pom.xml index c4a0b1bf82..2db113a8be 100644 --- a/features/apimgt-extensions/pom.xml +++ b/features/apimgt-extensions/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt apimgt-extensions-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon - API Management Extensions Feature http://wso2.org diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml index e1c735c948..d703166608 100644 --- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml +++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt certificate-mgt-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.certificate.mgt.server.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - Certificate Management Server Feature http://wso2.org This feature contains the core bundles required for back-end Certificate Management functionality diff --git a/features/certificate-mgt/pom.xml b/features/certificate-mgt/pom.xml index 014deb5f5b..c34270e209 100644 --- a/features/certificate-mgt/pom.xml +++ b/features/certificate-mgt/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt certificate-mgt-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon - Certificate Management Feature http://wso2.org diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml index 139f1c2eef..35e337b6b8 100644 --- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml +++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt device-mgt-extensions-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - GCM Based Push Notification Provider Feature http://wso2.org WSO2 Carbon - MQTT Based Push Notification Provider Feature diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml index 452d0c3feb..f13a64008f 100644 --- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml +++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt device-mgt-extensions-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - MQTT Based Push Notification Provider Feature http://wso2.org WSO2 Carbon - MQTT Based Push Notification Provider Feature diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml index dc0811d68e..6417bb335e 100644 --- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml +++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt device-mgt-extensions-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - XMPP Based Push Notification Provider Feature http://wso2.org WSO2 Carbon - XMPP Based Push Notification Provider Feature diff --git a/features/device-mgt-extensions/pom.xml b/features/device-mgt-extensions/pom.xml index 2631efbebe..7020f99f91 100644 --- a/features/device-mgt-extensions/pom.xml +++ b/features/device-mgt-extensions/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml index 1a04860745..540991450b 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml @@ -1,17 +1,15 @@ - + org.wso2.carbon.devicemgt device-mgt-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.analytics.dashboard.feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon - Device Management Dashboard Analytics Feature WSO2 Carbon - Device Management Dashboard Analytics Feature diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml index 8492787054..90ace4e4b6 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt device-mgt-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.analytics.data.publisher.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - Device Management Server Feature http://wso2.org This feature contains bundles related to device analytics data publisher diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml index b728ed51ea..560be52a74 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml @@ -17,14 +17,12 @@ ~ under the License. --> - + org.wso2.carbon.devicemgt device-mgt-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml index 1f425abbab..1b562c107c 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml @@ -4,14 +4,14 @@ org.wso2.carbon.devicemgt device-mgt-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.extensions.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - Device Management Extensions Feature http://wso2.org This feature contains common extensions used by key device management functionalities diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml index 1dc69a82c5..9b6a1eb6a0 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt device-mgt-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml index 78609ac5d0..b29b528d4c 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt device-mgt-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.server.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - Device Management Server Feature http://wso2.org This feature contains the core bundles required for Back-end Device Management functionality diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml index d00f2d3213..2f9d6f51fe 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml @@ -17,14 +17,12 @@ ~ under the License. --> - + org.wso2.carbon.devicemgt device-mgt-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml index 061dbdfdf6..1fcd9c3fe4 100644 --- a/features/device-mgt/pom.xml +++ b/features/device-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml b/features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml index f2adbd5fcc..3f9c04c2e6 100644 --- a/features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml +++ b/features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml @@ -23,14 +23,14 @@ org.wso2.carbon.devicemgt dynamic-client-registration-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.dynamic.client.registration.server.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - Dynamic Client Registration Server Feature http://wso2.org This feature contains dynamic client registration features diff --git a/features/dynamic-client-registration/pom.xml b/features/dynamic-client-registration/pom.xml index 9838bd4dba..d683886de4 100644 --- a/features/dynamic-client-registration/pom.xml +++ b/features/dynamic-client-registration/pom.xml @@ -23,14 +23,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt dynamic-client-registration-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon - Dynamic Client Registration Feature http://wso2.org diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml b/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml index 350cc0a895..9d623ef830 100644 --- a/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml +++ b/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt email-sender-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.email.sender.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - Email Sender Feature http://wso2.org This feature contains the core bundles required for email sender related functionality diff --git a/features/email-sender/pom.xml b/features/email-sender/pom.xml index a9112819a1..49064a31eb 100644 --- a/features/email-sender/pom.xml +++ b/features/email-sender/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt email-sender-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon - Email Sender Feature http://wso2.org diff --git a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml index 0e188d4ef7..925de55455 100644 --- a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml +++ b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml @@ -18,20 +18,19 @@ ~ under the License. --> - + org.wso2.carbon.devicemgt jwt-client-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.identity.jwt.client.extension.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - JWT Client Feature http://wso2.org This feature contains jwt client implementation from which we can get a access token using the jwt diff --git a/features/jwt-client/pom.xml b/features/jwt-client/pom.xml index 6566c5fe96..852ec20f53 100644 --- a/features/jwt-client/pom.xml +++ b/features/jwt-client/pom.xml @@ -18,19 +18,18 @@ ~ under the License. --> - + org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml 4.0.0 jwt-client-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon - Dynamic Client Registration Feature http://wso2.org diff --git a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml index 8c8a4d6f59..12ee5345c5 100644 --- a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml +++ b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml @@ -23,14 +23,14 @@ org.wso2.carbon.devicemgt oauth-extensions-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.oauth.extensions.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - Device Mgt OAuth Extensions Feature http://wso2.org This feature contains devicemgt related OAuth extensions diff --git a/features/oauth-extensions/pom.xml b/features/oauth-extensions/pom.xml index 0feeaf493d..3fb7ebf607 100644 --- a/features/oauth-extensions/pom.xml +++ b/features/oauth-extensions/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt oauth-extensions-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon Device Management - OAuth Extensions Feature http://wso2.org diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml index bc2fb6aac5..fb91690936 100644 --- a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml +++ b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml @@ -23,14 +23,14 @@ org.wso2.carbon.devicemgt policy-mgt-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.policy.mgt.server.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - Policy Management Server Feature http://wso2.org This feature contains the core bundles required for Back-end Device Management functionality diff --git a/features/policy-mgt/pom.xml b/features/policy-mgt/pom.xml index 6a1d7ebff7..b145d09c43 100644 --- a/features/policy-mgt/pom.xml +++ b/features/policy-mgt/pom.xml @@ -23,14 +23,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt policy-mgt-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon - Policy Management Feature http://wso2.org diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml index e835ced221..69ad47456c 100644 --- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml +++ b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt webapp-authenticator-framework-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.webapp.authenticator.framework.server.feature pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - Device Management Server Feature http://wso2.org This feature contains the core bundles required for Back-end Device Management functionality diff --git a/features/webapp-authenticator-framework/pom.xml b/features/webapp-authenticator-framework/pom.xml index 2a0495973b..1ec308e68a 100644 --- a/features/webapp-authenticator-framework/pom.xml +++ b/features/webapp-authenticator-framework/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.devicemgt webapp-authenticator-framework-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom WSO2 Carbon - Webapp Authenticator Framework Feature http://wso2.org diff --git a/pom.xml b/pom.xml index 33ecf3817b..7ad4fc14b7 100644 --- a/pom.xml +++ b/pom.xml @@ -17,14 +17,13 @@ ~ under the License. --> - + 4.0.0 org.wso2.carbon.devicemgt carbon-devicemgt pom - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT WSO2 Carbon - Device Management - Parent http://wso2.org WSO2 Connected Device Manager Components @@ -1117,6 +1116,11 @@ jsr311-api ${jsr311.version} + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.rs.version} + commons-logging commons-logging @@ -1777,7 +1781,7 @@ 1.2.11.wso2v5 - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT 4.4.8 @@ -1857,6 +1861,8 @@ 2.26.1.wso2v3 [2.26.1, 3.0.0) + + 2.0.1 1.5.8 2.5