/**
- * Copyright (c) 2018 Orange
+ * 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
+ * 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
+ * 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.apis.hub;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
import org.onap.nbi.apis.hub.model.Subscriber;
import org.onap.nbi.apis.hub.model.Subscription;
+import org.onap.nbi.apis.hub.service.dmaap.CheckDMaaPEventsManager;
import org.onap.nbi.apis.hub.service.SubscriptionService;
import org.onap.nbi.commons.JsonRepresentation;
import org.onap.nbi.commons.MultiCriteriaRequestBuilder;
import org.springframework.http.ResponseEntity;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
-
-import java.net.URI;
-import java.util.List;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/hub")
@EnableScheduling
public class HubResource extends ResourceManagement {
- Logger logger = LoggerFactory.getLogger(HubResource.class);
-
- @Autowired
- MongoTemplate mongoTemplate;
-
- @Autowired
- SubscriptionService subscriptionService;
+ Logger logger = LoggerFactory.getLogger(HubResource.class);
- @Autowired
- MultiCriteriaRequestBuilder multiCriteriaRequestBuilder;
+ @Autowired
+ MongoTemplate mongoTemplate;
- @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<Subscriber> createEventSubscription(@RequestBody Subscription subscription) {
- logger.debug("POST request for subscription : {}", subscription);
+ @Autowired
+ SubscriptionService subscriptionService;
- Subscriber subscriber = subscriptionService.createSubscription(subscription);
+ @Autowired
+ MultiCriteriaRequestBuilder multiCriteriaRequestBuilder;
- URI location = ServletUriComponentsBuilder
- .fromCurrentRequest()
- .path("/{id}")
- .buildAndExpand(subscriber.getId())
- .toUri();
+ @Autowired
+ CheckDMaaPEventsManager checkDMaaPEventMAnager;
- return ResponseEntity.created(location).build();
- }
-
- @GetMapping(value = "/{subscriptionId}", produces = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<Subscription> getSubscription(@PathVariable String subscriptionId) {
+ @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity<Object> createEventSubscription(@RequestBody Subscription subscription,
+ @RequestParam MultiValueMap<String, String> params) {
+ logger.debug("POST request for subscription : {}", subscription);
+ Subscriber subscriber = subscriptionService.createSubscription(subscription);
+ JsonRepresentation filter = new JsonRepresentation(params);
+ return this.createResponse(Subscription.createFromSubscriber(subscriber), filter);
- Subscriber subscriber = subscriptionService.findSubscriptionById(subscriptionId);
- if (subscriber == null) {
- return ResponseEntity.notFound().build();
- }
- return ResponseEntity.ok(Subscription.createFromSubscriber(subscriber));
- }
+ }
- @GetMapping(value = "", produces = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<Object> findSubscribers(@RequestParam MultiValueMap<String, String> params) {
+ @GetMapping(value = "/{subscriptionId}", produces = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity<Subscription> getSubscription(@PathVariable String subscriptionId) {
- Query query = multiCriteriaRequestBuilder.buildRequest(params);
- List<Subscriber> subscribers = mongoTemplate.find(query, Subscriber.class);
- JsonRepresentation filter = new JsonRepresentation(params);
- long totalCount = subscriptionService.countSubscription();
- HttpHeaders headers = new HttpHeaders();
- headers.add("X-Total-Count", String.valueOf(totalCount));
- headers.add("X-Result-Count", String.valueOf(subscribers.size()));
-
- return this.findResponse(subscribers, filter, headers);
+ Optional<Subscriber> optionalSubscriber =
+ subscriptionService.findSubscriptionById(subscriptionId);
+ if (!optionalSubscriber.isPresent()) {
+ return ResponseEntity.notFound().build();
}
+ return ResponseEntity.ok(Subscription.createFromSubscriber(optionalSubscriber.get()));
+ }
+
+ @GetMapping(value = "", produces = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity<Object> findSubscribers(
+ @RequestParam MultiValueMap<String, String> params) {
+
+ Query query = multiCriteriaRequestBuilder.buildRequest(params);
+ List<Subscriber> subscribers = mongoTemplate.find(query, Subscriber.class);
+ JsonRepresentation filter = new JsonRepresentation(params);
+ long totalCount = subscriptionService.countSubscription();
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("X-Total-Count", String.valueOf(totalCount));
+ headers.add("X-Result-Count", String.valueOf(subscribers.size()));
+ List<Subscription> subscriptions =
+ subscribers.stream().map(Subscription::createFromSubscriber).collect(Collectors.toList());
+
+ return this.findResponse(subscriptions, filter, headers);
+
+ }
+
+ /*
+ * Resource to test for DMaaP Integration for subscribing to AAI-EVENTs
+ */
+ @GetMapping("/testaaievents")
+ @ResponseStatus(HttpStatus.OK)
+ public void testAAIEventListener() {
+ checkDMaaPEventMAnager.checkForDMaaPAAIEvents();
+ }
+
+ @DeleteMapping("/{subscriptionId}")
+ @ResponseStatus(HttpStatus.NO_CONTENT)
+ public void deleteSubscription(@PathVariable String subscriptionId) {
+ logger.debug("DELETE request for subscription id #{}", subscriptionId);
+ subscriptionService.deleteSubscription(subscriptionId);
+ }
- @DeleteMapping("/{subscriptionId}")
- @ResponseStatus(HttpStatus.NO_CONTENT)
- public void deleteSubscription(@PathVariable String subscriptionId) {
- logger.debug("DELETE request for subscription id #{}", subscriptionId);
- subscriptionService.deleteSubscription(subscriptionId);
- }
}
Code Review / externalapi / nbi.git / blobdiff