community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

rolling back some imports

Browse Source
This commit is contained in:
Arcane94 2018-02-23 22:02:36 +05:30
parent 27ae7cfed8
commit 1ffaad6fb7
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
View File

@ -48,7 +48,6 @@ import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtUtil;
import org.wso2.carbon.user.api.UserStoreException;
import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
import javax.persistence.EntityExistsException;
import javax.ws.rs.*;
import javax.ws.rs.core.Response;
import java.util.ArrayList;

27
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceImpl.java
View File

@ -310,7 +310,7 @@ public class GeoLocationProviderServiceImpl implements GeoLocationProviderServic
@Override
public boolean createGeoAlert(Alert alert, String alertType)
throws GeoLocationBasedServiceException {
throws GeoLocationBasedServiceException,AlertAlreadyExist {
return saveGeoAlert(alert, alertType, false);
}
@ -322,12 +322,12 @@ public class GeoLocationProviderServiceImpl implements GeoLocationProviderServic
@Override
public boolean updateGeoAlert(Alert alert, String alertType)
throws GeoLocationBasedServiceException {
throws GeoLocationBasedServiceException,AlertAlreadyExist {
return saveGeoAlert(alert, alertType, true);
}
public boolean saveGeoAlert(Alert alert, String alertType, boolean isUpdate)
throws GeoLocationBasedServiceException {
throws GeoLocationBasedServiceException,AlertAlreadyExist {
Type type = new TypeToken<Map<String, String>>() {
}.getType();
@ -369,28 +369,33 @@ public class GeoLocationProviderServiceImpl implements GeoLocationProviderServic
"Unrecognized execution plan type: " + alertType + " while creating geo alert");
}
//persist alert in registry
updateRegistry(getRegistryPath(alertType, alert.getQueryName()), content,
options);
//deploy alert into event processor
EventProcessorAdminServiceStub eventprocessorStub = null;
String action = (isUpdate ? "updating" : "creating");
try {
String existingPlanName = null;
String executionPlanName = getExecutionPlanName(alertType, alert.getQueryName());
eventprocessorStub = getEventProcessorAdminServiceStub();
String parsedTemplate = parseTemplateForGeoClusters(alertType, parseMap);
String validationResponse = eventprocessorStub.validateExecutionPlan(parsedTemplate);
if (validationResponse.equals("success")) {
if (isUpdate) {
String executionPlanName = getExecutionPlanName(alertType, alert.getQueryName());
try {
String existingPlanName = eventprocessorStub.getActiveExecutionPlan(executionPlanName);
} catch (Exception e) {
existingPlanName = eventprocessorStub.getActiveExecutionPlan(executionPlanName);
} catch (AxisFault axisFault) {
eventprocessorStub.deployExecutionPlan(parsedTemplate);
}
eventprocessorStub.editActiveExecutionPlan(parsedTemplate, executionPlanName);
} else {
eventprocessorStub.deployExecutionPlan(parsedTemplate);
try {
existingPlanName = eventprocessorStub.getActiveExecutionPlan(executionPlanName);
if (existingPlanName.contains(executionPlanName)) {
throw new AlertAlreadyExist("Execution plan with this name already exists");
}
} catch (AxisFault axisFault) {
updateRegistry(getRegistryPath(alertType, alert.getQueryName()), content,options);
eventprocessorStub.deployExecutionPlan(parsedTemplate);
}
}
} else {
if (validationResponse.startsWith(