waruni
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change exception codes of device stream events

Browse Source
cherry-pick-b7435168
Yohan Avishke 5 years ago
parent e643db08d1
commit fe4e857639
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File

43
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java
Unescape View File

@ -86,24 +86,27 @@ public class AnalyticsArtifactsManagementServiceImpl
if (!isEdited) { if (!isEdited) {
eventStreamAdminServiceStub.addEventStreamDefinitionAsString(streamDefinition); eventStreamAdminServiceStub.addEventStreamDefinitionAsString(streamDefinition);
} else { } else {
// Find and edit stream
if (eventStreamAdminServiceStub.getStreamDetailsForStreamId(id) != null) { if (eventStreamAdminServiceStub.getStreamDetailsForStreamId(id) != null) {
eventStreamAdminServiceStub.editEventStreamDefinitionAsString(streamDefinition, id); eventStreamAdminServiceStub.editEventStreamDefinitionAsString(streamDefinition, id);
} }
} }
return Response.ok().build(); return Response.ok().build();
} catch (AxisFault e) { } catch (AxisFault e) {
log.error("Failed to create event definitions for tenantDomain: " + tenantDomain, e); String errMsg = "Failed to create event definitions for tenantDomain: " + tenantDomain;
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); log.error(errMsg, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
} catch (RemoteException e) { } catch (RemoteException e) {
log.error("Failed to connect with the remote services for tenantDomain: " + tenantDomain, e); String errMsg = "Failed to connect with the remote services for tenantDomain: " + tenantDomain;
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); log.error(errMsg, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
} catch (JWTClientException e) { } catch (JWTClientException e) {
log.error("Failed to generate jwt token for tenantDomain: " + tenantDomain, e); String errMsg = "Failed to generate jwt token for tenantDomain: " + tenantDomain;
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); log.error(errMsg, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
} catch (UserStoreException e) { } catch (UserStoreException e) {
log.error("Failed to connect with the user store for tenantDomain: " + tenantDomain, e); String errMsg = "Failed to connect with the user store for tenantDomain: " + tenantDomain;
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); log.error(errMsg, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
} finally { } finally {
cleanup(eventStreamAdminServiceStub); cleanup(eventStreamAdminServiceStub);
} }
@ -118,17 +121,21 @@ public class AnalyticsArtifactsManagementServiceImpl
publishStream(stream); publishStream(stream);
return Response.ok().build(); return Response.ok().build();
} catch (AxisFault e) { } catch (AxisFault e) {
log.error("Failed to create event definitions for tenantDomain: " + tenantDomain, e); String errMsg = "Failed to create event definitions for tenantDomain: " + tenantDomain;
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); log.error(errMsg, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
} catch (RemoteException e) { } catch (RemoteException e) {
log.error("Failed to connect with the remote services for tenantDomain: " + tenantDomain, e); String errMsg = "Failed to connect with the remote services for tenantDomain: " + tenantDomain;
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); log.error(errMsg, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
} catch (JWTClientException e) { } catch (JWTClientException e) {
log.error("Failed to generate jwt token for tenantDomain: " + tenantDomain, e); String errMsg = "Failed to generate jwt token for tenantDomain: " + tenantDomain;
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); log.error(errMsg, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
} catch (UserStoreException e) { } catch (UserStoreException e) {
log.error("Failed to connect with the user store for tenantDomain: " + tenantDomain, e); String errMsg = "Failed to connect with the user store for tenantDomain: " + tenantDomain;
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); log.error(errMsg, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
} }
} }
@ -351,7 +358,7 @@ public class AnalyticsArtifactsManagementServiceImpl
/** /**
* Set data to a stream dto and publish dto using a stub * Set data to a stream dto and publish dto using a stub
* *
* @param stream Stream definition * @param stream Stream definition
* @throws RemoteException Exception that may occur during a remote method call * @throws RemoteException Exception that may occur during a remote method call
* @throws UserStoreException Exception that may occur during JWT token generation * @throws UserStoreException Exception that may occur during JWT token generation
* @throws JWTClientException Exception that may occur during connecting to client store * @throws JWTClientException Exception that may occur during connecting to client store

Write Preview
Loading…
Cancel
Save