diff --git a/assembly/broker/descriptors/kapua-broker.xml b/assembly/broker/descriptors/kapua-broker.xml index 8d62a099bd4..ecb65f78a8a 100644 --- a/assembly/broker/descriptors/kapua-broker.xml +++ b/assembly/broker/descriptors/kapua-broker.xml @@ -173,6 +173,7 @@ io.netty:netty javax.inject:javax.inject + javax.batch:javax.batch-api joda-time:joda-time @@ -252,9 +253,13 @@ ${pom.groupId}:kapua-foreignkeys ${pom.groupId}:kapua-guice ${pom.groupId}:kapua-job-api - + ${pom.groupId}:kapua-job-internal + ${pom.groupId}:kapua-job-engine-api + ${pom.groupId}:kapua-job-engine-remote ${pom.groupId}:kapua-message-api ${pom.groupId}:kapua-message-internal + ${pom.groupId}:kapua-scheduler-api + ${pom.groupId}:kapua-scheduler-quartz ${pom.groupId}:kapua-security-authentication-api ${pom.groupId}:kapua-security-authorization-api ${pom.groupId}:kapua-security-certificate-api diff --git a/assembly/broker/pom.xml b/assembly/broker/pom.xml index 08691d2eb8b..02b90fd17bf 100644 --- a/assembly/broker/pom.xml +++ b/assembly/broker/pom.xml @@ -106,7 +106,23 @@ org.eclipse.kapua - kapua-tag-api + kapua-job-internal + + + org.eclipse.kapua + kapua-job-engine-api + + + org.eclipse.kapua + kapua-job-engine-remote + + + org.eclipse.kapua + kapua-scheduler-api + + + org.eclipse.kapua + kapua-scheduler-quartz org.eclipse.kapua @@ -116,6 +132,10 @@ org.eclipse.kapua kapua-security-certificate-internal + + org.eclipse.kapua + kapua-tag-api + org.eclipse.kapua kapua-tag-internal @@ -288,6 +308,10 @@ commons-io commons-io + + javax.batch + javax.batch-api + org.apache.commons commons-lang3 diff --git a/broker-core/src/main/java/org/eclipse/kapua/broker/core/listener/DeviceManagementNotificationMessageProcessor.java b/broker-core/src/main/java/org/eclipse/kapua/broker/core/listener/DeviceManagementNotificationMessageProcessor.java index 71fca65c6f1..9af70d7bf9c 100644 --- a/broker-core/src/main/java/org/eclipse/kapua/broker/core/listener/DeviceManagementNotificationMessageProcessor.java +++ b/broker-core/src/main/java/org/eclipse/kapua/broker/core/listener/DeviceManagementNotificationMessageProcessor.java @@ -66,23 +66,27 @@ public void processMessage(CamelKapuaMessage message) throws KapuaException { LOG.debug("Received notification message from device channel: client id '{}' - {}", message.getMessage().getClientId(), message.getMessage().getChannel()); KapuaNotifyMessage notifyMessage = (KapuaNotifyMessage) message.getMessage(); - KapuaNotifyPayload notifyPayload = notifyMessage.getPayload(); - DEVICE_MANAGEMENT_REGISTRY_MANAGER_SERVICE.processOperationNotification( - notifyMessage.getScopeId(), - notifyPayload.getOperationId(), - MoreObjects.firstNonNull(notifyMessage.getSentOn(), notifyMessage.getReceivedOn()), - notifyPayload.getResource(), - notifyPayload.getStatus(), - notifyPayload.getProgress()); - - JOB_DEVICE_MANAGEMENT_OPERATION_MANAGER_SERVICE.processJobTargetOnNotification( - notifyMessage.getScopeId(), - notifyPayload.getOperationId(), - MoreObjects.firstNonNull(notifyMessage.getSentOn(), notifyMessage.getReceivedOn()), - notifyPayload.getResource(), - notifyPayload.getStatus()); + try { + DEVICE_MANAGEMENT_REGISTRY_MANAGER_SERVICE.processOperationNotification( + notifyMessage.getScopeId(), + notifyPayload.getOperationId(), + MoreObjects.firstNonNull(notifyMessage.getSentOn(), notifyMessage.getReceivedOn()), + notifyPayload.getResource(), + notifyPayload.getStatus(), + notifyPayload.getProgress()); + + JOB_DEVICE_MANAGEMENT_OPERATION_MANAGER_SERVICE.processJobTargetOnNotification( + notifyMessage.getScopeId(), + notifyPayload.getOperationId(), + MoreObjects.firstNonNull(notifyMessage.getSentOn(), notifyMessage.getReceivedOn()), + notifyPayload.getResource(), + notifyPayload.getStatus()); + } catch (Exception e) { + LOG.error("Error while processing Device Management Operation Notification message!", e); + throw e; + } } public void processCommunicationErrorMessage(Exchange exchange, CamelKapuaMessage message) throws KapuaException {