diff options
author | romaingimbert <romain.gimbert@orange.com> | 2019-02-01 15:05:15 +0100 |
---|---|---|
committer | romaingimbert <romain.gimbert@orange.com> | 2019-02-01 15:05:15 +0100 |
commit | 7093b767e7d9a76c4f91ec98e95a9b1ea8a5e14d (patch) | |
tree | bf5d63b7d170504e490ca415345543d855dcbf62 /src/main/java/org/onap/nbi/apis/hub/HubResource.java | |
parent | 2afa1a1b9b020c0ada15581658268e98b7219a64 (diff) |
Update to Spring Boot 2
-update pom dependencies
-fix code
-fix test
Change-Id: I23c3c702c598ce46e5b861a2fbdfd06f2d439c51
Issue-ID: EXTAPI-192
Signed-off-by: romaingimbert <romain.gimbert@orange.com>
Diffstat (limited to 'src/main/java/org/onap/nbi/apis/hub/HubResource.java')
-rwxr-xr-x | src/main/java/org/onap/nbi/apis/hub/HubResource.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/org/onap/nbi/apis/hub/HubResource.java b/src/main/java/org/onap/nbi/apis/hub/HubResource.java index 6383265..0f94802 100755 --- a/src/main/java/org/onap/nbi/apis/hub/HubResource.java +++ b/src/main/java/org/onap/nbi/apis/hub/HubResource.java @@ -14,6 +14,7 @@ package org.onap.nbi.apis.hub; import java.net.URI; 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; @@ -72,11 +73,12 @@ public class HubResource extends ResourceManagement { @GetMapping(value = "/{subscriptionId}", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity<Subscription> getSubscription(@PathVariable String subscriptionId) { - Subscriber subscriber = subscriptionService.findSubscriptionById(subscriptionId); - if (subscriber == null) { + + Optional<Subscriber> optionalSubscriber = subscriptionService.findSubscriptionById(subscriptionId); + if (!optionalSubscriber.isPresent()) { return ResponseEntity.notFound().build(); } - return ResponseEntity.ok(Subscription.createFromSubscriber(subscriber)); + return ResponseEntity.ok(Subscription.createFromSubscriber(optionalSubscriber.get())); } @GetMapping(value = "", produces = MediaType.APPLICATION_JSON_VALUE) |