import com.fasterxml.jackson.databind.JsonNode;
import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
+import java.util.Date;
public class Event {
- private String eventId;
- private LocalDateTime eventDate;
+ private java.lang.String eventId;
+ private Date eventDate;
@NotNull
- private String eventType = "string";
+ private String eventType;
@NotNull
private JsonNode event;
this.eventId = eventId;
}
- public LocalDateTime getEventDate() {
+ public Date getEventDate() {
return eventDate;
}
- public void setEventDate(LocalDateTime eventDate) {
+ public void setEventDate(Date eventDate) {
this.eventDate = eventDate;
}
- public String getEventType() {
- return eventType;
- }
-
- public void setEventType(String eventType) {
- this.eventType = eventType;
- }
-
public JsonNode getEvent() {
return event;
}
public void setEvent(JsonNode event) {
this.event = event;
}
+
+ public String getEventType() {
+ return eventType;
+ }
+
+ public void setEventType(String eventType) {
+ this.eventType = eventType;
+ }
}
--- /dev/null
+/**
+ * Copyright (c) 2018 Orange
+ *
+ * Licensed 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.onap.nbi.apis.hub.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum EventType {
+
+ SERVICE_ORDER_CREATION("ServiceOrderCreationNotification"),
+
+ SERVICE_ORDER_STATE_CHANGE("ServiceOrderStateChangeNotification"),
+
+ SERVICE_ORDER_ITEM_STATE_CHANGE("ServiceOrderItemStateChangeNotification");
+
+ private String value;
+
+ EventType(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return String.valueOf(value);
+ }
+
+ @JsonCreator
+ public static EventType fromValue(String text) {
+ for (EventType b : EventType.values()) {
+ if (String.valueOf(b.value).equals(text)) {
+ return b;
+ }
+ }
+ return null;
+ }
+
+ @JsonValue
+ public String value() {
+ return this.value;
+ }
+
+}
Stream.of(request.getQuery().split("&"))
.map(q -> q.split("="))
.filter(q -> q.length == 2)
- .forEach(q -> sub.getQuery().put(q[0], q[1].split(",")));
+ .forEach(q -> sub.getQuery().put(q[0].trim(), q[1].trim().split(",")));
return sub;
}
--- /dev/null
+/**
+ * Copyright (c) 2018 Orange
+ *
+ * Licensed 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.onap.nbi.apis.hub.service;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onap.nbi.apis.hub.model.Event;
+import org.onap.nbi.apis.hub.model.EventType;
+import org.onap.nbi.apis.serviceorder.model.ServiceOrder;
+import org.onap.nbi.apis.serviceorder.model.ServiceOrderItem;
+import org.onap.nbi.commons.JacksonFilter;
+import org.onap.nbi.commons.JsonRepresentation;
+
+import java.util.Date;
+import java.util.UUID;
+
+public class EventFactory {
+
+ private static final ObjectMapper mapper = new ObjectMapper();
+
+ public static Event getEvent(EventType eventType, ServiceOrder serviceOrder, ServiceOrderItem serviceOrderItem) {
+ Event event = new Event();
+ event.setEventId(UUID.randomUUID().toString());
+ event.setEventDate(new Date());
+ event.setEventType(eventType.value());
+
+ JsonNode serviceOrderJson = mapper.valueToTree(filterServiceOrder(serviceOrder));
+
+ if (EventType.SERVICE_ORDER_ITEM_STATE_CHANGE.equals(eventType)) {
+ JsonNode serviceOrderItemJson = mapper.valueToTree(serviceOrderItem);
+ ((ObjectNode)serviceOrderJson).putArray("orderItem").add(serviceOrderItemJson);
+ }
+
+ event.setEvent(serviceOrderJson);
+
+ return event;
+ }
+
+
+ /**
+ * Filter ServiceOrderObject to produce a lightweight object that fit the eventBody specification
+ * @param serviceOrder
+ * @return
+ */
+ private static Object filterServiceOrder(final ServiceOrder serviceOrder) {
+
+ Object filteredServiceOrder;
+
+ JsonRepresentation jsonRepresentation = new JsonRepresentation();
+ jsonRepresentation.add("id").add("href").add("externalId").add("state").add("orderDate").add
+ ("completionDateTime").add("orderItem");
+
+ filteredServiceOrder = JacksonFilter.createNode(serviceOrder, jsonRepresentation);
+
+ return filteredServiceOrder;
+ }
+}
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Aspect;
+import org.onap.nbi.apis.hub.model.Event;
+import org.onap.nbi.apis.hub.model.EventType;
import org.onap.nbi.apis.hub.repository.SubscriberRepository;
import org.onap.nbi.apis.serviceorder.model.ServiceOrder;
+import org.onap.nbi.apis.serviceorder.model.ServiceOrderItem;
import org.onap.nbi.apis.serviceorder.model.StateType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Configurable;
".createServiceOrder(..))", returning = "serviceOrderCreated")
public void whenCreateServiceOrder(ServiceOrder serviceOrderCreated) {
if(StateType.ACKNOWLEDGED.equals(serviceOrderCreated.getState())) {
- // Notif createServiceOrder
+ processEvent(EventFactory.getEvent(EventType.SERVICE_ORDER_CREATION, serviceOrderCreated, null));
}
}
public void whenUpdateServiceOrderState(ServiceOrder serviceOrderUpdated) {
if(StateType.COMPLETED.equals(serviceOrderUpdated.getState())||
StateType.FAILED.equals(serviceOrderUpdated.getState())) {
- // Notif updateServiceOrder
+ processEvent(EventFactory.getEvent(EventType.SERVICE_ORDER_STATE_CHANGE, serviceOrderUpdated, null));
}
}
Object[] signatureArgs = joinPoint.getArgs();
if(signatureArgs != null && signatureArgs.length == 3) {
+ ServiceOrder serviceOrder = (ServiceOrder) signatureArgs[0];
+ ServiceOrderItem serviceOrderItem = (ServiceOrderItem) signatureArgs[1];
StateType serviceOrderItemState = (StateType) signatureArgs[2];
- // Notif updateServiceOrderItem
+ processEvent(EventFactory.getEvent(EventType.SERVICE_ORDER_ITEM_STATE_CHANGE, serviceOrder,
+ serviceOrderItem));
}
}
+
+ /**
+ * Retreive subscribers that match an event and fire notification
+ * asynchronously
+ * @param event
+ */
+ private void processEvent(Event event) {
+ subscriberRepository
+ .findSubscribersUsingEvent(event)
+ .forEach(sub -> notifier.run(sub, event));
+ }
}
}
ServiceOrder serviceOrderSaved =serviceOrderService.createServiceOrder(serviceOrder);
- serviceOrderService.updateOrderHref(serviceOrderSaved);
JsonRepresentation filter = new JsonRepresentation(params);
return this.createResponse(serviceOrderSaved, filter);
for (ServiceOrderItem serviceOrderItem : serviceOrder.getOrderItem()) {
serviceOrderItem.setState(StateType.ACKNOWLEDGED);
}
- return serviceOrderRepository.save(serviceOrder);
- }
-
- public void updateOrderHref(ServiceOrder serviceOrder){
+ serviceOrder = serviceOrderRepository.save(serviceOrder);
serviceOrder.setHref("serviceOrder/" + serviceOrder.getId());
- serviceOrderRepository.save(serviceOrder);
+ return serviceOrderRepository.save(serviceOrder);
}
-
public void deleteServiceOrder(String serviceOrderId){
serviceOrderRepository.delete(serviceOrderId);
}
Code Review / externalapi / nbi.git / commitdiff