aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/java
diff options
context:
space:
mode:
authorMatthieu Geerebaert <matthieu.geerebaert@orange.com>2019-03-04 16:04:21 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-04 16:04:21 +0000
commit54f4f123ca4fd37ded22dc7887a4bb7bb468f01b (patch)
tree79ad4c838dcc9432bad0c7688b514f9f9655153c /src/test/java
parente0e7ba60753556c5a135ebc057ad3780cddacb28 (diff)
parentd6df1fa47283fd52c8b1970d16c994919203f59e (diff)
Merge "Add DMaaP Integration to retrieve AAI-EVENT"
Diffstat (limited to 'src/test/java')
-rw-r--r--src/test/java/org/onap/nbi/api/listener/ListenerResource.java140
1 files changed, 78 insertions, 62 deletions
diff --git a/src/test/java/org/onap/nbi/api/listener/ListenerResource.java b/src/test/java/org/onap/nbi/api/listener/ListenerResource.java
index 1b60109..8fb276d 100644
--- a/src/test/java/org/onap/nbi/api/listener/ListenerResource.java
+++ b/src/test/java/org/onap/nbi/api/listener/ListenerResource.java
@@ -1,18 +1,18 @@
/**
* Copyright (c) 2019 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
+ * 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.
+ * 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.api.listener;
-import com.fasterxml.jackson.databind.JsonNode;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
@@ -34,81 +34,97 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import com.fasterxml.jackson.databind.JsonNode;
@RestController
@RequestMapping("/test/listener")
public class ListenerResource extends ResourceManagement {
- Logger logger = LoggerFactory.getLogger(ListenerResource.class);
-
- static Map<String, JsonNode> events = new ConcurrentHashMap<>();
+ Logger logger = LoggerFactory.getLogger(ListenerResource.class);
- /*
- listener resource test for hub resource
- */
- @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<JsonNode> postListener(@RequestBody JsonNode event) {
- if (logger.isDebugEnabled()) {
- logger.debug("POST event from nbi : {}", event.toString());
- }
- String eventId = event.get("eventId").asText();
- events.put(eventId, event);
-
- URI location = ServletUriComponentsBuilder
- .fromCurrentRequest()
- .path("/{id}")
- .buildAndExpand(eventId)
- .toUri();
+ static Map<String, JsonNode> events = new ConcurrentHashMap<>();
- return ResponseEntity.created(location).body(event);
+ /*
+ * listener resource test for hub resource
+ */
+ @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity<JsonNode> postListener(@RequestBody JsonNode event) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("POST event from nbi : {}", event.toString());
}
-
-
- @GetMapping(value = "", produces = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<Collection<JsonNode>> findEvents(@RequestParam MultiValueMap<String, String> params) {
- Collection<JsonNode> values = new ArrayList<>();
- String serviceOrderId = params.getFirst("serviceOrderId");
- if(StringUtils.isNotEmpty(serviceOrderId)) {
- for (JsonNode jsonNode : events.values()) {
- String id = jsonNode.get("event").get("id").asText();
- logger.info("found event with service order id : "+id);
- if(id.equals(serviceOrderId)) {
- values.add(jsonNode);
- }
- }
- if(!values.isEmpty()) {
- return ResponseEntity.ok(values);
- } else {
- logger.error("cannot found events with service order id : "+serviceOrderId);
- return ResponseEntity.notFound().build();
- }
- } else {
- values=events.values();
+ String eventId = event.get("eventId").asText();
+ logger.info("putting eventId {} in the events map", eventId);
+ events.put(eventId, event);
+
+ URI location = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}")
+ .buildAndExpand(eventId).toUri();
+
+ return ResponseEntity.created(location).body(event);
+ }
+
+
+ @GetMapping(value = "", produces = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity<Collection<JsonNode>> findEvents(
+ @RequestParam MultiValueMap<String, String> params) {
+ logger.info("called listener get with params {} : " + params.toString());
+ Collection<JsonNode> values = new ArrayList<>();
+ String serviceOrderId = params.getFirst("serviceOrderId");
+ String serviceInstanceId = params.getFirst("serviceInstanceId");
+ if (StringUtils.isNotEmpty(serviceOrderId)) {
+ for (JsonNode jsonNode : events.values()) {
+ String id = jsonNode.get("event").get("id").asText();
+ logger.info("found event with service order id : " + id);
+ if (id.equals(serviceOrderId)) {
+ values.add(jsonNode);
+ }
+ }
+ if (!values.isEmpty()) {
+ return ResponseEntity.ok(values);
+ } else {
+ logger.error("cannot found events with service order id : " + serviceOrderId);
+ return ResponseEntity.notFound().build();
+ }
+ } else if (StringUtils.isNotEmpty(serviceInstanceId)) {
+ for (JsonNode jsonNode : events.values()) {
+ String id = jsonNode.get("event").get("id").asText();
+ logger.info("found event with service Instance id : " + id);
+ if (id.equals(serviceInstanceId)) {
+ values.add(jsonNode);
}
+ }
+ if (!values.isEmpty()) {
return ResponseEntity.ok(values);
+ } else {
+ logger.error("cannot found events with service instance id : " + serviceInstanceId);
+ return ResponseEntity.notFound().build();
+ }
+ } else {
+ values = events.values();
}
+ return ResponseEntity.ok(values);
+ }
- @GetMapping(value = "/{eventId}", produces = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<Object> getEvent(@PathVariable String eventId) {
+ @GetMapping(value = "/{eventId}", produces = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity<Object> getEvent(@PathVariable String eventId) {
- return ResponseEntity.ok(events.get(eventId));
+ return ResponseEntity.ok(events.get(eventId));
- }
+ }
- @DeleteMapping(value = "/{eventId}", produces = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<Object> deleteEvent(@PathVariable String eventId) {
+ @DeleteMapping(value = "/{eventId}", produces = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity<Object> deleteEvent(@PathVariable String eventId) {
- events.remove(eventId);
- return ResponseEntity.noContent().build();
+ events.remove(eventId);
+ return ResponseEntity.noContent().build();
- }
+ }
- @DeleteMapping(produces = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<Object> deleteEvents() {
+ @DeleteMapping(produces = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity<Object> deleteEvents() {
- events.clear();
- return ResponseEntity.noContent().build();
+ events.clear();
+ return ResponseEntity.noContent().build();
- }
+ }
}